Added profinet

examples/swat-s2/minicps/protocols.py

@@ -470,6 +470,8 @@ def __init__(self, protocol):
                 self.used_input_register[label] = "DI32"
                 self.used_output_register[label] = "DO32"
 
+            print("LABEL ORDER ", label, self.used_input_register[label], self.used_output_register[label])
+
             self.dbstate[self._server['devices'][label]['name']] =  SQLiteState({"name": PN_NAME, "path": _db_path})
 
             self._server_subprocess[label] = PnioProtocolController._start_server(

examples/swat-s2/plc3.py

@@ -46,6 +46,9 @@ def main_loop(self):
             p301 = float(self.receive(P301_PLC, PLC3_ADDR))
 
             print 'DEBUG plc1 lit301: %.5f' % lit301
+
+
+
             print 'DEBUG plc1 p301: %.5f' % p301
 
             # self.send(LIT301_PLC, lit301, PLC3_ADDR)

examples/swat-s2/profinet_controller/main.py

@@ -58,7 +58,11 @@ def connect_device(self, ip, parameter_list="") -> CPMCONState:
         self.connection.announceEndPrm()
         self.connection.ackApplicationReady()
 
+<<<<<<< HEAD
         time.sleep(5)
+=======
+        time.sleep(150)
+>>>>>>> d797139da87598c3c2998a5ea19213c859ad1345
 
         self.stop_consumer_provider()