Add support for valve entities.

Issue #1720 Modify water valve devices to use it.
make-all · Mar 8, 2024 · f79fea2 · f79fea2
1 parent afa13cc
commit f79fea2
Show file tree

Hide file tree

Showing 19 changed files with 538 additions and 40 deletions.
diff --git a/custom_components/tuya_local/devices/ard100_valve.yaml b/custom_components/tuya_local/devices/ard100_valve.yaml
@@ -3,13 +3,20 @@ products:
   - id: nguto5atyd2xxnap
     name: ARD-100+ smart valve controller
 primary_entity:
-  entity: switch
-  icon: "mdi:valve"
+  entity: valve
   dps:
     - id: 1
       type: boolean
-      name: switch
+      name: valve
 secondary_entities:
+  - entity: switch
+    icon: "mdi:valve"
+    deprecated: valve
+    category: config
+    dps:
+      - id: 1
+        type: boolean
+        name: switch
   - entity: number
     translation_key: timer
     category: config

diff --git a/custom_components/tuya_local/devices/aubess_rainpoint_irrigation_system.yaml b/custom_components/tuya_local/devices/aubess_rainpoint_irrigation_system.yaml
@@ -3,13 +3,21 @@ products:
   - id: 2ak7r2culspkc7hx
     name: Aubess RainPoint TTP106W
 primary_entity:
-  entity: switch
-  icon: "mdi:pipe-valve"
+  entity: valve
+  class: water
   dps:
     - id: 1
-      name: switch
+      name: valve
       type: boolean
 secondary_entities:
+  - entity: switch
+    icon: "mdi:pipe-valve"
+    deprecated: valve
+    category: config
+    dps:
+      - id: 1
+        name: switch
+        type: boolean
   - entity: sensor
     name: Status
     class: enum

diff --git a/custom_components/tuya_local/devices/ble_hct611_watertimer.yaml b/custom_components/tuya_local/devices/ble_hct611_watertimer.yaml
@@ -3,12 +3,12 @@ products:
   - id: tqzkwarw
     name: HCT-611
 primary_entity:
-  entity: switch
-  icon: "mdi:pipe-valve"
+  entity: valve
+  class: water
   dps:
     - id: 1
       type: boolean
-      name: switch
+      name: valve
     - id: 12
       type: string
       name: state
@@ -49,6 +49,14 @@ primary_entity:
       name: program_8
       optional: true
 secondary_entities:
+  - entity: switch
+    icon: "mdi:pipe-valve"
+    deprecated: valve
+    category: config
+    dps:
+      - id: 1
+        type: boolean
+        name: switch
   - entity: sensor
     class: battery
     category: diagnostic

diff --git a/custom_components/tuya_local/devices/ble_water_valve.yaml b/custom_components/tuya_local/devices/ble_water_valve.yaml
@@ -10,12 +10,12 @@ products:
   - id: so5ybnw9
     name: BWC-495.bt Royal Gardineer
 primary_entity:
-  entity: switch
-  icon: "mdi:pipe-valve"
+  entity: valve
+  class: water
   dps:
     - id: 1
       type: boolean
-      name: switch
+      name: valve
     - id: 13
       type: string
       name: weather
@@ -29,6 +29,14 @@ primary_entity:
       name: irrigation_schedule
       optional: true
 secondary_entities:
+  - entity: switch
+    icon: "mdi:pipe-valve"
+    deprecated: valve
+    category: config
+    dps:
+      - id: 1
+        type: boolean
+        name: switch
   - entity: sensor
     class: battery
     category: diagnostic

diff --git a/custom_components/tuya_local/devices/diivoo_wt05.yaml b/custom_components/tuya_local/devices/diivoo_wt05.yaml
@@ -17,16 +17,34 @@ products:
   - id: fdrbxxbg
     name: Diivoo WT-05
 primary_entity:
-  entity: switch
-  icon: "mdi:pipe-valve"
-  name: Switch 1
+  entity: valve
+  class: water
+  name: Valve 1
   dps:
     - id: 105
       type: boolean
-      name: switch
+      name: valve
 secondary_entities:
+  - entity: valve
+    class: water
+    name: Valve 2
+    dps:
+      - id: 104
+        type: boolean
+        name: valve
+  - entity: switch
+    name: Switch 1
+    category: config
+    deprecated: valve
+    icon: "mdi:pipe-valve"
+    dps:
+      - id: 105
+        type: boolean
+        name: switch
   - entity: switch
     name: Switch 2
