Fix for bad report strategy overwriting

samson0v · Sep 18, 2024 · a008d28 · a008d28
1 parent dd6805e
commit a008d28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/thingsboard_gateway/connectors/modbus/modbus_connector.py b/thingsboard_gateway/connectors/modbus/modbus_connector.py
@@ -256,8 +256,11 @@ def __add_slave_to_devices(self):
 
     def __load_slaves(self):
         for device in self.__config.get('master', {'slaves': []}).get('slaves', []):
-            self.__slaves.append(Slave(**{**device, 'connector': self, 'gateway': self.__gateway, 'logger': self.__log,
-                     'callback': ModbusConnector.callback, REPORT_STRATEGY_PARAMETER: self.__main_report_strategy}))
+            slave_config = {**device, 'connector': self, 'gateway': self.__gateway, 'logger': self.__log,
+                'callback': ModbusConnector.callback}
+            if REPORT_STRATEGY_PARAMETER not in slave_config:
+                slave_config[REPORT_STRATEGY_PARAMETER] = self.__main_report_strategy
+            self.__slaves.append(Slave(**slave_config))
 
     @classmethod
     def callback(cls, slave: Slave, request_type: RequestType, data=None):

diff --git a/thingsboard_gateway/connectors/modbus/slave.py b/thingsboard_gateway/connectors/modbus/slave.py
@@ -111,7 +111,7 @@ def timer(self):
                 if current_monotonic - self.__last_polled_time >= self.poll_period:
                     self.callback(self, RequestType.POLL)
                     self.__last_polled_time = current_monotonic
-                if current_monotonic - self.__last_checked_time >= 1:
+                if current_monotonic - self.__last_checked_time >= 1.0:
                     self.__check_data_to_send_periodically(current_monotonic)
                     self.__last_checked_time = current_monotonic
             except Exception as e: