matterbridge-zigbee2mqtt 2.5.0-dev.5 → 2.5.0-dev.7

package/dist/entity.js

@@ -134,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 });
@@ -1193,21 +1197,24 @@ export class ZigbeeDevice extends ZigbeeEntity {
             });
         }
         if (zigbeeDevice.bridgedDevice.hasClusterServer(WindowCoveringCluster.id)) {
+            const reversed = zigbeeDevice.lastPayload.motor_direction === 'reversed';
+            if (reversed)
+                zigbeeDevice.log.debug(`Device ${zigbeeDevice.ien}${device.friendly_name}${rs}${db} has reversed motor direction. Commands will be 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}`);
@@ -1215,8 +1222,10 @@ export class ZigbeeDevice extends ZigbeeEntity {
                 zigbeeDevice.publishCommand('stopMotion', device.friendly_name, { state: 'STOP' });
             });
             zigbeeDevice.bridgedDevice.addCommandHandler('goToLiftPercentage', async ({ request: { liftPercent100thsValue } }) => {
+                if (reversed)
+                    liftPercent100thsValue = 10000 - 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.5",
+  "version": "2.5.0-dev.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-zigbee2mqtt",
-      "version": "2.5.0-dev.5",
+      "version": "2.5.0-dev.7",
       "license": "Apache-2.0",
       "dependencies": {
         "moment": "2.30.1",

package/package.json

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