zigbee-herdsman-converters 15.0.44 → 15.0.46

package/converters/fromZigbee.js

@@ -4150,123 +4150,6 @@ const converters = {
             }
         },
     },
-    haozee_thermostat: {
-        cluster: 'manuSpecificTuya',
-        type: ['commandDataResponse', 'commandDataReport'],
-        convert: (model, msg, publish, options, meta) => {
-            const dpValue = tuya.firstDpValue(msg, meta, 'haozee_thermostat');
-            const dp = dpValue.dp; // First we get the data point ID
-            const value = tuya.getDataValue(dpValue);
-            const presetLookup = {0: 'auto', 1: 'manual', 2: 'off', 3: 'on'};
-            const systemModeLookup = {0: 'auto', 1: 'auto', 2: 'off', 3: 'heat'};
-            switch (dp) {
-            case tuya.dataPoints.haozeeSystemMode:
-                return {preset: presetLookup[value], system_mode: systemModeLookup[value]};
-            case tuya.dataPoints.haozeeHeatingSetpoint:
-                return {current_heating_setpoint: (value / 10).toFixed(1)};
-            case tuya.dataPoints.haozeeLocalTemp:
-                return {local_temperature: (value / 10).toFixed(1)};
-            case tuya.dataPoints.haozeeBoostHeatingCountdown:
-                // quick heating countdown - not supported by this device
-                return {boost_heating_countdown: value};
-            case tuya.dataPoints.haozeeWindowDetection:
-                // window check
-                return {window_detection: value ? 'ON' : 'OFF'};
-            case tuya.dataPoints.haozeeWindowState:
-                // window state
-                return {window: value ? 'OPEN' : 'CLOSED'};
-            case tuya.dataPoints.haozeeChildLock:
-                return {child_lock: value ? 'LOCK' : 'UNLOCK'};
-            case tuya.dataPoints.haozeeBattery:
-                // battery
-                return {battery: value};
-            case tuya.dataPoints.haozeeFaultAlarm:
-                return {error: value ? 'ON': 'OFF'};
-            case tuya.dataPoints.haozeeScheduleMonday:
-                // Monday
-                return {
-                    'monday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleTuesday:
-                // Tuesday
-                return {
-                    'tuesday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleWednesday:
-                // wednesday
-                return {
-                    'wednesday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleThursday:
-                // Thursday
-                return {
-                    'thursday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleFriday:
-                // Friday
-                return {
-                    'friday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleSaturday:
-                // Saturday
-                return {
-                    'saturday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-            case tuya.dataPoints.haozeeScheduleSunday:
-
-                // Sunday
-                return {
-                    'sunday_schedule': ' ' + value[1] + 'h:' + value[2] + 'm ' + value[4] / 10 + '°C' +
-                        ',  ' + value[5] + 'h:' + value[6] + 'm ' + value[8] / 10 + '°C' +
-                        ',  ' + value[9] + 'h:' + value[10] + 'm ' + value[12] / 10 + '°C' +
-                        ',  ' + value[13] + 'h:' + value[14] + 'm ' + value[16] / 10 + '°C ',
-                };
-
-            case tuya.dataPoints.haozeeRunningState:
-                // working status 0 - pause 1 -working
-                return {'heating': value ? 'ON' : 'OFF'};
-            case tuya.dataPoints.haozeeBoostHeating:
-                // rapid heating -> boolean - not supported by this device
-                return {'boost_heating': value ? 'ON' : 'OFF'};
-            case tuya.dataPoints.haozeeTempCalibration:
-                // temperature calibration
-                return {'local_temperature_calibration': ( value/10 ).toFixed(1)};
-            case tuya.dataPoints.haozeeValvePosition:
-                // valve position
-                return {'position': ( value/10 ).toFixed(1)};
-            case tuya.dataPoints.haozeeMinTemp:
-                // lower limit temperature
-                return {'min_temperature': ( value/10 ).toFixed(1)};
-            case tuya.dataPoints.haozeeMaxTemp:
-                // max limit temperature
-                return {'max_temperature': ( value/10 ).toFixed(1)};
-            case tuya.dataPoints.haozeeSoftVersion:
-                // software
-                break;
-            default:
-                meta.logger.warn(`zigbee-herdsman-converters:haozee: NOT RECOGNIZED DP #${
-                    dp} with data ${JSON.stringify(dpValue)}`);
-            }
-        },
-    },
     tuya_air_quality: {
         cluster: 'manuSpecificTuya',
         type: ['commandDataReport', 'commandDataResponse'],

package/converters/toZigbee.js

@@ -102,6 +102,12 @@ const converters = {
             await entity.read('genPowerCfg', ['batteryPercentageRemaining']);
         },
     },
+    battery_voltage: {
+        key: ['battery', 'voltage'],
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genPowerCfg', ['batteryVoltage']);
+        },
+    },
     power_on_behavior: {
         key: ['power_on_behavior'],
         convertSet: async (entity, key, value, meta) => {
@@ -1260,7 +1266,12 @@ const converters = {
             if (val === undefined) {
                 val = utils.getKey(constants.thermostatControlSequenceOfOperations, value, value, Number);
             }
-            await entity.write('hvacThermostat', {ctrlSeqeOfOper: val});
+            const attributes = {ctrlSeqeOfOper: val};
+            await entity.write('hvacThermostat', attributes);
+            // NOTE: update the cluster attribute we store as this is used by
+            //       SMaBiT AV2010/32's dynamic expose function.
+            entity.saveClusterAttributeKeyValue('hvacThermostat', attributes);
+            return {readAfterWriteTime: 250, state: {control_sequence_of_operation: value}};
         },
         convertGet: async (entity, key, meta) => {
             await entity.read('hvacThermostat', ['ctrlSeqeOfOper']);
@@ -3474,79 +3485,6 @@ const converters = {
             return tuya.sendDataPointRaw(entity, tuya.dataPoints.moesSschedule, payload);
         },
     },
-    haozee_thermostat_preset: {
-        key: ['preset'],
-        convertSet: async (entity, key, value, meta) => {
-            const lookup = {'auto': 0, 'manual': 1, 'off': 2, 'on': 3};
-            await tuya.sendDataPointEnum(entity, tuya.dataPoints.haozeeSystemMode, lookup[value]);
-        },
-    },
-    haozee_thermostat_system_mode: {
-        key: ['system_mode'],
-        convertSet: async (entity, key, value, meta) => {
-            // mapping 'heat' system mode to 100% heating (same as preset 'ON'),
-            // mapping 'auto' system mode to heating up to the set point temperature (same as preset 'MANUAL')
-            // mapping 'off' system mode to idle (same as preset 'OFF')
-            // programmed schedule can be enabled by using preset mode 'AUTO' instead of 'MANUAL'
-            const lookup = {'auto': 1, 'off': 2, 'heat': 3};
-            await tuya.sendDataPointEnum(entity, tuya.dataPoints.haozeeSystemMode, lookup[value]);
-        },
-    },
-    haozee_thermostat_current_heating_setpoint: {
-        key: ['current_heating_setpoint'],
-        convertSet: async (entity, key, value, meta) => {
-            const temp = Math.round(value*10);
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.haozeeHeatingSetpoint, temp);
-        },
-    },
-    haozee_thermostat_boost_heating: {
-        key: ['boost_heating'],
-        convertSet: async (entity, key, value, meta) => {
-            await tuya.sendDataPointBool(entity, tuya.dataPoints.haozeeBoostHeating, value === 'ON');
-        },
-    },
-    haozee_thermostat_boost_heating_countdown: {
-        key: ['boost_heating_countdown'],
-        convertSet: async (entity, key, value, meta) => {
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.haozeeBoostHeatingCountdown, value);
-        },
-    },
-    haozee_thermostat_window_detection: {
-        key: ['window_detection'],
-        convertSet: async (entity, key, value, meta) => {
-            await tuya.sendDataPointBool(entity, tuya.dataPoints.haozeeWindowDetection, value === 'ON');
-        },
-    },
-    haozee_thermostat_child_lock: {
-        key: ['child_lock'],
-        convertSet: async (entity, key, value, meta) => {
-            await tuya.sendDataPointBool(entity, tuya.dataPoints.haozeeChildLock, value === 'LOCK');
-        },
-    },
-    haozee_thermostat_temperature_calibration: {
-        key: ['local_temperature_calibration'],
-        convertSet: async (entity, key, value, meta) => {
-            let temp = Math.round(value * 10);
-            if (temp < 0) {
-                temp = 0xFFFFFFFF + temp + 1;
-            }
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.haozeeTempCalibration, temp);
-        },
-    },
-    haozee_thermostat_max_temperature: {
-        key: ['max_temperature'],
-        convertSet: async (entity, key, value, meta) => {
-            const temp = Math.round(value*10);
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.haozeeMaxTemp, temp);
-        },
-    },
-    haozee_thermostat_min_temperature: {
-        key: ['min_temperature'],
-        convertSet: async (entity, key, value, meta) => {
-            const temp = Math.round(value*10);
-            await tuya.sendDataPointValue(entity, tuya.dataPoints.haozeeMinTemp, temp);
-        },
-    },
     hgkg_thermostat_standby: {
         key: ['system_mode'],
         convertSet: async (entity, key, value, meta) => {

package/devices/bitron.js

@@ -4,6 +4,7 @@ const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
+const ea = exposes.access;
 
 module.exports = [
     {
@@ -190,13 +191,43 @@ module.exports = [
         vendor: 'SMaBiT (Bitron Video)',
         description: 'Wireless wall thermostat with relay',
         fromZigbee: [fz.legacy.thermostat_att_report, fz.battery, fz.hvac_user_interface],
-        toZigbee: [tz.thermostat_control_sequence_of_operation, tz.thermostat_occupied_heating_setpoint,
-            tz.thermostat_occupied_cooling_setpoint, tz.thermostat_local_temperature_calibration, tz.thermostat_local_temperature,
-            tz.thermostat_running_state, tz.thermostat_temperature_display_mode, tz.thermostat_keypad_lockout, tz.thermostat_system_mode],
-        exposes: [e.battery(), exposes.climate().withSetpoint('occupied_heating_setpoint', 7, 30, 0.5).withLocalTemperature()
-            .withSystemMode(['off', 'heat']).withRunningState(['idle', 'heat'])
-            .withLocalTemperatureCalibration(), e.keypad_lockout()],
-        meta: {battery: {voltageToPercentage: '3V_2500_3200'}},
+        toZigbee: [
+            tz.thermostat_control_sequence_of_operation, tz.thermostat_occupied_heating_setpoint,
+            tz.thermostat_occupied_cooling_setpoint, tz.thermostat_local_temperature_calibration,
+            tz.thermostat_local_temperature, tz.thermostat_running_state, tz.thermostat_temperature_display_mode,
+            tz.thermostat_keypad_lockout, tz.thermostat_system_mode, tz.battery_voltage,
+        ],
+        exposes: (device, options) => {
+            const dynExposes = [];
+            let ctrlSeqeOfOper = device ? device.getEndpoint(1).getClusterAttributeValue('hvacThermostat', 'ctrlSeqeOfOper') : null;
+            const modes = [];
+
+            // NOTE: ctrlSeqeOfOper defaults to 2 for this device (according to the manual)
+            if (ctrlSeqeOfOper == null) ctrlSeqeOfOper = 2;
+
+            // NOTE: set cool and/or heat support based on ctrlSeqeOfOper (see lib/constants -> thermostatControlSequenceOfOperations)
+            // WARN: a restart of zigbee2mqtt is required after changing ctrlSeqeOfOper for expose data to be re-calculated
+            if (ctrlSeqeOfOper >= 2) {
+                modes.push('heat');
+            }
+            if (ctrlSeqeOfOper < 2 || ctrlSeqeOfOper > 3) {
+                modes.push('cool');
+            }
+
+            dynExposes.push(exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 7, 30, 0.5)
+                .withLocalTemperature()
+                .withSystemMode(['off'].concat(modes))
+                .withRunningState(['idle'].concat(modes))
+                .withLocalTemperatureCalibration()
+                .withControlSequenceOfOperation(['heating_only', 'cooling_only'], ea.ALL));
+            dynExposes.push(e.keypad_lockout());
+            dynExposes.push(e.battery().withAccess(ea.STATE_GET));
+            dynExposes.push(e.battery_low());
+            dynExposes.push(e.linkquality());
+            return dynExposes;
+        },
+        meta: {battery: {voltageToPercentage: '3V_2500'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             const binds = [
@@ -204,12 +235,12 @@ module.exports = [
             ];
             await reporting.bind(endpoint, coordinatorEndpoint, binds);
             await reporting.thermostatTemperature(endpoint);
-            await reporting.thermostatTemperatureCalibration(endpoint);
             await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
             await reporting.thermostatOccupiedCoolingSetpoint(endpoint);
             await reporting.thermostatRunningState(endpoint);
             await reporting.batteryAlarmState(endpoint);
             await reporting.batteryVoltage(endpoint);
+            await endpoint.read('hvacThermostat', ['ctrlSeqeOfOper', 'localTemperatureCalibration']);
         },
     },
     {

package/devices/candeo.js

@@ -6,7 +6,7 @@ const e = exposes.presets;
 
 module.exports = [
     {
-        zigbeeModel: ['HK-DIM-A'],
+        zigbeeModel: ['HK-DIM-A', 'Candeo Zigbee Dimmer'],
         model: 'HK-DIM-A',
         vendor: 'Candeo',
         description: 'Zigbee LED dimmer smart switch',

package/devices/centralite.js

@@ -129,7 +129,7 @@ module.exports = [
                 // For some this fails so set manually
                 // https://github.com/Koenkk/zigbee2mqtt/issues/3575
                 endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {
-                    acCurrentDivisor: 1000, acCurrentMultiplier: 1, powerMultiplier: 1, powerDivisor: 10});
+                    acCurrentDivisor: 1000, acCurrentMultiplier: 1, acPowerMultiplier: 1, acPowerDivisor: 10});
             }
             await reporting.rmsVoltage(endpoint, {change: 2}); // Voltage reports in V
             await reporting.rmsCurrent(endpoint, {change: 10}); // Current reports in mA

package/devices/custom_devices_diy.js

@@ -473,7 +473,7 @@ module.exports = [
             await firstEndpoint.configureReporting('genPowerCfg', payload1);
         },
         exposes: [e.soil_moisture(), e.battery(), e.temperature(),
-            exposes.numeric('report_delay', ea.STATE_SET).withUnit('Minutes').withValueMin(1).withValueMax(240)
+            exposes.numeric('report_delay', ea.STATE_SET).withUnit('min').withValueMin(1).withValueMax(240)
                 .withDescription('Adjust Report Delay. Setting the time in minutes, by default 15 minutes')],
     },
     {
@@ -823,7 +823,7 @@ module.exports = [
             await reporting.batteryPercentageRemaining(endpoint, overides);
         },
         exposes: [e.battery(), e.temperature(), e.humidity(),
-            exposes.numeric('report_delay', ea.STATE_SET).withUnit('Minutes')
+            exposes.numeric('report_delay', ea.STATE_SET).withUnit('min')
                 .withDescription('Adjust Report Delay. Setting the time in minutes, by default 5 minutes')
                 .withValueMin(1).withValueMax(60),
             exposes.binary('enable_temperature', ea.STATE_SET, 'ON', 'OFF').withDescription('Enable Temperature Control'),

package/devices/danalock.js

@@ -2,6 +2,7 @@ const exposes = require('../lib/exposes');
 const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
+const ota = require('../lib/ota');
 const e = exposes.presets;
 
 module.exports = [
@@ -13,6 +14,7 @@ module.exports = [
         fromZigbee: [fz.lock, fz.lock_operation_event, fz.battery, fz.lock_programming_event, fz.lock_pin_code_response],
         toZigbee: [tz.lock, tz.pincode_lock, tz.lock_userstatus],
         meta: {pinCodeCount: 20},
+        ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['closuresDoorLock', 'genPowerCfg']);

package/devices/frankever.js

@@ -17,7 +17,7 @@ module.exports = [
         exposes: [e.switch().setAccess('state', ea.STATE_SET),
             exposes.numeric('threshold', exposes.access.STATE_SET).withValueMin(0).withValueMax(100).withUnit('%')
                 .withDescription('Valve open percentage (multiple of 10)'),
-            exposes.numeric('timer', exposes.access.STATE_SET).withValueMin(0).withValueMax(600).withUnit('minutes')
+            exposes.numeric('timer', exposes.access.STATE_SET).withValueMin(0).withValueMax(600).withUnit('min')
                 .withDescription('Countdown timer in minutes')],
     },
 ];

package/devices/ikea.js

@@ -12,7 +12,7 @@ const e = exposes.presets;
 const ea = exposes.access;
 const herdsman = require('zigbee-herdsman');
 const {
-    calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue,
+    calibrateAndPrecisionRoundOptions, postfixWithEndpointName, getMetaValue, precisionRound,
 } = require('../lib/utils');
 
 const bulbOnEvent = async (type, data, device, options, state) => {
@@ -72,39 +72,6 @@ const configureRemote = async (device, coordinatorEndpoint, logger) => {
     await reporting.batteryPercentageRemaining(endpoint);
 };
 
-const fzLocal = {
-    // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
-    // https://github.com/Koenkk/zigbee2mqtt/issues/13335
-    STYRBAR_on: {
-        cluster: 'genOnOff',
-        type: 'commandOn',
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            const arrowReleaseAgo = Date.now() - globalStore.getValue(msg.endpoint, 'arrow_release', 0);
-            if (arrowReleaseAgo > 700) {
-                return {action: 'on'};
-            }
-        },
-    },
-    STYRBAR_arrow_release: {
-        cluster: 'genScenes',
-        type: 'commandTradfriArrowRelease',
-        options: [exposes.options.legacy()],
-        convert: (model, msg, publish, options, meta) => {
-            if (utils.hasAlreadyProcessedMessage(msg, model)) return;
-            globalStore.putValue(msg.endpoint, 'arrow_release', Date.now());
-            const direction = globalStore.getValue(msg.endpoint, 'direction');
-            if (direction) {
-                globalStore.clearValue(msg.endpoint, 'direction');
-                const duration = msg.data.value / 1000;
-                const result = {action: `arrow_${direction}_release`, duration, action_duration: duration};
-                if (!utils.isLegacyEnabled(options)) delete result.duration;
-                return result;
-            }
-        },
-    },
-};
-
 const tradfriExtend = {
     light_onoff_brightness: (options = {}) => ({
         ...extend.light_onoff_brightness(options),
@@ -214,6 +181,61 @@ const ikea = {
                 return state;
             },
         },
+        remote_battery: {
+            cluster: 'genPowerCfg',
+            type: ['attributeReport', 'readResponse'],
+            convert: (model, msg, publish, options, meta) => {
+                const payload = {};
+                if (msg.data.hasOwnProperty('batteryPercentageRemaining')) {
+                    // Some devices do not comply to the ZCL and report a
+                    // batteryPercentageRemaining of 100 when the battery is full (should be 200).
+                    //
+                    // IKEA corrected this on newer remote fw version, but many people are still
+                    // 2.2.010 which is the last version supporting group bindings. We try to be
+                    // smart and pick the correct one for IKEA remotes.
+                    let dontDividePercentage = false;
+                    let percentage = msg.data['batteryPercentageRemaining'];
+                    const fwVer = meta.device.softwareBuildID.split('.');
+                    if ((fwVer[0] < 2) || (fwVer[0] == 2 && fwVer[1] <= 3)) {
+                        dontDividePercentage = true;
+                    }
+                    percentage = dontDividePercentage ? percentage : percentage / 2;
+                    payload.battery = precisionRound(percentage, 2);
+                }
+
+                return payload;
+            },
+        },
+        // The STYRBAR sends an on +- 500ms after the arrow release. We don't want to send the ON action in this case.
+        // https://github.com/Koenkk/zigbee2mqtt/issues/13335
+        styrbar_on: {
+            cluster: 'genOnOff',
+            type: 'commandOn',
+            convert: (model, msg, publish, options, meta) => {
+                if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+                const arrowReleaseAgo = Date.now() - globalStore.getValue(msg.endpoint, 'arrow_release', 0);
+                if (arrowReleaseAgo > 700) {
+                    return {action: 'on'};
+                }
+            },
+        },
+        styrbar_arrow_release: {
+            cluster: 'genScenes',
+            type: 'commandTradfriArrowRelease',
+            options: [exposes.options.legacy()],
+            convert: (model, msg, publish, options, meta) => {
+                if (utils.hasAlreadyProcessedMessage(msg, model)) return;
+                globalStore.putValue(msg.endpoint, 'arrow_release', Date.now());
+                const direction = globalStore.getValue(msg.endpoint, 'direction');
+                if (direction) {
+                    globalStore.clearValue(msg.endpoint, 'direction');
+                    const duration = msg.data.value / 1000;
+                    const result = {action: `arrow_${direction}_release`, duration, action_duration: duration};
+                    if (!utils.isLegacyEnabled(options)) delete result.duration;
+                    return result;
+                }
+            },
+        },
     },
     tz: {
         air_purifier_fan_mode: {
@@ -623,12 +645,12 @@ module.exports = [
         model: 'E1524/E1810',
         description: 'TRADFRI remote control',
         vendor: 'IKEA',
-        fromZigbee: [fz.battery, fz.E1524_E1810_toggle, fz.E1524_E1810_levelctrl, fz.ikea_arrow_click, fz.ikea_arrow_hold,
+        fromZigbee: [ikea.fz.remote_battery, fz.E1524_E1810_toggle, fz.E1524_E1810_levelctrl, fz.ikea_arrow_click, fz.ikea_arrow_hold,
             fz.ikea_arrow_release],
-        exposes: [e.battery(), e.action(['arrow_left_click', 'arrow_left_hold', 'arrow_left_release', 'arrow_right_click',
-            'arrow_right_hold', 'arrow_right_release', 'brightness_down_click', 'brightness_down_hold', 'brightness_down_release',
-            'brightness_up_click', 'brightness_up_hold', 'brightness_up_release', 'toggle'])],
-        toZigbee: [],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['arrow_left_click', 'arrow_left_hold', 'arrow_left_release',
+            'arrow_right_click', 'arrow_right_hold', 'arrow_right_release', 'brightness_down_click', 'brightness_down_hold',
+            'brightness_down_release', 'brightness_up_click', 'brightness_up_hold', 'brightness_up_release', 'toggle'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         // dontDividePercentage: true not needed with latest firmware
         // https://github.com/Koenkk/zigbee2mqtt/issues/16412
@@ -639,12 +661,12 @@ module.exports = [
         model: 'E2001/E2002',
         vendor: 'IKEA',
         description: 'STYRBAR remote control',
-        fromZigbee: [fz.battery, fzLocal.STYRBAR_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
-            fz.ikea_arrow_hold, fzLocal.STYRBAR_arrow_release],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down',
+        fromZigbee: [ikea.fz.remote_battery, ikea.fz.styrbar_on, fz.command_off, fz.command_move, fz.command_stop, fz.ikea_arrow_click,
+            fz.ikea_arrow_hold, ikea.fz.styrbar_arrow_release],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off', 'brightness_move_up', 'brightness_move_down',
             'brightness_stop', 'arrow_left_click', 'arrow_right_click', 'arrow_left_hold',
             'arrow_right_hold', 'arrow_left_release', 'arrow_right_release'])],
-        toZigbee: [],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         meta: {battery: {dontDividePercentage: true}},
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -659,10 +681,14 @@ module.exports = [
         model: 'E1743',
         vendor: 'IKEA',
         description: 'TRADFRI ON/OFF switch',
-        fromZigbee: [fz.command_on, fz.legacy.genOnOff_cmdOn, fz.command_off, fz.legacy.genOnOff_cmdOff, fz.command_move, fz.battery,
-            fz.legacy.E1743_brightness_up, fz.legacy.E1743_brightness_down, fz.command_stop, fz.legacy.E1743_brightness_stop],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_down', 'brightness_move_up', 'brightness_stop'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.legacy.genOnOff_cmdOn, fz.command_off, fz.legacy.genOnOff_cmdOff, fz.command_move,
+            ikea.fz.remote_battery, fz.legacy.E1743_brightness_up, fz.legacy.E1743_brightness_down, fz.command_stop,
+            fz.legacy.E1743_brightness_stop],
+        exposes: [
+            e.battery().withAccess(ea.STATE_GET),
+            e.action(['on', 'off', 'brightness_move_down', 'brightness_move_up', 'brightness_stop']),
+        ],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
         configure: configureRemote,
@@ -672,9 +698,9 @@ module.exports = [
         model: 'E1841',
         vendor: 'IKEA',
         description: 'KNYCKLAN open/close remote water valve',
-        fromZigbee: [fz.command_on, fz.command_off, fz.battery],
-        exposes: [e.battery(), e.action(['on', 'off'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.command_off, ikea.fz.remote_battery],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
         configure: configureRemote,
@@ -699,9 +725,9 @@ module.exports = [
         model: 'E1812',
         vendor: 'IKEA',
         description: 'TRADFRI shortcut button',
-        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery],
-        exposes: [e.battery(), e.action(['on', 'off', 'brightness_move_up', 'brightness_stop'])],
-        toZigbee: [],
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, ikea.fz.remote_battery],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['on', 'off', 'brightness_move_up', 'brightness_stop'])],
+        toZigbee: [tz.battery_percentage_remaining],
         ota: ota.tradfri,
         meta: {disableActionGroup: true, battery: {dontDividePercentage: true}},
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -741,7 +767,6 @@ module.exports = [
             exposes.binary('illuminance_above_threshold', ea.STATE, true, false)
                 .withDescription('Indicates whether the device detected bright light (works only in night mode)')],
         ota: ota.tradfri,
-        meta: {battery: {dontDividePercentage: true}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg']);
@@ -839,10 +864,10 @@ module.exports = [
         model: 'E1766',
         vendor: 'IKEA',
         description: 'TRADFRI open/close remote',
-        fromZigbee: [fz.battery, fz.command_cover_close, fz.legacy.cover_close, fz.command_cover_open, fz.legacy.cover_open,
+        fromZigbee: [ikea.fz.remote_battery, fz.command_cover_close, fz.legacy.cover_close, fz.command_cover_open, fz.legacy.cover_open,
             fz.command_cover_stop, fz.legacy.cover_stop],
-        exposes: [e.battery(), e.action(['close', 'open', 'stop'])],
-        toZigbee: [],
+        exposes: [e.battery().withAccess(ea.STATE_GET), e.action(['close', 'open', 'stop'])],
+        toZigbee: [tz.battery_percentage_remaining],
         meta: {battery: {dontDividePercentage: true}},
         ota: ota.tradfri,
         configure: configureRemote,
@@ -980,6 +1005,13 @@ module.exports = [
         description: 'STOFTMOLN ceiling/wall lamp 24 warm light dimmable',
         extend: tradfriExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['STOFTMOLN ceiling/wall lamp WW10'],
+        model: 'T2105',
+        vendor: 'IKEA',
+        description: 'STOFTMOLN ceiling/wall lamp 10 warm light dimmable',
+        extend: tradfriExtend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['TRADFRIbulbPAR38WS900lm'],
         model: 'LED2006R9',

package/devices/legrand.js

@@ -28,6 +28,22 @@ const tzLocal = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: [' Pocket remote\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'+
+            '\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],
+        model: '067755',
+        vendor: 'Legrand',
+        description: 'Wireless and batteryless 4 scenes control',
+        fromZigbee: [fz.identify, fz.battery, fz.command_recall],
+        exposes: [e.battery(), e.action(['identify', 'recall_1_1'])],
+        toZigbee: [],
+        meta: {multiEndpoint: true, battery: {voltageToPercentage: '3V_2500'}, publishDuplicateTransaction: true},
+        onEvent: readInitialBatteryState,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'genOnOff', 'genLevelCtrl']);
+        },
+    },
     {
         zigbeeModel: [' Dry contact\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'+
             '\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000'],

package/devices/mercator.js

@@ -183,6 +183,10 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genIdentify', 'manuSpecificTuya', 'hvacFanCtrl']);
             await reporting.onOff(endpoint);
             await reporting.fanMode(endpoint);
+
+            // Device ships with {fanModeSequence: 1} which restricts physical speed
+            // button to low/high. Set to 0 to allow low/med/high from physical press.
+            await endpoint.write('hvacFanCtrl', {fanModeSequence: 0});
         },
     },
     {

package/devices/moes.js

@@ -308,9 +308,9 @@ module.exports = [
                 'You can set up to 4 stages of temperature every for WEEKDAY ➀➁➂➃➄,  SATURDAY ➅ and SUNDAY ➆.'),
             exposes.binary('boost_heating', ea.STATE_SET, 'ON', 'OFF').withDescription('Boost Heating: press and hold "+" for 3 seconds, ' +
                 'the device will enter the boost heating mode, and the ▷╵◁ will flash. The countdown will be displayed in the APP'),
-            exposes.numeric('boost_heating_countdown', ea.STATE).withUnit('minutes').withDescription('Countdown in minutes')
+            exposes.numeric('boost_heating_countdown', ea.STATE).withUnit('min').withDescription('Countdown in minutes')
                 .withValueMin(0).withValueMax(15),
-            exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('seconds')
+            exposes.numeric('boost_heating_countdown_time_set', ea.STATE_SET).withUnit('s')
                 .withDescription('Boost Time Setting 100 sec - 900 sec, (default = 300 sec)').withValueMin(100)
                 .withValueMax(900).withValueStep(100)],
     },