matterbridge-zigbee2mqtt 2.5.0-dev.4 → 2.5.0-dev.6

package/CHANGELOG.md

@@ -17,7 +17,7 @@ New device types:
 - rainSensor
 - smokeSensor
 
-If your controller has issues detecting the new device type, blacklist these devices, restart, wait 5 minutes that the controller removes them, remove the blacklist and restart again. This will create a new endpoint on the controller.
+If your controller has issues detecting the new device type, blacklist these devices, restart, wait 5 minutes that the controller removes them, remove the blacklist and restart again. This will create a new endpoint on the controller and the controllers will likely remove and recreate all the devices so make a backup of configurations (i.e. room assignements) and automations on the controller.
 
 ## [2.5.0] - 2025-05-23
 
@@ -27,10 +27,10 @@ If your controller has issues detecting the new device type, blacklist these dev
 - [waterLeak]: Added waterLeakDetector device type for zigbee property "water_leak". Default to false (i.e. no alarm) since is not possible to get the property.
 - [rainSensor]: Added rainSensor device type for zigbee property "rain". Default to false (i.e. no alarm) since is not possible to get the property.
 - [smokeSensor]: Added smokeSensor device type for zigbee property "smoke". Default to false (i.e. no alarm) since is not possible to get the property.
-- [colorTemp]: Added conversion from color temperature to rgb for the rgb devices that don't support color temperature.
+- [colorTemp]: Added conversion from color temperature to rgb for the rgb devices that don't support color_temp.
 - [battery]: Set batChargeLevel to warning if battery is less than 40% and the device doesn't expose battery_low.
 - [battery]: Set batChargeLevel to critical if battery is less than 20% and the device doesn't expose battery_low.
-- [retain]: Send retained mqtt states at startup if z2m has retain enabled.
+- [retain]: Send retained mqtt states at startup if z2m has retain enabled. See the README.md for explanations.
 - [logger]: Added onChangeLoggerLevel() to the platform.
 
 ### Changed
@@ -40,7 +40,12 @@ If your controller has issues detecting the new device type, blacklist these dev
 - [plugin]: Requires Matterbridge 3.0.3.
 - [config]: As anticipated in the previous release, the parameter postfixHostname has been removed. Use postfix if needed.
 - [colorRgb]: Changed the default device type from colorTemperatureLight to extendedColorLight to solve the SmartThings issue with colors.
-- [colorTemp]: The min and max mired values are now set in the cluster.
+- [colorTemp]: The min and max mired values for color_temp are now set in the cluster.
+
+### Fixed
+
+- [logger]: Fixed logger not always taking the correct value from the frontend.
+- [issue104]: Solved wrong mode AUTO in system_mode for HEAT only devices.
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">

package/dist/entity.js

@@ -50,7 +50,7 @@ export class ZigbeeEntity extends EventEmitter {
             this.en = gn;
             this.ien = ign;
         }
