zigbee-herdsman-converters 15.0.39 → 15.0.41

package/devices/ajax_online.js

@@ -39,7 +39,7 @@ module.exports = [
         meta: {applyRedFix: true, enhancedHue: false},
     },
     {
-        zigbeeModel: ['ZB-CCT_Filament'],
+        fingerprint: [{modelID: 'CCT Light', manufacturerName: 'ZB/Ajax Online', manufacturerID: 4137}],
         model: 'ZB-CCT_Filament',
         vendor: 'Ajax Online',
         description: 'Zigbee LED filament light dimmable E27, edison ST64, flame 2200K',

package/devices/bankamp.js

@@ -5,7 +5,7 @@ module.exports = [
         zigbeeModel: ['Bankamp Dimm-Leuchte'],
         model: '2189/1-xx',
         vendor: 'Bankamp',
-        description: 'Grazia ceiling light',
+        description: 'Ceiling light (e.g. Grazia, Grand)',
         extend: extend.light_onoff_brightness(),
     },
 ];

package/devices/datek.js

@@ -10,12 +10,13 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        fingerprint: [{modelID: 'PoP', manufacturerName: 'Eva'}],
+        zigbeeModel: ['PoP'],
         model: 'HLU2909K',
         vendor: 'Datek',
         description: 'APEX smart plug 16A',
         fromZigbee: [fz.on_off, fz.electrical_measurement, fz.temperature],
         toZigbee: [tz.on_off, tz.power_on_behavior],
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'msTemperatureMeasurement']);
@@ -28,11 +29,10 @@ module.exports = [
             await reporting.activePower(endpoint);
             await reporting.temperature(endpoint);
         },
-        ota: ota.zigbeeOTA,
         exposes: [e.power(), e.current(), e.voltage(), e.switch(), e.temperature(), e.power_on_behavior()],
     },
     {
-        fingerprint: [{modelID: 'Meter Reader', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Meter Reader'],
         model: 'HSE2905E',
         vendor: 'Datek',
         description: 'Datek Eva AMS HAN power-meter sensor',
@@ -86,7 +86,7 @@ module.exports = [
             e.voltage_phase_c(), e.temperature()],
     },
     {
-        fingerprint: [{modelID: 'Motion Sensor', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Motion Sensor'],
         model: 'HSE2927E',
         vendor: 'Datek',
         description: 'Eva motion sensor',
@@ -114,7 +114,7 @@ module.exports = [
             exposes.numeric('occupancy_timeout', ea.ALL).withUnit('seconds').withValueMin(0).withValueMax(65535)],
     },
     {
-        fingerprint: [{modelID: 'ID Lock 150', manufacturerName: 'Eva'}],
+        zigbeeModel: ['ID Lock 150'],
         model: '0402946',
         vendor: 'Datek',
         description: 'Zigbee module for ID lock 150',
@@ -188,7 +188,7 @@ module.exports = [
                 'random_pin_24_hours']).withDescription('Service Mode of the Lock')],
     },
     {
-        fingerprint: [{modelID: 'Water Sensor', manufacturerName: 'Eva'}],
+        zigbeeModel: ['Water Sensor'],
         model: 'HSE2919E',
         vendor: 'Datek',
         description: 'Eva water leak sensor',
@@ -229,7 +229,6 @@ module.exports = [
                 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
     },
     {
-        fingerprint: [{modelID: 'Door/Window Sensor', manufacturerName: 'Eva'}],
         zigbeeModel: ['Door/Window Sensor'],
         model: 'HSE2920E',
         vendor: 'Datek',

package/devices/essentialb.js

@@ -8,4 +8,11 @@ module.exports = [
         description: 'Smart LED bulb',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        zigbeeModel: ['EB-E27-ST64-CCT-FV'],
+        model: 'EB-E27-ST64-CCT-FV',
+        vendor: 'EssentielB',
+        description: 'Filament vintage light bulb',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 454]}),
+    },
 ];

package/devices/immax.js

