node-red-contrib-knx-ultimate 2.1.32 → 2.1.33

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.1.33</b> - July 2023<br/>
+- HUE Light: fix for lights not supporting GAMUT.<br/>
+</p>
 <p>
 <b>Version 2.1.32</b> - July 2023<br/>
 - NEW: Hue Battery Sensor: you can now get the battery level of all your battery powered HUE devices.<br/>

package/nodes/knxUltimateHueLight.js

@@ -54,7 +54,10 @@ module.exports = function (RED) {
                 // The user selected specific color/brightness at switch on.
                 let jColorChoosen = { red: 255, green: 255, blue: 255 }
                 jColorChoosen = JSON.parse(config.colorAtSwitchOnDayTime || '{ "red": 255, "green": 255, "blue": 255 }')
-                let dgamut = node.currentHUEDevice !== undefined ? node.currentHUEDevice.color.gamut_type : null
+                let dgamut = null
+                if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                  dgamut = node.currentHUEDevice.color.gamut_type
+                }
                 let dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, dgamut)
                 let dbright = hueColorConverter.ColorConverter.getBrightnessFromRGB(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue)
                 state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } }
@@ -68,7 +71,10 @@ module.exports = function (RED) {
               if (config.enableDayNightLighting === true && !node.DayTime) {
                 let jColorChoosen = { red: 23, green: 4, blue: 0 }
                 jColorChoosen = JSON.parse(config.colorAtSwitchOnNightTime || '{ "red": 23, "green": 4, "blue": 0 }')
-                let dgamut = node.currentHUEDevice !== undefined ? node.currentHUEDevice.color.gamut_type : null
+                let dgamut = null
+                if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                  dgamut = node.currentHUEDevice.color.gamut_type
+                }
                 let dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, dgamut)
                 let dbright = hueColorConverter.ColorConverter.getBrightnessFromRGB(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue)
                 state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } }
@@ -145,7 +151,10 @@ module.exports = function (RED) {
             break
           case config.GALightColor:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColor))
-            const gamut = node.currentHUEDevice !== undefined ? node.currentHUEDevice.color.gamut_type : null
+            let gamut = null
+            if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+              gamut = node.currentHUEDevice.color.gamut_type
+            }
             const retXY = hueColorConverter.ColorConverter.rgbToXy(msg.payload.red, msg.payload.green, msg.payload.blue, gamut)
             const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(msg.payload.red, msg.payload.green, msg.payload.blue)
             //state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } }
@@ -185,7 +194,10 @@ module.exports = function (RED) {
                   const red = getRandomIntInclusive(0, 255)
                   const green = getRandomIntInclusive(0, 255)
                   const blue = getRandomIntInclusive(0, 255)
-                  const gamut = node.currentHUEDevice !== undefined ? node.currentHUEDevice.color.gamut_type : null
+                  let gamut = null
+                  if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty('color') && node.currentHUEDevice.color.hasOwnProperty('gamut_type')) {
+                    gamut = node.currentHUEDevice.color.gamut_type
+                  }
                   const retXY = hueColorConverter.ColorConverter.rgbToXy(red, green, blue, gamut)
                   const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(red, green, blue)
                   state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } }

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.1.32",
+  "version": "2.1.33",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable. With integrated Philips HUE devices handling.",
   "dependencies": {
     "mkdirp": "3.0.1",