rudementary consolidation of messages in log

python/tmc_classes.py

@@ -614,6 +614,10 @@ class tmc_dict:
         return True        
     def add(self,message):
         self.list_lock.acquire()
+        #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()
@@ -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())

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: