fix: Fix state and position of TuYa TS0601_cover_6 inverted Koenkk/zi…

…gbee2mqtt#17436
Koenkk · Oct 20, 2023 · c31f402 · c31f402
1 parent de3e73d
commit c31f402
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/devices/tuya.ts b/src/devices/tuya.ts
@@ -2469,9 +2469,9 @@ const definitions: Definition[] = [
         ],
         meta: {
             tuyaDatapoints: [
-                [1, 'state', tuya.valueConverterBasic.lookup({'CLOSE': tuya.enum(0), 'STOP': tuya.enum(1), 'OPEN': tuya.enum(2)})],
-                [2, 'position', tuya.valueConverter.coverPosition],
-                [3, 'position', tuya.valueConverter.raw],
+                [1, 'state', tuya.valueConverterBasic.lookup({'CLOSE': tuya.enum(2), 'STOP': tuya.enum(1), 'OPEN': tuya.enum(0)})],
+                [2, 'position', tuya.valueConverter.coverPositionInverted],
+                [3, 'position', tuya.valueConverter.coverPositionInverted],
                 [4, 'opening_mode', tuya.valueConverterBasic.lookup({'tilt': tuya.enum(0), 'lift': tuya.enum(1)})],
                 [7, 'work_state', tuya.valueConverterBasic.lookup({'standby': tuya.enum(0), 'success': tuya.enum(1), 'learning': tuya.enum(2)})],
                 [13, 'battery', tuya.valueConverter.raw],

diff --git a/src/lib/tuya.ts b/src/lib/tuya.ts
@@ -473,6 +473,14 @@ export const valueConverter = {
             return options.invert_cover ? 100 - v : v;
         },
     },
+    coverPositionInverted: {
+        to: async (v: number, meta: Tz.Meta) => {
+            return meta.options.invert_cover ? v : 100 - v;
+        },
+        from: (v: number, meta: Fz.Meta, options: KeyValue) => {
+            return options.invert_cover ? v : 100 - v;
+        },
+    },
     plus1: {
         from: (v: number) => v + 1,
         to: (v: number) => v - 1,