Use translations for select timer options.

Issue #1708

custom_components/tuya_local/devices/AlecoAir_D25_Traditio.yaml

@@ -104,52 +104,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/DH-CSK03W_dehumidifier.yaml

@@ -35,24 +35,24 @@ secondary_entities:
         name: option
         optional: true
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "18h"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"
           - dps_val: "36h"
-            value: "36 hours"
+            value: "36h"
           - dps_val: "48h"
-            value: "48 hours"
+            value: "48h"
   - entity: select
     name: "Light mode"
     category: config

custom_components/tuya_local/devices/alecoair_d12_home_dehumidifier.yaml

@@ -72,7 +72,6 @@ secondary_entities:
         type: boolean
         name: lock
   - entity: select
-    name: Countdown
     translation_key: timer
     category: config
     dps:
@@ -81,55 +80,55 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "0"
-            value: Cancel
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/alecoair_d14_dehumidifier.yaml

@@ -109,52 +109,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/alecoair_d16_dehumidifier.yaml

@@ -134,52 +134,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/amico_smart_ceiling_fan.yaml

@@ -68,13 +68,13 @@ secondary_entities:
         type: string
         name: option
         mapping:
-          - dps_val: "cancel"
-            value: "off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/arlec_12speed_tower_fan.yaml

@@ -62,55 +62,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/arlec_6speed_fan.yaml

@@ -73,16 +73,16 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"

custom_components/tuya_local/devices/arlec_apr005ha_air_purifier.yaml

@@ -56,31 +56,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
   - entity: sensor
     class: pm25
     dps:
@@ -96,4 +96,4 @@ secondary_entities:
       - id: 17
         name: sensor
         type: integer
-        unit: hours
+        unit: h

custom_components/tuya_local/devices/arlec_fan.yaml

@@ -35,10 +35,10 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "off"
-            value: "Off"
+            value: cancel
           - dps_val: 2hour
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4hour
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8hour
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/arlec_fan_light.yaml

@@ -58,10 +58,10 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "off"
-            value: "Off"
+            value: cancel
           - dps_val: 2hour
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4hour
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8hour
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/arlec_panel_heater_v2.yaml

@@ -45,26 +45,26 @@ secondary_entities:
       - id: 7
         type: boolean
         name: lock
-  - entity: number
+  - entity: select
     translation_key: timer
     category: config
     dps:
       - id: 19
         type: string
-        name: value
+        name: option
         optional: true
         mapping:
-          - dps_val: "cancel"
-            value: "off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"

custom_components/tuya_local/devices/asc_wifi_circuit_breaker.yaml

@@ -9,7 +9,6 @@ primary_entity:
       type: boolean
 secondary_entities:
   - entity: number
-    name: Countdown
     translation_key: timer
     category: config
     dps:

custom_components/tuya_local/devices/atomi_ceramic_heater.yaml

@@ -63,31 +63,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0h"
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/atorch_s1wp.yaml

@@ -302,7 +302,7 @@ secondary_entities:
       - id: 122
         type: integer
         name: value
-        unit: hours
+        unit: h
         range:
           min: 1
           max: 99

custom_components/tuya_local/devices/avatto_roller_blinds.yaml

@@ -60,15 +60,15 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/betterlife_bl1500_heater.yaml

@@ -55,31 +55,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/ble_hct611_watertimer.yaml

@@ -72,6 +72,7 @@ secondary_entities:
         name: state
   - entity: select
     name: Weather delay
+    translation_key: timer
     icon: "mdi:weather-cloudy-clock"
     category: config
     dps:
@@ -81,13 +82,13 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "24h"
-            value: "1 day"
+            value: "24h"
           - dps_val: "48h"
-            value: "2 days"
+            value: "48h"
           - dps_val: "72h"
-            value: "3 days"
+            value: "72h"
           - dps_val: null
             value: "not set"
             hidden: true

custom_components/tuya_local/devices/ble_water_valve.yaml

@@ -90,6 +90,7 @@ secondary_entities:
         optional: true
   - entity: select
     name: Weather delay
