From ecd3bc41547a5fb7984465f2fc90008b44873665 Mon Sep 17 00:00:00 2001
From: Erik Baauw <ebaauw@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:08:29 +0100
Subject: [PATCH] Fix wrong value for `state/open` on Window Covering devices
 (#7314)

---
 devices/ikea/blind.json                             | 8 +++++++-
 devices/ikea/fyrtur_block-out_roller_blind.json     | 2 +-
 devices/iluminize/roller_shutter_actuator_mini.json | 2 +-
 devices/merten/meg5113-0300_cover_controller.json   | 4 ++--
 devices/ubisys/j1_5502.json                         | 4 ++--
 devices/ubisys/j1r_5602.json                        | 4 ++--
 devices/wiser/wall_switch_shutter.json              | 4 ++--
 devices/xiaomi/lumi_curtain.json                    | 2 +-
 devices/xiaomi/lumi_curtain_acn002.json             | 2 +-
 9 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/devices/ikea/blind.json b/devices/ikea/blind.json
index 3fd5cd8d31..85acc29ee0 100644
--- 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
index 95f945cd99..085b8f74a7 100644
--- 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
index 285bedd1d5..91892fc048 100644
--- 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
index 9e63b5ff1e..fc8b08e1c8 100644
--- 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 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/devices/ubisys/j1_5502.json b/devices/ubisys/j1_5502.json
index e7ea15c2cd..2022c8a814 100644
--- 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 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/devices/ubisys/j1r_5602.json b/devices/ubisys/j1r_5602.json
index eaf1656a25..d733699a25 100644
--- 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 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/devices/wiser/wall_switch_shutter.json b/devices/wiser/wall_switch_shutter.json
index e773669e5f..b6a47f484c 100644
--- 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 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/devices/xiaomi/lumi_curtain.json b/devices/xiaomi/lumi_curtain.json
index d05514ffda..70910c252b 100644
--- 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
index 3e847e82d1..d4f9d9fca8 100644
--- 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"