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

package/CHANGELOG.md

@@ -6,11 +6,11 @@
 
 # CHANGELOG
 
-**Version 2.2.21** - November 2023<br/>
-- HUE Light: added DPT 9.002 for direkt kelvin selection, with HUE range (2000K-6535K). There is another DPT 7.600 with the KNX scale (0K-6553K) avaiable.<br/>
+**Version 2.2.22** - 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/>
-- WARNING: the new HUE Light options are to be considered BETA (= in testing with user feedback)<br/>
+- The fontawesome JS is now locally referenced.<br/>
+- WARNING: the new HUE Light options are to be considered **BETA (= in testing with user feedback)**.<br/>
 
 **Version 2.2.20** - November 2023<br/>
 - Fixed a cross site js script loading, affecting the node running under HomeAssistant.<br/>

package/nodes/hue-config.js

@@ -422,6 +422,10 @@ module.exports = (RED) => {
       try {
         // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
         const serverNode = RED.nodes.getNode(req.query.nodeID); // Retrieve node.id of the config node.
+        if (serverNode === null) {
+          RED.log.error(`Warn KNXUltimateGetResourcesHUE serverNode is null`);
+          res.json({ devices: `serverNode not set` });
+        }
         const jRet = serverNode.getResources(req.query.rtype);
         if (jRet !== undefined) {
           res.json(jRet);
@@ -430,7 +434,7 @@ module.exports = (RED) => {
         }
         // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
       } catch (error) {
-        RED.log.error(`Errore KNXUltimateGetResourcesHUE non gestito ${error.message}`);
+        //RED.log.error(`Errore KNXUltimateGetResourcesHUE non gestito ${error.message}`);
         res.json({ devices: error.message });
         // (async () => {
         //   await node.initHUEConnection();

package/nodes/knxUltimateHueLight.html

@@ -74,7 +74,7 @@
       dptLightKelvinState: { value: "" },
 
       specifySwitchOnBrightness: { value: "yes" },
-      colorAtSwitchOnDayTime: { value: '{"red":255, "green":255, "blue":255}' },
+      colorAtSwitchOnDayTime: { value: '{"red":255, "green":200, "blue":180}' },
 
       enableDayNightLighting: { value: "no" },
       colorAtSwitchOnNightTime: { value: '{"red":23, "green":4, "blue":0}' },
@@ -946,7 +946,7 @@
         <select id="node-input-enableDayNightLighting">
           <option value="temperature">Select temperature and brightness</option>
           <option value="yes">Select color</option>
-          <option value="no">Last status</option>
+          <option value="no">No night lighting</option>
         </select>
       </div>
 

package/nodes/knxUltimateHueLight.js

@@ -36,30 +36,32 @@ module.exports = function (RED) {
     node.hueDevice = config.hueDevice.split("#")[0];
     node.initializingAtStart = (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "yes");
     config.specifySwitchOnBrightness === undefined ? "yes" : config.specifySwitchOnBrightness;
+    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;
+
     // Transform HEX in RGB and stringified json in json oblects.
     if (config.colorAtSwitchOnDayTime.indexOf("#") !== -1) {
-      // Transform to rgb. 
+      // Transform to rgb.
       try {
         config.colorAtSwitchOnDayTime = hueColorConverter.ColorConverter.hexRgb(config.colorAtSwitchOnDayTime.replace("#", ""));
       } catch (error) {
-        config.colorAtSwitchOnDayTime = { red: 255, green: 255, blue: 255 };
+        config.colorAtSwitchOnDayTime = { kelvin: 3000, brightness: 100 };
       }
     } else {
       config.colorAtSwitchOnDayTime = JSON.parse(config.colorAtSwitchOnDayTime);
     }
     // Same thing, but with night color
     if (config.colorAtSwitchOnNightTime.indexOf("#") !== -1) {
-      // Transform to rgb. 
+      // Transform to rgb.
       try {
         config.colorAtSwitchOnNightTime = hueColorConverter.ColorConverter.hexRgb(config.colorAtSwitchOnNightTime.replace("#", ""));
       } catch (error) {
-        config.colorAtSwitchOnNightTime = { red: 12, green: 0, blue: 10 };
+        config.colorAtSwitchOnNightTime = { kelvin: 2700, brightness: 20 };
       }
     } else {
       config.colorAtSwitchOnNightTime = JSON.parse(config.colorAtSwitchOnNightTime);
     }
 
-
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
       fill, shape, text, payload,
@@ -486,10 +488,10 @@ module.exports = function (RED) {
             if (node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && _event.dimming.brightness === 0) {
               // Do nothing, because the light is off and the dimming also is 0
             } else {
-              if (node.currentHUEDevice.on.on === false && (!_event.hasOwnProperty("on") || (_event.hasOwnProperty("on") && _event.on.on === true))) node.updateKNXLightState(_event.dimming.brightness > 0);
+              if (node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && (!_event.hasOwnProperty("on") || (_event.hasOwnProperty("on") && _event.on.on === true))) node.updateKNXLightState(_event.dimming.brightness > 0);
               node.updateKNXBrightnessState(_event.dimming.brightness);
               // If the brightness reaches zero, the hue lamp "on" property must be set to zero as well
-              if (_event.dimming.brightness === 0) {
+              if (_event.dimming.brightness === 0 && node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === true) {
                 node.serverHue.hueManager.writeHueQueueAdd(
                   node.hueDevice,
                   { on: { on: false } },
@@ -512,6 +514,7 @@ module.exports = function (RED) {
           shape: "dot",
           text: `HUE->KNX error ${node.id} ${error.message}`,
         });
+        RED.log.error(`knxUltimateHueLight: node.handleSendHUE = (_event): ${error.message}`);
       }
     };
 

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.21",
+  "version": "2.2.22",
   "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",