+    translation_key: timer
     icon: "mdi:weather-cloudy-clock"
     category: config
     dps:
@@ -98,13 +99,13 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "24h"
-            value: "1 day"
+            value: "24h"
           - dps_val: "48h"
-            value: "2 days"
+            value: "48h"
           - dps_val: "72h"
-            value: "3 days"
+            value: "72h"
   - entity: number
     name: Irrigation time
     category: config

custom_components/tuya_local/devices/blitzwolf_bwsh2_humidifier.yaml

@@ -64,16 +64,16 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"

custom_components/tuya_local/devices/blitzwolf_bwsh5_humidifier.yaml

@@ -125,32 +125,32 @@ secondary_entities:
         type: string
         optional: true
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
       - id: 20
         name: remaining
         type: integer

custom_components/tuya_local/devices/blumfeldt_cosmicbeam_heater.yaml

@@ -65,55 +65,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: binary_sensor
     class: problem
     category: diagnostic

custom_components/tuya_local/devices/breville_airdynamic3d_fan.yaml

@@ -62,31 +62,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/breville_easyair_purifier.yaml

@@ -56,13 +56,13 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "cancle"
-            value: "Cancel"
+            value: cancel
           - dps_val: "2"
-            value: "2 hour"
+            value: "2h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/breville_lad208_dehumidifier.yaml

@@ -67,55 +67,55 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     class: humidity
     dps:

custom_components/tuya_local/devices/breville_smart_air_viral_protect_plus.yaml

@@ -69,13 +69,13 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "cancel"
-            value: "Cancel"
+            value: cancel
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/breville_smartairconnect_purifier.yaml

@@ -70,14 +70,14 @@ secondary_entities:
         type: string
         name: option
         mapping:
-          - dps_val: "cancle"
-            value: "Cancel"
+          - dps_val: cancle
+            value: cancel
           - dps_val: "2"
-            value: "2 hour"
+            value: "2h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/bvf_cp1_heater.yaml

@@ -103,52 +103,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13h"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14h"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15h"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16h"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17h"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18h"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19h"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20h"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21h"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22h"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23h"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"

custom_components/tuya_local/devices/calex_convector_heater.yaml

@@ -75,55 +75,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/carro_ph805_humidifier.yaml

@@ -78,25 +78,25 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
   - entity: binary_sensor
     translation_key: tank_empty
     category: diagnostic

custom_components/tuya_local/devices/casafan_ceiling_fan_light.yaml

@@ -57,16 +57,16 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"

custom_components/tuya_local/devices/cecotec_fan_light.yaml

@@ -87,21 +87,21 @@ secondary_entities:
         name: option
         type: string
         mapping:
-          - dps_val: "cancel"
-            value: "cancel"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/cleanair_604b_humidifier.yaml

@@ -54,31 +54,31 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: 'Off'
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/ditua_dt1522yn_aromadiffuser.yaml

@@ -119,13 +119,13 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "3"
-            value: "6 hours"
+            value: "6h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/duux_whisper_fan.yaml

@@ -105,31 +105,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/dynasty_btx_fireplace.yaml

@@ -67,25 +67,25 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/eanons_humidifier.yaml

@@ -70,32 +70,32 @@ secondary_entities:
         name: option
         type: string
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/ebac_dj4000_dehumidifier.yaml

@@ -141,20 +141,20 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Continuous"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h

custom_components/tuya_local/devices/eeese_anna_dehumidifier.yaml

@@ -132,52 +132,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/eeese_carl_dehumidifier.yaml

@@ -73,52 +73,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/eeese_otto_dehumidifier.yaml

@@ -93,52 +93,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/eesee_adam_dehumidifier.yaml

@@ -120,52 +120,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/electric_panel_heater.yaml

@@ -75,55 +75,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/essentials_purifier.yaml

@@ -84,13 +84,13 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 2h
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4h
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8h
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/etersky_aroma_diffuser.yaml

