Незначительно причесан код (убраны дублирующиеся строки).

[mqtt-noolite.git] / nmd / nl_mqtt.py

diff --git a/nmd/nl_mqtt.py b/nmd/nl_mqtt.py
index ab7b997c3e747fb1dafc0929c878c6b932a6d5cd..d4ce7aec82b0c71b705e76f1f85a9c5711871f6d 100644 (file)
--- a/nmd/nl_mqtt.py
+++ b/nmd/nl_mqtt.py
@@ -100,7 +100,7 @@ class MqttDriver(metaclass=Singleton):
                   if command == "power":
                     payload = payload.decode('utf-8').lower()
                     print( "command: POWER " + payload )
-                    if payload == "off":
+                    if payload == "off" or payload == "0":
                       mtrf_command["cmd"] = 0
                     else:  
                       mtrf_command["cmd"] = 2
@@ -144,6 +144,22 @@ class MqttDriver(metaclass=Singleton):
                   elif command == "service":
                     mtrf_command["cmd"] = 131
 
+                  elif command == "start_bind":
+                    mtrf_command["ctr"] = 3
+                    mtrf_command["cmd"] = 0
+                    
+                  elif command == "stop_bind":
+                    mtrf_command["ctr"] = 4
+                    mtrf_command["cmd"] = 0
+
+                  elif command == "clear_bind":
+                    mtrf_command["ctr"] = 5
+                    mtrf_command["cmd"] = 0
+
+                  elif command == "unbind_addr":
+                    mtrf_command["ctr"] = 7
+                    mtrf_command["cmd"] = 0
+
                 except Exception as e:
                   logger.exception(e)
                   continue
@@ -225,10 +241,6 @@ class MqttDriver(metaclass=Singleton):
           message['command'] = 'BRIGHT_UP'
         elif cmd == 4: 
           message['command'] = 'SWITCH'
-        elif cmd == 5: 
-          message['command'] = 'SWITCH'
-        elif cmd == 5: 
-          message['command'] = 'BRIGHT_BACK'
         elif cmd == 5: 
           message['command'] = 'BRIGHT_BACK'
         elif cmd == 6: 
@@ -241,12 +253,12 @@ class MqttDriver(metaclass=Singleton):
           message['command'] = 'UNBIND'
         elif cmd == 10: 
           message['command'] = 'STOP_REG'
-#        elif cmd == 11: 
-#          message['command'] = 'BRIGHTNESS_STEP_DOWN'
-#        elif cmd == 12: 
-#          message['command'] = 'BRIGHTNESS_STEP_UP'
-#        elif cmd == 13: 
-#          message['command'] = 'BRIGHT_REG'
+        elif cmd == 11: 
+          message['command'] = 'BRIGHTNESS_STEP_DOWN'
+        elif cmd == 12: 
+          message['command'] = 'BRIGHTNESS_STEP_UP'
+        elif cmd == 13: 
+          message['command'] = 'BRIGHT_REG'
         elif cmd == 15: 
           message['command'] = 'BIND'
         elif cmd == 16: