Rename curtain to more generic window coverings

athombv · Sep 24, 2024 · f1d8ebe · f1d8ebe
1 parent 53de521
commit f1d8ebe
Show file tree

Hide file tree

Showing 23 changed files with 121 additions and 121 deletions.
diff --git a/.homeycompose/flow/actions/send_command_boolean.json b/.homeycompose/flow/actions/send_command_boolean.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/actions/send_command_json.json b/.homeycompose/flow/actions/send_command_json.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/actions/send_command_number.json b/.homeycompose/flow/actions/send_command_number.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/actions/send_command_string.json b/.homeycompose/flow/actions/send_command_string.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/triggers/receive_status_boolean.json b/.homeycompose/flow/triggers/receive_status_boolean.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/triggers/receive_status_json.json b/.homeycompose/flow/triggers/receive_status_json.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/triggers/receive_status_number.json b/.homeycompose/flow/triggers/receive_status_number.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/.homeycompose/flow/triggers/receive_status_string.json b/.homeycompose/flow/triggers/receive_status_string.json
@@ -13,7 +13,7 @@
       "name": "device",
       "type": "device",
       "filter": {
-        "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+        "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
       },
       "title": {
         "en": "Device"

diff --git a/app.json b/app.json
@@ -438,7 +438,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -479,7 +479,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -520,7 +520,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -561,7 +561,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -1311,7 +1311,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -1349,7 +1349,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -1387,7 +1387,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -1425,7 +1425,7 @@
             "name": "device",
             "type": "device",
             "filter": {
-              "driver_id": "button|camera|circuit_breaker|curtain|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat"
+              "driver_id": "button|camera|circuit_breaker|dimmer|doorbell|fan|garage_door|heater|irrigator|light|other|sensor_climate|sensor_contact|sensor_human|sensor_motion|sensor_smoke|siren|socket|thermostat|window_coverings"
             },
             "title": {
               "en": "Device"
@@ -3440,88 +3440,6 @@
         }
       ]
     },
-    {
-      "capabilities": [
-        "windowcoverings_state",
-        "windowcoverings_set"
-      ],
-      "connectivity": [
-        "cloud"
-      ],
-      "platforms": [
-        "local",
-        "cloud"
-      ],
-      "images": {
-        "small": "/drivers/curtain/assets/images/small.png",
-        "large": "/drivers/curtain/assets/images/large.png",
-        "xlarge": "/drivers/curtain/assets/images/xlarge.png"
-      },
-      "pair": [
-        {
-          "id": "welcome",
-          "navigation": {
-            "next": "login_oauth2"
-          }
-        },
-        {
-          "id": "login_oauth2",
-          "template": "login_oauth2"
-        },
-        {
-          "id": "list_devices",
-          "template": "list_devices",
-          "navigation": {
-            "next": "add_devices"
-          }
-        },
-        {
-          "id": "add_devices",
-          "template": "add_devices"
-        }
-      ],
-      "repair": [
-        {
-          "id": "login_oauth2",
-          "template": "login_oauth2"
-        }
-      ],
-      "class": "curtain",
-      "name": {
-        "en": "Curtain",
-        "nl": "Gordijn"
-      },
-      "id": "curtain",
-      "settings": [
-        {
-          "type": "group",
-          "label": {
-            "en": "NOTE: Some settings are not supported by every device."
-          },
-          "children": [
-            {
-              "id": "inverse",
-              "type": "checkbox",
-              "label": {
-                "en": "Inverse direction"
-              },
-              "value": false
-            }
-          ]
-        },
-        {
-          "id": "deviceSpecification",
-          "type": "label",
-          "label": {
-            "en": "Device Specification"
-          },
-          "hint": {
-            "en": "The Tuya specification of this device"
-          },
-          "value": "<not available>"
-        }
-      ]
-    },
     {
       "capabilities": [
         "onoff",
@@ -6235,6 +6153,88 @@
           "value": "<not available>"
         }
       ]
