Browse Source

fixed error in handling of duplicate MGM heads

dev
Clemens Richter 9 years ago
parent
commit
d4620e2bfe
  1. 2
      python/tmc_classes.py
  2. 5
      python/tmc_parser.py

2
python/tmc_classes.py

@ -917,7 +917,7 @@ class tmc_message:
self.ci=int(tmc_x&0x7) #continuity index self.ci=int(tmc_x&0x7) #continuity index
self.data_arr=BitArray() self.data_arr=BitArray()
self.mgm_list=[] self.mgm_list=[]
self.length=0 #self.length=0# attribute error is catched and signals incomplete mgm
self.location=tmc_location(tmc_z,tableobj) self.location=tmc_location(tmc_z,tableobj)
#self.event=int(tmc_y&0x7ff) #Y10-Y0 #self.event=int(tmc_y&0x7ff) #Y10-Y0
self.event=tmc_event(int(tmc_y&0x7ff),self.tableobj) #Y10-Y0 self.event=tmc_event(int(tmc_y&0x7ff),self.tableobj) #Y10-Y0

5
python/tmc_parser.py

@ -183,11 +183,12 @@ class tmc_parser(gr.sync_block):
ci=int(tmc_x&0x7) ci=int(tmc_x&0x7)
tmc_msg=tmc_message(PI,psn,ltn,tmc_x,tmc_y,tmc_z,datetime_received,self) tmc_msg=tmc_message(PI,psn,ltn,tmc_x,tmc_y,tmc_z,datetime_received,self)
self.dataLock.acquire(1) self.dataLock.acquire(1)
self.tmc_messages.add(tmc_msg) message_is_repeat=self.tmc_messages.add(tmc_msg)
self.dataLock.release(1) self.dataLock.release(1)
#if self.RDS_data[PI]["internals"]["unfinished_TMC"].has_key(ci): #if self.RDS_data[PI]["internals"]["unfinished_TMC"].has_key(ci):
#print("overwriting parital message") #print("overwriting parital message")
self.unfinished_messages[PI][ci]={"msg":tmc_msg,"time":time.time()} if not message_is_repeat:#save unfinished message only once (dont overwrite collected additional groups)
self.unfinished_messages[PI][ci]={"msg":tmc_msg,"time":time.time()}
else: else:
ci=int(tmc_x&0x7) ci=int(tmc_x&0x7)
if self.unfinished_messages[PI].has_key(ci): if self.unfinished_messages[PI].has_key(ci):

Loading…
Cancel
Save