@@ -87,14 +87,14 @@ secondary_entities:
         name: option
         type: string
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/fanco_ecosilentdeluxe.yaml

@@ -49,15 +49,15 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: Cancel
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/goodcell_ev_charger.yaml

@@ -147,6 +147,10 @@ secondary_entities:
         range:
           min: 0
           max: 15
+      - id: 121
+        type: string
+        optional: true
+        name: display
   - entity: sensor
     class: energy
     dps:
@@ -266,6 +270,10 @@ secondary_entities:
         type: string
         optional: true
         name: session_duration
+      - id: 122
+        type: string
+        optional: true
+        name: display
   - entity: select
     name: Toggle charging
     icon: "mdi:ev-plug-type2"

custom_components/tuya_local/devices/greenmigo_alpha_q25_pro_wifi.yaml

@@ -148,52 +148,52 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h

custom_components/tuya_local/devices/herschel_irheater.yaml

@@ -40,55 +40,55 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/himox_h05_purifier.yaml

@@ -61,15 +61,15 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: "1 hour"
+            value: "1h"
           - dps_val: 2h
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4h
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8h
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     name: Air quality
     dps:

custom_components/tuya_local/devices/himox_h06_purifier.yaml

@@ -49,11 +49,11 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 4h
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8h
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/hiper_bladeless_fan.yaml

@@ -59,23 +59,23 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/hjz_radiator.yaml

@@ -55,19 +55,19 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: "1 hour"
+            value: "1h"
           - dps_val: 2h
-            value: "2 hour"
+            value: "2h"
           - dps_val: 3h
-            value: "3 hour"
+            value: "3h"
           - dps_val: 4h
-            value: "4 hour"
+            value: "4h"
           - dps_val: 5h
-            value: "5 hour"
+            value: "5h"
           - dps_val: 6h
-            value: "6 hour"
+            value: "6h"
   - entity: binary_sensor
     category: diagnostic
     class: problem

custom_components/tuya_local/devices/holman_wx1_taptimer.yaml

@@ -235,6 +235,7 @@ secondary_entities:
           - mask: "FF00000000000000"
   - entity: select
     name: Watering delay
+    translation_key: timer
     category: config
     dps:
       - id: 113
@@ -242,7 +243,7 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: 0
-            value: 0h
+            value: cancel
           - dps_val: 24
             value: 24h
           - dps_val: 48

custom_components/tuya_local/devices/holman_wx2_taptimer.yaml

@@ -256,6 +256,7 @@ secondary_entities:
           - mask: "FF00000000000000"
   - entity: select
     name: Watering delay 1
+    translation_key: timer
     category: config
     dps:
       - id: 113
@@ -263,7 +264,7 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: 0
-            value: 0h
+            value: cancel
           - dps_val: 24
             value: 24h
           - dps_val: 48
@@ -708,6 +709,7 @@ secondary_entities:
           - mask: "FF00000000000000"
   - entity: select
     name: Watering delay 2
+    translation_key: timer
     category: config
     dps:
       - id: 160
@@ -715,7 +717,7 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: 0
-            value: 0h
+            value: cancel
           - dps_val: 24
             value: 24h
           - dps_val: 48

custom_components/tuya_local/devices/hyd_weair_plus_fan.yaml

@@ -88,23 +88,23 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: "duration"

custom_components/tuya_local/devices/immax_neo_light_vento.yaml

@@ -50,12 +50,12 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "off"
-            value: "Off"
+            value: cancel
           - dps_val: 1hour
-            value: "1 hour"
+            value: "1h"
           - dps_val: 2hour
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4hour
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8hour
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/inow_heater_element.yaml

@@ -36,11 +36,11 @@ primary_entity:
       optional: true
       mapping:
         - dps_val: "0h"
-          value: "off"
+          value: cancel
         - dps_val: "1h"
-          value: "1 hour"
+          value: "1h"
         - dps_val: "2h"
-          value: "2 hours"
+          value: "2h"
 secondary_entities:
   - entity: lock
     translation_key: child_lock