-        this.log = new AnsiLogger({ logName: this.entityName, logTimestampFormat: 4, logLevel: platform.debugEnabled ? "debug" : "info" });
+        this.log = new AnsiLogger({ logName: this.entityName, logTimestampFormat: 4, logLevel: platform.debugEnabled ? "debug" : platform.log.logLevel });
         this.log.debug(`Created MatterEntity: ${this.entityName}`);
         this.platform.z2m.on('MESSAGE-' + this.entityName, (payload) => {
             const now = Date.now();
@@ -106,6 +106,10 @@ export class ZigbeeEntity extends EventEmitter {
                     if (!z2m)
                         z2m = z2ms.find((z2m) => z2m.property === propertyMap?.name);
                     if (z2m) {
+                        if (z2m.valueLookup && propertyMap.values && propertyMap.values !== '' && typeof value === 'string' && !propertyMap.values.includes(value)) {
+                            this.log.debug(`*Payload entry ${CYAN}${key}${db} value ${CYAN}${value}${db} not found in propertyMap values ${CYAN}${propertyMap.values}${db}`);
+                            return;
+                        }
                         if (z2m.converter || z2m.valueLookup) {
                             this.updateAttributeIfChanged(this.bridgedDevice, propertyMap === undefined || propertyMap.endpoint === '' ? undefined : propertyMap.endpoint, z2m.cluster, z2m.attribute, z2m.converter ? z2m.converter(value) : value, z2m.valueLookup);
                             return;
@@ -130,6 +134,10 @@ export class ZigbeeEntity extends EventEmitter {
                     this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.Cluster.id, 'currentPositionLiftPercent100ths', value * 100);
                 }
                 if (key === 'moving' && this.isDevice) {
+                    const reversed = this.lastPayload.motor_direction === 'reversed';
+                    if (reversed && (value === 'UP' || value === 'DOWN')) {
+                        value = reversed ? (value === 'UP' ? 'DOWN' : 'UP') : value;
+                    }
                     if (value === 'UP') {
                         const status = WindowCovering.MovementStatus.Opening;
                         this.updateAttributeIfChanged(this.bridgedDevice, undefined, WindowCovering.Cluster.id, 'operationalStatus', { global: status, lift: status, tilt: status });
@@ -1016,11 +1024,17 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 zigbeeDevice.propertyMap.delete('running_state');
                 zigbeeDevice.bridgedDevice.createDefaultHeatingThermostatClusterServer(undefined, undefined, minHeating, maxHeating);
                 mainEndpoint.clusterServersIds.splice(mainEndpoint.clusterServersIds.indexOf(Thermostat.Cluster.id), 1);
+                const sMode = zigbeeDevice.propertyMap.get('system_mode');
+                if (sMode)
+                    sMode.values = 'off|heat';
             }
             else if ((!heat && cool) || (!system_mode_values?.includes('auto') && system_mode_values?.includes('cool'))) {
                 zigbeeDevice.propertyMap.delete('running_state');
                 zigbeeDevice.bridgedDevice.createDefaultCoolingThermostatClusterServer(undefined, undefined, minCooling, maxCooling);
                 mainEndpoint.clusterServersIds.splice(mainEndpoint.clusterServersIds.indexOf(Thermostat.Cluster.id), 1);
+                const sMode = zigbeeDevice.propertyMap.get('system_mode');
+                if (sMode)
+                    sMode.values = 'off|cool';
             }
             else {
                 zigbeeDevice.bridgedDevice.createDefaultThermostatClusterServer(undefined, undefined, undefined, undefined, minHeating, maxHeating, minCooling, maxCooling);
@@ -1183,21 +1197,22 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
         }
         if (zigbeeDevice.bridgedDevice.hasClusterServer(WindowCoveringCluster.id)) {
+            const reversed = zigbeeDevice.lastPayload.motor_direction === 'reversed';
             zigbeeDevice.bridgedDevice.addCommandHandler('upOrOpen', async () => {
                 zigbeeDevice.log.debug(`Command upOrOpen called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db}`);
-                if (zigbeeDevice.isDevice && zigbeeDevice.propertyMap.has('position'))
-                    await zigbeeDevice.bridgedDevice?.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', 0, zigbeeDevice.log);
+                if (zigbeeDevice.propertyMap.has('position'))
+                    await zigbeeDevice.bridgedDevice?.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', reversed ? 10000 : 0, zigbeeDevice.log);
                 else
-                    await zigbeeDevice.bridgedDevice?.setWindowCoveringTargetAndCurrentPosition(0);
-                zigbeeDevice.publishCommand('upOrOpen', device.friendly_name, { state: 'OPEN' });
+                    await zigbeeDevice.bridgedDevice?.setWindowCoveringTargetAndCurrentPosition(reversed ? 10000 : 0);
+                zigbeeDevice.publishCommand('upOrOpen', device.friendly_name, { state: reversed ? 'CLOSE' : 'OPEN' });
             });
             zigbeeDevice.bridgedDevice.addCommandHandler('downOrClose', async () => {
                 zigbeeDevice.log.debug(`Command downOrClose called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db}`);
-                if (zigbeeDevice.isDevice && zigbeeDevice.propertyMap.has('position'))
-                    await zigbeeDevice.bridgedDevice?.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', 10000, zigbeeDevice.log);
+                if (zigbeeDevice.propertyMap.has('position'))
+                    await zigbeeDevice.bridgedDevice?.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', reversed ? 0 : 10000, zigbeeDevice.log);
                 else
-                    await zigbeeDevice.bridgedDevice?.setWindowCoveringTargetAndCurrentPosition(10000);
-                zigbeeDevice.publishCommand('downOrClose', device.friendly_name, { state: 'CLOSE' });
+                    await zigbeeDevice.bridgedDevice?.setWindowCoveringTargetAndCurrentPosition(reversed ? 0 : 10000);
+                zigbeeDevice.publishCommand('downOrClose', device.friendly_name, { state: reversed ? 'OPEN' : 'CLOSE' });
             });
             zigbeeDevice.bridgedDevice.addCommandHandler('stopMotion', async () => {
                 zigbeeDevice.log.debug(`Command stopMotion called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db}`);
@@ -1206,7 +1221,7 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
             zigbeeDevice.bridgedDevice.addCommandHandler('goToLiftPercentage', async ({ request: { liftPercent100thsValue } }) => {
                 zigbeeDevice.log.debug(`Command goToLiftPercentage called for ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} request liftPercent100thsValue: ${liftPercent100thsValue}`);
-                if (zigbeeDevice.isDevice && zigbeeDevice.propertyMap.has('position'))
+                if (zigbeeDevice.propertyMap.has('position'))
                     await zigbeeDevice.bridgedDevice?.setAttribute(WindowCoveringCluster.id, 'targetPositionLiftPercent100ths', liftPercent100thsValue, zigbeeDevice.log);
                 else
                     await zigbeeDevice.bridgedDevice?.setWindowCoveringTargetAndCurrentPosition(liftPercent100thsValue);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.5.0-dev.4",
+  "version": "2.5.0-dev.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.5.0-dev.4",
+      "version": "2.5.0-dev.6",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-zigbee2mqtt",
-  "version": "2.5.0-dev.4",
+  "version": "2.5.0-dev.6",
   "description": "Matterbridge zigbee2mqtt plugin",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",