Merge branch 'wip-stable7-7.1.011' into stable7

zigbeefordomoticz · Mar 17, 2024 · 5199be9 · 5199be9
2 parents f1fad23 + f66268c
commit 5199be9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Modules/domoCreate.py b/Modules/domoCreate.py
@@ -767,6 +767,12 @@ def set_default_value( self, Devices, unit, widget_record):
     "ProdPower": {
         "widgetType": "Usage"
     },
+    "SOS": {
+        "Type": 244,
+        "Subtype": 73,
+        "Switchtype": 9,
+        "Image": 13
+    },
     "ShutterCalibration": {
         "Type": 244,
         "Subtype": 73,

diff --git a/Modules/inRawAps.py b/Modules/inRawAps.py
@@ -117,7 +117,7 @@ def inRawAps( self, Devices, srcnwkid, srcep, cluster, dstnwkid, dstep, Sqn, Glo
 
         elif Command == "02":
             # Emergency
-            MajDomoDevice(self, Devices, srcnwkid, srcep, "0006", "02")
+            MajDomoDevice(self, Devices, srcnwkid, srcep, "0006", "01")
 
         return
 

diff --git a/Modules/switchSelectorWidgets.py b/Modules/switchSelectorWidgets.py
@@ -589,13 +589,13 @@
         "ForceUpdate": False
     },
     "SOS": {
-        "00": (0, "No Alert"),
-        "01": (4, "Critical"),
+        "01": (1, "On"),
         "ForceUpdate": True
     },
     "Smoke": {
         "00": (0, "Off"),
         "01": (1, "On"),
+        "02": (1, "On"),
         "ForceUpdate": False
     },
     "Switch": {