homebridge-deconz 0.0.12 → 0.0.13

package/lib/Deconz/Resource.js

@@ -1187,9 +1187,9 @@ class Resource {
     */
   patchThermostat (gateway) {
     if (this.manufacturer === 'ELKO' && this.model === 'Super TR') {
-      this.capbilities.heatValue = 'heat'
+      this.capabilities.heatValue = 'heat'
     } else {
-      this.capbilities.heatValue = 'auto'
+      this.capabilities.heatValue = 'auto'
     }
   }
 
@@ -1197,7 +1197,8 @@ class Resource {
   * @param {DeconzAccessory.Gateway} gateway - The gateway.
     */
   patchWindowCovering (gateway) {
-    if (this.manufacturer === 'ELKO' && this.model === 'Super TR') {
+    if (this.manufacturer === 'LUMI' && this.model === 'lumi.curtain.acn002') {
+      this.capabilities.maxSpeed = 2
       this.capabilities.positionChange = true
     }
   }

package/lib/DeconzAccessory/Gateway.js

@@ -874,16 +874,17 @@ class Gateway extends homebridgeLib.AccessoryDelegate {
           name: 'homebridge-deconz',
           description: 'migration',
           classid: 1,
-          links: Object.keys(this.resourceByRpath).sort()
+          links: Object.keys(this.accessoryByRpath).sort()
         })
         this.context.migration = '/resourcelinks/' + response.success.id
       } else {
         await this.client.put(this.context.migration, {
-          links: Object.keys(this.resourceByRpath).sort()
+          links: Object.keys(this.accessoryByRpath).sort()
         })
       }
       this.log(
-        'migration: %s: %d resources', this.context.migration, this.nResources
+        'migration: %s: %d resources',
+        this.context.migration, this.nResourcesMonitored
       )
     }
   }

package/lib/DeconzService/Thermostat.js

@@ -12,7 +12,7 @@ const DeconzService = require('../DeconzService')
   */
 class Thermostat extends DeconzService.SensorsResource {
   constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.hap.TemperatureSensor
+    params.Service = accessory.Services.hap.Thermostat
     super(accessory, resource, params)
 
     this.addCharacteristicDelegate({

package/lib/DeconzService/WindowCovering.js

@@ -63,6 +63,25 @@ class WindowCovering extends DeconzService.LightsResource {
       })
     }
 
+    if (resource.capabilities.maxSpeed != null) {
+      this.addCharacteristicDelegate({
+        key: 'motorSpeed',
+        Characteristic: this.Characteristics.my.MotorSpeed,
+        unit: '',
+        props: {
+          unit: '',
+          minValue: 0,
+          maxValue: resource.capabilities.maxSpeed,
+          minStep: 1
+        }
+      }).on('didSet', async (value, fromHomeKit) => {
+        if (!fromHomeKit) {
+          return
+        }
+        await this.put({ speed: value })
+      })
+    }
+
     if (resource.capabilities.positionChange) {
       this.addCharacteristicDelegate({
         key: 'positionChange',
@@ -80,9 +99,10 @@ class WindowCovering extends DeconzService.LightsResource {
     this.addCharacteristicDelegates()
 
     this.update(resource.body, resource.rpath)
+    this.values.targetPosition = this.values.currentPosition
   }
 
-  setPosition () {
+  async setPosition () {
     if (this.timer != null) {
       clearTimeout(this.timer)
       delete this.timer
@@ -101,14 +121,14 @@ class WindowCovering extends DeconzService.LightsResource {
       this.values.targetPosition > this.values.currentPosition
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
-    this.put({ lift: lift })
+    await this.put({ lift: lift })
     this.timer = setTimeout(() => {
       this.values.positionState =
         this.Characteristics.hap.PositionState.STOPPED
     }, 15000)
   }
 
-  updateState (state, rpath) {
+  updateState (state) {
     if (state.lift != null) {
       let position = Math.round(state.lift / 5) * 5
       let closeUpwards
@@ -121,16 +141,19 @@ class WindowCovering extends DeconzService.LightsResource {
         }
       }
       position = 100 - position // % open -> % closed
+      this.values.currentPosition = position
+      if (closeUpwards != null) {
+        this.values.closeUpwards = closeUpwards
+      }
       if (
         position === this.values.targetPosition &&
         (closeUpwards == null || closeUpwards === this.targetCloseUpwards)
       ) {
         this.values.positionState = this.Characteristics.hap.PositionState.STOPPED
       }
-      this.values.currentPosition = position
-      if (closeUpwards != null) {
-        this.values.closeUpwards = closeUpwards
-      }
+    }
+    if (state.speed != null) {
+      this.values.motorSpeed = state.speed
     }
     super.updateState(state)
   }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -28,7 +28,7 @@
     "@homebridge/plugin-ui-utils": "~0.0.19",
     "homebridge-lib": "~5.2.3",
     "semver": "^7.3.5",
-    "ws": "^8.4.2",
+    "ws": "^8.5.0",
     "xml2js": "~0.4.23"
   },
   "scripts": {