@willieee802/zigbee-herdsman-converters 19.44.4 → 19.45.0

package/dist/devices/sunricher.js

@@ -43,6 +43,7 @@ const exposes = __importStar(require("../lib/exposes"));
 const logger_1 = require("../lib/logger");
 const m = __importStar(require("../lib/modernExtend"));
 const modernExtend_1 = require("../lib/modernExtend");
+const namron = __importStar(require("../lib/namron"));
 const reporting = __importStar(require("../lib/reporting"));
 const reporting_1 = require("../lib/reporting");
 const sunricher = __importStar(require("../lib/sunricher"));
@@ -52,6 +53,21 @@ const NS = "zhc:sunricher";
 const e = exposes.presets;
 const ea = exposes.access;
 const sunricherManufacturerCode = 0x1224;
+const SRZGP2801K45C_LOOKUP = {
+    33: "press_on",
+    32: "press_off",
+    55: "press_high",
+    56: "press_low",
+    53: "hold_high",
+    54: "hold_low",
+    52: "high_low_release",
+    99: "cw_ww_release",
+    98: "cw_dec_ww_inc",
+    100: "ww_inc_cw_dec",
+    65: "r_g_b",
+    66: "b_g_r",
+    64: "rgb_release",
+};
 const fzLocal = {
     SRZGP2801K45C: {
         cluster: "greenPower",
@@ -60,24 +76,9 @@ const fzLocal = {
             const commandID = msg.data.commandID;
             if (utils.hasAlreadyProcessedMessage(msg, model, msg.data.frameCounter, `${msg.device.ieeeAddr}_${commandID}`))
                 return;
-            if (commandID === 224)
-                return;
-            const lookup = {
-                33: "press_on",
-                32: "press_off",
-                55: "press_high",
-                56: "press_low",
-                53: "hold_high",
-                54: "hold_low",
-                52: "high_low_release",
-                99: "cw_ww_release",
-                98: "cw_dec_ww_inc",
-                100: "ww_inc_cw_dec",
-                65: "r_g_b",
-                66: "b_g_r",
-                64: "rgb_release",
-            };
-            return { action: utils.getFromLookup(commandID, lookup) };
+            if (commandID >= 0xe0)
+                return; // Skip op commands
+            return { action: utils.getFromLookup(commandID, SRZGP2801K45C_LOOKUP) };
         },
     },
     ZG9095B: {
@@ -194,6 +195,163 @@ async function syncTimeWithTimeZone(endpoint) {
     }
 }
 exports.definitions = [
+    {
+        zigbeeModel: ["HK-DIM-PIR"],
+        model: "SR-ZG9032A-PIR",
+        vendor: "Sunricher",
+        description: "Zigbee motion sensor + light sensor + 0-10V dimming",
+        extend: [
+            m.deviceEndpoints({ endpoints: { "1": 1, "2": 2, "3": 3 } }),
+            m.light({ endpointNames: ["1"] }),
+            m.occupancy({ endpointNames: ["2"] }),
+            m.illuminance({ endpointNames: ["3"] }),
+            m.commandsOnOff({ endpointNames: ["1"] }),
+            m.commandsLevelCtrl({ endpointNames: ["1"] }),
+            m.enumLookup({
+                name: "dimming_brightness_curve",
+                cluster: "genBasic",
+                attribute: { ID: 0x8806, type: 0x20 },
+                lookup: {
+                    linear: 0x00,
+                    gamma_1_5: 0x0f,
+                    gamma_1_8: 0x12,
+                },
+                description: "Dimming brightness curve. Options: linear, gamma 1.5, gamma 1.8. Default: linear.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "motion_sensor_lux_threshold",
+                cluster: "genBasic",
+                attribute: { ID: 0x8903, type: 0x21 },
+                valueMin: 0,
+                valueMax: 65535,
+                description: "Daylight sensor lux threshold. When the measured lux is below this value, the light is allowed to turn on. Set to minimum value to disable this function. Default: disabled.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "motion_sensor_sensitivity",
+                cluster: "genBasic",
+                attribute: { ID: 0x8905, type: 0x20 },
+                valueMin: 0,
+                valueMax: 15,
+                description: "Motion sensor sensitivity. 0 is highest sensitivity, 15 is lowest. Default: 1.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.enumLookup({
+                name: "brightness_module_enable",
+                cluster: "genBasic",
+                attribute: { ID: 0x890c, type: 0x20 },
+                lookup: {
+                    disabled: 0,
+                    enabled: 1,
+                },
+                description: "Enable or disable the brightness module. Options: enabled, disabled. Default: enabled.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "light_on_time",
+                cluster: "genBasic",
+                attribute: { ID: 0x8902, type: 0x21 },
+                valueMin: 0,
+                valueMax: 65535,
+                unit: "s",
+                description: "Light on time (first delay). When motion is detected and then the area is vacated, this is the time the light stays on. Unit: seconds. Default: 60 seconds.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "pwm_brightness_value",
+                cluster: "genBasic",
+                attribute: { ID: 0x8908, type: 0x21 },
+                valueMin: 0,
+                valueMax: 1000,
+                unit: "lux",
+                description: "Brightness value for PWM output when motion is detected. 0 disables this function. Default: disabled.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "pwm_output_percentage",
+                cluster: "genBasic",
+                attribute: { ID: 0x8909, type: 0x20 },
+                valueMin: 0,
+                valueMax: 254,
+                unit: "%",
+                description: "PWM output percentage when motion is detected. Range: 0-100%. Default: 100%.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "light_status_after_first_delay",
+                cluster: "genBasic",
+                attribute: { ID: 0x890a, type: 0x20 },
+                valueMin: 0,
+                valueMax: 254,
+                unit: "%",
+                description: "Light status after the first delay expires, during the second delay. Range: 0-100%. Default: 0% (off).",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "second_delay_time",
+                cluster: "genBasic",
+                attribute: { ID: 0x8901, type: 0x21 },
+                valueMin: 0,
+                valueMax: 65535,
+                unit: "s",
+                description: "Duration of the second delay after the first delay expires. Unit: seconds. Default: 60 seconds.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "light_status_after_second_delay",
+                cluster: "genBasic",
+                attribute: { ID: 0x890b, type: 0x20 },
+                valueMin: 0,
+                valueMax: 254,
+                unit: "%",
+                description: "Light status after the second delay expires. Range: 0-100%. Default: 0% (off).",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "linearity_error_ratio_lux",
+                cluster: "genBasic",
+                attribute: { ID: 0x890d, type: 0x21 },
+                valueMin: 100,
+                valueMax: 10000,
+                description: "Linearity error ratio coefficient for LUX measurement. 1000 means 1000‰ (default). Increasing this value magnifies the LUX measurement linearly, decreasing minifies it.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+            m.numeric({
+                name: "fixed_deviation_lux",
+                cluster: "genBasic",
+                attribute: { ID: 0x890e, type: 0x29 },
+                valueMin: -100,
+                valueMax: 100,
+                description: "Fixed deviation of LUX measurement. Positive value increases, negative value decreases the measured LUX.",
+                entityCategory: "config",
+                access: "ALL",
+                zigbeeCommandOptions: { manufacturerCode: sunricherManufacturerCode },
+            }),
+        ],
+    },
     {
         zigbeeModel: ["ZGRC-KEY-047"],
         model: "SR-ZG2868K12-DIM",
@@ -643,10 +801,12 @@ exports.definitions = [
         extend: [
             m.battery(),
             m.deviceAddCustomCluster("sunricherRemote", {
+                name: "sunricherRemote",
                 ID: 0xff03,
                 attributes: {},
                 commands: {
                     press: {
+                        name: "press",
                         ID: 0x01,
                         parameters: [
                             { name: "messageType", type: zigbee_herdsman_1.Zcl.DataType.UINT8, max: 0xff },
@@ -668,9 +828,11 @@ exports.definitions = [
         description: "Zigbee thermostatic radiator valve",
         extend: [
             m.deviceAddCustomCluster("hvacThermostat", {
+                name: "hvacThermostat",
                 ID: zigbee_herdsman_1.Zcl.Clusters.hvacThermostat.ID,
                 attributes: {
                     screenTimeout: {
+                        name: "screenTimeout",
                         ID: 0x100d,
                         type: zigbee_herdsman_1.Zcl.DataType.UINT8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -678,6 +840,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     antiFreezingTemp: {
+                        name: "antiFreezingTemp",
                         ID: 0x1005,
                         type: zigbee_herdsman_1.Zcl.DataType.UINT8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -685,6 +848,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     temperatureDisplayMode: {
+                        name: "temperatureDisplayMode",
                         ID: 0x1008,
                         type: zigbee_herdsman_1.Zcl.DataType.ENUM8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -692,6 +856,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     windowOpenCheck: {
+                        name: "windowOpenCheck",
                         ID: 0x1009,
                         type: zigbee_herdsman_1.Zcl.DataType.UINT8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -699,6 +864,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     hysteresis: {
+                        name: "hysteresis",
                         ID: 0x100a,
                         type: zigbee_herdsman_1.Zcl.DataType.UINT8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -706,6 +872,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     windowOpenFlag: {
+                        name: "windowOpenFlag",
                         ID: 0x100b,
                         type: zigbee_herdsman_1.Zcl.DataType.ENUM8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -713,6 +880,7 @@ exports.definitions = [
                         max: 0xff,
                     },
                     forcedHeatingTime: {
+                        name: "forcedHeatingTime",
                         ID: 0x100e,
                         type: zigbee_herdsman_1.Zcl.DataType.UINT8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -720,12 +888,14 @@ exports.definitions = [
                         max: 0xff,
                     },
                     errorCode: {
+                        name: "errorCode",
                         ID: 0x2003,
                         type: zigbee_herdsman_1.Zcl.DataType.BITMAP8,
                         manufacturerCode: sunricherManufacturerCode,
                         write: true,
                     },
                     awayOrBoostMode: {
+                        name: "awayOrBoostMode",
                         ID: 0x2002,
                         type: zigbee_herdsman_1.Zcl.DataType.ENUM8,
                         manufacturerCode: sunricherManufacturerCode,
@@ -946,12 +1116,13 @@ exports.definitions = [
             m.occupancy(),
             m.commandsOnOff(),
             m.deviceAddCustomCluster("sunricherSensor", {
+                name: "sunricherSensor",
                 ID: 0xfc8b,
                 manufacturerCode: 0x120b,
                 attributes: {
-                    indicatorLight: { ID: 0xf001, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
-                    detectionArea: { ID: 0xf002, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
-                    illuminanceThreshold: { ID: 0xf004, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
+                    indicatorLight: { name: "indicatorLight", ID: 0xf001, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
+                    detectionArea: { name: "detectionArea", ID: 0xf002, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
+                    illuminanceThreshold: { name: "illuminanceThreshold", ID: 0xf004, type: zigbee_herdsman_1.Zcl.DataType.UINT8, write: true, max: 0xff },
                 },
                 commands: {},
                 commandsResponse: {},
@@ -1805,6 +1976,8 @@ exports.definitions = [
             { modelID: "GreenPower_2", ieeeAddr: /^0x000000001fa.....$/ },
             { modelID: "GreenPower_2", ieeeAddr: /^0x0000000034b.....$/ },
             { modelID: "GreenPower_2", ieeeAddr: /^0x00000000f12.....$/ },
+            { modelID: "GreenPower_2", ieeeAddr: /^0x0000000039a.....$/ },
+            { modelID: "GreenPower_2", ieeeAddr: /^0x00000000675.....$/ },
         ],
         model: "SR-ZGP2801K4-DIM",
         vendor: "Sunricher",
@@ -1843,7 +2016,13 @@ exports.definitions = [
         model: "SR-ZG9092A",
         vendor: "Sunricher",
         description: "Touch thermostat",
-        fromZigbee: [fz.thermostat, fz.namron_thermostat, fz.metering, fz.electrical_measurement, fz.namron_hvac_user_interface],
+        fromZigbee: [
+            fz.thermostat,
+            namron.fromZigbee.namron_thermostat,
+            fz.metering,
+            fz.electrical_measurement,
+            namron.fromZigbee.namron_hvac_user_interface,
+        ],
         toZigbee: [
             tz.thermostat_occupied_heating_setpoint,
             tz.thermostat_unoccupied_heating_setpoint,
@@ -1854,8 +2033,8 @@ exports.definitions = [
             tz.thermostat_system_mode,
             tz.thermostat_control_sequence_of_operation,
             tz.thermostat_running_state,
-            tz.namron_thermostat,
-            tz.namron_thermostat_child_lock,
+            namron.toZigbee.namron_thermostat,
+            namron.toZigbee.namron_thermostat_child_lock,
         ],
         exposes: [
             e.numeric("outdoor_temperature", ea.STATE_GET).withUnit("°C").withDescription("Current temperature measured from the floor sensor"),
@@ -1918,7 +2097,7 @@ exports.definitions = [
                 .withDescription("Room temperature alarm threshold, between 20 and 60 in °C.  0 means disabled.  Default: 45."),
         ],
         // Device does not ask for the time with binding, therefore we write the time every 24 hours
-        extend: [m.writeTimeDaily({ endpointId: 1 })],
+        extend: [m.writeTimeDaily({ endpointId: 1 }), namron.namronExtend.addNamronHvacThermostatCluster()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -2138,7 +2317,14 @@ exports.definitions = [
         model: "SR-ZG9095B",
         vendor: "Sunricher",
         description: "Touch thermostat",
-        fromZigbee: [fz.thermostat, fz.namron_thermostat, fz.metering, fz.electrical_measurement, fz.namron_hvac_user_interface, fzLocal.ZG9095B],
+        fromZigbee: [
+            fz.thermostat,
+            namron.fromZigbee.namron_thermostat,
+            fz.metering,
+            fz.electrical_measurement,
+            namron.fromZigbee.namron_hvac_user_interface,
+            fzLocal.ZG9095B,
+        ],
         toZigbee: [
             tzLocal.ZG9095B.temperature_display,
             tzLocal.ZG9095B.sensor,
@@ -2153,8 +2339,8 @@ exports.definitions = [
             tz.thermostat_system_mode,
             tz.thermostat_control_sequence_of_operation,
             tz.thermostat_running_state,
-            tz.namron_thermostat,
-            tz.namron_thermostat_child_lock,
+            namron.toZigbee.namron_thermostat,
+            namron.toZigbee.namron_thermostat_child_lock,
             tz.fan_mode,
             tzLocal.ZG9095B.min_setpoint_deadband,
         ],
@@ -2200,7 +2386,7 @@ exports.definitions = [
                 .withDescription("This parameter refers to the minimum difference between cooling and heating temperatures. between 1 and 1.5 in 0.1 °C  Default: 1 °C. The hysteresis used by this device = MinSetpointDeadBand /2"),
         ],
         // Device does not ask for the time with binding, therefore we write the time every 24 hours
-        extend: [m.writeTimeDaily({ endpointId: 1 })],
+        extend: [m.writeTimeDaily({ endpointId: 1 }), namron.namronExtend.addNamronHvacThermostatCluster()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             const binds = ["genBasic", "genIdentify", "hvacThermostat", "seMetering", "genTime", "hvacUserInterfaceCfg"];