@@ -192,7 +192,7 @@ module.exports = [
         exposes: [e.action(['disarm', 'arm_home', 'arm_away', 'sos']), e.tamper()],
         meta: {
             tuyaDatapoints: [
-                [24, 'tamper', tuya.valueConverter.trueFalse],
+                [24, 'tamper', tuya.valueConverter.trueFalse1],
                 [26, 'action', tuya.valueConverter.static('disarm')],
                 [27, 'action', tuya.valueConverter.static('arm_away')],
                 [28, 'action', tuya.valueConverter.static('arm_home')],

package/devices/linkind.js

@@ -81,6 +81,13 @@ module.exports = [
         description: 'Zigbee LED 4.8W GU10 bulb, dimmable & tunable',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
     },
+    {
+        zigbeeModel: ['ZBT-CCTLight-D115'],
+        model: 'ZL13100314',
+        vendor: 'Linkind',
+        description: 'Ceiling light 28W, 3000 lm, Ø40CM CCT',
+        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+    },
     {
         zigbeeModel: ['ZBT-CCTLight-BR300107'],
         model: 'ZL100050004',

package/devices/lonsonho.js

@@ -183,7 +183,7 @@ module.exports = [
             {disableColorTempStartup: true, colorTempRange: [153, 500], disableEffect: true}),
     },
     {
-        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TYZB01_zsl6z0pw'}],
+        fingerprint: [{modelID: 'TS0003', manufacturerName: '_TYZB01_zsl6z0pw'}, {modelID: 'TS0003', manufacturerName: '_TYZB01_uqkphoed'}],
         model: 'QS-Zigbee-S04-2C-LN',
         vendor: 'Lonsonho',
         description: '2 gang switch module with neutral wire',

package/devices/stelpro.js

@@ -48,6 +48,9 @@ module.exports = [
             await reporting.thermostatSystemMode(endpoint);
             await reporting.thermostatPIHeatingDemand(endpoint);
             await reporting.thermostatKeypadLockMode(endpoint);
+            // Has Unknown power source, force it.
+            device.powerSource = 'Mains (single phase)';
+            device.save();
         },
     },
     {

package/devices/tuya.js

@@ -873,10 +873,10 @@ module.exports = [
         exposes: [e.gas(), tuya.exposes.selfTest(), tuya.exposes.selfTestResult(), tuya.exposes.faultAlarm(), tuya.exposes.silence()],
         meta: {
             tuyaDatapoints: [
-                [1, 'gas', tuya.valueConverter.true0ElseFalse],
+                [1, 'gas', tuya.valueConverter.trueFalse0],
                 [8, 'self_test', tuya.valueConverter.raw],
                 [9, 'self_test_result', tuya.valueConverter.selfTestResult],
-                [11, 'fault_alarm', tuya.valueConverter.trueFalse],
+                [11, 'fault_alarm', tuya.valueConverter.trueFalse1],
                 [16, 'silence', tuya.valueConverter.raw],
             ],
         },
@@ -1828,7 +1828,7 @@ module.exports = [
         vendor: 'TuYa',
         description: 'Wireless switch with 4 buttons',
         whiteLabel: [{vendor: 'Lonsonho', model: 'TS0044'}, {vendor: 'Haozee', model: 'ESW-OZAA-EU'},
-            {vendor: 'LoraTap', model: 'SS6400ZB'}],
+            {vendor: 'LoraTap', model: 'SS6400ZB'}, {vendor: 'Moes', model: 'ZT-SY-EU-G-4S-WH-MS'}],
         fromZigbee: [fz.tuya_on_off_action, fz.battery],
         exposes: [e.battery(), e.action(['1_single', '1_double', '1_hold', '2_single', '2_double', '2_hold',
             '3_single', '3_double', '3_hold', '4_single', '4_double', '4_hold'])],
@@ -1894,7 +1894,8 @@ module.exports = [
         exposes: [e.battery(), e.water_leak()],
     },
     {
-        fingerprint: tuya.fingerprint('TS0001', ['_TZ3000_xkap8wtb', '_TZ3000_qnejhcsu', '_TZ3000_x3ewpzyr', '_TZ3000_mkhkxx1p']),
+        fingerprint: tuya.fingerprint('TS0001', ['_TZ3000_xkap8wtb', '_TZ3000_qnejhcsu', '_TZ3000_x3ewpzyr',
+            '_TZ3000_mkhkxx1p', '_TZ3000_tgddllx4']),
         model: 'TS0001_power',
         description: 'Switch with power monitoring',
         vendor: 'TuYa',
@@ -2302,7 +2303,7 @@ module.exports = [
                 [31, 'working_day', tuya.valueConverterBasic.lookup({'mon_sun': tuya.enum(0), 'mon_fri+sat+sun': tuya.enum(1),
                     'separate': tuya.enum(2)})],
                 [32, 'holiday_temperature', tuya.valueConverter.divideBy10],
-                [35, 'battery_low', tuya.valueConverter.true0ElseFalse],
+                [35, 'battery_low', tuya.valueConverter.trueFalse0],
                 [40, 'child_lock', tuya.valueConverter.lockUnlock],
                 [45, 'error_status', tuya.valueConverter.raw],
                 [46, 'holiday_start_stop', tuya.valueConverter.thermostatHolidayStartStop],
@@ -2349,7 +2350,7 @@ module.exports = [
                 [16, 'current_heating_setpoint', tuya.valueConverter.divideBy10],
                 [24, 'local_temperature', tuya.valueConverter.divideBy10],
                 [27, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration1],
-                [35, 'battery_low', tuya.valueConverter.true0ElseFalse],
+                [35, 'battery_low', tuya.valueConverter.trueFalse0],
                 [40, 'child_lock', tuya.valueConverter.lockUnlock],
                 [45, 'error_status', tuya.valueConverter.raw],
                 [101, 'schedule_monday', tuya.valueConverter.thermostatScheduleDayMultiDP],
@@ -2626,9 +2627,9 @@ module.exports = [
         exposes: [e.smoke(), e.tamper(), e.battery_low()],
         meta: {
             tuyaDatapoints: [
-                [1, 'smoke', tuya.valueConverter.true0ElseFalse],
+                [1, 'smoke', tuya.valueConverter.trueFalse0],
                 [4, 'tamper', tuya.valueConverter.raw],
-                [14, 'battery_low', tuya.valueConverter.true0ElseFalse],
+                [14, 'battery_low', tuya.valueConverter.trueFalse0],
             ],
         },
     },
@@ -2648,7 +2649,7 @@ module.exports = [
         ],
         meta: {
             tuyaDatapoints: [
-                [1, 'smoke', tuya.valueConverter.true0ElseFalse],
+                [1, 'smoke', tuya.valueConverter.trueFalse0],
                 [2, 'smoke_concentration', tuya.valueConverter.divideBy10],
                 [11, 'device_fault', tuya.valueConverter.raw],
                 [15, 'battery', tuya.valueConverter.raw],
@@ -2659,7 +2660,7 @@ module.exports = [
     {
         zigbeeModel: ['5p1vj8r'],
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_t5p1vj8r', '_TZE200_uebojraa', '_TZE200_vzekyi4c', '_TZE200_yh7aoahi',
-            '_TZE200_dnz6yvl2']),
+            '_TZE200_dnz6yvl2', '_TZE200_dq1mfjug']),
         model: 'TS0601_smoke',
         vendor: 'TuYa',
         description: 'Smoke sensor',
@@ -2668,7 +2669,7 @@ module.exports = [
         exposes: [e.smoke(), e.battery(), tuya.exposes.batteryState()],
         meta: {
             tuyaDatapoints: [
-                [1, 'smoke', tuya.valueConverter.true0ElseFalse],
+                [1, 'smoke', tuya.valueConverter.trueFalse0],
                 [14, 'battery_state', tuya.valueConverter.batteryState],
                 [15, 'battery', tuya.valueConverter.raw],
             ],
@@ -3449,9 +3450,9 @@ module.exports = [
         ],
         meta: {
             tuyaDatapoints: [
-                [1, 'presence', tuya.valueConverter.trueFalse],
+                [1, 'presence', tuya.valueConverter.trueFalse1],
                 [2, 'radar_sensitivity', tuya.valueConverter.raw],
-                [102, 'occupancy', tuya.valueConverterBasic.lookup({false: 1, true: 2})],
+                [102, 'occupancy', tuya.valueConverterBasic.trueFalse2],
                 [103, 'illuminance_lux', tuya.valueConverter.raw],
                 [105, 'tumble_switch', tuya.valueConverter.plus1],
                 [106, 'tumble_alarm_time', tuya.valueConverter.raw],
@@ -3857,7 +3858,7 @@ module.exports = [
         exposes: [e.gas(), tuya.exposes.gasValue().withUnit('ppm')],
         meta: {
             tuyaDatapoints: [
-                [1, 'gas', tuya.valueConverter.true0ElseFalse],
+                [1, 'gas', tuya.valueConverter.trueFalse0],
                 [2, 'gas_value', tuya.valueConverter.raw],
             ],
         },
@@ -3875,7 +3876,7 @@ module.exports = [
             [tz.light_onoff_brightness],
             [tzLocal.TS110E_light_onoff_brightness],
         ),
-        exposes: [e.light_brightness(), e.power_on_behavior(), tuya.exposes.switchType()],
+        exposes: [e.light_brightness().withMinBrightness().withMaxBrightness(), e.power_on_behavior(), tuya.exposes.switchType()],
         configure: async (device, coordinatorEndpoint, logger) => {
             await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/lib/tuya.js

@@ -1243,10 +1243,15 @@ const valueConverterBasic = {
     divideBy: (value) => {
         return {to: (v) => v * value, from: (v) => v / value};
     },
+    trueFalse: (valueTrue) => {
+        return {from: (v) => v === valueTrue};
+    },
 };
 
 const valueConverter = {
-    trueFalse: valueConverterBasic.lookup({true: 1, false: 0}),
+    trueFalse0: valueConverterBasic.trueFalse(0),
+    trueFalse1: valueConverterBasic.trueFalse(1),
+    trueFalse2: valueConverterBasic.trueFalse(2),
     onOff: valueConverterBasic.lookup({'ON': true, 'OFF': false}),
     powerOnBehavior: valueConverterBasic.lookup({'off': 0, 'on': 1, 'previous': 2}),
     lightType: valueConverterBasic.lookup({'led': 0, 'incandescent': 1, 'halogen': 2}),
@@ -1308,7 +1313,6 @@ const valueConverter = {
             };
         },
     },
-    true0ElseFalse: {from: (v) => v === 0},
     selfTestResult: valueConverterBasic.lookup({'checking': 0, 'success': 1, 'failure': 2, 'others': 3}),
     lockUnlock: valueConverterBasic.lookup({'LOCK': true, 'UNLOCK': false}),
     localTempCalibration1: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.39",
+  "version": "15.0.41",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [