Merge branch 'Koenkk:master' into tuya

Author: svhelge

src/devices/acova.ts

@@ -1,6 +1,7 @@
 import * as fz from "../converters/fromZigbee";
 import * as tz from "../converters/toZigbee";
 import * as exposes from "../lib/exposes";
+import * as m from "../lib/modernExtend";
 import * as reporting from "../lib/reporting";
 import type {DefinitionWithExtend} from "../lib/types";
 
@@ -87,4 +88,25 @@ export const definitions: DefinitionWithExtend[] = [
             await reporting.occupancy(endpoint2);
         },
     },
+    {
+        zigbeeModel: ["IHC-Enki"],
+        model: "IHC-Enki",
+        vendor: "Acova",
+        description: "Acova Madras IHC towel radiator (Zigbee thermostat)",
+        extend: [
+            m.thermostat({
+                setpoints: {values: {occupiedHeatingSetpoint: {min: 7, max: 30, step: 0.5}}},
+                localTemperatureCalibration: {values: {min: -5, max: 5, step: 0.1}},
+                systemMode: {values: ["off", "heat", "auto"]},
+            }),
+        ],
+        exposes: [
+            e
+                .climate()
+                .withLocalTemperature()
+                .withSetpoint("occupied_heating_setpoint", 7, 30, 0.5)
+                .withSystemMode(["off", "heat", "auto"])
+                .withLocalTemperatureCalibration(),
+        ],
+    },
 ];

src/devices/inovelli.ts

@@ -39,6 +39,8 @@ interface Inovelli {
         quickStartLevel: number;
         higherOutputInNonNeutral: number;
         dimmingMode: number;
+        dimmingAlgorithm: number;
+        auxDetectionLevel: number;
         nonNeutralAuxMediumGear: number;
         nonNeutralAuxLowGear: number;
         internalTemperature: number;
@@ -376,6 +378,8 @@ const inovelliExtend = {
                 quickStartLevel: {name: "quickStartLevel", ID: 0x0018, type: Zcl.DataType.UINT8, write: true, max: 0xff},
                 higherOutputInNonNeutral: {name: "higherOutputInNonNeutral", ID: 0x0019, type: Zcl.DataType.BOOLEAN, write: true},
                 dimmingMode: {name: "dimmingMode", ID: 0x001a, type: Zcl.DataType.UINT8, write: true, max: 0xff},
+                dimmingAlgorithm: {name: "dimmingAlgorithm", ID: 0x001b, type: Zcl.DataType.UINT8, write: true, max: 0xff},
+                auxDetectionLevel: {name: "auxDetectionLevel", ID: 0x007c, type: Zcl.DataType.UINT8, write: true, max: 0xff},
                 nonNeutralAuxMediumGear: {name: "nonNeutralAuxMediumGear", ID: 0x001e, type: Zcl.DataType.UINT8, write: true, max: 0xff},
                 nonNeutralAuxLowGear: {name: "nonNeutralAuxLowGear", ID: 0x001f, type: Zcl.DataType.UINT8, write: true, max: 0xff},
                 internalTemperature: {name: "internalTemperature", ID: 0x0020, type: Zcl.DataType.INT8, write: true, max: 0xff},
@@ -1698,6 +1702,27 @@ const VZM31_ATTRIBUTES: {[s: string]: Attribute} = {
         values: {"Disabled (Click Sound On)": 0, "Enabled (Click Sound Off)": 1},
         displayType: "enum",
     },
+    dimmingAlgorithm: {
+        ID: 27,
+        dataType: Zcl.DataType.UINT8,
+        displayType: "enum",
+        values: {"Old dimming algorithm (v2.18)": 0, "New dimming algorithm (v3.04)": 1},
+        min: 0,
+        max: 1,
+        description:
+            "Switches the dimming algorithm from old to new. When switching the algorithm, the switch will restart. " +
+            "Some non-neutral setups may not support the new algorithm, in which case you can use the old algorithm." +
+            "0 = old dimming algorithm (v2.18), 1 = new dimming algorithm (v3.04+) (default).",
+    },
+    auxDetectionLevel: {
+        ID: 124,
+        dataType: Zcl.DataType.UINT8,
+        min: 0,
+        max: 4,
+        description:
+            "Aux detection level (P124). Range: 0-4, default: 1. " +
+            "If you are having issues with the aux function, start setting from 0 and continue until the aux function operates normally.",
+    },
 };
 
 const VZM32_ATTRIBUTES: {[s: string]: Attribute} = {

src/devices/muller_licht.ts

@@ -330,4 +330,11 @@ export const definitions: DefinitionWithExtend[] = [
         description: "tint Smart Socket Tower Outdoor",
         extend: [m.onOff({powerOnBehavior: false})],
     },
+    {
+        zigbeeModel: ["tint Retro Bulb white+ambiance"],
+        model: "404114",
+        vendor: "MLI",
+        description: "Tint LED Bulb, E27, 806 lumen, CCT, clear",
+        extend: [m.light({colorTemp: {range: [153, 555]}})],
+    },
 ];

src/devices/schneider_electric.ts

@@ -3031,4 +3031,14 @@ export const definitions: DefinitionWithExtend[] = [
             e.numeric("current_phase_l3", ea.STATE).withUnit("A").withDescription("Instantaneous measured electrical current on phase L3"),
         ],
     },
