Fix for old configuration with sendDataOnlyOnChange

thingsboard · Sep 19, 2024 · cbbe8af · cbbe8af
1 parent a86571d
commit cbbe8af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/thingsboard_gateway/connectors/modbus/slave.py b/thingsboard_gateway/connectors/modbus/slave.py
@@ -190,12 +190,12 @@ def __get_report_strategy_from_config(self, config: dict, default_report_strateg
         report_strategy_config = default_report_strategy_config
         if not config:
             return report_strategy_config
-        if config.get(SEND_DATA_ONLY_ON_CHANGE_PARAMETER) is not None:
+        if config.get(SEND_DATA_ONLY_ON_CHANGE_PARAMETER) is not None and not (config.get(REPORT_STRATEGY_PARAMETER)):
             report_strategy_config = {
                 'type': ReportStrategy.ON_CHANGE if config.get(SEND_DATA_ONLY_ON_CHANGE_PARAMETER) else ReportStrategy.ON_REPORT_PERIOD,
                 REPORT_PERIOD_PARAMETER: config.get(REPORT_PERIOD_PARAMETER, report_strategy_config.get(REPORT_PERIOD_PARAMETER, self.poll_period))
             }
-        if config.get(REPORT_STRATEGY_PARAMETER) is not None:
+        elif config.get(REPORT_STRATEGY_PARAMETER) is not None:
             try:
                 report_strategy_config = {
                     'type': ReportStrategy[config[REPORT_STRATEGY_PARAMETER].get('type', ReportStrategy.ON_REPORT_PERIOD.name).upper()],