zigbee-herdsman-converters 21.17.0 → 21.18.0

package/devices/tuya.js

@@ -44,6 +44,7 @@ const exposes = __importStar(require("../lib/exposes"));
 const legacy = __importStar(require("../lib/legacy"));
 const logger_1 = require("../lib/logger");
 const modernExtend_1 = require("../lib/modernExtend");
+const m = __importStar(require("../lib/modernExtend"));
 const reporting = __importStar(require("../lib/reporting"));
 const globalStore = __importStar(require("../lib/store"));
 const tuya = __importStar(require("../lib/tuya"));
@@ -878,7 +879,6 @@ const definitions = [
             if (!device || !noBatteryLowModels.includes(device.manufacturerName)) {
                 exps.push(e.battery_low());
             }
-            exps.push(e.linkquality());
             return exps;
         },
         meta: {
@@ -982,7 +982,6 @@ const definitions = [
                 exps.push(e.battery_low());
                 exps.push(e.enum('battery_level', ea.STATE, ['low', 'middle', 'high']).withDescription('Battery level state'));
             }
-            exps.push(e.linkquality());
             return exps;
         },
     },
@@ -1711,11 +1710,12 @@ const definitions = [
         model: 'TS0202_3',
         vendor: 'Tuya',
         description: 'Motion detector with illuminance',
-        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_occupancy_alarm_1_report, fromZigbee_1.default.illuminance],
+        fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report, fromZigbee_1.default.ias_occupancy_alarm_1_report],
         toZigbee: [],
         onEvent: tuya.onEventSetTime,
         configure: tuya.configureMagicPacket,
