homebridge-deconz 0.0.17 → 0.0.21

package/lib/DeconzService/Consumption.js

@@ -31,6 +31,14 @@ class Consumption extends DeconzService.SensorsResource {
         unit: ' W'
       })
     }
+
+    if (service.values.lastUpdated === undefined) {
+      service.addCharacteristicDelegate({
+        key: 'lastUpdated',
+        Characteristic: service.Characteristics.my.LastUpdated,
+        silent: true
+      })
+    }
   }
 
   static updateResourceState (service, state) {
@@ -51,7 +59,7 @@ class Consumption extends DeconzService.SensorsResource {
 
     Consumption.addResource(this, resource)
 
-    super.addCharacteristicDelegates()
+    super.addCharacteristicDelegates({ noLastUpdated: true })
 
     this.update(resource.body)
   }

package/lib/DeconzService/Light.js

@@ -92,11 +92,11 @@ class Light extends DeconzService.LightsResource {
         },
         value: this.resource.body.state.ct
       }).on('didSet', (value, fromHomeKit) => {
-        this.checkAdaptiveLighting()
         const ct = Math.max(
           this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
         )
         if (fromHomeKit) {
+          this.checkAdaptiveLighting()
           this.put({ ct })
           this.values.colormode = 'ct'
         }
@@ -214,7 +214,7 @@ class Light extends DeconzService.LightsResource {
           const response = this.adaptiveLighting.generateControlResponse()
           const parsedResponse = this.adaptiveLighting.parseControl(response)
           this.vdebug(
-            'Adaptive Lighting: control update: %j => %j',
+            'adaptive lighting: control update: %j => %j',
             control, parsedResponse
           )
           this.values.activeTransitionCount = parsedResponse === '' ? 0 : 1
@@ -228,7 +228,7 @@ class Light extends DeconzService.LightsResource {
         silent: true,
         value: 0
       }).on('didSet', (value) => {
-        this.log('Adaptive Lighting: %sabled', value > 0 ? 'en' : 'dis')
+        this.log('adaptive lighting: %sabled', value > 0 ? 'en' : 'dis')
         if (value) {
           this.updateAdaptiveLighting()
         }
@@ -314,7 +314,6 @@ class Light extends DeconzService.LightsResource {
     }
 
     this.settings = {
-      brightnessAdjustment: 1,
       resetTimeout: this.platform.config.resetTimeout,
       waitTimeUpdate: this.platform.config.waitTimeUpdate,
       wallSwitch: false
@@ -322,9 +321,11 @@ class Light extends DeconzService.LightsResource {
   }
 
   updateState (state) {
+    this.initAdaptiveLighting()
     let updateAdaptiveLighting = false
     for (const key in state) {
       const value = state[key]
+      // const oldValue = this.resource.body.state[key]
       this.resource.body.state[key] = value
       switch (key) {
         case 'all_on':
@@ -435,11 +436,11 @@ class Light extends DeconzService.LightsResource {
         const control = this.adaptiveLighting.parseControl(
           this.context.transitionControl
         )
-        this.vdebug('Adaptive Lighting: restore control: %j', control)
+        this.vdebug('adaptive lighting: restore control: %j', control)
         this.adaptiveLighting.parseControl(this.context.transitionControl)
       }
       this.log(
-        'Adaptive Lighting: %sabled',
+        'adaptive lighting: %sabled',
         this.values.activeTransitionCount > 0 ? 'en' : 'dis'
       )
     }
@@ -454,24 +455,21 @@ class Light extends DeconzService.LightsResource {
       return
     }
     const ct = this.adaptiveLighting.getCt(
-      this.values.brightness * this.settings.brightnessAdjustment
+      this.values.brightness * this.platform.config.brightnessAdjustment
     )
     if (ct == null) {
       this.warn('assertion failed')
       return
     }
-    this.debug(
-      '/%s/%d: adaptive lighting: {"state":{"ct": %d}}',
-      this.rtype, this.rid, ct
-    )
     if (this.values.colormode === 'ct' && ct === this.values.colorTemperature) {
       return
     }
+    this.debug('adaptive lighting: set Color Temperature to %d mired', ct)
     this.put({ ct })
     this.fromAdaptiveLighting = true
     this.values.colormode = 'ct'
     if (ct !== this.values.colorTemperature) {
-      this.values.colorTemperature = ct
+      this.values.colorTemperature = ct // should only do this when PUT succeeds
     } else if (this.capabilities.xy) { // colormode changed
       const { h, s } = xyToHsv(ctToXy(ct), this.capabilities.gamut)
       this.values.hue = h

package/lib/DeconzService/LightsResource.js

@@ -17,6 +17,7 @@ class LightsResource extends DeconzService {
     super(accessory, resource, params)
     this.rpath += resource.rtype === 'groups' ? '/action' : '/state'
 
+    this.updating = 0
     this.targetState = {}
     this.deferrals = []
   }
@@ -65,16 +66,15 @@ class LightsResource extends DeconzService {
   // Send the request (for the combined changes) to the gateway.
   async _put () {
     try {
-      if (this.updating) {
-        return
-      }
-      this.updating = true
       if (this.platform.config.waitTimeUpdate > 0) {
+        this.updating++
         await timeout(this.platform.config.waitTimeUpdate)
+        if (--this.updating > 0) {
+          return
+        }
       }
       const targetState = this.targetState
       this.targetState = {}
-      this.updating = false
       if (
         this.gateway.transitionTime !== this.gateway.defaultTransitionTime &&
         targetState.transitiontime === undefined

package/lib/DeconzService/Outlet.js

@@ -39,7 +39,7 @@ class Outlet extends DeconzService.LightsResource {
     this.addCharacteristicDelegate({
       key: 'outletInUse',
       Characteristic: this.Characteristics.hap.OutletInUse,
-      value: 1
+      value: 1 // Eve interpretes OutletInUse as: device is physically plugged in.
     })
 
     this.addCharacteristicDelegates()

package/lib/DeconzService/Power.js

@@ -69,7 +69,7 @@ class Power extends DeconzService.SensorsResource {
 
     Power.addResource(this, resource)
 
-    super.addCharacteristicDelegates()
+    super.addCharacteristicDelegates({ noLastUpdated: true })
 
     this.update(resource.body)
   }

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.endsWith('Switch')) {
+      this.buttonResources[resource.rpath] = {
+        buttonEvent: resource.body.state.buttonevent,
+        lastUpdated: '',
+        toButtonEvent: resource.capabilities.toButtonEvent
+      }
+    } else if (resource.body.type.endsWith('RelativeRotary')) {
+      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]
@@ -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/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -20,14 +20,14 @@
     "deconz": "cli/deconz.js"
   },
   "engines": {
-    "deCONZ": "2.16.1",
-    "homebridge": "^1.4.1",
-    "node": "^16.15.1"
+    "deCONZ": "2.17.1",
+    "homebridge": "^1.5.0",
+    "node": "^16.17.0"
   },
   "dependencies": {
-    "homebridge-lib": "~5.6.0",
+    "homebridge-lib": "~5.6.5",
     "semver": "^7.3.7",
-    "ws": "^8.8.0",
+    "ws": "^8.8.1",
     "xml2js": "~0.4.23"
   },
   "scripts": {