Update README.md

Author: dhoomakethu

img/simu.gif

@@ -286,16 +286,17 @@ def update_view(self):
             self.add_widget(self.list_view)
             self.dirty_model = False
 
-    def get_address(self, offset):
+    def get_address(self, offset, as_string=False):
         offset = int(offset)
         if self.blockname == "coils":
-            return offset
+            offset = offset
         elif self.blockname == "discrete_inputs":
-            return 10001 + offset if offset < 10001 else offset
+            offset = 10001 + offset if offset < 10001 else offset
         elif self.blockname == "input_registers":
-            return 30001 + offset if offset < 30001 else offset
+            offset = 30001 + offset if offset < 30001 else offset
         else:
-            return 40001 + offset if offset < 40001 else offset
+            offset = 40001 + offset if offset < 40001 else offset
+        return str(offset) if as_string else offset
 
     def arg_converter(self, index, data):
         """
@@ -369,14 +370,17 @@ def add_data(self, data):
         self.update_view()
         current_keys = self.list_view.adapter.sorted_keys
         next_index = 0
+        key_as_string = False
         if current_keys:
             next_index = int(max(current_keys)) + 1
-        data = {self.get_address(int(offset) + next_index): v
+            if not isinstance(current_keys[0], int):
+                key_as_string = True
+        data = {self.get_address(int(offset) + next_index, key_as_string): v
                 for offset, v in data.items()}
         for offset, d in data.items():
             # offset = self.get_address(offset)
             item_strings.append(offset)
-            if offset >= 30001:
+            if int(offset) >= 30001:
                 if not d.get('formatter'):
                     d['formatter'] = 'uint16'
 
@@ -473,7 +477,10 @@ def refresh(self, data={}, to_remove=None):
         :return:
         """
         self.update_view()
-        self.list_view.adapter.data.update(data)
+        if not data or len(data) != len(self.list_view.adapter.data):
+            self.list_view.adapter.data = data
+        else:
+            self.list_view.adapter.data.update(data)
         if to_remove:
             for entry in to_remove:
                 removed = self.list_view.adapter.data.pop(entry, None)

modbus_simulator/ui/datamodel.py

@@ -448,7 +448,9 @@ def _add_slaves(self, selected, data, ret):
             self.modbus_device.add_slave(slave_to_add)
             for block_name, block_type in BLOCK_TYPES.items():
                 self.modbus_device.add_block(slave_to_add,
-                                             block_name, block_type, self.block_start, self.block_size)
+                                             block_name, block_type,
+                                             self.block_start,
+                                             self.block_size)
 
             data.append(str(slave_to_add))
         self.slave_list.adapter.data = data
@@ -540,9 +542,13 @@ def _update_data_models(self, active, tab, value):
         current_tab = MAP[ct.text]
 
         ct.content.update_view()
-        # self.data_map[self.active_slave][current_tab]['dirty'] = False
         _data = self.data_map[active][current_tab]
-        item_strings = _data['item_strings']
+        registers = sum(
+            map(
+                lambda val: int(
+                    filter(
+                        str.isdigit, str(val.get('formatter', '16')))
+                ), _data['data'].values()))/16
 
         # Old schema
         if isinstance(value, list):
@@ -553,14 +559,15 @@ def _update_data_models(self, active, tab, value):
                     value[index] = {'value': v}
                 if current_tab in ['input_registers', 'holding_registers']:
                     value[index]['formatter'] = 'uint16'
-        if len(value) < self.block_size:
+        if registers+len(value) <= self.block_size:
             list_data, item_strings = ct.content.add_data(value)
-            _data['item_strings'] = item_strings
+            _data['item_strings'].extend(item_strings)
+            _data['item_strings'] = list(set(_data['item_strings']))
             _data['data'].update(list_data)
-            self.update_backend(int(active), current_tab, value)
+            self.update_backend(int(active), current_tab, list_data)
         else:
             msg = ("OutOfModbusBlockError: address %s"
-                   " is out of block size %s" % (len(item_strings),
+                   " is out of block size %s" % (len(value),
                                                  self.block_size))
             self.show_error(msg)
 
@@ -610,9 +617,14 @@ def sync_formatter_callback(self, blockname, data, old_formatter):
                 _updated['count'] = count
                 if old_wc > new_wc:
                     missing = self.modbus_device.get_values(
-                        int(self.active_slave), current_tab, k, old_wc-new_val)
+                        int(self.active_slave),
+                        current_tab, int(k) + new_wc,
+                        old_wc-new_wc
+                    )
                     for i, val in enumerate(missing):
-                        o = int(k) + i
+                        o = int(k) + new_wc + i
+                        if not isinstance(k, int):
+                            o = str(o)
                         data[o] = {'value': val, 'formatter': 'uint16'}
             _data['data'].update(data)
             _data['data'] = dict(ct.content.update_registers(_data['data'],
@@ -873,9 +885,13 @@ def load_state(self):
             slaves_memory = data['slaves_memory']
             for slave_memory in slaves_memory:
                 active_slave, memory_type, memory_data = slave_memory
-                self._update_data_models(active_slave,
-                                         memory_map[memory_type],
-                                         memory_data)
+                _data = self.data_map[active_slave][memory_type]
+                _data['data'].update(memory_data)
+                _data['item_strings'] = list(sorted(memory_data.keys()))
+                self.update_backend(int(active_slave), memory_type, memory_data)
+                # self._update_data_models(active_slave,
+                #                          memory_map[memory_type],
+                #                          memory_data)
 
 
 setting_panel = """

modbus_simulator/ui/gui.py

@@ -177,7 +177,7 @@ def _add_device_info(self):
         self.identity.VendorUrl = 'http://github.com/riptideio/'
         self.identity.ProductName = 'Modbus Server'
         self.identity.ModelName = 'Modbus Server'
-        self.identity.MajorMinorRevision = '1.0.0'
+        self.identity.MajorMinorRevision = '2.0.0'
 
     @property
     def server_type(self):