+    category: config
+    deprecated: valve
     icon: "mdi:pipe-valve"
     dps:
       - id: 104

diff --git a/custom_components/tuya_local/devices/qoto_03_sprinkler.yaml b/custom_components/tuya_local/devices/qoto_03_sprinkler.yaml
@@ -1,18 +1,28 @@
 name: QOTO 03 sprinkler controller
 primary_entity:
-  entity: number
-  icon: "mdi:pipe-valve"
+  entity: valve
+  class: water
   dps:
     - id: 102
       type: integer
-      name: value
-      unit: "%"
-      range:
-        min: 0
-        max: 100
+      name: valve
       mapping:
         - step: 5
 secondary_entities:
+  - entity: number
+    icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
+    dps:
+      - id: 102
+        type: integer
+        name: value
+        unit: "%"
+        range:
+          min: 0
+          max: 100
+        mapping:
+          - step: 5
   - entity: sensor
     category: diagnostic
     icon: "mdi:valve"

diff --git a/custom_components/tuya_local/devices/qoto_05_water_valve.yaml b/custom_components/tuya_local/devices/qoto_05_water_valve.yaml
@@ -3,19 +3,25 @@ products:
   - id: arge1ptm
     name: QOTO 05 water valve
 primary_entity:
-  entity: number
-  icon: "mdi:pipe-valve"
+  entity: valve
+  class: water
   dps:
     - id: 2
       type: integer
-      name: value
-      unit: "%"
-      range:
-        min: 0
-        max: 100
-      mapping:
-        - step: 1
+      name: valve
 secondary_entities:
+  - entity: number
+    icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
+    dps:
+      - id: 2
+        type: integer
+        name: value
+        unit: "%"
+        range:
+          min: 0
+          max: 100
   - entity: sensor
     category: diagnostic
     icon: "mdi:valve"

diff --git a/custom_components/tuya_local/devices/sh07_sprinkler_controller.yaml b/custom_components/tuya_local/devices/sh07_sprinkler_controller.yaml
@@ -3,16 +3,76 @@ products:
   - id: e8fwsklivj87msao
     name: Smart sprinkler controller
 primary_entity:
-  entity: switch
+  entity: valve
   name: Valve 1
-  icon: "mdi:pipe-valve"
+  class: water
   dps:
     - id: 101
-      name: switch
+      name: valve
       type: boolean
 secondary_entities:
+  - entity: valve
+    name: Valve 2
+    class: water
+    dps:
+      - id: 102
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 3
+    class: water
+    dps:
+      - id: 103
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 4
+    class: water
+    dps:
+      - id: 104
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 5
+    class: water
+    dps:
+      - id: 105
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 6
+    class: water
+    dps:
+      - id: 106
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 7
+    class: water
+    dps:
+      - id: 109
+        name: valve
+        type: boolean
+  - entity: valve
+    name: Valve 8
+    class: water
+    dps:
+      - id: 110
+        name: valve
+        type: boolean
+  - entity: switch
+    name: Valve 1
+    category: config
+    deprecated: valve
+    icon: "mdi:pipe-valve"
+    dps:
+      - id: 101
+        name: switch
+        type: boolean
   - entity: switch
     name: Valve 2
+    category: config
+    deprecated: valve
     icon: "mdi:pipe-valve"
     dps:
       - id: 102
@@ -21,12 +81,16 @@ secondary_entities:
   - entity: switch
     name: Valve 3
     icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
     dps:
       - id: 103
         name: switch
         type: boolean
   - entity: switch
     name: Valve 4
+    category: config
+    deprecated: valve
     icon: "mdi:pipe-valve"
     dps:
       - id: 104
@@ -35,6 +99,8 @@ secondary_entities:
   - entity: switch
     name: Valve 5
     icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
     dps:
       - id: 105
         name: switch
@@ -43,6 +109,8 @@ secondary_entities:
   - entity: switch
     name: Valve 6
     icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
     dps:
       - id: 106
         name: switch
@@ -51,6 +119,8 @@ secondary_entities:
   - entity: switch
     name: Valve 7
     icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
     dps:
       - id: 110
         name: switch
@@ -59,6 +129,8 @@ secondary_entities:
   - entity: switch
     name: Valve 8
     icon: "mdi:pipe-valve"
+    category: config
+    deprecated: valve
     dps:
       - id: 111
         name: switch