custom_components/tuya_local/devices/inow_heater_element_v2.yaml

@@ -60,11 +60,11 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0h"
-            value: "off"
+            value: cancel
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
   - entity: climate
     name: Room temperature
     icon: "mdi:home-thermometer-outline"

custom_components/tuya_local/devices/inventor_atmospherexl_dehumidifier.yaml

@@ -155,25 +155,25 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "None"
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/juskys_oh125bw2_radiator.yaml

@@ -58,55 +58,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13h"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14h"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15h"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16h"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17h"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18h"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19h"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20h"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21h"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22h"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23h"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"
   - entity: binary_sensor
     class: problem
     category: diagnostic

custom_components/tuya_local/devices/kennedy_fireplace.yaml

@@ -98,25 +98,25 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/klarstein_skyscraper_ice_smart.yaml

@@ -44,35 +44,35 @@ secondary_entities:
           - dps_val: cancel
             value: "off"
           - dps_val: "0_5h"
-            value: "0.5 hours"
+            value: "30m"
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "1_5h"
-            value: "1.5 hours"
+            value: "1h30m"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "2_5h"
-            value: "2.5 hours"
+            value: "2h30m"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "3_5h"
-            value: "3.5 hours"
+            value: "3h30m"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "4_5h"
-            value: "4.5 hours"
+            value: "4h30m"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "5_5h"
-            value: "5.5 hours"
+            value: "5h30m"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "6_5h"
-            value: "6.5 hours"
+            value: "6h30m"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "7_5h"
-            value: "7.5 hours"
+            value: "7h30m"
   - entity: sensor
     category: diagnostic
     translation_key: time_remaining

custom_components/tuya_local/devices/klarstein_wonderwall_air.yaml

@@ -53,55 +53,55 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/klarstein_wonderwall_irheater.yaml

@@ -35,55 +35,55 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/klarta_humea_humidifier.yaml

@@ -110,28 +110,28 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"

custom_components/tuya_local/devices/klarta_stor2_purifier.yaml

@@ -101,15 +101,15 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: "1 hours"
+            value: "1h"
           - dps_val: 2h
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4h
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8h
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     class: temperature
     dps:

custom_components/tuya_local/devices/kogan_air_purifier.yaml

@@ -59,11 +59,11 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: 1
-            value: "Off"
+            value: cancel
           - dps_val: 2
-            value: "4 hours"
+            value: "4h"
           - dps_val: 3
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/kogan_bladeless_fan.yaml

@@ -97,23 +97,23 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/kogan_kasthfp2kwa_towerheater.yaml

@@ -69,32 +69,32 @@ secondary_entities:
         name: option
         type: string
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: 1h
-            value: "1 hour"
+            value: "1h"
           - dps_val: 2h
-            value: "2 hours"
+            value: "2h"
           - dps_val: 3h
-            value: "3 hours"
+            value: "3h"
           - dps_val: 4h
-            value: "4 hours"
+            value: "4h"
           - dps_val: 5h
-            value: "5 hours"
+            value: "5h"
           - dps_val: 6h
-            value: "6 hours"
+            value: "6h"
           - dps_val: 7h
-            value: "7 hours"
+            value: "7h"
           - dps_val: 8h
-            value: "8 hours"
+            value: "8h"
           - dps_val: 9h
-            value: "9 hours"
+            value: "9h"
           - dps_val: 10h
-            value: "10 hours"
+            value: "10h"
           - dps_val: 11h
-            value: "11 hours"
+            value: "11h"
           - dps_val: 12h
-            value: "12 hours"
+            value: "12h"
   - entity: binary_sensor
     class: problem
     category: diagnostic

custom_components/tuya_local/devices/lehmann_lhohc2013c_radiator.yaml

@@ -65,55 +65,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     class: duration
     translation_key: time_remaining

custom_components/tuya_local/devices/mantra_fan.yaml

@@ -90,23 +90,23 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/maxcio_aromadiffuser.yaml

