adds latest coordinator (cleaned up)

software/coordinator2.py

@@ -56,18 +56,7 @@ def calculate_checksum(*args):
         s += sum(bytes(a, 'utf-8'))
     return hex( s&0xFF )[2:].upper().zfill(2)
 
-
-def handle_serial_rx(d):
-    src_id = d['src']['id'][0]
-    ts = d['ts']
-    line = d['line'].strip()
-
-    match_ifconfig = re_ifconfig.match(line)
-    if match_ifconfig is not None:
-        return True
-
-    match_tx = re_tx.match(line)
-    if match_tx is not None:
+def handle_match_tx( src_id, ts, match_tx ):
     seq_nr = match_tx.group("seq_nr")
     checksum = match_tx.group("checksum")
     
@@ -81,8 +70,8 @@ def handle_serial_rx(d):
     else:
         logger.debug("Corrupt Line")
         return False
-    match_rx = re_rx.match(line)
-    if match_rx is not None:
+
+def handle_match_rx( src_id, ts, match_rx ):
     node_id = match_rx.group("node_id")
     seq_nr = match_rx.group("seq_nr")
     rssi = match_rx.group('rssi')
@@ -93,15 +82,15 @@ def handle_serial_rx(d):
     if expected_checksum == checksum:
         session = Session()
         session.add(RX(serial_id = src_id, ts=ts, seq_nr = seq_nr, node_id = node_id, rssi = rssi, lqi = lqi))
+        # TODO(rh): Add sqlite3.OperationalError
         session.commit()
         #logger.log("[{}] RX: #{} from {}".format( src_id, node_id, seq_nr ))
         return True
     else:
         logger.debug("Corrupt Line {} != {}".format( expected_checksum, checksum) )
         return False
-        return True
-    match_rx_corrupt = re_rx_corrupt.match(line)
-    if match_rx_corrupt is not None:
+
+def handle_match_rx_corrupt( src_id, ts, match_rx_corrupt ):
     rssi = match_rx_corrupt.group('rssi')
     lqi = match_rx_corrupt.group('lqi')
     payload = match_rx_corrupt.group('payload').strip()
@@ -110,6 +99,24 @@ def handle_serial_rx(d):
     session.add(Corrupt(serial_id = src_id, ts=ts, rssi = rssi, lqi = lqi, payload = payload))
     session.commit()
     return True
+
+def handle_serial_rx(d):
+    src_id = d['src']['id'][0]
+    ts = d['ts']
+    line = d['line'].strip()
+
+    match_ifconfig = re_ifconfig.match(line)
+    if match_ifconfig is not None:
+        return True
+    match_tx = re_tx.match(line)
+    if match_tx is not None:
+        return handle_match_tx( src_id, ts, match_tx )
+    match_rx = re_rx.match(line)
+    if match_rx is not None:
+        return handle_match_rx( src_id, ts, match_rx )
+    match_rx_corrupt = re_rx_corrupt.match(line)
+    if match_rx_corrupt is not None:
+        return handle_match_rx_corrupt( src_id, ts, match_rx_corrupt  )
     return False
 
 class PRREvalClient(Client):
@@ -130,10 +137,15 @@ class PRREvalClient(Client):
                     logger.log( "PAYLOAD={} ".format(payload) )
                     self.send_all( "payload {}\n".format( payload )  )
                     sleep( 0.5 )
+                    # TODO(rh) START ROUND:
+                    # round = Round( channel=channel, power=power, payload=payload )
+                    # session.add( round )
+                    # sessionc.commit()
                     for sender in NODES:
                         self.send({'dst': {'id': sender}, 'type': 'serial_tx', 'line': 'tx 5 200000\n'})
                         # 5 packets, 200ms -> 1 second
                         sleep( 1.5 )
+                        self.send({'dst': {'id': sender}, 'type': 'serial_tx', 'line': 'ifconfig 3 set state idle\n'})
 
     def run(self):
         while True:
@@ -144,7 +156,7 @@ class PRREvalClient(Client):
                 break
 
     def set_channel(self, channel):
-        self.send_all("ifconfig 3 set state idle\n")
+        #self.send_all("ifconfig 3 set state idle\n")
         self.send_all("ifconfig 3 set channel {}\n".format( channel ))
     
     def set_txpower(self, power):