Merge new plick neve X config with older one.

There seems to be an overlap between PR and issue, and due to
an unanswered question on the PR, the issue got handled first.  So
these were duplicated.

Merge in the heat/cool support (original was cool only), and other
changes from PR #1878

ACKNOWLEDGEMENTS.md

@@ -554,7 +554,7 @@ Further device support has been made with the assistance of users. Please consid
 - [simplelnx](https://github.com/simplelnx) for contributing support for OPK K2 vacuums.
 - [kimhartlev](https://github.com/kimhartlev) for contributing support for Semptec ZX7007 infrared heaters.
 - [ebarriosjr](https://github.com/ebarriosjr) for assisting with support for LSC PTZ cameras.
-- [AdrianGarside](https://github.com/AdrianGarside) for contributing support for cloud account linking and device detail lookup.
+- [AdrianGarside](https://github.com/AdrianGarside) for contributing support for cloud account linking and device detail lookup, and support for HCT-636 dual water timers.
 - [Netjuggernaut](https://github.com/Netjuggernaut) for assisting with support for Gainsborough Liberty entrance locks.
 - [Onvisoc](https://github.com/Onvisoc) for contributing support for Soho air purifiers.
 - [wlfc2031](https://github.com/wlfc2031) for assisting with support for Ailrinni BLE fingerprint locks.

DEVICES.md

@@ -650,7 +650,6 @@ port and password.
 - Aubess Rainpoint TTP106W irrigation system
 - Becasmart BAF-908 irrigation system
 - Garza Wi-Fi garden irrigation system (ITV103W with 433MHz WiFi hub)
-- HCT-626 bluetooth dual water timer (sold as Zefinot, Dewenwils, Diivoo, Lingusta, Soguyi and other brands)
 - Holman WX1 tap timer (sprinkler controller)
 - Holman WX2 dual tap timer
 - Holman WX8 8 sprinkler irrigation controller
@@ -717,6 +716,7 @@ port and password.
 - Diivoo WT05 dual water timer
 - Gainsborough Liberty entrance lock
 - HCT-611 water timer
+- HCT-626 dual water timer
 - HU06 smart lock
 - Ironzon fingerprint lock
 - MoistenLand water timer

custom_components/tuya_local/devices/plikc_neve_thermostat.yaml

@@ -2,6 +2,8 @@ name: Thermostat
 products:
   - id: qgmh0aak7xcmrlf3
     name: Plikc Neve X RFW
+  - id: 5kwgvcaqzzkzrftu
+    name: Plikc Neve X W
 primary_entity:
   entity: climate
   translation_key: thermostat
@@ -13,25 +15,40 @@ primary_entity:
         - dps_val: false
           value: "off"
         - dps_val: true
-          value: cool
+          value: heat_cool
     - id: 2
       type: string
       name: preset_mode
       mapping:
         - dps_val: auto
           value: program
-        - dps_val: holiday
-          value: away
         - dps_val: manual
           value: manual
+        - dps_val: temporary
+          value: temp_override
+          hidden: true
+        - dps_val: holiday
+          value: away
+          constraint: holiday_duration
+          conditions:
+            - dps_val: 0
+              value: "Set holiday length!"
+              hidden: true
     - id: 3
       type: string
       name: hvac_action
       mapping:
+        - dps_val: heat
+          value: heating
         - dps_val: cold
           value: cooling
         - dps_val: "off"
-          value: idle
+          constraint: hvac_mode
+          conditions:
+            - dps_val: true
+              value: idle
+            - dps_val: false
+              value: "off"
     - id: 16
       type: integer
       name: temperature
@@ -60,6 +77,10 @@ primary_entity:
         max: 350
       mapping:
         - scale: 10
+    - id: 33
+      type: integer
+      name: holiday_duration
+      hidden: true
 secondary_entities:
   - entity: number
     name: Temperature calibration

custom_components/tuya_local/devices/plikc_neve_x_thermostat.yaml

@@ -1,148 +0,0 @@
-name: Thermostat
-products:
-  - id: 5kwgvcaqzzkzrftu
-    name: Plikc Neve X W
-primary_entity:
-  entity: climate
-  translation_key: thermostat
-  dps:
-    - id: 1
-      type: boolean
-      name: hvac_mode
-      mapping:
-        - dps_val: false
-          value: "off"
-        - dps_val: true
-          value: heat_cool
-    - id: 2
-      type: string
-      name: preset_mode
-      mapping:
-        - dps_val: auto
-          value: program
-        - dps_val: manual
-          value: manual
-        - dps_val: temporary
-          value: temp_override
-          hidden: true
-        - dps_val: holiday
-          value: away
-          constraint: holiday_duration
-          conditions:
-            - dps_val: 0
-              value: "Set holiday duration!"
-              hidden: true
-    - id: 3
-      type: string
-      name: hvac_action
-      readonly: true
-      mapping:
-        - dps_val: heat
-          value: heating
-        - dps_val: cold
-          value: cooling
-        - dps_val: "off"
-          value: idle
-    - id: 16
-      type: integer
-      name: temperature
-      unit: C
-      range:
-        min: 50
-        max: 350
-      mapping:
-        - scale: 10
-          constraint: preset_mode
-          conditions:
-            - dps_val: holiday
-              value_redirect: holiday_temp_set
-    - id: 24
-      type: integer
-      name: current_temperature
-      mapping:
-        - scale: 10
-    - id: 32
-      type: integer
-      name: holiday_temp_set
-      optional: true
-      hidden: true
-      force: true
-      range:
-        min: 50
-        max: 350
-      mapping:
-        - scale: 10
-    - id: 33
-      type: integer
-      name: holiday_duration
-      hidden: true
-secondary_entities:
-  - entity: number
-    name: Temperature calibration
-    category: config
-    icon: "mdi:thermometer-check"
-    dps:
-      - id: 27
-        type: integer
-        name: value
-        unit: °
-        range:
-          min: -30
-          max: 30
-        mapping:
-          - scale: 10
-  - entity: number
-    name: Holiday duration
-    category: config
-    icon: "mdi:calendar-range"
-    dps:
-      - id: 33
-        type: integer
-        name: value
-        unit: d
-        range:
-          min: 0
-          max: 99
-  - entity: button
-    name: Factory reset
-    class: restart
-    category: config
-    dps:
-      - id: 39
-        type: boolean
-        name: button
-        optional: true
-  - entity: lock
-    translation_key: child_lock
-    category: config
-    dps:
-      - id: 40
-        type: boolean
-        name: lock
-        optional: true
-        mapping:
-          - dps_val: null
-            value: false
-  - entity: sensor
-    translation_key: time_remaining
-    class: duration
-    category: diagnostic
-    dps:
-      - id: 42
-        type: integer
-        name: sensor
-        unit: min
-  - entity: binary_sensor
-    class: problem
-    category: diagnostic
-    dps:
-      - id: 45
-        type: bitfield
-        optional: true
-        name: sensor
-        mapping:
-          - dps_val: 0
-            value: false
-          - dps_val: null
-            value: false
-          - value: true