@@ -117,13 +117,13 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "3"
-            value: "6 hours"
+            value: "6h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/mellerware_comfy_radiator.yaml

@@ -101,55 +101,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
           - dps_val: 13h
-            value: 13 hours
+            value: 13h
           - dps_val: 14h
-            value: 14 hours
+            value: 14h
           - dps_val: 15h
-            value: 15 hours
+            value: 15h
           - dps_val: 16h
-            value: 16 hours
+            value: 16h
           - dps_val: 17h
-            value: 17 hours
+            value: 17h
           - dps_val: 18h
-            value: 18 hours
+            value: 18h
           - dps_val: 19h
-            value: 19 hours
+            value: 19h
           - dps_val: 20h
-            value: 20 hours
+            value: 20h
           - dps_val: 21h
-            value: 21 hours
+            value: 21h
           - dps_val: 22h
-            value: 22 hours
+            value: 22h
           - dps_val: 23h
-            value: 23 hours
+            value: 23h
           - dps_val: 24h
-            value: 24 hours
+            value: 24h
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/modernflames_orion_fireplace.yaml

@@ -96,25 +96,25 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "00"
-            value: "Off"
+            value: cancel
           - dps_val: "30"
-            value: "30 minutes"
+            value: "30m"
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
       - id: 114
         type: string
         optional: true

custom_components/tuya_local/devices/moistenland_water_timer.yaml

@@ -50,6 +50,7 @@ secondary_entities:
             value: "Fully Charged"
   - entity: select
     name: Weather delay
+    translation_key: timer
     icon: "mdi:weather-cloudy-clock"
     category: config
     dps:
@@ -57,14 +58,14 @@ secondary_entities:
         type: string
         name: option
         mapping:
-          - dps_val: "cancel"
-            value: "Off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "24h"
-            value: "1 day"
+            value: "24h"
           - dps_val: "48h"
-            value: "2 days"
+            value: "48h"
           - dps_val: "72h"
-            value: "3 days"
+            value: "72h"
   - entity: number
     category: config
     translation_key: timer

custom_components/tuya_local/devices/nac_ap470_purifier.yaml

@@ -112,15 +112,15 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: cancle
-            value: "Off"
+            value: cancel
           - dps_val: 2
-            value: "2 hours"
+            value: "2h"
           - dps_val: 4
-            value: "4 hours"
+            value: "4h"
           - dps_val: 6
-            value: "6 hours"
+            value: "6h"
           - dps_val: 8
-            value: "8 hours"
+            value: "8h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/nashone_mts700wb_thermostat.yaml

@@ -91,10 +91,10 @@ secondary_entities:
         type: string
         name: option
         mapping:
-          - dps_val: "cancel"
-            value: "off"
+          - dps_val: cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
   - entity: sensor
     category: diagnostic
     translation_key: time_remaining

custom_components/tuya_local/devices/nedis_ptc_fan_heater.yaml

@@ -67,19 +67,19 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "cancel"
-            value: Cancel
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "2h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "3h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "4h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "5h"
-            value: "6 hours"
+            value: "6h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/netmostat_n1_thermostat.yaml

@@ -51,8 +51,8 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0h"
-            value: "off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"

custom_components/tuya_local/devices/nx_100ap_air_purifier.yaml

@@ -62,22 +62,22 @@ secondary_entities:
         type: string
         name: option
         mapping:
-          - dps_val: "Cancel"
-            value: "Cancel"
+          - dps_val: Cancel
+            value: cancel
           - dps_val: "2H"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4H"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "6H"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "8H"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "10H"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "12H"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "24H"
-            value: "24 hours"
+            value: "24h"
   - entity: button
     name: Filter reset
     category: config

custom_components/tuya_local/devices/ovlaim_ceiling_fan_light.yaml

@@ -59,12 +59,12 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "off"
-            value: "Off"
+            value: cancel
           - dps_val: "1hour"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2hour"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4hour"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8hour"
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/poiema_one_purifier.yaml

@@ -64,17 +64,17 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
   - entity: sensor
     translation_key: time_remaining
     category: diagnostic

