From 2b343fea5975936af3143c7e9cb68b0150b0d80b Mon Sep 17 00:00:00 2001 From: csrichter Date: Fri, 19 May 2017 11:57:35 +0200 Subject: [PATCH] rudementary consolidation of messages in log --- python/tmc_classes.py | 8 ++++++-- python/tmc_parser.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python/tmc_classes.py b/python/tmc_classes.py index e59ff3f..617eaa1 100644 --- a/python/tmc_classes.py +++ b/python/tmc_classes.py @@ -614,7 +614,11 @@ class tmc_dict: return True def add(self,message): self.list_lock.acquire() - self.message_list.append(message) + #check if duplicate of last message in list + if len(self.message_list)>=1 and self.message_list[-1].tmc_hash==message.tmc_hash: + self.message_list[-1].add_confirmation(message) + else: + self.message_list.append(message) self.list_lock.release() self.dict_lock.acquire() try: @@ -789,7 +793,7 @@ class tmc_message: def log_string(self): retstr="" try: - retstr=str(self.event.updateClass)+": "+self.getTime()+": "+self.location_text()+": "+self.events_string()+"; "+self.info_str()+"; "+self.psn + retstr=str(self.event.updateClass)+": "+self.getTime()+": "+self.location_text()+": "+self.events_string()+"; "+self.info_str()+"; "+str(list(self.psns))+"x%i"%self.confirmations except UnicodeDecodeError as e: print e code.interact(local=locals()) diff --git a/python/tmc_parser.py b/python/tmc_parser.py index 058a02a..d000236 100644 --- a/python/tmc_parser.py +++ b/python/tmc_parser.py @@ -202,7 +202,7 @@ class tmc_parser(gr.sync_block): if tmc_msg.is_complete: self.print_tmc_msg(tmc_msg)#print message self.dataLock.acquire(1)#wait for print before delete - print_dbg("deleted finished message") + print_dbg("deleted finished (multi-group) message") del self.unfinished_messages[PI][tmc_msg.ci]#delete finished message self.dataLock.release(1) else: