Merge branch 'website-python-rewrite'

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/mqtt_node_util.py b/bin/mqtt_node_util.py
index 68d3bd1..639d4b9 100755
--- a/bin/mqtt_node_util.py
+++ b/bin/mqtt_node_util.py
@@ -48,7 +48,6 @@ if __name__ == '__main__':
                         help='mqtt modules to include')
     parser.add_argument('--switch-relay', choices=[0, 1], type=int,
                         help='send relay state')
-    parser.add_argument('--legacy-relay', action='store_true')
     parser.add_argument('--push-ota', type=str, metavar='OTA_FILENAME',
                         help='push OTA, receives path to firmware.bin (not .elf!)')
     parser.add_argument('--no-wait', action='store_true',
@@ -80,8 +79,10 @@ if __name__ == '__main__':
     if arg.modules:
         for m in arg.modules:
             kwargs = {}
-            if m == 'relay' and arg.legacy_relay:
+            if m == 'relay' and MqttNodesConfig().node_uses_legacy_relay_power_payload(arg.node_id):
                 kwargs['legacy_topics'] = True
+            if m == 'temphum' and MqttNodesConfig().node_uses_legacy_temphum_data_payload(arg.node_id):
+                kwargs['legacy_payload'] = True
             module_instance = mqtt_node.load_module(m, **kwargs)
             if m == 'relay' and arg.switch_relay is not None:
                 relay_module = module_instance