custom_components/tuya_local/devices/probreeze_pb20.yaml

@@ -75,55 +75,55 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: "0"
-            value: Cancel
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/proscenic_a9_airpurifier.yaml

@@ -135,12 +135,12 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: 0
-            value: "Off"
+            value: cancel
           - dps_val: 1
-            value: "1 hour"
+            value: "1h"
           - dps_val: 2
-            value: "2 hour"
+            value: "2h"
           - dps_val: 4
-            value: "4 hours"
+            value: "4h"
           - dps_val: 8
-            value: "8 hours"
+            value: "8h"

custom_components/tuya_local/devices/qh_gd_elegant_heater.yaml

@@ -66,55 +66,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13h"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14h"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15h"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16h"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17h"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18h"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19h"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20h"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21h"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22h"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23h"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/qlima_d820a_dehumidifier.yaml

@@ -155,13 +155,13 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/rainpoint_water_timer.yaml

@@ -32,6 +32,7 @@ secondary_entities:
             value: true
   - entity: select
     name: Rain delay
+    translation_key: timer
     category: config
     icon: "mdi:timer-sand"
     dps:
@@ -41,7 +42,7 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "0h"
+            value: cancel
           - dps_val: "24"
             value: "24h"
           - dps_val: "48"

custom_components/tuya_local/devices/reiga_52_fan_light.yaml

@@ -38,15 +38,15 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "off"
-            value: "Off"
+            value: cancel
           - dps_val: "1hour"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2hour"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4hour"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "8hour"
-            value: "8 hours"
+            value: "8h"
   - entity: light
     name: Light
     icon: "mdi:lightbulb"

custom_components/tuya_local/devices/royalclima_rcb150_ventilation.yaml

@@ -83,31 +83,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
   - entity: sensor
     name: Outdoor temperature
     class: temperature
@@ -155,28 +155,28 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"

custom_components/tuya_local/devices/semptec_zx7007_heater.yaml

@@ -48,21 +48,21 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/sensei_airconditioner.yaml

@@ -145,55 +145,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     class: duration
     translation_key: time_remaining

custom_components/tuya_local/devices/shinco_30d_dehumidifier.yaml

@@ -110,55 +110,55 @@ secondary_entities:
         optional: true
         mapping:
           - dps_val: "0"
-            value: "Off"
+            value: cancel
           - dps_val: "1"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/skyfan_dc_fan.yaml

@@ -39,28 +39,28 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"

custom_components/tuya_local/devices/skyfan_fan_light.yaml

@@ -63,28 +63,28 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"

custom_components/tuya_local/devices/soho_air_purifier.yaml

@@ -71,31 +71,31 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: 1h
-            value: 1 hour
+            value: 1h
           - dps_val: 2h
-            value: 2 hours
+            value: 2h
           - dps_val: 3h
-            value: 3 hours
+            value: 3h
           - dps_val: 4h
-            value: 4 hours
+            value: 4h
           - dps_val: 5h
-            value: 5 hours
+            value: 5h
           - dps_val: 6h
-            value: 6 hours
+            value: 6h
           - dps_val: 7h
-            value: 7 hours
+            value: 7h
           - dps_val: 8h
-            value: 8 hours
+            value: 8h
           - dps_val: 9h
-            value: 9 hours
+            value: 9h
           - dps_val: 10h
-            value: 10 hours
+            value: 10h
           - dps_val: 11h
-            value: 11 hours
+            value: 11h
           - dps_val: 12h
-            value: 12 hours
+            value: 12h
   - entity: sensor
     name: Air Quality
     class: enum

custom_components/tuya_local/devices/sonninkonig_eco_elegance_heater.yaml

@@ -41,55 +41,55 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "3h"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "5h"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "6h"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "7h"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "8h"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "9h"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "10h"
-            value: "10 hours"
+            value: "10h"
           - dps_val: "11h"
-            value: "11 hours"
+            value: "11h"
           - dps_val: "12h"
