Adds serial ids for mapping, fixed some typos

software/coordinator2.py

@@ -25,8 +25,21 @@ POWERS = [-17, -7, 3]
 PAYLOADS = ['short', 'looooooooooooong']
 LOG_DIRECTORY = "test"
 
-SERVER_ONE_NODES = { '-': ('INGA red', 0x10) , '-': ('INGA blue', 0x20) , '-': ('TelosB', 0x30) , '-': ('SAMR21-Xpro', 0x40) , '-': ('nrf52840dk', 0x50) , '-': ('Universal Node', 0x60) , '-': ('IBR-Node', 0x70) }
-SERVER_TWO_NODES = { '-': ('INGA red', 0x10) , '-': ('INGA blue', 0x20) , '-': ('TelosB', 0x30) , '-': ('SAMR21-Xpro', 0x40) , '-': ('nrf52840dk', 0x50) , '-': ('Universal Node', 0x60) , '-': ('IBR-Node', 0x70) }
+SERVER_ONE_NODES = {    'A502C3WP': ('INGA red', 0x10) ,
+                        'A502C1PW': ('INGA blue', 0x20) ,
+                        'MFSLXP25': ('TelosB', 0x30) ,
+                        'ATML2127031800008867': ('SAMR21-Xpro', 0x40) ,
+                        '000683430717': ('nrf52840dk', 0x50) ,
+                        'A50285BI': ('Universal Node', 0x60) ,
+                        'B5DF8DFF': ('IBR-Node', 0x70) }
+
+SERVER_TWO_NODES = {    'A502C3X3': ('INGA red', 0x10) ,
+                        'A502C1PF': ('INGA blue', 0x20) ,
+                        'MFT4LLAN': ('TelosB', 0x30) ,
+                        'ATML2127031800010891': ('SAMR21-Xpro', 0x40) ,
+                        '000683871093': ('nrf52840dk', 0x50) ,
+                        'A50285BI': ('Universal Node', 0x60) ,
+                        'B5DB8D0E': ('IBR-Node', 0x70) }
 
 #logger = Logger(__file__)
 Base = declarative_base()
@@ -235,7 +248,7 @@ class PRREvalClient(Thread):
         self.file_formatter = logging.Formatter('%(message)s')
         self.logger.debug("Init done")
 
-    def get_code_id(server_name, node_serial_id):
+    def get_code_id(self, server_name, node_serial_id):
         if server_name == self.server_one:
             id = 0x01
 
@@ -244,7 +257,7 @@ class PRREvalClient(Thread):
                     (node_type, node_id_offset) = SERVER_ONE_NODES[serial_id]
                     id += node_id_offset
                     return id
-            self.logger.wraning("Unknown Node!")
+            self.logger.warning("Unknown Node!")
             return -1
     
         elif server_name == self.server_two:
@@ -255,11 +268,11 @@ class PRREvalClient(Thread):
                     (node_type, node_id_offset) = SERVER_TWO_NODES[serial_id]
                     id += node_id_offset
                     return id
-            self.logger.wraning("Unknown Node!")
+            self.logger.warning("Unknown Node!")
             return -1
-            
+
         else:
-            self.logger.wraning("Unknown server!")
+            self.logger.warning("Unknown server!")
             return -1
 
     def on_disconnect(self, client, userdata, rc):
@@ -296,8 +309,8 @@ class PRREvalClient(Thread):
             self.logger.debug("Got nodes: {}".format(received_nodes))
             for node_serial_id in received_nodes:
 
-                #check if node is already known
-                if node_serial_id not in self.registered_nodes.keys() and node_serial_id is not '':
+                #check if node is not empty. ToDo: Check if node is already known!
+                if node_serial_id is not '':
 
                     #set up logging components
                     #create dir for Logs files if it does not exist yet!