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

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!");
       }

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,7 +229,6 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></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,7 +406,6 @@
 
 
 </script>
-<script src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueButton">
 This node lets you get the events from your HUE button.