BEDGE-3066 fix serial server errors

Author: dhoomakethu

modbus_simulator/ui/gui.py

@@ -283,7 +283,8 @@ def _create_modbus_device(self):
             create_new = True
         else:
             if self.modbus_device.server_type == self.active_server:
-                if int(self.modbus_device.port) != int(self.port.text):
+
+                if str(self.modbus_device.port) != str(self.port.text):
                     create_new = True
                 if self._serial_settings_changed:
                     create_new = True
@@ -306,7 +307,8 @@ def _create_modbus_device(self):
 
             self._serial_settings_changed = False
         elif self.active_server == "rtu":
-            self.modbus_device._serial.open()
+            if not USE_PYMODBUS:
+                self.modbus_device._serial.open()
 
     def start_server(self, btn):
         if btn.state == "down":
@@ -549,8 +551,8 @@ def delete_data_entry(self, *args):
 
         if deleted:
             self.update_backend(int(self.active_slave), current_tab, data)
-            msg = ("modbus-tk do not support deleting "
-               "individual modbus register/discrete_inputs/coils"
+            msg = ("Deleting "
+               "individual modbus register/discrete_inputs/coils is not supported."
                "The data is removed from GUI and the corresponding value is"
                "updated to '0' in backend . ")
             self.show_error(msg)

modbus_simulator/utils/pymodbus_server.py

@@ -133,6 +133,7 @@ def __init__(self, server="tcp", *args, **kwargs):
 
         self.context = ModbusServerContext(single=False)
         self.simulate = kwargs.get('simulate', False)
+        self.dirty = False
         if server == "tcp":
             self._port = int(self._port)
             self._address = kwargs.get("address", "localhost")
@@ -188,7 +189,7 @@ def add_block(self, slave_id, block_name, block_type, starting_add, size):
 
     def remove_block(self, slave_id, block_name):
         slave = self.get_slave(slave_id)
-        slave.remove_block(block_name)
+        slave.store[_STORE_MAPPER[block_name]].reset()
 
     def remove_all_blocks(self, slave_id):
         slave = self.get_slave(slave_id)
@@ -209,10 +210,13 @@ def get_slave(self, slave_id):
         return self.context[slave_id]
 
     def start(self):
+        if self.dirty:
+            self.server_thread = ThreadedModbusServer(self.server)
         self.server_thread.start()
 
     def stop(self):
         self.server_thread.stop()
+        self.dirty = True
         # if self._server_type == 'rtu':
         #     self._serial.close()
         # self._server_add = ()