-        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper(), e.illuminance()],
+        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.tamper()],
+        extend: [m.illuminance()],
     },
     {
         fingerprint: tuya.fingerprint('TS0202', ['_TZ3210_cwamkvua']),
@@ -1759,7 +1759,7 @@ const definitions = [
         // Requires alarm_1_with_timeout https://github.com/Koenkk/zigbee2mqtt/issues/2818#issuecomment-776119586
         fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1_with_timeout, fromZigbee_1.default.battery, fromZigbee_1.default.ignore_basic_report],
         toZigbee: [],
-        exposes: [e.occupancy(), e.battery_low(), e.linkquality(), e.battery(), e.battery_voltage()],
+        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
@@ -1793,7 +1793,6 @@ const definitions = [
             if (!device || !['_TZ3000_bsvqrxru', '_TZ3000_nss8amz9'].includes(device.manufacturerName)) {
                 exps.push(e.tamper());
             }
-            exps.push(e.linkquality());
             return exps;
         },
         configure: async (device, coordinatorEndpoint) => {
@@ -1935,7 +1934,6 @@ const definitions = [
             if (!device || !noTamperModels.includes(device.manufacturerName)) {
                 exps.push(e.tamper());
             }
-            exps.push(e.linkquality());
             return exps;
         },
     },
@@ -2153,7 +2151,6 @@ const definitions = [
             if (!device || !['_TZE200_ykgar0ow'].includes(device.manufacturerName)) {
                 exps.push(tuya.exposes.lightType(), tuya.exposes.backlightModeOffNormalInverted().withAccess(ea.STATE_SET));
             }
-            exps.push(e.linkquality());
             return exps;
         },
         meta: {
@@ -2580,7 +2577,7 @@ const definitions = [
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic']);
         },
-        exposes: [e.battery(), e.illuminance(), e.linkquality(), e.enum('brightness_level', ea.STATE, ['LOW', 'MEDIUM', 'HIGH'])],
+        exposes: [e.battery(), e.illuminance(), e.enum('brightness_level', ea.STATE, ['LOW', 'MEDIUM', 'HIGH'])],
     },
     {
         zigbeeModel: ['TS130F'],
@@ -2620,7 +2617,6 @@ const definitions = [
             if (device?.manufacturerName !== '_TZ3210_xbpt8ewc' && device?.manufacturerName !== '_TZ3000_e3vhyirx') {
                 exps.push(tuya.exposes.indicatorMode(), tuya.exposes.backlightModeOffOn());
             }
-            exps.push(e.linkquality());
             return exps;
         },
     },
@@ -4466,7 +4462,7 @@ const definitions = [
             tuyaDatapoints: [
                 [1, 'state', tuya.valueConverterBasic.lookup({ OPEN: tuya.enum(0), STOP: tuya.enum(1), CLOSE: tuya.enum(2) })],
                 [2, 'position', tuya.valueConverter.coverPosition],
-                [3, 'position', tuya.valueConverter.raw],
+                [3, 'position', tuya.valueConverter.coverPosition],
                 [5, 'reverse_direction', tuya.valueConverterBasic.lookup({ forward: tuya.enum(0), back: tuya.enum(1) })],
                 [12, 'motor_fault', tuya.valueConverter.trueFalse1],
                 [13, 'battery', tuya.valueConverter.raw],
@@ -7137,32 +7133,35 @@ const definitions = [
         model: 'TS0222_temperature_humidity',
         vendor: 'Tuya',
         description: 'Temperature & humidity sensor',
-        fromZigbee: [fzLocal.TS0222_humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.illuminance],
+        fromZigbee: [fzLocal.TS0222_humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
-        exposes: [e.battery(), e.temperature(), e.humidity(), e.illuminance()],
+        exposes: [e.battery(), e.temperature(), e.humidity()],
         whiteLabel: [tuya.whitelabel('Tuya', 'QT-07S', 'Soil sensor', ['_TZE204_myd45weu'])],
+        extend: [m.illuminance()],
     },
     {
         fingerprint: tuya.fingerprint('TS0222', ['_TZ3000_8uxxzz4b', '_TZ3000_hy6ncvmw', '_TZ3000_9kbbfeho', '_TZ3000_l6rsaipj']),
         model: 'TS0222_light',
         vendor: 'Tuya',
         description: 'Light sensor',
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.illuminance],
+        fromZigbee: [fromZigbee_1.default.battery],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
         whiteLabel: [tuya.whitelabel('Moes', 'ZSS-QT-LS-C', 'Light sensor', ['_TZ3000_9kbbfeho'])],
-        exposes: [e.battery(), e.illuminance()],
+        exposes: [e.battery()],
+        extend: [m.illuminance()],
     },
     {
         fingerprint: tuya.fingerprint('TS0222', ['_TZ3000_t9qqxn70']),
         model: 'THE01860A',
         vendor: 'Tuya',
         description: 'Temp & humidity flower sensor with illuminance',
-        fromZigbee: [fromZigbee_1.default.humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.illuminance],
+        fromZigbee: [fromZigbee_1.default.humidity, fromZigbee_1.default.battery, fromZigbee_1.default.temperature],
         toZigbee: [],
         configure: tuya.configureMagicPacket,
-        exposes: [e.battery(), e.temperature(), e.humidity(), e.illuminance()],
+        exposes: [e.battery(), e.temperature(), e.humidity()],
+        extend: [m.illuminance()],
     },
     {
         fingerprint: [
@@ -7173,10 +7172,11 @@ const definitions = [
         model: 'TS0222',
         vendor: 'Tuya',
         description: 'Light intensity sensor',
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.illuminance, legacy.fromZigbee.TS0222],
+        fromZigbee: [fromZigbee_1.default.battery, legacy.fromZigbee.TS0222],
         toZigbee: [],
-        exposes: [e.battery(), e.illuminance()],
+        exposes: [e.battery()],
         configure: tuya.configureMagicPacket,
+        extend: [m.illuminance()],
     },
     {
         zigbeeModel: ['TS0210'],
@@ -7440,7 +7440,7 @@ const definitions = [
         model: 'LCZ030',
         vendor: 'Tuya',
         description: 'Temperature & humidity & illuminance sensor with display',
-        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.illuminance, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity, fromZigbee_1.default.ts0201_temperature_humidity_alarm],
+        fromZigbee: [fromZigbee_1.default.battery, fromZigbee_1.default.temperature, fromZigbee_1.default.humidity, fromZigbee_1.default.ts0201_temperature_humidity_alarm],
         toZigbee: [toZigbee_1.default.ts0201_temperature_humidity_alarm],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
@@ -7450,7 +7450,6 @@ const definitions = [
                 'genBasic',
                 'genPowerCfg',
                 'msTemperatureMeasurement',
-                'msIlluminanceMeasurement',
                 'msRelativeHumidity',
                 'manuSpecificTuya_2',
             ]);
@@ -7459,7 +7458,6 @@ const definitions = [
             e.temperature(),
             e.humidity(),
             e.battery(),
-            e.illuminance(),
             e
                 .numeric('alarm_temperature_max', ea.STATE_SET)
                 .withUnit('°C')
@@ -7477,6 +7475,7 @@ const definitions = [
             e.enum('alarm_humidity', ea.STATE, ['below_min_humdity', 'over_humidity', 'off']).withDescription('Alarm humidity status'),
             e.enum('alarm_temperature', ea.STATE, ['below_min_temperature', 'over_temperature', 'off']).withDescription('Alarm temperature status'),
         ],
+        extend: [m.illuminance()],
     },
     {
         fingerprint: [{ modelID: 'TS0601', manufacturerName: '_TZE200_auin8mzr' }],
@@ -9144,7 +9143,7 @@ const definitions = [
         fromZigbee: [fromZigbee_1.default.temperature, fzLocal.TS011F_threshold],
         toZigbee: [tzLocal.TS011F_threshold],
         exposes: (device, options) => {
-            const exposes = [e.linkquality()];
+            const exposes = [];
             if (!['_TZ3000_303avxxt', '_TZ3000_zjchz7pd'].includes(device?.manufacturerName)) {
                 exposes.push(e.temperature(), e
                     .numeric('temperature_threshold', ea.STATE_SET)
@@ -10249,7 +10248,7 @@ const definitions = [
         description: 'Motion sensor',
         fromZigbee: [fromZigbee_1.default.ias_occupancy_alarm_1_with_timeout, fromZigbee_1.default.battery],
         toZigbee: [],
-        exposes: [e.occupancy(), e.battery_low(), e.linkquality(), e.battery(), e.battery_voltage()],
+        exposes: [e.occupancy(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);