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

package/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 # CHANGELOG
 
+**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/>
+
 **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

@@ -319,14 +319,26 @@ module.exports = (RED) => {
       }
     };
 
-    // Query HUE Bridge and get the updated color.
+    // Get current color in HEX (used in html)
     node.getColorFromHueLight = (_lightId) => {
       try {
         const oLight = node.hueAllResources.filter((a) => a.id === _lightId)[0];
-        const ret = hueColorConverter.ColorConverter.xyBriToRgb(oLight.color.xy.x, oLight.color.xy.y, oLight.dimming.brightness);
+        const retRGB = hueColorConverter.ColorConverter.xyBriToRgb(oLight.color.xy.x, oLight.color.xy.y, oLight.dimming.brightness);
+        const ret = "#" + hueColorConverter.ColorConverter.rgbHex(retRGB.r, retRGB.g, retRGB.b).toString();
+        return ret;
+      } catch (error) {
+        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.warn(`KNXUltimateHue: hueEngine: getColorFromHueLight: error ${error.message}`);
+        return {};
+      }
+    };
+    // Get current Kelvin (used in html)
+    node.getKelvinFromHueLight = (_lightId) => {
+      try {
+        const oLight = node.hueAllResources.filter((a) => a.id === _lightId)[0];
+        const ret = { kelvin: hueColorConverter.ColorConverter.mirekToKelvin(oLight.color_temperature.mirek), brightness: Math.round(oLight.dimming.brightness, 0) };
         return JSON.stringify(ret);
       } catch (error) {
-        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`KNXUltimateHue: hueEngine: getColorFromHueLight: error ${error.message}`);
+        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`KNXUltimateHue: hueEngine: getKelvinFromHueLight: error ${error.message}`);
         return {};
       }
     };
@@ -391,8 +403,16 @@ module.exports = (RED) => {
 
     RED.httpAdmin.get("/knxUltimateGetHueColor", RED.auth.needsPermission("hue-config.read"), (req, res) => {
       try {
-        const rgbColor = node.getColorFromHueLight(req.query.id);
-        res.json(rgbColor);
+        const hexColor = node.getColorFromHueLight(req.query.id);
+        res.json(hexColor);
+      } catch (error) {
+        res.json("Select the device first!");
+      }
+    });
+    RED.httpAdmin.get("/knxUltimateGetKelvinColor", RED.auth.needsPermission("hue-config.read"), (req, res) => {
+      try {
+        const jKelvin = node.getKelvinFromHueLight(req.query.id);
+        res.json(jKelvin);
       } catch (error) {
         res.json("Select the device first!");
       }
@@ -402,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);
@@ -410,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/knxUltimateHueBattery.html

@@ -1,3 +1,5 @@
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+
 <script type="text/javascript">
     RED.nodes.registerType('knxUltimateHueBattery', {
         category: "KNX Ultimate",
@@ -227,8 +229,6 @@
 
 
 </script>
-<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
-    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueBattery">
 This node lets you get the battery level from your HUE device. Here you can get the HUE battery level events, that represents a percentage 0-100% value, evetytime the

package/nodes/knxUltimateHueButton.html

@@ -1,3 +1,5 @@
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
+
 <script type="text/javascript">
     RED.nodes.registerType('knxUltimateHueButton', {
         category: "KNX Ultimate",
@@ -404,8 +406,6 @@
 
 
 </script>
-<script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js"
-    crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueButton">
 This node lets you get the events from your HUE button.