Просмотр исходного кода

feat!(button events): use new HA standard event types

This is a breaking change, as it changes a number of event types
  - arlec_smart_button
  - linkoze_smart_button
  - loratap_zigbee_six_switch

     - `single_click` becomes `press_end`
     - `long_press` becomes `long_press_end`
     - `double_click` becomes `multi_press_end` and adds
       `multi_press_count` attribute with value 2

  - nedis_zbrc10wt_remotecontrol
  - plantsio_ivy_smart_planter
  - plantsio_ivygen2_planter

     - `pressed` becomes `press_end`

  - rse_tywfh301_gate

     - `pressed` becomes `press_start`
     - `released` becomes `press_end`

Issue #5771
Jason Rumney 23 часов назад
Родитель
Сommit
74d6e987ca

+ 11 - 3
custom_components/tuya_local/devices/arlec_smart_button.yaml

@@ -15,11 +15,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 1
+        type: string
+        optional: true
+        name: multi_press_count
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: sensor
     class: battery
     dps:

+ 20 - 6
custom_components/tuya_local/devices/linkoze_dual_button.yaml

@@ -13,11 +13,18 @@ entities:
         name: event
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 1
+        type: string
+        name: multi_press_count
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 2
     class: button
@@ -27,11 +34,18 @@ entities:
         name: event
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
+          - dps_val: double_click
+            value: multi_press_end
+      - id: 2
+        type: string
+        name: multi_press_count
+        mapping:
           - dps_val: double_click
-            value: double_click
+            value: 2
+          - value: null
   - entity: sensor
     class: battery
     dps:

+ 66 - 18
custom_components/tuya_local/devices/loratap_zigbee_six_switch.yaml

@@ -21,11 +21,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 1
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 2
     class: button
@@ -36,11 +44,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 2
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 3
     class: button
@@ -51,11 +67,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
+          - dps_val: double_click
+            value: multi_press_end
+      - id: 3
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
           - dps_val: double_click
-            value: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 4
     class: button
@@ -66,11 +90,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 4
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 5
     class: button
@@ -81,11 +113,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
           - dps_val: double_click
-            value: double_click
+            value: multi_press_end
+      - id: 5
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
+          - dps_val: double_click
+            value: 2
+          - value: null
   - entity: event
     name: Button 6
     class: button
@@ -96,11 +136,19 @@ entities:
         optional: true
         mapping:
           - dps_val: single_click
-            value: single_click
+            value: press_end
           - dps_val: long_press
-            value: long_press
+            value: long_press_end
+          - dps_val: double_click
+            value: multi_press_end
+      - id: 6
+        type: string
+        name: multi_press_count
+        optional: true
+        mapping:
           - dps_val: double_click
-            value: double_click
+            value: 2
+          - value: null
   - entity: sensor
     class: battery
     dps:

+ 4 - 4
custom_components/tuya_local/devices/nedis_zbrc10wt_remotecontrol.yaml

@@ -15,7 +15,7 @@ entities:
         mapping:
           - dps_val: null
             value: null
-          - value: pressed
+          - value: press_end
       - id: 29
         type: string
         optional: true
@@ -31,7 +31,7 @@ entities:
         mapping:
           - dps_val: null
             value: null
-          - value: pressed
+          - value: press_end
       - id: 27
         type: string
         optional: true
@@ -47,7 +47,7 @@ entities:
         mapping:
           - dps_val: null
             value: null
-          - value: pressed
+          - value: press_end
       - id: 28
         type: string
         optional: true
@@ -63,7 +63,7 @@ entities:
         mapping:
           - dps_val: null
             value: null
-          - value: pressed
+          - value: press_end
       - id: 26
         type: string
         optional: true

+ 4 - 4
custom_components/tuya_local/devices/plantsio_ivy_smart_planter.yaml

@@ -150,7 +150,7 @@ entities:
         optional: true
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Right touch
@@ -163,7 +163,7 @@ entities:
         optional: true
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Plant touch
@@ -176,7 +176,7 @@ entities:
         optional: true
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Hug
@@ -189,7 +189,7 @@ entities:
         optional: true
         mapping:
           - dps_val: "hug"
-            value: pressed
+            value: press_end
           - value: null
   # Diagnostic entities
   - entity: sensor

+ 4 - 4
custom_components/tuya_local/devices/plantsio_ivygen2_planter.yaml

@@ -186,7 +186,7 @@ entities:
         name: event
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Right touch
@@ -198,7 +198,7 @@ entities:
         name: event
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Plant touch
@@ -211,7 +211,7 @@ entities:
         optional: true
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_end
           - value: null
   - entity: event
     name: Hug
@@ -224,7 +224,7 @@ entities:
         optional: true
         mapping:
           - dps_val: 3
-            value: pressed
+            value: press_end
           - value: null
   - entity: text
     name: Direct control

+ 2 - 2
custom_components/tuya_local/devices/rse_tywfh301_gate.yaml

@@ -121,6 +121,6 @@ entities:
         optional: true
         mapping:
           - dps_val: true
-            value: pressed
+            value: press_start
           - dps_val: false
-            value: released
+            value: press_end