homebridge-deconz 1.2.7 → 1.2.9

package/lib/Deconz/Resource.js

@@ -410,15 +410,24 @@ class Resource {
       case 'LIDL Livarno Lux':
         this.capabilities.ctMax = 454 // 2200 K
         this.capabilities.ctMin = 153 // 6500 K
-        if (this.model === 'HG06467') { // Xmas light strip
-          this.capabilities.colorLoop = false
-          this.capabilities.hs = true
-          this.capabilities.effects = [
-            'Steady', 'Snow', 'Rainbow', 'Snake',
-            'Twinkle', 'Fireworks', 'Flag', 'Waves',
-            'Updown', 'Vintage', 'Fading', 'Collide',
-            'Strobe', 'Sparkles', 'Carnival', 'Glow'
-          ]
+        break
+      case '_TZE200_s8gkrkxk': // LIDL Xmas light strip
+        if (this.model === 'TS0601') { // Xmas light strip
+          this.manufacturer = 'LIDL Livarno Lux'
+          this.model = 'HG06467'
+          this.body.capabilities.bri = {
+            no_bri_inc: true
+          }
+          this.body.capabilities.color = {
+            effects: [
+              'steady', 'snow', 'rainbow', 'snake',
+              'twinkle', 'fireworks', 'flag', 'waves',
+              'updown', 'vintage', 'fading', 'collide',
+              'strobe', 'sparkles', 'carnival', 'glow'
+            ],
+            effect_colors: 6,
+            effect_speed: true
+          }
         }
         break
       default:

package/lib/DeconzService/Light.js

@@ -11,7 +11,7 @@ import { ServiceDelegate } from 'homebridge-lib/ServiceDelegate'
 import { DeconzService } from '../DeconzService/index.js'
 import '../DeconzService/LightsResource.js'
 
-const { defaultGamut, xyToHsv, hsvToXy, ctToXy } = Colour
+const { defaultGamut, xyToHsv, hsvToXy, ctToXy, hsvToRgb } = Colour
 
 class Light extends DeconzService.LightsResource {
   constructor (accessory, resource, params = {}) {
@@ -26,7 +26,7 @@ class Light extends DeconzService.LightsResource {
         this.resource.body[this.stateKey].hue !== undefined,
       xy: this.resource.body[this.stateKey].xy !== undefined
     }
-    if (this.resource.body.action?.effect !== undefined) {
+    if (this.resource.body?.action?.effect !== undefined) {
       this.capabilities.colorLoop = true
     } else if (this.resource.body?.capabilities?.color?.effects != null) {
       const effects = this.resource.body.capabilities.color.effects
@@ -78,16 +78,18 @@ class Light extends DeconzService.LightsResource {
         }
       })
 
-      this.addCharacteristicDelegate({
-        key: 'brightnessChange',
-        Characteristic: this.Characteristics.my.BrightnessChange,
-        value: 0
-      }).on('didSet', async (value) => {
-        this.putState({ bri_inc: Math.round(value * 254.0 / 100.0) })
-        await timeout(this.platform.config.waitTimeReset)
+      if (!this.resource.body?.capabilities?.bri?.no_bri_inc) {
+        this.addCharacteristicDelegate({
+          key: 'brightnessChange',
+          Characteristic: this.Characteristics.my.BrightnessChange,
+          value: 0
+        }).on('didSet', async (value) => {
+          this.putState({ bri_inc: Math.round(value * 254.0 / 100.0) })
+          await timeout(this.platform.config.waitTimeReset)
+          this.values.brightnessChange = 0
+        })
         this.values.brightnessChange = 0
-      })
-      this.values.brightnessChange = 0
+      }
     }
 
     if (this.capabilities.ct || this.capabilities.xy || this.capabilities.hs) {
@@ -338,8 +340,8 @@ class Light extends DeconzService.LightsResource {
         }).on('didSet', (value, fromHomeKit) => {
           if (fromHomeKit) {
             this.checkAdaptiveLighting()
-            this.putState({ effect: value ? effect : 'none' })
             this.values.effectString = value ? effect : 'none'
+            this.putEffect()
           }
         })
         effectString.on('didSet', (value) => {
@@ -347,44 +349,95 @@ class Light extends DeconzService.LightsResource {
         })
       }
     }
-    // if (this.capabilities.effectSpeed) {
-    //   this.addCharacteristicDelegate({
-    //     key: 'effectSpeed',
-    //     Characteristic: this.Characteristics.my.EffectSpeed,
-    //     value: 50
-    //   }).on('didSet', (value) => {
-    //     this.setEffectSpeed(value)
-    //   })
-    //   this.hk.effectColours = []
-    //   for (let i = 0; i <= 5; i++) {
-    //     const service = new this.Service.Lightbulb(
-    //       this.name + ' Effect Color ' + (i + 1), this.subtype + '-C' + i
-    //     )
-    //     service.addCharacteristicDelegate({
-    //       key: 'on',
-    //       Characteristic: this.Characteristics.hap.On,
-    //       value: true
-    //     }).on('didSet', (value) => {
-    //       this.setEffectOn(i, value)
-    //     })
-    //     service.addCharacteristicDelegate({
-    //       key: 'hue',
-    //       Characteristic: this.Characteristics.hap.Hue,
-    //       value: i * 60
-    //     }).on('didSet', (value) => {
-    //       this.setEffectHue(i, value)
-    //     })
-    //     service.addCharacteristicDelegate({
-    //       key: 'saturation',
-    //       Characteristic: this.Characteristics.hap.Saturation,
-    //       value: 100
-    //     }).on('didSet', (value) => {
-    //       this.setEffectSat(i, value)
-    //     })
-    //     this.effectServices.push(service)
-    //   }
-    // }
-    // this.checkEffect(this.obj.state.effect)
+    if (this.resource.body.capabilities.color.effect_speed) {
+      this.addCharacteristicDelegate({
+        key: 'effectSpeed',
+        Characteristic: this.Characteristics.my.EffectSpeed,
+        unit: '%',
+        value: 50
+      }).on('didSet', (value, fromHomeKit) => {
+        if (fromHomeKit) {
+          this.checkAdaptiveLighting()
+          this.putEffect()
+        }
+      })
+    }
+    if (this.resource.body.capabilities.color.effect_colors != null) {
+      this.effectServices = []
+      for (let i = 0; i < this.resource.body.capabilities.color.effect_colors; i++) {
+        const service = new ServiceDelegate(this.accessory, {
+          name: this.name + ' Effect Color ' + (i + 1),
+          Service: this.Services.hap.Lightbulb,
+          subtype: this.subtype + '-C' + i
+        })
+        service.addCharacteristicDelegate({
+          key: 'on',
+          Characteristic: this.Characteristics.hap.On,
+          value: true
+        }).on('didSet', (value, fromHomeKit) => {
+          if (fromHomeKit) {
+            if (value) {
+              for (let j = 0; j < i; j++) {
+                this.effectServices[j].values.on = true
+              }
+            } else {
+              for (let j = i + 1; j < this.resource.body.capabilities.color.effect_colors; j++) {
+                this.effectServices[j].values.on = false
+              }
+            }
+            this.checkAdaptiveLighting()
+            this.putEffect()
+          }
+        })
+        service.addCharacteristicDelegate({
+          key: 'hue',
+          Characteristic: this.Characteristics.hap.Hue,
+          unit: '°',
+          value: i * 60
+        }).on('didSet', (value, fromHomeKit) => {
+          if (fromHomeKit) {
+            this.checkAdaptiveLighting()
+            this.putEffect()
+          }
+        })
+        service.addCharacteristicDelegate({
+          key: 'saturation',
+          Characteristic: this.Characteristics.hap.Saturation,
+          unit: '%',
+          value: 100
+        }).on('didSet', (value, fromHomeKit) => {
+          if (fromHomeKit) {
+            this.checkAdaptiveLighting()
+            this.putEffect()
+          }
+        })
+        this.effectServices.push(service)
+      }
+    }
+  }
+
+  putEffect () {
+    this.putState({ effect: this.values.effectString })
+    if (this.values.effectString === 'none') {
+      return
+    }
+    if (this.resource.body.capabilities.color.effect_speed) {
+      this.putState({ effectSpeed: this.values.effectSpeed })
+    }
+    if (this.resource.body.capabilities.color.effect_colors != null) {
+      const effectColours = []
+      for (let i = 0; i < this.resource.body.capabilities.color.effect_colors; i++) {
+        const service = this.effectServices[i]
+        if (!service.values.on) {
+          break
+        }
+        const { r, g, b } = hsvToRgb(service.values.hue, service.values.saturation)
+        effectColours.push([Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)])
+      }
+      if (effectColours.length > 0) {
+        this.putState({ effectColours })
+      }
+    }
   }
 
   updateState (state, rpath, stateKey = 'state') {
@@ -426,7 +479,7 @@ class Light extends DeconzService.LightsResource {
           break
         case 'hue':
           if (!this.capabilities.xy) {
-            this.values.hue = value
+            this.values.hue = Math.round(value * 360.0 / 65535.0)
           }
           break
         case 'on':
@@ -444,7 +497,7 @@ class Light extends DeconzService.LightsResource {
           break
         case 'sat':
           if (!this.capabilities.xy) {
-            this.values.hue = value
+            this.values.saturation = Math.round(value / 2.54)
           }
           break
         case 'xy':

package/package.json

@@ -7,7 +7,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "hb-deconz-tools": "~2.0.19",
-    "homebridge-lib": "~7.1.13"
+    "homebridge-lib": "~7.2.0"
   },
   "scripts": {
     "prepare": "standard && rm -rf out && jsdoc -c jsdoc.json",