node-red-contrib-knx-ultimate 2.2.22 → 2.2.24

package/CHANGELOG.md

@@ -6,7 +6,7 @@
 
 # CHANGELOG
 
-**Version 2.2.22** - November 2023<br/>
+**Version 2.2.24** - November 2023<br/>
 - HUE Light: added DPT 9.002 for direct kelvin selection, with HUE range (2000K-6535K). There is another DPT 7.600 with the KNX scale (0K-6553K) avaiable.<br/>
 - NEW: HUE Light: now you can choose the "switch on" behaviour between color and temperature (in Kelvin) + brightness.<br/>
 - The fontawesome JS is now locally referenced.<br/>

package/nodes/knxUltimateHueLight.html

@@ -73,11 +73,11 @@
       GALightKelvinState: { value: "" },
       dptLightKelvinState: { value: "" },
 
-      specifySwitchOnBrightness: { value: "yes" },
-      colorAtSwitchOnDayTime: { value: '{"red":255, "green":200, "blue":180}' },
+      specifySwitchOnBrightness: { value: "temperature" },
+      colorAtSwitchOnDayTime: { value: '{"kelvin":3000, "brightness":100 }' },
 
       enableDayNightLighting: { value: "no" },
-      colorAtSwitchOnNightTime: { value: '{"red":23, "green":4, "blue":0}' },
+      colorAtSwitchOnNightTime: { value: '{ "kelvin":2700, "brightness":20 }' },
 
       invertDayNight: { value: false },
 
@@ -454,6 +454,8 @@
 
       // Calculate kelvin/color
       let json;
+      this.colorAtSwitchOnDayTime = this.colorAtSwitchOnDayTime.replace("geen", "green"); // Old bug in "geen" property
+      this.colorAtSwitchOnNightTime = this.colorAtSwitchOnNightTime.replace("geen", "green"); // Old bug in "geen" property
       try {
         json = JSON.parse(this.colorAtSwitchOnDayTime);
       } catch (error) { }
@@ -461,13 +463,19 @@
         // Kelvin
         $("#comboTemperatureAtSwitchOn").val(json.kelvin);
         $("#comboBrightnessAtSwitchOn").val(json.brightness);
+        if (this.specifySwitchOnBrightness !== 'no') $("#node-input-specifySwitchOnBrightness").val('temperature'); // Adjust in case of mismatch (from old geen bug)
       } else if (json !== undefined && json.red !== undefined) {
         // Must transform RGB into HTML HEX color
-        $("#node-input-colorAtSwitchOnDayTime").val("#" + rgbHex(json.red, json.green, json.blue));
+        try {
+          $("#node-input-colorAtSwitchOnDayTime").val("#" + rgbHex(json.red, json.green, json.blue));
+        } catch (error) {
+        }
         $("#colorPickerDay").val($("#node-input-colorAtSwitchOnDayTime").val());
+        if (this.specifySwitchOnBrightness !== 'no') $("#node-input-specifySwitchOnBrightness").val('yes'); // Adjust in case of mismatch (from old geen bug)
       } else {
         // It's already an HEX color
         $("#colorPickerDay").val(this.colorAtSwitchOnDayTime);
+        if (this.specifySwitchOnBrightness !== 'no') $("#node-input-specifySwitchOnBrightness").val('yes'); // Adjust in case of mismatch (from old geen bug)
       }
       //Night
       json = undefined;
@@ -478,15 +486,22 @@
         // Kelvin
         $("#comboTemperatureAtSwitchOnNightTime").val(json.kelvin);
         $("#comboBrightnessAtSwitchOnNightTime").val(json.brightness);
+        if (this.enableDayNightLighting !== 'no') $("#node-input-enableDayNightLighting").val('temperature'); // Adjust in case of mismatch (from old geen bug)
       } else if (json !== undefined && json.red !== undefined) {
         // Must transform RGB into HTML HEX color
-        $("#node-input-colorAtSwitchOnNightTime").val("#" + rgbHex(json.red, json.green, json.blue));
+        try {
+          $("#node-input-colorAtSwitchOnNightTime").val("#" + rgbHex(json.red, json.green, json.blue));
+        } catch (error) {
+        }
         $("#colorPickerNight").val($("#node-input-colorAtSwitchOnNightTime").val());
+        if (this.enableDayNightLighting !== 'no') $("#node-input-enableDayNightLighting").val('yes'); // Adjust in case of mismatch (from old geen bug)
       } else {
         // It's already an HEX color
         $("#colorPickerNight").val(this.colorAtSwitchOnNightTime);
+        if (this.enableDayNightLighting !== 'no') $("#node-input-enableDayNightLighting").val('yes'); // Adjust in case of mismatch (from old geen bug)
       }
 
+
       $("#comboTemperatureAtSwitchOn, #comboBrightnessAtSwitchOn").on("change", function () {
         $("#node-input-colorAtSwitchOnDayTime").val('{ "kelvin":' + $("#comboTemperatureAtSwitchOn").val() + ', "brightness":' + $("#comboBrightnessAtSwitchOn").val() + ' }');
       });

package/nodes/knxUltimateHueLight.js

@@ -35,10 +35,12 @@ module.exports = function (RED) {
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
     node.hueDevice = config.hueDevice.split("#")[0];
     node.initializingAtStart = (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "yes");
-    config.specifySwitchOnBrightness === undefined ? "yes" : config.specifySwitchOnBrightness;
+    config.specifySwitchOnBrightness = (config.specifySwitchOnBrightness === undefined || config.specifySwitchOnBrightness === '') ? "temperature" : config.specifySwitchOnBrightness;
+    config.specifySwitchOnBrightnessNightTime = (config.specifySwitchOnBrightnessNightTime === undefined || config.specifySwitchOnBrightnessNightTime === '') ? "no" : config.specifySwitchOnBrightnessNightTime;
     config.colorAtSwitchOnDayTime = (config.colorAtSwitchOnDayTime === '' || config.colorAtSwitchOnDayTime === undefined) ? '{ "kelvin":3000, "brightness":100 }' : config.colorAtSwitchOnDayTime;
     config.colorAtSwitchOnNightTime = (config.colorAtSwitchOnNightTime === '' || config.colorAtSwitchOnNightTime === undefined) ? '{ "kelvin":2700, "brightness":20 }' : config.colorAtSwitchOnNightTime;
-
+    config.colorAtSwitchOnDayTime = config.colorAtSwitchOnDayTime.replace("geen", "green");
+    config.colorAtSwitchOnNightTime = config.colorAtSwitchOnNightTime.replace("geen", "green");
     // Transform HEX in RGB and stringified json in json oblects.
     if (config.colorAtSwitchOnDayTime.indexOf("#") !== -1) {
       // Transform to rgb.

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.22",
+  "version": "2.2.24",
   "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 control.",
   "dependencies": {
     "binary-parser": "2.2.1",