homebridge-deconz 0.1.9 → 0.1.10

package/lib/Deconz/Resource.js

@@ -30,51 +30,6 @@ const sensorsPrios = [
 
 // =============================================================================
 
-// See: http://www.developers.meethue.com/documentation/supported-lights
-
-const hueGamutType = { // Color gamut per light model.
-  A: { // Color Lights
-    r: [0.7040, 0.2960],
-    g: [0.2151, 0.7106],
-    b: [0.1380, 0.0800]
-  },
-  B: { // Extended Color Lights
-    r: [0.6750, 0.3220],
-    g: [0.4090, 0.5180],
-    b: [0.1670, 0.0400]
-  },
-  C: { // next gen Extended Color Lights
-    r: [0.6920, 0.3080],
-    g: [0.1700, 0.7000],
-    b: [0.1530, 0.0480]
-  }
-}
-
-const hueGamutTypeByModel = {
-  LCT001: 'B', // Hue bulb A19
-  LCT002: 'B', // Hue Spot BR30
-  LCT003: 'B', // Hue Spot GU10
-  LCT007: 'B', // Hue bulb A19
-  LCT010: 'C', // Hue bulb A19
-  LCT011: 'C', // Hue BR30
-  LCT012: 'C', // Hue Color Candle
-  LCT014: 'C', // Hue bulb A19
-  LCT015: 'C', // Hue bulb A19
-  LCT016: 'C', // Hue bulb A19
-  LLC005: 'A', // Living Colors Gen3 Bloom, Aura
-  LLC006: 'A', // Living Colors Gen3 Iris
-  LLC007: 'A', // Living Colors Gen3 Bloom, Aura
-  LLC010: 'A', // Hue Living Colors Iris
-  LLC011: 'A', // Hue Living Colors Bloom
-  LLC012: 'A', // Hue Living Colors Bloom
-  LLC013: 'A', // Disney Living Colors
-  LLC014: 'A', // Living Colors Gen3 Bloom, Aura
-  LLC020: 'C', // Hue Go
-  LLM001: 'B', // Color Light Module
-  LST001: 'A', // Hue LightStrips
-  LST002: 'C' // Hue LightStrips Plus
-}
-
 const hueTapMap = {
   34: 1002, // press 1
   16: 2002, // press 2
@@ -240,9 +195,7 @@ class Resource {
               this.capabilities.ctMin = cap.color.ct.min
             }
             if (cap.color.effects != null && cap.color.effects.length > 2) {
-              this.capabilities.effects = cap.color.effects.slice(2).map((effect) => {
-                return effect[0].toUpperCase() + effect.slice(1)
-              })
+              this.capabilities.effects = cap.color.effects.slice(2)
             }
             if (cap.color.xy != null) {
               this.capabilities.gamut = {
@@ -386,34 +339,7 @@ class Resource {
     */
   patchLight (gateway) {
     switch (this.manufacturer) {
-      case 'Busch-Jaeger':
-        // See: https://www.busch-jaeger.de/en/products/product-solutions/dimmer/busch-radio-controlled-dimmer-zigbee-light-link/
-        if (
-          this.model === 'RM01' && // 6715 U-500 with 6736-84.
-          this.capabilities.bri && this.body.type === 'On/Off light' // Issue #241
-        ) {
-          gateway.vdebug(
-            '%s: ignoring state.bri for %s', this.rpath, this.body.type
-          )
-          this.capabilities.bri = false
-        }
-        break
-      case 'dresden elektronik':
-        // See: https://www.dresden-elektronik.de/funktechnik/solutions/wireless-light-control/wireless-ballasts/?L=1
-        this.capabilities.computesXy = true
-        break
-      case 'FeiBit':
-        if (this.model === 'FNB56-SKT1EHG1.2') { // issue #361
-          this.body.type = 'On/Off plug-in unit'
-        }
-        break
       case 'GLEDOPTO':
-        // See: https://www.led-trading.de/zigbee-kompatibel-controller-led-lichtsteuerung
-        this.capabilities.gamut = {
-          r: [0.7006, 0.2993],
-          g: [0.1387, 0.8148],
-          b: [0.1510, 0.0227]
-        }
         if (this.model === 'GLEDOPTO') { // Issue #244
           if (
             this.endpoint === '0A' &&
@@ -444,37 +370,6 @@ class Resource {
           gateway.vdebug('%s: set model to %j', this.rpath, this.model)
         }
         break
-      case 'IKEA of Sweden':
-        // See: http://www.ikea.com/us/en/catalog/categories/departments/lighting/smart_lighting/
-        this.capabilities.gamut = defaultGamut // Issue #956
-        this.capabilities.noTransition = true
-        if (this.model === 'TRADFRI bulb E27 CWS 806lm') {
-          this.capabilities.computesXy = true
-          this.capabilities.gamut = {
-            r: [0.68, 0.31],
-            g: [0.11, 0.82],
-            b: [0.13, 0.04]
-          }
-        }
-        break
-      case 'innr':
-        // See: https://shop.innrlighting.com/en/shop
-        this.capabilities.gamut = { // Issue #152
-          r: [0.8817, 0.1033],
-          g: [0.2204, 0.7758],
-          b: [0.0551, 0.1940]
-        }
-        if (this.model === 'SP 120') { // smart plug
-          this.capabilities.bri = false
-        }
-        break
-      case 'LEDVANCE':
-        this.capabilities.gamut = {
-          r: [0.6972, 0.3027],
-          g: [0.1737, 0.6991],
-          b: [0.1227, 0.0959]
-        }
-        break
       case 'LIDL Livarno Lux':
         this.capabilities.ctMax = 454 // 2200 K
         this.capabilities.ctMin = 153 // 6500 K
@@ -489,36 +384,6 @@ class Resource {
           ]
         }
         break
-      case 'MLI': // Issue #439
-        this.capabilities.gamut = {
-          r: [0.68, 0.31],
-          g: [0.11, 0.82],
-          b: [0.13, 0.04]
-        }
-        if (this.capabilities.colorLoop) {
-          this.capabilities.effects = [
-            'Sunset', 'Party', 'Worklight', 'Campfire', 'Romance', 'Nightlight'
-          ]
-        }
-        break
-      case 'OSRAM':
-        this.capabilities.gamut = {
-          r: [0.6850, 0.3149],
-          g: [0.1780, 0.7253],
-          b: [0.1241, 0.0578]
-        }
-        break
-      case 'Philips':
-      case 'Signify Netherlands B.V.':
-        // See: http://www.developers.meethue.com/documentation/supported-lights
-        this.manufacturer = 'Signify Netherlands B.V.'
-        this.capabilities.breathe = true
-        this.capabilities.computesXy = true
-        if (this.body.capabilities == null) {
-          const gamut = hueGamutTypeByModel[this.model] || 'C'
-          this.capabilities.gamut = hueGamutType[gamut]
-        }
-        break
       default:
         break
     }
@@ -784,12 +649,16 @@ class Resource {
               }
             }
             break
-          case 'lumi.sensor_86sw1': // Xiaomi wall switch (single button)
           case 'lumi.ctrl_ln1.aq1':
+          case 'lumi.sensor_86sw1': // Xiaomi wall switch (single button).
+          case 'lumi.switch.l1aeu1': // Xiaomi Aqara H1, see #1149.
+          case 'lumi.switch.n1aeu1': // Xiaomi Aqara H1, see #1149.
             buttons.push([1, 'Button', SINGLE | DOUBLE])
             break
-          case 'lumi.sensor_86sw2': // Xiaomi wall switch (two buttons)
           case 'lumi.ctrl_ln2.aq1':
+          case 'lumi.sensor_86sw2': // Xiaomi wall switch (two buttons).
+          case 'lumi.switch.l2aeu1': // Xiaomi Aqara H2, see #1149.
+          case 'lumi.switch.n2aeu1': // Xiaomi Aqara H2, see #1149.
             buttons.push([1, 'Left', SINGLE | DOUBLE])
             buttons.push([2, 'Right', SINGLE | DOUBLE])
             buttons.push([3, 'Both', SINGLE | DOUBLE])

package/lib/DeconzAccessory/Light.js

@@ -66,19 +66,19 @@ class Light extends DeconzAccessory {
       })
     }
     if (this.serviceByServiceName.Consumption != null) {
-      params.consumptionDelegate = this.service.characteristicDelegate('totalConsumption')
-      if (this.service.values.currentConsumption === undefined) {
-        // Current Consumption to be computed by history if not exposed by device
-        params.computedPowerDelegate = this.service.addCharacteristicDelegate({
-          key: 'currentConsumption',
-          Characteristic: this.Characteristics.eve.CurrentConsumption,
+      params.totalConsumptionDelegate = this.service.characteristicDelegate('totalConsumption')
+      if (this.service.values.consumption === undefined) {
+        // Power to be computed by history if not exposed by device
+        params.computedConsumptionDelegate = this.service.addCharacteristicDelegate({
+          key: 'consumption',
+          Characteristic: this.Characteristics.eve.Consumption,
           unit: ' W'
         })
       }
     } else if (this.serviceByServiceName.Power != null) {
-      params.powerDelegate = this.service.characteristicDelegate('currentConsumption')
+      params.consumptionDelegate = this.service.characteristicDelegate('consumption')
       // Total Consumption to be computed by history
-      params.computedConsumptionDelegate = this.service.addCharacteristicDelegate({
+      params.computedTotalConsumptionDelegate = this.service.addCharacteristicDelegate({
         key: 'totalConsumption',
         Characteristic: this.Characteristics.eve.TotalConsumption,
         unit: ' kWh'

package/lib/DeconzAccessory/index.js

@@ -139,7 +139,12 @@ class DeconzAccessory extends AccessoryDelegate {
     this.debug('%s: params: %j', resource.rpath, params)
 
     let service
-    if (params.serviceName === 'Battery') {
+    if (params.serviceName === 'AirQuality') {
+      service = this.serviceByServiceName.AirQuality
+      if (service != null) {
+        service.addResource(resource)
+      }
+    } else if (params.serviceName === 'Battery') {
       service = this.serviceByServiceName.Battery
     } else if (params.serviceName === 'Consumption') {
       service = this.serviceByServiceName.Outlet ||

package/lib/DeconzService/AirQuality.js

@@ -5,73 +5,104 @@
 
 'use strict'
 
+const Deconz = require('../Deconz')
 const DeconzService = require('../DeconzService')
 
+const { dateToString } = Deconz.ApiClient
+
 /**
   * @memberof DeconzService
   */
 class AirQuality extends DeconzService.SensorsResource {
-  constructor (accessory, resource, params = {}) {
-    params.Service = accessory.Services.hap.AirQualitySensor
-    super(accessory, resource, params)
-
-    this.addCharacteristicDelegate({
-      key: 'airQuality',
-      Characteristic: this.Characteristics.hap.AirQuality
-    })
+  static addResource (service, resource) {
+    if (service.values.airQuality === undefined) {
+      service.addCharacteristicDelegate({
+        key: 'airQuality',
+        Characteristic: service.Characteristics.hap.AirQuality
+      })
+    }
 
     if (resource.body.state.airqualityppb !== undefined) {
-      this.addCharacteristicDelegate({
+      service.addCharacteristicDelegate({
         key: 'vocDensity',
-        Characteristic: this.Characteristics.hap.VOCDensity,
+        Characteristic: service.Characteristics.hap.VOCDensity,
         unit: ' µg/m³',
         props: { minValue: 0, maxValue: 65535, minStep: 1 }
       })
     }
 
     if (resource.body.state.pm2_5 !== undefined) {
-      this.addCharacteristicDelegate({
-        key: 'pm2_5Density',
-        Characteristic: this.Characteristics.hap.PM2_5Density,
+      service.addCharacteristicDelegate({
+        key: 'pm25Density',
+        Characteristic: service.Characteristics.hap.PM2_5Density,
         unit: ' µg/m³',
         props: { minValue: 0, maxValue: 65535, minStep: 1 }
       })
     }
 
-    if (params.linkedServiceDelegate == null) {
-      super.addCharacteristicDelegates()
+    if (service.values.lastUpdated === undefined) {
+      service.addCharacteristicDelegate({
+        key: 'lastUpdated',
+        Characteristic: service.Characteristics.my.LastUpdated,
+        silent: true
+      })
     }
 
-    this.update(resource.body, resource.rpath)
+    AirQuality.updateResourceState(service, resource.body.state)
   }
 
-  airQualityValue (value) {
+  static airQualityValue (service, value) {
     switch (value) {
       case 'excellent':
-        return this.Characteristics.hap.AirQuality.EXCELLENT
+        return service.Characteristics.hap.AirQuality.EXCELLENT
       case 'good':
-        return this.Characteristics.hap.AirQuality.GOOD
+        return service.Characteristics.hap.AirQuality.GOOD
       case 'moderate':
-        return this.Characteristics.hap.AirQuality.FAIR
+        return service.Characteristics.hap.AirQuality.FAIR
       case 'poor':
-        return this.Characteristics.hap.AirQuality.INFERIOR
+        return service.Characteristics.hap.AirQuality.INFERIOR
       case 'unhealthy':
-        return this.Characteristics.hap.AirQuality.POOR
+        return service.Characteristics.hap.AirQuality.POOR
       default:
-        return this.Characteristics.hap.AirQuality.UNKNOWN
+        return service.Characteristics.hap.AirQuality.UNKNOWN
     }
   }
 
-  updateState (state) {
-    if (state.airquality != null) {
-      this.values.airQuality = this.airQualityValue(state.airquality)
-    }
+  static updateResourceState (service, state) {
     if (state.airqualityppb != null) {
-      this.values.vocDensity = Math.round(state.airqualityppb * 4.57)
+      service.values.vocDensity = Math.round(state.airqualityppb * 4.57)
+      if (state.airquality != null) {
+        service.values.airQuality = AirQuality.airQualityValue(
+          service, state.airquality
+        )
+      }
     }
     if (state.pm2_5 != null) {
-      this.values.pm2_5Density = state.pm2_5
+      service.values.pm25Density = state.pm2_5
+      if (state.airquality != null && service.values.vocDensity === undefined) {
+        service.values.airQuality = AirQuality.airQualityValue(
+          service, state.airquality
+        )
+      }
+    }
+    if (state.lastupdated != null) {
+      service.values.lastUpdated = dateToString(state.lastupdated)
     }
+  }
+
+  constructor (accessory, resource, params = {}) {
+    params.Service = accessory.Services.hap.AirQualitySensor
+    super(accessory, resource, params)
+
+    AirQuality.addResource(this, resource)
+
+    super.addCharacteristicDelegates({ noLastUpdated: true })
+
+    this.update(resource.body, resource.rpath)
+  }
+
+  updateState (state) {
+    AirQuality.updateResourceState(this, state)
     super.updateState(state)
   }
 }

package/lib/DeconzService/Consumption.js

@@ -23,11 +23,11 @@ class Consumption extends DeconzService.SensorsResource {
 
     if (
       resource.body.state.power !== undefined &&
-      service.values.currentConsumption === undefined
+      service.values.consumption === undefined
     ) {
       service.addCharacteristicDelegate({
-        key: 'currentConsumption',
-        Characteristic: service.Characteristics.eve.CurrentConsumption,
+        key: 'consumption',
+        Characteristic: service.Characteristics.eve.Consumption,
         unit: ' W'
       })
     }
@@ -40,7 +40,7 @@ class Consumption extends DeconzService.SensorsResource {
       })
     }
 
-    service.update(resource.body, resource.rpath)
+    Consumption.updateResourceState(service, resource.body.state)
   }
 
   static updateResourceState (service, state) {
@@ -48,7 +48,7 @@ class Consumption extends DeconzService.SensorsResource {
       service.values.totalConsumption = state.consumption / 1000
     }
     if (state.power != null) {
-      service.values.currentConsumption = state.power
+      service.values.consumption = state.power
     }
     if (state.lastupdated != null) {
       service.values.lastUpdated = dateToString(state.lastupdated)

package/lib/DeconzService/Light.js

@@ -8,14 +8,31 @@
 const { AdaptiveLighting, Colour, ServiceDelegate, timeout } = require('homebridge-lib')
 const DeconzService = require('../DeconzService')
 
-const { xyToHsv, hsvToXy, ctToXy } = Colour
-const { History } = ServiceDelegate
+const { defaultGamut, xyToHsv, hsvToXy, ctToXy } = Colour
 
 class Light extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
     params.Service = accessory.Services.hap.Lightbulb
     super(accessory, resource, params)
 
+    this.capabilities = {
+      on: this.resource.body.state.on !== undefined,
+      bri: this.resource.body.state.bri !== undefined,
+      ct: this.resource.body.state.ct !== undefined,
+      hs: this.resource.body.state.xy === undefined &&
+        this.resource.body.state.hue !== undefined,
+      xy: this.resource.body.state.xy !== undefined
+    }
+    if (this.resource.body?.capabilities?.color?.effects != null) {
+      const effects = this.resource.body.capabilities.color.effects
+      if (effects.length > 1 && effects[1] === 'colorloop') {
+        this.capabilities.colorLoop = true
+        this.capabilities.effects = effects.length > 2
+      } else if (effects.length > 1) {
+        this.capabilities.effects = effects.length > 1
+      }
+    }
+
     this.addCharacteristicDelegate({
       key: 'on',
       Characteristic: this.Characteristics.hap.On,
@@ -81,11 +98,7 @@ class Light extends DeconzService.LightsResource {
       })
     }
 
-    if (
-      this.resource.body.config != null &&
-      this.resource.body.config.color != null &&
-      this.resource.body.config.color.execute_if_off != null
-    ) {
+    if (this.resource.body?.config?.color?.execute_if_off != null) {
       this.addCharacteristicDelegate({
         key: 'colorExecuteIfOff',
         value: this.resource.body.config.color.execute_if_off
@@ -93,19 +106,25 @@ class Light extends DeconzService.LightsResource {
     }
 
     if (this.capabilities.ct) {
+      if (
+        this.resource.body?.capabilities?.color?.ct?.min == null ||
+        this.resource.body?.capabilities?.color?.ct?.max == null
+      ) {
+        this.warn('using default ct range')
+      }
+      const ctMin = this.resource.body?.capabilities?.color?.ct?.min ?? 153
+      const ctMax = this.resource.body?.capabilities?.color?.ct?.max ?? 500
       this.colorTemperatureDelegate = this.addCharacteristicDelegate({
         key: 'colorTemperature',
         Characteristic: this.Characteristics.hap.ColorTemperature,
         unit: ' mired',
         props: {
-          minValue: this.capabilities.ctMin,
-          maxValue: this.capabilities.ctMax
+          minValue: ctMin,
+          maxValue: ctMax
         },
         value: this.resource.body.state.ct
       }).on('didSet', (value, fromHomeKit) => {
-        const ct = Math.max(
-          this.capabilities.ctMin, Math.min(value, this.capabilities.ctMax)
-        )
+        const ct = Math.max(ctMin, Math.min(value, ctMax))
         if (fromHomeKit) {
           this.checkAdaptiveLighting()
           this.put({ ct })
@@ -120,6 +139,21 @@ class Light extends DeconzService.LightsResource {
     }
 
     if (this.capabilities.xy) {
+      if (
+        this.resource.body?.capabilities?.color?.xy?.blue == null ||
+        this.resource.body?.capabilities?.color?.xy?.green == null ||
+        this.resource.body?.capabilities?.color?.xy?.red == null
+      ) {
+        this.warn('using default xy gamut')
+        this.capabilities.gamut = defaultGamut
+      } else {
+        this.capabilities.gamut = {
+          r: this.resource.body.capabilities.color.xy.red,
+          g: this.resource.body.capabilities.color.xy.green,
+          b: this.resource.body.capabilities.color.xy.blue
+        }
+      }
+
       this.addCharacteristicDelegate({
         key: 'hue',
         Characteristic: this.Characteristics.hap.Hue,
@@ -261,13 +295,7 @@ class Light extends DeconzService.LightsResource {
     }
 
     if (this.capabilities.effects != null) {
-      this.addCharacteristicDelegate({
-        key: 'exposeEffects',
-        value: true
-      })
-      if (this.values.exposeEffects) {
-        this.exposeEffects()
-      }
+      this.exposeEffects()
     }
 
     if (this.resource.rtype === 'lights') {
@@ -279,57 +307,29 @@ class Light extends DeconzService.LightsResource {
   }
 
   exposeEffects () {
-    this.effectServices = {}
-    this.addCharacteristicDelegate({
-      key: 'effect',
-      value: -1,
+    const effectString = this.addCharacteristicDelegate({
+      key: 'effectString',
+      value: 'none',
       silent: true
-    }).on('didSet', (value) => {
-      for (const i in this.capabilities.effects) {
-        this.effectServices[i].values.on = value === i
-      }
     })
-    for (const id in this.capabilities.effects) {
-      const effect = this.capabilities.effects[id]
-      const service = new ServiceDelegate(this.accessoryDelegate, {
-        name: this.resource.body.name + ' ' + effect,
-        Service: this.Services.hap.Lightbulb,
-        subtype: (this.subtype == null ? 'E' : this.subtype + '-E') + id
-      })
-      service.addCharacteristicDelegate({
-        key: 'on',
-        Characteristic: this.Characteristics.hap.On
-      }).on('didSet', (value, fromHomeKit) => {
-        service.values.lastActivation =
-          this.accessoryDelegate.historyService.lastActivationValue(History.now())
-        if (fromHomeKit) {
-          this.checkAdaptiveLighting()
-          this.values.effect = value ? id : -1
-          const newEffect = value
-            ? effect.toLowerCase()
-            : 'none'
-          this.put({ effect: newEffect })
-        }
-      })
-      service.addCharacteristicDelegate({
-        key: 'index',
-        Characteristic: this.Characteristics.hap.ServiceLabelIndex,
-        value: Number(id) + 1
-      })
-      service.addCharacteristicDelegate({
-        key: 'lastActivation',
-        Characteristic: this.Characteristics.eve.LastActivation,
-        silent: true
-      })
-      this.effectServices[id] = service
-
-      this.characteristicDelegate('configuredName')
-        .on('didSet', (value) => {
-          for (const id in this.capabilities.effects) {
-            this.effectServices[id].values.configuredName = value +
-              ' ' + this.capabilities.effects[id]
+    for (const id in this.resource.body.capabilities.color.effects) {
+      const effect = this.resource.body.capabilities.color.effects[id]
+      const characteristicName = effect[0].toUpperCase() + effect.slice(1) + 'Effect'
+      if (this.Characteristics.my[characteristicName] != null) {
+        this.addCharacteristicDelegate({
+          key: effect,
+          Characteristic: this.Characteristics.my[characteristicName]
+        }).on('didSet', (value, fromHomeKit) => {
+          if (fromHomeKit) {
+            this.checkAdaptiveLighting()
+            this.put({ effect: value ? effect : 'none' })
+            this.values.effectString = value ? effect : 'none'
           }
         })
+        effectString.on('didSet', (value) => {
+          this.values[effect] = value === effect
+        })
+      }
     }
     // if (this.capabilities.effectSpeed) {
     //   this.addCharacteristicDelegate({
@@ -403,9 +403,8 @@ class Light extends DeconzService.LightsResource {
           break
         case 'effect':
           this.values.colorLoop = value === 'colorloop'
-          if (this.capabilities.effects != null) {
-            const effectName = value[0].toUpperCase() + value.slice(1)
-            this.values.effect = '' + this.capabilities.effects.indexOf(effectName)
+          if (this.capabilities.effects) {
+            this.values.effectString = value
           }
           break
         case 'hue':
@@ -430,8 +429,10 @@ class Light extends DeconzService.LightsResource {
           break
         case 'xy':
           if (
-            !this.recentlyUpdated &&
-            (this.values.colormode !== 'ct' || this.capabilities.computesXy)
+            !this.recentlyUpdated && (
+              this.values.colormode !== 'ct' ||
+              this.resource.body?.capabilities?.color?.ct?.computesXy
+            )
           ) {
             const { h, s } = xyToHsv(value, this.capabilities.gamut)
             this.values.hue = h

package/lib/DeconzService/Power.js

@@ -15,10 +15,10 @@ const { dateToString } = Deconz.ApiClient
   */
 class Power extends DeconzService.SensorsResource {
   static addResource (service, resource) {
-    if (service.values.currentConsumption === undefined) {
+    if (service.values.consumption === undefined) {
       service.addCharacteristicDelegate({
-        key: 'currentConsumption',
-        Characteristic: service.Characteristics.eve.CurrentConsumption,
+        key: 'consumption',
+        Characteristic: service.Characteristics.eve.Consumption,
         unit: ' W'
       })
     }
@@ -46,12 +46,13 @@ class Power extends DeconzService.SensorsResource {
         silent: true
       })
     }
-    service.update(resource.body, resource.rpath)
+
+    Power.updateResourceState(service, resource.body.state)
   }
 
   static updateResourceState (service, state) {
     if (state.power != null) {
-      service.values.currentConsumption = state.power
+      service.values.consumption = state.power
     }
     if (state.current != null) {
       service.values.electricCurrent = state.current / 1000

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge deCONZ",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -21,12 +21,12 @@
     "ui": "cli/ui.js"
   },
   "engines": {
-    "deCONZ": "2.19.3",
+    "deCONZ": "2.20.1",
     "homebridge": "^1.6.0",
-    "node": "^18.14.2"
+    "node": "^18.15.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.11",
+    "homebridge-lib": "~6.3.12",
     "ws": "^8.12.1",
     "xml2js": "~0.4.23"
   },