+    {
+        zigbeeModel: ["UFH"],
+        model: "CCTFR6000",
+        vendor: "Schneider Electric",
+        description: "6 Channel Boiler Actuator",
+        extend: [
+            m.deviceEndpoints({endpoints: {"1": 1, "2": 2, "3": 3, "4": 4, "5": 5, "6": 6, "7": 7, "8": 8}}),
+            m.onOff({powerOnBehavior: false, endpointNames: ["1", "2", "3", "4", "5", "6", "7", "8"]}),
+        ],
+    },
 ];

src/devices/third_reality.ts

@@ -40,9 +40,21 @@ interface ThirdMotionSensor {
     commandResponses: never;
 }
 
-interface ThirdRadarSpecialCluster {
+interface Third60gRadarSensor {
     attributes: {
-        volatileCrganiccCompounds: number;
+        totalVolatileOrganicCompounds: number;
+        presenceSensorSensitivity: number;
+        airThreshold: number;
+        tvocSensorCalibration: number;
+    };
+    commands: never;
+    commandResponses: never;
+}
+
+interface ThirdWateringKit {
+    attributes: {
+        wateringTimes: number;
+        intervalDay: number;
     };
     commands: never;
     commandResponses: never;
@@ -312,25 +324,55 @@ export const definitions: DefinitionWithExtend[] = [
                 ID: 0x042e,
                 manufacturerCode: 0x1407,
                 attributes: {
-                    volatileCrganiccCompounds: {
+                    totalVolatileOrganicCompounds: {
                         name: "volatileCrganiccCompounds",
                         ID: 0x0000,
                         type: Zcl.DataType.UINT32,
                         write: true,
                         max: 0xffffffff,
                     },
+                    presenceSensorSensitivity: {name: "presenceSensorSensitivity", ID: 0xf002, type: Zcl.DataType.UINT8, write: true, min: 1, max: 6},
+                    tvocSensorCalibration: {name: "tvocSensorCalibration", ID: 0xf001, type: Zcl.DataType.UINT8, write: true, min: 1, max: 1},
+                    airThreshold: {name: "airThreshold", ID: 0xf003, type: Zcl.DataType.UINT16, write: true, min: 3000, max: 15000},
                 },
                 commands: {},
                 commandsResponse: {},
             }),
-            m.numeric<"3r60gRadarSpecialCluster", ThirdRadarSpecialCluster>({
-                name: "volatile_organic_compounds",
+            m.numeric<"3r60gRadarSpecialCluster", Third60gRadarSensor>({
+                name: "total_volatile_organic_compounds",
                 cluster: "3r60gRadarSpecialCluster",
-                attribute: "volatileCrganiccCompounds",
+                attribute: "totalVolatileOrganicCompounds",
                 unit: "ppb",
-                description: "Measured VOC value",
+                description: "Measured TVOC value",
                 access: "STATE_GET",
             }),
+            m.enumLookup<"3r60gRadarSpecialCluster", Third60gRadarSensor>({
+                name: "tvoc_sensor_calibration",
+                lookup: {Reset: 1},
+                cluster: "3r60gRadarSpecialCluster",
+                attribute: "tvocSensorCalibration",
+                description: "TVOC sensor calibration",
+                access: "ALL",
+            }),
+            m.numeric<"3r60gRadarSpecialCluster", Third60gRadarSensor>({
+                name: "presence_sensor_sensitivity",
+                valueMin: 1,
+                valueMax: 6,
+                cluster: "3r60gRadarSpecialCluster",
+                attribute: "presenceSensorSensitivity",
+                description: "Presence sensor sensitivity",
+                access: "ALL",
+            }),
+            m.numeric<"3r60gRadarSpecialCluster", Third60gRadarSensor>({
+                name: "air_threshold",
+                valueMin: 3000,
+                valueMax: 15000,
+                cluster: "3r60gRadarSpecialCluster",
+                attribute: "airThreshold",
+                unit: "ppb",
+                description: "Air threshold",
+                access: "ALL",
+            }),
             m.light({
                 color: {modes: ["xy"], enhancedHue: true},
             }),
@@ -741,17 +783,42 @@ export const definitions: DefinitionWithExtend[] = [
         extend: [
             m.battery({percentage: true, voltage: true, lowStatus: true, percentageReporting: true}),
             m.onOff({powerOnBehavior: false}),
+            m.iasZoneAlarm({
+                zoneType: "generic",
+                zoneAttributes: ["alarm_1"],
+                description: "Water shortage warning",
+            }),
             m.deviceAddCustomCluster("3rWateringSpecialCluster", {
                 name: "3rWateringSpecialCluster",
                 ID: 0xfff2,
                 manufacturerCode: 0x1407,
                 attributes: {
-                    wateringTimes: {name: "wateringTimes", ID: 0x0000, type: Zcl.DataType.UINT16, write: true, max: 0xffff},
-                    intervalDay: {name: "intervalDay", ID: 0x0001, type: Zcl.DataType.UINT8, write: true, max: 0xff},
+                    wateringTimes: {name: "wateringTimes", ID: 0x0000, type: Zcl.DataType.UINT16, write: true, min: 1, max: 1800},
+                    intervalDay: {name: "intervalDay", ID: 0x0001, type: Zcl.DataType.UINT8, write: true, min: 0, max: 30},
                 },
                 commands: {},
                 commandsResponse: {},
             }),
+            m.numeric<"3rWateringSpecialCluster", ThirdWateringKit>({
+                name: "watering_times",
+                cluster: "3rWateringSpecialCluster",
+                attribute: "wateringTimes",
+                valueMin: 1,
+                valueMax: 1800,
+                unit: "s",
+                description: "watering times",
+                access: "ALL",
+            }),
+            m.numeric<"3rWateringSpecialCluster", ThirdWateringKit>({
+                name: "interval_day",
+                cluster: "3rWateringSpecialCluster",
+                attribute: "intervalDay",
+                valueMin: 0,
+                valueMax: 30,
+                unit: "Day",
+                description: "interval day",
+                access: "ALL",
+            }),
         ],
         ota: true,
     },

src/devices/tuya.ts

@@ -3419,7 +3419,9 @@ export const definitions: DefinitionWithExtend[] = [
         // https://github.com/Koenkk/zigbee2mqtt/issues/30584
         meta: {
             moveToLevelWithOnOffDisable: (e) =>
-                e.getDevice().manufacturerName === "_TZB210_uoiqhjqe" || e.getDevice().manufacturerName === "_TZB210_417ikxay",
+                e.getDevice().manufacturerName === "_TZB210_uoiqhjqe" ||
+                e.getDevice().manufacturerName === "_TZB210_417ikxay" ||
+                e.getDevice().manufacturerName === "_TZB210_qzsxaqqe",
         },
         toZigbee: [tzLocal.TS0505B_1_transitionFixesOnOffBrightness],
         configure: (device, coordinatorEndpoint) => {
@@ -3998,9 +4000,9 @@ export const definitions: DefinitionWithExtend[] = [
     },
     {
         fingerprint: tuya.fingerprint("TS0601", ["_TZE284_noixx2uz"]),
-        model: "TRV603",
+        model: "AR331",
         vendor: "Tuya",
-        description: "Thermostatic Radiator Valve",
+        description: "Thermostatic radiator valve",
         extend: [tuya.modernExtend.tuyaBase({dp: true, timeStart: "1970"})],
         exposes: [
             e.battery().withUnit("%"),
@@ -4936,6 +4938,8 @@ export const definitions: DefinitionWithExtend[] = [
             tuya.exposes.switch().withEndpoint("l4"),
             tuya.exposes.switch().withEndpoint("l5"),
             tuya.exposes.switch().withEndpoint("l6"),
+            tuya.exposes.powerOnBehavior(),
+            tuya.exposes.indicatorModeNoneRelayPos(),
         ],
         endpoint: (device) => {
             return {l1: 1, l2: 1, l3: 1, l4: 1, l5: 1, l6: 1};
@@ -4949,6 +4953,24 @@ export const definitions: DefinitionWithExtend[] = [
                 [4, "state_l4", tuya.valueConverter.onOff],
                 [5, "state_l5", tuya.valueConverter.onOff],
                 [6, "state_l6", tuya.valueConverter.onOff],
+                [
+                    14,
+                    "power_on_behavior",
+                    tuya.valueConverterBasic.lookup({
+                        off: tuya.enum(0),
+                        on: tuya.enum(1),
+                        memory: tuya.enum(2),
+                    }),
+                ],
+                [
+                    15,
+                    "indicator_mode",
+                    tuya.valueConverterBasic.lookup({
+                        none: tuya.enum(0),
+                        relay: tuya.enum(1),
+                        pos: tuya.enum(2),
+                    }),
+                ],
             ],
         },
         whiteLabel: [
@@ -14805,6 +14827,7 @@ export const definitions: DefinitionWithExtend[] = [
             e.power_factor().withUnit("%").withDescription("Total power factor"),
             e.power().withDescription("Total active power"),
             e.ac_frequency(),
+            e.numeric("data_report_duration", ea.SET).withValueMin(30).withValueMax(3600),
             tuya.exposes.energyWithPhase("a"),
             tuya.exposes.energyWithPhase("b"),
             tuya.exposes.energyWithPhase("c"),
@@ -14820,6 +14843,56 @@ export const definitions: DefinitionWithExtend[] = [
                 [1, "energy", tuya.valueConverter.divideBy100],
                 [2, "produced_energy", tuya.valueConverter.divideBy100],
                 [15, "power_factor", tuya.valueConverter.raw],
+                [
+                    18,
+                    "data_report_duration",
+                    {
+                        to: (v: number) => {
+                            const value = Math.max(30, Math.min(3600, Math.round(v))) * 2;
+                            // The reporting logic of this device is: for example, if 30 is input, it will report twice within 30 seconds,
+                            // Which means reporting once every 15 seconds. Therefore, the input data needs to be multiplied by 2.
+                            const byte1 = (value >> 8) & 0xff;
+                            const byte2 = value & 0xff;
+                            return [
+                                // Other settings of the device
+                                0x01,
+                                0x01,
+                                0x00,
+                                0x3c,
+                                0x02,
+                                0x00,
+                                0x00,
+                                0x0a,
+                                0x03,
+                                0x01,
+                                0x00,
+                                0xfd,
+                                0x04,
+                                0x00,
+                                0x00,
+                                0xb4,
+                                0x05,
+                                0x01,
+                                0x00,
+                                0x00,
+                                0x07,
+                                0x01,
+                                0x00,
+                                0x00,
+                                0x08,
+                                0x01,
+                                // Report duration
+                                byte1,
+                                byte2,
+                                // Only modify the report duration
+                                0x09,
+                                0x00,
+                                0x00,
+                                0x00,
+                            ];
+                        },
+                    },
+                ],
                 [101, "ac_frequency", tuya.valueConverter.divideBy100],
                 [102, "voltage_a", tuya.valueConverter.divideBy10],
                 [103, "current_a", tuya.valueConverter.divideBy1000],