-            value: "12 hours"
+            value: "12h"
           - dps_val: "13h"
-            value: "13 hours"
+            value: "13h"
           - dps_val: "14h"
-            value: "14 hours"
+            value: "14h"
           - dps_val: "15h"
-            value: "15 hours"
+            value: "15h"
           - dps_val: "16h"
-            value: "16 hours"
+            value: "16h"
           - dps_val: "17h"
-            value: "17 hours"
+            value: "17h"
           - dps_val: "18h"
-            value: "18 hours"
+            value: "18h"
           - dps_val: "19h"
-            value: "19 hours"
+            value: "19h"
           - dps_val: "20h"
-            value: "20 hours"
+            value: "20h"
           - dps_val: "21h"
-            value: "21 hours"
+            value: "21h"
           - dps_val: "22h"
-            value: "22 hours"
+            value: "22h"
           - dps_val: "23h"
-            value: "23 hours"
+            value: "23h"
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"
   - entity: sensor
     translation_key: time_remaining
     class: duration

custom_components/tuya_local/devices/sop10_sprinkler.yaml

@@ -52,6 +52,7 @@ secondary_entities:
   - entity: select
     name: Weather delay
     icon: "mdi:weather-cloudy-clock"
+    translation_key: timer
     category: config
     dps:
       - id: 10
@@ -59,13 +60,13 @@ secondary_entities:
         name: option
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "24h"
-            value: "24 hours"
+            value: "24h"
           - dps_val: "48h"
-            value: "48 hours"
+            value: "48h"
           - dps_val: "72h"
-            value: "72 hours"
+            value: "72h"
   - entity: number
     translation_key: timer
     category: config

custom_components/tuya_local/devices/stadlerform_roger_purifier.yaml

@@ -81,11 +81,11 @@ secondary_entities:
           - dps_val: cancel
             value: cancel
           - dps_val: "1h"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "2h"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "4h"
-            value: "4 hours"
+            value: "4h"
   - entity: switch
     name: Auto
     class: switch

custom_components/tuya_local/devices/stirling_fs140dc_fan.yaml

@@ -35,44 +35,44 @@ secondary_entities:
         type: string
         mapping:
           - dps_val: cancel
-            value: "Off"
+            value: cancel
           - dps_val: "0_5"
-            value: "30 minutes"
+            value: "30m"
           - dps_val: "1_0"
-            value: "1 hour"
+            value: "1h"
           - dps_val: "1_5"
-            value: "1.5 hours"
+            value: "1h30m"
           - dps_val: "2_0"
-            value: "2 hours"
+            value: "2h"
           - dps_val: "2_5"
-            value: "2.5 hours"
+            value: "2h30m"
           - dps_val: "3_0"
-            value: "3 hours"
+            value: "3h"
           - dps_val: "3_5"
-            value: "3.5 hours"
+            value: "3h30m"
           - dps_val: "4_0"
-            value: "4 hours"
+            value: "4h"
           - dps_val: "4_5"
-            value: "4.5 hours"
+            value: "4h30m"
           - dps_val: "5_0"
-            value: "5 hours"
+            value: "5h"
           - dps_val: "5_5"
-            value: "5.5 hours"
+            value: "5h30m"
           - dps_val: "6_0"
-            value: "6 hours"
+            value: "6h"
           - dps_val: "6_5"
-            value: "6.5 hours"
+            value: "6h30m"
           - dps_val: "7_0"
-            value: "7 hours"
+            value: "7h"
           - dps_val: "7_5"
-            value: "7.5 hours"
+            value: "7h30m"
           - dps_val: "8_0"
-            value: "8 hours"
+            value: "8h"
           - dps_val: "8_5"
-            value: "8.5 hours"
+            value: "8h30m"
           - dps_val: "9_0"
-            value: "9 hours"
+            value: "9h"
           - dps_val: "9_5"
-            value: "9.5 hours"
+            value: "9h30m"
           - dps_val: "10_0"
-            value: "10 hours"
+            value: "10h"