homebridge-zencontrol-tpi 1.1.0-next.2 → 1.1.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # homebridge-zencontrol-tpi
 
+## 1.1.0-next.4
+
+### Minor Changes
+
+- 86419e7: Add blind controller support
+
+## 1.1.0-next.3
+
+### Patch Changes
+
+- d96d82d: Upgrade zencontrol-tpi-node to fix treatement of unused system variables
+
 ## 1.1.0-next.2
 
 ### Minor Changes

package/config.schema.json

@@ -9,10 +9,18 @@
 				"title": "Name",
 				"required": true
 			},
+			"blinds": {
+				"type": "array",
+				"title": "Blinds",
+				"description": "The names of the Blind Controller relays on your controllers.",
+				"items": {
+					"type": "string"
+				}
+			},
 			"relays": {
 				"type": "array",
-				"title": "Relays",
-				"description": "The names of the relays on your controllers that should be includes in HomeKit",
+				"title": "Switches",
+				"description": "The names of the relays on your controllers that should be represented as Switches.",
 				"items": {
 					"type": "string"
 				}
@@ -57,7 +65,7 @@
 				"type": "integer",
 				"title": "CO2 Abnormal Level",
 				"required": false,
-				"default": 1000
+				"default": 2000
 			},
 			"debug": {
 				"type": "boolean",

package/dist/blindAccessory.js

@@ -0,0 +1,56 @@
+export class ZencontrolBlindPlatformAccessory {
+    constructor(platform, accessory) {
+        this.platform = platform;
+        this.accessory = accessory;
+        this.currentPosition = 0; /* 0 = open, 100 = closed */
+        this.accessory.getService(this.platform.Service.AccessoryInformation)
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Zencontrol')
+            .setCharacteristic(this.platform.Characteristic.Model, accessory.context.model || 'Unknown')
+            .setCharacteristic(this.platform.Characteristic.SerialNumber, accessory.context.serial || 'Unknown');
+        this.service = this.accessory.getService(this.platform.Service.WindowCovering) || this.accessory.addService(this.platform.Service.WindowCovering);
+        this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+        // https://developers.homebridge.io/#/service/WindowCovering
+        this.service.getCharacteristic(this.platform.Characteristic.CurrentPosition)
+            .onGet(this.getCurrentPosition.bind(this));
+        this.service.getCharacteristic(this.platform.Characteristic.TargetPosition)
+            .onGet(this.getTargetPosition.bind(this))
+            .onSet(this.setTargetPosition.bind(this));
+        this.service.getCharacteristic(this.platform.Characteristic.PositionState)
+            .onGet(this.getPositionState.bind(this));
+    }
+    get displayName() {
+        return this.accessory.displayName;
+    }
+    async getCurrentPosition() {
+        return this.currentPosition;
+    }
+    async getTargetPosition() {
+        return this.targetPosition ?? 0;
+    }
+    async setTargetPosition(value) {
+        const targetPosition = value;
+        this.platform.log.debug(`Set blind ${this.accessory.displayName} (${this.accessory.context.address}) to ${targetPosition}`);
+        this.targetPosition = targetPosition;
+        try {
+            await this.platform.sendArcLevel(this.accessory.context.address, this.targetPosition ? 254 : 0, false);
+        }
+        catch (error) {
+            this.platform.log.warn(`Failed to update state for ${this.accessory.displayName}`, error);
+        }
+    }
+    async getPositionState() {
+        return this.platform.Characteristic.PositionState.STOPPED;
+    }
+    async receiveArcLevel(arcLevel) {
+        if (arcLevel === 255) {
+            /* A stop fade; ignore */
+            return;
+        }
+        const value = arcLevel > 0 ? 100 : 0;
+        if (value !== this.currentPosition) {
+            this.platform.log.debug(`Controller updated blind ${this.accessory.displayName} to ${value}`);
+            this.currentPosition = value;
+            this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, value);
+        }
+    }
+}

package/dist/platform.js