+    },
+    {
+      "capabilities": [
+        "windowcoverings_state",
+        "windowcoverings_set"
+      ],
+      "connectivity": [
+        "cloud"
+      ],
+      "platforms": [
+        "local",
+        "cloud"
+      ],
+      "images": {
+        "small": "/drivers/window_coverings/assets/images/small.png",
+        "large": "/drivers/window_coverings/assets/images/large.png",
+        "xlarge": "/drivers/window_coverings/assets/images/xlarge.png"
+      },
+      "pair": [
+        {
+          "id": "welcome",
+          "navigation": {
+            "next": "login_oauth2"
+          }
+        },
+        {
+          "id": "login_oauth2",
+          "template": "login_oauth2"
+        },
+        {
+          "id": "list_devices",
+          "template": "list_devices",
+          "navigation": {
+            "next": "add_devices"
+          }
+        },
+        {
+          "id": "add_devices",
+          "template": "add_devices"
+        }
+      ],
+      "repair": [
+        {
+          "id": "login_oauth2",
+          "template": "login_oauth2"
+        }
+      ],
+      "class": "windowcoverings",
+      "name": {
+        "en": "Window coverings",
+        "nl": "Raambekleding"
+      },
+      "id": "window_coverings",
+      "settings": [
+        {
+          "type": "group",
+          "label": {
+            "en": "NOTE: Some settings are not supported by every device."
+          },
+          "children": [
+            {
+              "id": "inverse",
+              "type": "checkbox",
+              "label": {
+                "en": "Inverse direction"
+              },
+              "value": false
+            }
+          ]
+        },
+        {
+          "id": "deviceSpecification",
+          "type": "label",
+          "label": {
+            "en": "Device Specification"
+          },
+          "hint": {
+            "en": "The Tuya specification of this device"
+          },
+          "value": "<not available>"
+        }
+      ]
     }
   ],
   "capabilities": {

diff --git a/drivers/curtain/TuyaCurtainConstants.ts → ...coverings/TuyaWindowCoveringsConstants.ts b/drivers/curtain/TuyaCurtainConstants.ts → ...coverings/TuyaWindowCoveringsConstants.ts
@@ -1,26 +1,26 @@
 import TRANSLATIONS from './translations.json';
 
-export const CURTAIN_CAPABILITY_MAPPING = {
+export const WINDOW_COVERINGS_CAPABILITY_MAPPING = {
   control: 'windowcoverings_state',
   mach_operate: 'windowcoverings_state',
   position: 'windowcoverings_set',
   percent_control: 'windowcoverings_set',
   percent_state: 'windowcoverings_set',
 } as const;
 
-export const CURTAIN_CAPABILITIES = {
+export const WINDOW_COVERINGS_CAPABILITIES = {
   read_write: ['control', 'position', 'mach_operate', 'percent_control'],
   setting: ['opposite', 'control_back'],
 } as const;
 
-export type HomeyCurtainSettings = {
+export type HomeyWindowCoveringsSettings = {
   inverse: boolean;
 };
 
-export type TuyaCurtainSettings = {
+export type TuyaWindowCoveringsSettings = {
   opposite: boolean; // inverse
   control_back: boolean; // inverse
   control_back_mode: 'forward' | 'back'; // inverse
 };
 
-export const CURTAIN_SETTING_LABELS = TRANSLATIONS.setting_labels;
+export const WINDOW_COVERINGS_SETTING_LABELS = TRANSLATIONS.setting_labels;
diff --git a/drivers/curtain/assets/icon.svg → drivers/window_coverings/assets/icon.svg b/drivers/curtain/assets/icon.svg → drivers/window_coverings/assets/icon.svg
diff --git a/drivers/curtain/assets/images/large.png → .../window_coverings/assets/images/large.png b/drivers/curtain/assets/images/large.png → .../window_coverings/assets/images/large.png
diff --git a/drivers/curtain/assets/images/small.png → .../window_coverings/assets/images/small.png b/drivers/curtain/assets/images/small.png → .../window_coverings/assets/images/small.png
diff --git a/drivers/curtain/assets/images/xlarge.png → ...window_coverings/assets/images/xlarge.png b/drivers/curtain/assets/images/xlarge.png → ...window_coverings/assets/images/xlarge.png