zigbee-herdsman-converters 14.0.649 → 14.0.650

package/converters/fromZigbee.js

@@ -1961,10 +1961,10 @@ const converters = {
                     result.min_humidity = calibrateAndPrecisionRoundOptions(value, options, 'humidity');
                     break;
                 case tuya.dataPoints.nousTempAlarm:
-                    result.temperature_alarm = {0x00: 'canceled', 0x01: 'lower_alarm', 0x02: 'upper_alarm'}[value];
+                    result.temperature_alarm = {0x00: 'lower_alarm', 0x01: 'upper_alarm', 0x02: 'canceled'}[value];
                     break;
                 case tuya.dataPoints.nousHumiAlarm:
-                    result.humidity_alarm = {0x00: 'canceled', 0x01: 'lower_alarm', 0x02: 'upper_alarm'}[value];
+                    result.humidity_alarm = {0x00: 'lower_alarm', 0x01: 'upper_alarm', 0x02: 'canceled'}[value];
                     break;
                 case tuya.dataPoints.nousTempSensitivity:
                     result.temperature_sensitivity = calibrateAndPrecisionRoundOptions(value / 10, options, 'temperature');

package/devices/osram.js

@@ -395,6 +395,7 @@ module.exports = [
         vendor: 'OSRAM',
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (only one device)',
         extend: extend.ledvance.light_onoff_brightness(),
+        ota: ota.zigbeeOTA,
     },
     {
         fingerprint: [{modelID: 'Zigbee 3.0 DALI CONV LI', endpoints: [{ID: 10}, {ID: 25}, {ID: 242}]},
@@ -402,7 +403,16 @@ module.exports = [
         model: '4062172044776_2',
         vendor: 'OSRAM',
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (one device and pushbutton)',
-        extend: extend.ledvance.light_onoff_brightness(),
+        fromZigbee: [...extend.ledvance.light_onoff_brightness({noConfigure: true}).fromZigbee,
+            fz.command_toggle, fz.command_move, fz.command_stop],
+        extend: extend.ledvance.light_onoff_brightness({noConfigure: true}),
+        exposes: [e.action(['toggle', 'brightness_move_up', 'brightness_move_down', 'brightness_stop']),
+            ...extend.ledvance.light_onoff_brightness({noConfigure: true}).exposes],
+        ota: ota.zigbeeOTA,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await reporting.bind(device.getEndpoint(10), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
+            await reporting.bind(device.getEndpoint(25), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
+        },
         onEvent: async (type, data, device) => {
             if (type === 'deviceInterview') {
                 device.getEndpoint(25).addBinding('genOnOff', device.getEndpoint(10));
@@ -418,6 +428,7 @@ module.exports = [
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (with two devices)',
         extend: extend.ledvance.light_onoff_brightness({noConfigure: true}),
         exposes: [e.light_brightness().withEndpoint('l1'), e.light_brightness().withEndpoint('l2')],
+        ota: ota.zigbeeOTA,
         endpoint: (device) => {
             return {'l1': 10, 'l2': 11};
         },
@@ -425,10 +436,6 @@ module.exports = [
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(10), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
             await reporting.bind(device.getEndpoint(11), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
-            await reporting.onOff(device.getEndpoint(10));
-            await reporting.brightness(device.getEndpoint(10));
-            await reporting.onOff(device.getEndpoint(11));
-            await reporting.brightness(device.getEndpoint(11));
         },
     },
     {
@@ -437,19 +444,20 @@ module.exports = [
         model: '4062172044776_4',
         vendor: 'OSRAM',
         description: 'Zigbee 3.0 DALI CONV LI dimmer for DALI-based luminaires (with two devices and pushbutton)',
+        fromZigbee: [...extend.ledvance.light_onoff_brightness({noConfigure: true}).fromZigbee,
+            fz.command_toggle, fz.command_move, fz.command_stop],
         extend: extend.ledvance.light_onoff_brightness({noConfigure: true}),
-        exposes: [e.light_brightness().withEndpoint('l1'), e.light_brightness().withEndpoint('l2')],
+        exposes: [e.action(['toggle_s1', 'brightness_move_up_s1', 'brightness_move_down_s1', 'brightness_stop_s1']),
+            e.light_brightness().withEndpoint('l1'), e.light_brightness().withEndpoint('l2')],
+        ota: ota.zigbeeOTA,
         endpoint: (device) => {
-            return {'l1': 10, 'l2': 11};
+            return {'l1': 10, 'l2': 11, 's1': 25};
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
             await reporting.bind(device.getEndpoint(10), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
             await reporting.bind(device.getEndpoint(11), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
-            await reporting.onOff(device.getEndpoint(10));
-            await reporting.brightness(device.getEndpoint(10));
-            await reporting.onOff(device.getEndpoint(11));
-            await reporting.brightness(device.getEndpoint(11));
+            await reporting.bind(device.getEndpoint(25), coordinatorEndpoint, ['genLevelCtrl', 'genOnOff']);
         },
         onEvent: async (type, data, device) => {
             if (type === 'deviceInterview') {

package/devices/tuya.js

@@ -2084,7 +2084,7 @@ module.exports = [
         onEvent: tuya.onEventSetLocalTime,
         configure: tuya.configureMagicPacket,
         exposes: [
-            e.battery(), e.child_lock(), e.open_window(), e.open_window_temperature().withValueMin(5).withValueMax(30),
+            e.battery_low(), e.child_lock(), e.open_window(), e.open_window_temperature().withValueMin(5).withValueMax(30),
             e.comfort_temperature().withValueMin(5).withValueMax(30), e.eco_temperature().withValueMin(5).withValueMax(30),
             exposes.climate().withSystemMode(['off', 'heat'], ea.STATE_SET, 'When switched to the "off" mode, the device will display ' +
                 '"HS" and the valve will be fully closed. Press the pair button to cancel or switch back to "heat" mode. Battery life ' +

package/package.json

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