Additional water valve devices converted to use valve entties.

These use different icons, so were not picked up in the previous simplistic "valve" search.
make-all · Mar 8, 2024 · e803d51 · e803d51
1 parent 12e33d8
commit e803d51
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 17 deletions.
diff --git a/custom_components/tuya_local/devices/garza_irrigation_system.yaml b/custom_components/tuya_local/devices/garza_irrigation_system.yaml
@@ -3,18 +3,31 @@ products:
   - id: xnajzurgqo1ugohn
     name: Garza ITV103W
 primary_entity:
-  entity: switch
-  icon: "mdi:watering-can"
+  entity: valve
+  class: water
   dps:
     - id: 108
       type: boolean
-      name: switch
+      name: valve
       mapping:
         - dps_val: true
           value: false
         - dps_val: false
           value: true
 secondary_entities:
+  - entity: switch
+    icon: "mdi:watering-can"
+    category: config
+    deprecated: valve
+    dps:
+      - id: 108
+        type: boolean
+        name: switch
+        mapping:
+          - dps_val: true
+            value: false
+          - dps_val: false
+            value: true
   - entity: sensor
     class: battery
     category: diagnostic

diff --git a/custom_components/tuya_local/devices/holman_wx1_taptimer.yaml b/custom_components/tuya_local/devices/holman_wx1_taptimer.yaml
@@ -4,19 +4,33 @@ products:
     name: Holman WX1
     # DP decoding thanks to funtastix
 primary_entity:
-  entity: switch
+  entity: valve
   name: Manual
-  icon: "mdi:watering-can"
+  class: water
   dps:
     - id: 108
       type: boolean
-      name: switch
+      name: valve
       mapping:
         - dps_val: true
           value: false
         - dps_val: false
           value: true
 secondary_entities:
+  - entity: switch
+    name: Manual
+    category: config
+    deprecated: valve
+    icon: "mdi:watering-can"
+    dps:
+      - id: 108
+        type: boolean
+        name: switch
+        mapping:
+          - dps_val: true
+            value: false
+          - dps_val: false
+            value: true
   - entity: sensor
     name: Soil temperature
     class: temperature

diff --git a/custom_components/tuya_local/devices/holman_wx2_taptimer.yaml b/custom_components/tuya_local/devices/holman_wx2_taptimer.yaml
@@ -3,21 +3,49 @@ products:
   - id: wfchjk5vc9bysjtk
     name: Holman WX2
 primary_entity:
-  entity: switch
+  entity: valve
   name: Manual 1
-  icon: "mdi:watering-can"
+  class: water
   dps:
     - id: 108
       type: boolean
-      name: switch
+      name: valve
       mapping:
         - dps_val: true
           value: false
         - dps_val: false
           value: true
 secondary_entities:
+  - entity: valve
+    name: Manual 2
+    class: water
+    dps:
+      - id: 155
+        type: boolean
+        name: valve
+        mapping:
+          - dps_val: true
+            value: false
+          - dps_val: false
+            value: true
+  - entity: switch
+    name: Manual 1
+    category: config
+    deprecated: valve
+    icon: "mdi:watering-can"
+    dps:
+      - id: 108
+        type: boolean
+        name: switch
+        mapping:
+          - dps_val: true
+            value: false
+          - dps_val: false
+            value: true
   - entity: switch
     name: Manual 2
+    category: config
+    deprecated: valve
     icon: "mdi:watering-can"
     dps:
       - id: 155

diff --git a/custom_components/tuya_local/devices/holman_wx8_irrigation_controller.yaml b/custom_components/tuya_local/devices/holman_wx8_irrigation_controller.yaml
@@ -18,57 +18,129 @@ primary_entity:
       type: string
       optional: true
 secondary_entities:
+  - entity: valve
+    name: Zone 1
+    class: water
+    dps:
+      - id: 102
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 2
+    class: water
+    dps:
+      - id: 103
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 3
+    class: water
+    dps:
+      - id: 104
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 4
+    class: water
+    dps:
+      - id: 104
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 5
+    class: water
+    dps:
+      - id: 106
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 6
+    class: water
+    dps:
+      - id: 107
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 7
+    class: water
+    dps:
+      - id: 108
+        type: boolean
+        name: valve
+  - entity: valve
+    name: Zone 8
+    class: water
+    dps:
+      - id: 112
+        type: boolean
+        name: valve
   - entity: switch
     name: Zone 1
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 102
         type: boolean
         name: switch
   - entity: switch
     name: Zone 2
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 103
         type: boolean
         name: switch
   - entity: switch
     name: Zone 3
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 104
         type: boolean
         name: switch
   - entity: switch
     name: Zone 4
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 104
         type: boolean
         name: switch
   - entity: switch
     name: Zone 5
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 106
         type: boolean
         name: switch
   - entity: switch
     name: Zone 6
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 107
         type: boolean
         name: switch
   - entity: switch
     name: Zone 7
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 108
         type: boolean
         name: switch
   - entity: switch
     name: Zone 8
+    category: config
+    deprecated: valve
     icon: mdi:sprinkler-variant
     dps:
       - id: 112

diff --git a/custom_components/tuya_local/devices/smart_watering_device.yaml b/custom_components/tuya_local/devices/smart_watering_device.yaml
@@ -3,21 +3,25 @@ products:
   - id: abzzvtulukkwzynv
     name: Becasmart BAF-908
 primary_entity:
-  entity: switch
+  entity: valve
+  class: water
   dps:
     - id: 1
-      name: switch
+      name: valve
       type: boolean
-      mapping:
-        - dps_val: true
-          icon: mdi:water-pump
-        - dps_val: false
-          icon: mdi:water-pump-off
     - id: 48
       type: string
       optional: true
       name: schedule
 secondary_entities:
+  - entity: switch
+    category: config
+    deprecated: valve
+    icon: "mdi:water-pump"
+    dps:
+      - id: 1
+        name: switch
+        type: boolean
   - entity: select
     name: Mode
     icon: "mdi:auto-mode"

diff --git a/tests/test_valve.py b/tests/test_valve.py
@@ -1,4 +1,4 @@
-""" Tests for the valve entity"""
+"""Tests for the valve entity"""
 
 from unittest.mock import AsyncMock, Mock