Changed order of args for handle_serial_rx, now hands over the code_id

software/coordinator2.py

@@ -157,7 +157,7 @@ def handle_match_rx_corrupt( src_id, ts, match_rx_corrupt, temp ):
     db_lock.release()
     return True
 
-def handle_serial_rx(src_id, ts, line, temp):
+def handle_serial_rx(src_id, ts, temp, line):
     global eval_round
 
     if eval_round is None:
@@ -300,7 +300,7 @@ class PRREvalClient(Thread):
 
         else:
             self.logger.warning("Connected to unexspected mqtt server!")
-        
+
     def on_message(self, client, userdata, msg):
         topic = msg.topic.split('/')
         if msg.topic == self.HUB_ONE_DISCOVERY_ANSWER_TOPIC or msg.topic == self.HUB_TWO_DISCOVERY_ANSWER_TOPIC:
@@ -361,10 +361,10 @@ class PRREvalClient(Thread):
 
             #write it to the DB!
             if userdata == self.chamber_one_logger_pi:
-                handle_serial_rx(node_serial_id, ts, line, self.chamber_one_temp)
+                handle_serial_rx(node_code_id, ts, self.chamber_one_temp, line)
 
             elif userdata == self.chamber_two_logger_pi:
-                handle_serial_rx(node_serial_id, ts, line, self.chamber_two_temp)
+                handle_serial_rx(node_code_id, ts, self.chamber_two_temp, line)
             
             else:
                 self.logger.warning("Got node message from unknown source!")