homebridge-deconz 0.0.15 → 0.0.18

package/lib/DeconzService/Switch.js

@@ -29,10 +29,19 @@ class Switch extends DeconzService.SensorsResource {
   }
 
   createButtonServices (resource) {
-    this.buttonResources[resource.rpath] = {
-      buttonEvent: resource.body.state.buttonevent,
-      lastUpdated: '',
-      toButtonEvent: resource.capabilities.toButtonEvent
+    if (resource.body.type === 'ZHASwitch') {
+      this.buttonResources[resource.rpath] = {
+        buttonEvent: resource.body.state.buttonevent,
+        lastUpdated: '',
+        toButtonEvent: resource.capabilities.toButtonEvent
+      }
+    } else if (resource.body.type === 'ZHARelativeRotary') {
+      const keys = Object.keys(resource.capabilities.buttons)
+      this.buttonResources[resource.rpath] = {
+        lastUpdated: '',
+        right: keys[0],
+        left: keys[1]
+      }
     }
     for (const i in resource.capabilities.buttons) {
       const { label, events, hasRepeat } = resource.capabilities.buttons[i]
@@ -42,8 +51,8 @@ class Switch extends DeconzService.SensorsResource {
       this.buttonServices[i] = new DeconzService.Button(this.accessoryDelegate, {
         name: this.name + ' ' + label,
         button: Number(i),
-        events: events,
-        hasRepeat: hasRepeat
+        events,
+        hasRepeat
       })
     }
   }
@@ -57,17 +66,27 @@ class Switch extends DeconzService.SensorsResource {
       state.lastupdated !== buttonResource.lastUpdated
     ) {
       buttonResource.lastUpdated = state.lastupdated
-      const oldValue = buttonResource.buttonEvent
-      if (state.buttonevent != null) {
-        buttonResource.buttonEvent = buttonResource.toButtonEvent == null
-          ? state.buttonevent
-          : buttonResource.toButtonEvent(state.buttonevent)
+      if (buttonResource.buttonEvent !== undefined) {
+        const oldValue = buttonResource.buttonEvent
+        if (state.buttonevent != null) {
+          buttonResource.buttonEvent = buttonResource.toButtonEvent == null
+            ? state.buttonevent
+            : buttonResource.toButtonEvent(state.buttonevent)
+        }
+        // TODO handle repeat
+        const i = Math.floor(buttonResource.buttonEvent / 1000)
+        if (this.buttonServices[i] != null) {
+          this.buttonServices[i].update(
+            buttonResource.buttonEvent, oldValue,
+            this.accessoryDelegate.settingsService.values.repeat
+          )
+        }
+      } else {
+        const i = state.expectedrotation >= 0
+          ? buttonResource.right
+          : buttonResource.left
+        this.buttonServices[i].updateRotation()
       }
-      // TODO handle repeat
-      this.updateButtonEvent(
-        buttonResource.buttonEvent, oldValue,
-        this.accessoryDelegate.settingsService.values.repeat
-      )
     }
     super.updateState(state)
   }
@@ -77,13 +96,6 @@ class Switch extends DeconzService.SensorsResource {
     super.updateConfig(config)
   }
 
-  updateButtonEvent (value, oldValue, repeat) {
-    const i = Math.floor(value / 1000)
-    if (this.buttonServices[i] != null) {
-      this.buttonServices[i].update(value, oldValue, repeat)
-    }
-  }
-
   async identify () {
     this.debug('hasRepeat: %j', this.hasRepeat)
     return super.identify()

package/lib/DeconzService/Temperature.js

@@ -27,6 +27,7 @@ class Temperature extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/Thermostat.js

@@ -77,6 +77,7 @@ class Thermostat extends DeconzService.SensorsResource {
       key: 'offset',
       Characteristic: this.Characteristics.my.Offset,
       unit: '°C',
+      props: { minValue: -5, maxValue: 5, minStep: 0.1 },
       value: 0
     }).on('didSet', async (value, fromHomeKit) => {
       if (fromHomeKit) {

package/lib/DeconzService/WindowCovering.js

@@ -114,7 +114,7 @@ class WindowCovering extends DeconzService.LightsResource {
         ? this.Characteristics.hap.PositionState.INCREASING
         : this.Characteristics.hap.PositionState.DECREASING
     this.moving = new Date()
-    await this.put({ lift: lift })
+    await this.put({ lift })
   }
 
   updateState (state) {

package/lib/DeconzService/index.js

@@ -15,6 +15,7 @@ const { dateToString } = Deconz.ApiClient
   */
 class DeconzService extends homebridgeLib.ServiceDelegate {
   static get AirPressure () { return require('./AirPressure') }
+  static get AirPurifier () { return require('./AirPurifier') }
   static get AirQuality () { return require('./AirQuality') }
   static get Alarm () { return require('./Alarm') }
   static get Battery () { return require('./Battery') }

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.15",
+  "version": "0.0.18",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,14 +20,14 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.14.1",
-    "homebridge": "^1.4.0",
-    "node": "^16.14.2"
+    "deCONZ": "2.17.1",
+    "homebridge": "^1.5.0",
+    "node": "^16.16.0"
   },
   "dependencies": {
-    "homebridge-lib": "~5.4.0",
+    "homebridge-lib": "~5.6.4",
     "semver": "^7.3.7",
-    "ws": "^8.5.0",
+    "ws": "^8.8.1",
     "xml2js": "~0.4.23"
   },
   "scripts": {