Fix wrong value for state/open on Window Covering devices (#7314)

dresden-elektronik · Nov 17, 2023 · ecd3bc4 · ecd3bc4
1 parent 726aafa
commit ecd3bc4
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/devices/ikea/blind.json b/devices/ikea/blind.json
@@ -70,6 +70,9 @@
         {
           "name": "cap/groups/not_supported"
         },
+        {
+          "name": "state/alert"
+        },
         {
           "name": "state/lift"
         },
@@ -80,7 +83,7 @@
             "ep": 1,
             "cl": "0x0102",
             "at": "0x0008",
-            "eval": "Item.val = Attr.val === 0"
+            "eval": "Item.val = Attr.val < 100"
           },
           "read": {
             "fn": "none"
@@ -162,6 +165,9 @@
         {
           "name": "attr/uniqueid"
         },
+        {
+          "name": "config/alert"
+        },
         {
           "name": "config/on"
         },

diff --git a/devices/ikea/fyrtur_block-out_roller_blind.json b/devices/ikea/fyrtur_block-out_roller_blind.json
@@ -52,7 +52,7 @@
             "ep": 1,
             "cl": "0x0102",
             "at": "0x0008",
-            "eval": "Item.val = Attr.val === 0"
+            "eval": "Item.val = Attr.val < 100"
           },
           "read": {
             "fn": "none"

diff --git a/devices/iluminize/roller_shutter_actuator_mini.json b/devices/iluminize/roller_shutter_actuator_mini.json
@@ -81,7 +81,7 @@
             "at": "0x0008",
             "cl": "0x0102",
             "ep": 1,
-            "eval": "Item.val = Attr.val === 100",
+            "eval": "Item.val = Attr.val < 100",
             "fn": "zcl:attr"
           }
         },

diff --git a/devices/merten/meg5113-0300_cover_controller.json b/devices/merten/meg5113-0300_cover_controller.json
@@ -71,7 +71,7 @@
             "at": "0x0008",
             "cl": "0x0102",
             "ep": 5,
-            "eval": "if(Attr.val == 100) { Item.val = false; } else { Item.val = true; }",
+            "eval": "Item.val = Attr.val < 100",
             "fn": "zcl:attr"
           }
         },
@@ -97,4 +97,4 @@
       ]
     }
   ]
-}
+}
diff --git a/devices/ubisys/j1_5502.json b/devices/ubisys/j1_5502.json
@@ -77,7 +77,7 @@
             "at": "0x0008",
             "cl": "0x0102",
             "ep": 1,
-            "eval": "if (Attr.val == 100) { Item.val = false; } else { Item.val = true; }",
+            "eval": "Item.val = Attr.val < 100",
             "fn": "zcl:attr"
           },
           "read": {
@@ -362,4 +362,4 @@
       ]
     }
   ]
-}
+}
diff --git a/devices/ubisys/j1r_5602.json b/devices/ubisys/j1r_5602.json
@@ -77,7 +77,7 @@
             "at": "0x0008",
             "cl": "0x0102",
             "ep": 1,
-            "eval": "if (Attr.val == 100) { Item.val = false; } else { Item.val = true; }",
+            "eval": "Item.val = Attr.val < 100",
             "fn": "zcl:attr"
           },
           "read": {
@@ -362,4 +362,4 @@
       ]
     }
   ]
-}
+}
diff --git a/devices/wiser/wall_switch_shutter.json b/devices/wiser/wall_switch_shutter.json
@@ -60,7 +60,7 @@
                         "at": "0x0008",
                         "cl": "0x0102",
                         "ep": 5,
-                        "eval": "Item.val = Attr.val != 0",
+                        "eval": "Item.val = Attr.val < 100",
                         "fn": "zcl:attr"
                     },
                     "awake": true,
@@ -269,4 +269,4 @@
             ]
         }
     ]
-}
+}
diff --git a/devices/xiaomi/lumi_curtain.json b/devices/xiaomi/lumi_curtain.json
@@ -79,7 +79,7 @@
             "ep": 1,
             "cl": "0x0102",
             "at": "0x0008",
-            "eval": "Item.val = Attr.val === 100"
+            "eval": "Item.val = Attr.val > 0"
           },
           "read": {
             "fn": "none"

diff --git a/devices/xiaomi/lumi_curtain_acn002.json b/devices/xiaomi/lumi_curtain_acn002.json
@@ -126,7 +126,7 @@
             "ep": 1,
             "cl": "0x000D",
             "at": "0x0055",
-            "eval": "Item.val = Attr.val === 100"
+            "eval": "Item.val = Attr.val > 0"
           },
           "read": {
             "fn": "none"