@@ -4,6 +4,7 @@ import { ZenController, ZenProtocol, ZenAddress, ZenAddressType, ZenControlGearT
 import { ZencontrolTemperaturePlatformAccessory } from './temperatureAccessory.js';
 import { ZencontrolHumidityPlatformAccessory } from './humidityAccessory.js';
 import { ZencontrolRelayPlatformAccessory } from './relayAccessory.js';
+import { ZencontrolBlindPlatformAccessory } from './blindAccessory.js';
 import { ZencontrolLuxPlatformAccessory } from './luxAccessory.js';
 import { ZencontrolCO2PlatformAccessory } from './co2Accessory.js';
 /**
@@ -14,7 +15,6 @@ import { ZencontrolCO2PlatformAccessory } from './co2Accessory.js';
 export class ZencontrolTPIPlatform {
     constructor(log, config, api) {
         this.log = log;
-        this.config = config;
         this.api = api;
         // this is used to track restored cached accessories
         this.accessories = new Map();
@@ -23,6 +23,7 @@ export class ZencontrolTPIPlatform {
         this.accessoryNeedsRegister = [];
         this.accessoryNeedsUpdate = [];
         this.lastSentDAPC = new Map();
+        this.config = config;
         this.Service = api.hap.Service;
         this.Characteristic = api.hap.Characteristic;
         const debug = !!config.debug;
@@ -124,15 +125,34 @@ export class ZencontrolTPIPlatform {
                                 if (!label) {
                                     return;
                                 }
-                                if ((this.config.relays ?? []).indexOf(label) === -1) {
+                                if ((this.config.relays ?? []).indexOf(label) !== -1) {
+                                    const acc = this.addRelayAccessory({
+                                        address: addressToString(ecg),
+                                        label,
+                                        model: 'Relay',
+                                        serial: `${controller.id}.${ecg.ecg()}`,
+                                    });
+                                    const level = await this.zc.daliQueryLevel(ecg);
+                                    if (level !== null) {
+                                        acc.receiveArcLevel(level);
+                                    }
+                                }
+                                else if ((this.config.blinds ?? []).indexOf(label) !== -1) {
+                                    const acc = this.addBlindAccessory({
+                                        address: addressToString(ecg),
+                                        label,
+                                        model: 'Relay',
+                                        serial: `${controller.id}.${ecg.ecg()}`,
+                                    });
+                                    const level = await this.zc.daliQueryLevel(ecg);
+                                    if (level !== null) {
+                                        acc.receiveArcLevel(level);
+                                    }
+                                }
+                                else {
                                     this.log.debug(`Ignoring relay "${label}" as it is not listed in the config`);
                                     return;
                                 }
-                                const acc = this.addRelayAccessory({ address: addressToString(ecg), label, model: 'Relay', serial: `${controller.id}.${ecg.ecg()}` });
-                                const level = await this.zc.daliQueryLevel(ecg);
-                                if (level !== null) {
-                                    acc.receiveArcLevel(level);
-                                }
                             }
                         }
                     }));
@@ -275,6 +295,25 @@ export class ZencontrolTPIPlatform {
         this.discoveredCacheUUIDs.push(uuid);
         return acc;
     }
+    addBlindAccessory({ address, label, model, serial }) {
+        const uuid = this.api.hap.uuid.generate(`relay @ ${address}`);
+        const existingAccessory = this.accessories.get(uuid);
+        let acc;
+        if (existingAccessory) {
+            this.log.debug('Restoring existing blind accessory from cache:', existingAccessory.displayName);
+            this.updateAccessory(existingAccessory, { address, label, model, serial });
+            acc = new ZencontrolBlindPlatformAccessory(this, existingAccessory);
+        }
+        else {
+            this.log.info('Adding new blind accessory:', label);
+            const accessory = new this.api.platformAccessory(label, uuid);
+            this.setupAccessory(accessory, { address, label, model, serial });
+            acc = new ZencontrolBlindPlatformAccessory(this, accessory);
+        }
+        this.accessoriesByAddress.set(address, acc);
+        this.discoveredCacheUUIDs.push(uuid);
+        return acc;
+    }
     addTemperatureAccessory({ address, label, model, serial }) {
         const uuid = this.api.hap.uuid.generate(`temperature @ ${address}`);
         const existingAccessory = this.accessories.get(uuid);
@@ -403,7 +442,7 @@ export class ZencontrolTPIPlatform {
         this.zc.levelChangeCallback = (address, arcLevel) => {
             const accessoryId = addressToString(address);
             const acc = this.accessoriesByAddress.get(accessoryId);
-            if (acc instanceof ZencontrolLightPlatformAccessory || acc instanceof ZencontrolRelayPlatformAccessory) {
+            if (acc instanceof ZencontrolLightPlatformAccessory || acc instanceof ZencontrolRelayPlatformAccessory || acc instanceof ZencontrolBlindPlatformAccessory) {
                 acc.receiveArcLevel(arcLevel).catch((reason) => {
                     this.log.warn(`Failed to update accessory "${acc.displayName}" brightness: ${reason}`);
                 });

package/dist/relayAccessory.js

@@ -23,7 +23,7 @@ export class ZencontrolRelayPlatformAccessory {
      */
     async setOn(value) {
         const on = value;
-        this.platform.log.debug(`Set ${this.accessory.displayName} (${this.accessory.context.address}) to ${on ? 'on' : 'off'}`);
+        this.platform.log.debug(`Set relay ${this.accessory.displayName} (${this.accessory.context.address}) to ${on ? 'on' : 'off'}`);
         this.requestOn = !!on;
         try {
             await this.platform.sendArcLevel(this.accessory.context.address, this.requestOn ? 254 : 0, false);
@@ -42,7 +42,7 @@ export class ZencontrolRelayPlatformAccessory {
         }
         const on = arcLevel > 0;
         if (on !== this.knownOn) {
-            this.platform.log.debug(`Controller updated ${this.accessory.displayName} on/off to ${on ? 'on' : 'off'}`);
+            this.platform.log.debug(`Controller updated relay ${this.accessory.displayName} on/off to ${on ? 'on' : 'off'}`);
             this.knownOn = on;
             this.service.updateCharacteristic(this.platform.Characteristic.On, on);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "homebridge-zencontrol-tpi",
-	"version": "1.1.0-next.2",
+	"version": "1.1.0-next.4",
 	"description": "",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"homebridge-lib": "^7.2.0",
-		"zencontrol-tpi-node": "^1.0.0"
+		"zencontrol-tpi-node": "^1.1.0"
 	},
 	"publishConfig": {
 		"access": "public"