node-red-contrib-knx-ultimate 2.2.26 → 2.2.28

package/CHANGELOG.md

@@ -6,6 +6,18 @@
 
 # CHANGELOG
 
+**Version 2.2.28** - November 2023<br/>
+This is an interim version, to quick fix some issues. Please report any issue with HUE Nodes, on gitHub.<br/>
+- HUE Light: fixed an issue where dimming down with the light switched off, causes the brightness status to jump to 100%, thus the light remains off.<br/>
+- HUE Light: Fixed some errors, if all devices belonging to a group, have only the dimming capability.<br/>
+- WARNING: the new HUE Light options are to be considered **BETA (= in testing with user feedback)**.<br/>
+
+**Version 2.2.27** - November 2023<br/>
+This is an interim version, to quick fix some issues. Please report any issue with HUE Nodes, on gitHub.<br/>
+- HUE Light: the UI now changes, to adapt to lamp type.<br/>
+- HUE Light: "Get current" color button, now works for grouped light as well, by reading the first light belongin to the group.<br/>
+- WARNING: the new HUE Light options are to be considered **BETA (= in testing with user feedback)**.<br/>
+
 **Version 2.2.26** - November 2023<br/>
 This is an interim version, to quick fix some issues. Please report any issue with HUE Nodes, on gitHub.<br/>
 - HUE Light: fixed some spurious node status errors.<br/>

package/nodes/hue-config.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 /* eslint-disable no-lonely-if */
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-inner-declarations */
@@ -170,7 +171,7 @@ module.exports = (RED) => {
     // Query the HUE Bridge to return the resources
     node.loadResourcesFromHUEBridge = async () => {
       if (node.linkStatus === "disconnected") return;
-      //(async () => {
+      // (async () => {
       // °°°°°° Load ALL resources
       try {
         node.hueAllResources = await node.hueManager.hueApiV2.get("/resource");
@@ -226,24 +227,19 @@ module.exports = (RED) => {
     node.getFirstLightInGroup = function getFirstLightInGroup(_groupID) {
       if (node.hueAllResources === undefined || node.hueAllResources === null) return;
       try {
-        // Find the group
         const group = node.hueAllResources.filter((a) => a.id === _groupID)[0];
-        if (group === null || group === undefined) return;
         const owner = node.hueAllResources.filter((a) => a.id === group.owner.rid)[0];
-        if (owner.children !== undefined && owner.children.length > 0) {
-          const firstLightId = owner.children.find((a) => a.rtype === "light").rid;
-          if (firstLightId !== undefined && firstLightId !== null) {
-            const firstLight = node.hueAllResources.find((a) => a.id === firstLightId);
-            if (firstLight !== null && firstLight !== undefined) {
-              return firstLight;
-            } else {
-              return;
-            }
+        if (owner.children !== undefined) {
+          const dev = node.hueAllResources.filter((a) => a.id === owner.children[0].rid)[0];
+          if (dev.type === "device" && dev.services !== undefined) {
+            const lightID = dev.services.filter((a) => a.rtype === 'light')[0].rid;
+            const oLight = node.hueAllResources.filter((a) => a.id === lightID)[0];
+            return oLight;
+          } else if (dev.type === "light") {
+            return dev;
           }
         }
-      } catch (error) {
-
-      }
+      } catch (error) { }
     };
 
     // Returns the cached devices (node.hueAllResources) by type.
@@ -445,18 +441,64 @@ module.exports = (RED) => {
 
     RED.httpAdmin.get("/knxUltimateGetHueColor", RED.auth.needsPermission("hue-config.read"), (req, res) => {
       try {
-        const hexColor = node.getColorFromHueLight(req.query.id);
-        res.json(hexColor);
+        // find wether the light is a light or is grouped_light
+        let hexColor;
+        const _oDevice = node.hueAllResources.filter((a) => a.id === req.query.id)[0];
+        if (_oDevice.type === "light") {
+          hexColor = node.getColorFromHueLight(req.query.id);
+        } else {
+          // grouped_light, get the first light in the group
+          const oLight = node.getFirstLightInGroup(_oDevice.id);
+          hexColor = node.getColorFromHueLight(oLight.id);
+        }
+        res.json(hexColor !== undefined ? hexColor : "Select the device first!");
       } 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);
+        // find wether the light is a light or is grouped_light
+        let kelvinValue;
+        const _oDevice = node.hueAllResources.filter((a) => a.id === req.query.id)[0];
+        if (_oDevice.type === "light") {
+          kelvinValue = node.getKelvinFromHueLight(req.query.id);
+        } else {
+          // grouped_light, get the first light in the group
+          const oLight = node.getFirstLightInGroup(_oDevice.id);
+          kelvinValue = node.getKelvinFromHueLight(oLight.id);
+        }
+        res.json(kelvinValue !== undefined ? kelvinValue : "Select the device first!");
       } catch (error) {
         res.json("Select the device first!");
+      };
+    });
+
+    RED.httpAdmin.get("/knxUltimateGetLightObject", RED.auth.needsPermission("hue-config.read"), (req, res) => {
+      try {
+        const _lightId = req.query.id;
+        const oLight = node.hueAllResources.filter((a) => a.id === _lightId)[0];
+        // Infer some useful info, so the HTML part cann avoid to query the server
+        // Kelvin
+        try {
+          if (oLight.color_temperature !== undefined && oLight.color_temperature.mirek !== undefined) {
+            oLight.calculatedKelvin = hueColorConverter.ColorConverter.mirekToKelvin(oLight.color_temperature.mirek);
+          }
+        } catch (error) {
+          oLight.calculatedKelvin = undefined;
+        }
+        // HEX value from XYBri
+        try {
+          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();
+          oLight.calculatedHEXColor = ret;
+        } catch (error) {
+          oLight.calculatedHEXColor = undefined;
+        }
+        res.json(oLight);
+      } catch (error) {
+        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`KNXUltimateHue: hueEngine: knxUltimateGetLightObject: error ${error.message}. Resources still loading. Try later.`);
+        res.json({});
       }
     });
 
@@ -486,6 +528,15 @@ module.exports = (RED) => {
       }
     });
 
+    RED.httpAdmin.get("/knxUltimateGetFirstLightInGroup", RED.auth.needsPermission("hue-config.read"), (req, res) => {
+      try {
+        res.json(node.getFirstLightInGroup(req.query.id));
+      } catch (error) {
+        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`KNXUltimateHue: hueEngine: knxUltimateGetFirstLightInGroup: error ${error.message}`);
+        res.json({});
+      }
+    });
+
     RED.httpAdmin.get("/knxUltimateDpts", RED.auth.needsPermission("hue-config.read"), (req, res) => {
       try {
         const dpts = Object.entries(dptlib).filter(onlyDptKeys).map(extractBaseNo).sort(sortBy("base")).reduce(toConcattedSubtypes, []);

package/nodes/knxUltimateHueLight.html

@@ -1,108 +1,14 @@
 <!-- <script type="application/javascript;charset=utf-8" src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 <script type="application/javascript;charset=utf-8" src="https://cdn.jsdelivr.net/npm/@jaames/iro@5"></script> -->
+
+'use strict'
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
 
 <script type="text/javascript">
+  (function () {
 
-  RED.nodes.registerType("knxUltimateHueLight", {
-    category: "KNX Ultimate",
-    color: "#C0C7E9",
-    defaults: {
-      //buttonState: {value: true},
-      server: { type: "knxUltimate-config", required: false },
-      serverHue: { type: "hue-config", required: true },
-      name: { value: "" },
-
-      nameLightSwitch: { value: "" },
-      GALightSwitch: { value: "" },
-      dptLightSwitch: { value: "" },
-
-      nameLightState: { value: "" },
-      GALightState: { value: "" },
-      dptLightState: { value: "" },
-
-      nameLightDIM: { value: "" },
-      GALightDIM: { value: "" },
-      dptLightDIM: { value: "" },
-
-      nameLightColor: { value: "" },
-      GALightColor: { value: "" },
-      dptLightColor: { value: "" },
-
-      nameLightColorState: { value: "" },
-      GALightColorState: { value: "" },
-      dptLightColorState: { value: "" },
-
-      nameLightHSV: { value: "" },
-      GALightHSV: { value: "" },
-      dptLightHSV: { value: "" },
-
-      nameLightHSVPercentage: { value: "" },
-      GALightHSVPercentage: { value: "" },
-      dptLightHSVPercentage: { value: "" },
-
-      nameLightHSVState: { value: "" },
-      GALightHSVState: { value: "" },
-      dptLightHSVState: { value: "" },
-
-      nameLightBrightness: { value: "" },
-      GALightBrightness: { value: "" },
-      dptLightBrightness: { value: "" },
-
-      nameLightBrightnessState: { value: "" },
-      GALightBrightnessState: { value: "" },
-      dptLightBrightnessState: { value: "" },
-
-      nameLightBlink: { value: "" },
-      GALightBlink: { value: "" },
-      dptLightBlink: { value: "" },
-
-      nameLightColorCycle: { value: "" },
-      GALightColorCycle: { value: "" },
-      dptLightColorCycle: { value: "" },
-
-      nameDaylightSensor: { value: "" },
-      GADaylightSensor: { value: "" },
-      dptDaylightSensor: { value: "" },
-
-      nameLightKelvin: { value: "" },
-      GALightKelvin: { value: "" },
-      dptLightKelvin: { value: "" },
-
-      nameLightKelvinState: { value: "" },
-      GALightKelvinState: { value: "" },
-      dptLightKelvinState: { value: "" },
-
-      specifySwitchOnBrightness: { value: "temperature" },
-      colorAtSwitchOnDayTime: { value: '{"kelvin":3000, "brightness":100 }' },
-
-      enableDayNightLighting: { value: "no" },
-      colorAtSwitchOnNightTime: { value: '{ "kelvin":2700, "brightness":20 }' },
-
-      invertDayNight: { value: false },
-
-      updateKNXBrightnessStatusOnHUEOnOff: { value: "no" },
-      dimSpeed: { value: 5000, required: false },
-      minDimLevelLight: { value: 10, required: false },
-      maxDimLevelLight: { value: 100, required: false },
-      readStatusAtStartup: { value: "yes" },
-      enableNodePINS: { value: "no" },
-
-      outputs: { value: 0 },
-      inputs: { value: 0 },
-
-      hueDevice: { value: "" },
-      hueDeviceObject: { value: {} },
-    },
-    inputs: 0,
-    outputs: 0,
-    icon: "node-hue-icon.svg",
-    label: function () {
-      return this.name;
-    },
-    paletteLabel: "Hue Light (beta)",
-    oneditprepare: function () {
-      var node = this;
+    function onEditPrepare(node) {
+      // var node = node;
       var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
       var oNodeServerHue = RED.nodes.node($("#node-input-serverHue").val()); // Store the config-node
 
@@ -134,19 +40,19 @@
       // 19/02/2020 Used to get the server sooner als deploy.
       $("#node-input-server").change(function () {
         try {
-          oNodeServer = RED.nodes.node($(this).val());
+          oNodeServer = RED.nodes.node($(node).val());
         } catch (error) { }
       });
       // 19/02/2020 Used to get the server sooner als deploy.
       $("#node-input-serverHue").change(function () {
         try {
-          oNodeServerHue = RED.nodes.node($(this).val());
+          oNodeServerHue = RED.nodes.node($(node).val());
         } catch (error) { }
       });
 
       // 31/03/2020 Search Helper
       function fullSearch(sourceText, searchString) {
-        // This searches for all words in a string
+        // node searches for all words in a string
         var aSearchWords = searchString.toLowerCase().split(" ");
         var i = 0;
         for (let index = 0; index < aSearchWords.length; index++) {
@@ -158,6 +64,7 @@
       function getDPT(_dpt, _destinationWidget) {
         // DPT Switch command
         // ########################
+        $(_destinationWidget).empty();
         $.getJSON("knxUltimateDpts", (data) => {
           data.forEach((dpt) => {
             if (dpt.value.startsWith(_dpt)) {
@@ -172,7 +79,7 @@
             }
           });
           // Eval
-          const format = "this." + _destinationWidget.replace("#node-input-", "");
+          const format = "node." + _destinationWidget.replace("#node-input-", "");
           try {
             if (format !== undefined) $(_destinationWidget).val(eval(format).toString());
           } catch (error) { }
@@ -267,57 +174,138 @@
       getGroupAddress("#node-input-GALightKelvinState", "#node-input-nameLightKelvinState", "#node-input-dptLightKelvinState", " 9.002");
 
 
+      // Get the HUE capabilities to enable/disable UI parts
+      $.getJSON("knxUltimateGetLightObject?id=" + $("#node-input-hueDevice").val().split("#")[0], (data) => {
+        let oLight = data;
+        // Check if grouped, to hide/show the "Get current" buttons
+        if (oLight.type === "grouped_light") {
+          $("#tabs").tabs("enable", "#tabs-4");
+          $("#tabs").tabs("enable", "#tabs-3");
+          $("#tabs").tabs("enable", "#tabs-2");
+          $("#getColorAtSwitchOnDayTimeButton").show();
+          $("#getColorAtSwitchOnNightTimeButton").show();
+          $("#node-input-specifySwitchOnBrightness").empty().append(
+            $("<option>")
+              .val("no")
+              .text("Last status")
+          ).append(
+            $("<option>")
+              .val("yes")
+              .text("Select color")
+          ).append(
+            $("<option>")
+              .val("temperature")
+              .text("Select temperature and brightness")
+          );
+          $("#node-input-enableDayNightLighting").empty().append(
+            $("<option>")
+              .val("no")
+              .text("No")
+          ).append(
+            $("<option>")
+              .val("yes")
+              .text("Select color")
+          ).append(
+            $("<option>")
+              .val("temperature")
+              .text("Select temperature and brightness")
+          );
+          $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
+          $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
+          return;
+        } else {
 
-      // Autocomplete suggestion with HUE Lights
-      $("#node-input-name").autocomplete({
-        minLength: 1,
-        source: function (request, response) {
-          $.getJSON("KNXUltimateGetResourcesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
-            response(
-              $.map(data.devices, function (value, key) {
-                //alert(JSON.stringify(value) + " "+ key)
-                var sSearch = value.name;
-                if (!value.name.includes("I'm still connecting")) {
-                  if (fullSearch(sSearch, request.term)) {
-                    return {
-                      hueDevice: value.id,
-                      value: value.name,
-                    };
-                  } else {
-                    return null;
-                  }
-                } else {
-                  return {
-                    hueDevice: value.id,
-                    value: value.name,
-                  };
-                }
-              })
-            );
-          });
-        },
-        select: function (event, ui) {
-          // Distinguish between group of lights an single light.
-          if (ui.item.value.toLowerCase().startsWith("grouped_light")) {
-            $("#node-input-hueDevice").val(ui.item.hueDevice + "#grouped_light");
-            $("#getColorAtSwitchOnDayTimeButton").hide();
-            $("#getColorAtSwitchOnNightTimeButton").hide();
-          } else {
-            $("#node-input-hueDevice").val(ui.item.hueDevice + "#light");
-            $("#getColorAtSwitchOnDayTimeButton").show();
-            $("#getColorAtSwitchOnNightTimeButton").show();
-          }
-          $("#tabs").show();
-        },
+          $("#getColorAtSwitchOnDayTimeButton").show();
+          $("#getColorAtSwitchOnNightTimeButton").show();
+          $("#node-input-specifySwitchOnBrightness").empty().append(
+            $("<option>")
+              .val("no")
+              .text("Last status")
+          );
+          $("#node-input-enableDayNightLighting").empty().append(
+            $("<option>")
+              .val("no")
+              .text("No")
+          );
+        }
+        $("#tabs").tabs("disable", "#tabs-4");
+        $("#tabs").tabs("disable", "#tabs-3");
+        $("#tabs").tabs("disable", "#tabs-2");
+        $("#divColorsAtSwitchOn").hide();
+        $("#divColorsAtSwitchOnNightTime").hide();
+        $("#divTemperatureAtSwitchOn").hide();
+        $("#divTemperatureAtSwitchOnNightTime").hide();
+        $("#divColorCycle").hide();
+        $("#divUpdateKNXBrightnessStatusOnHUEOnOff").hide();
+        $("#divMinMaxBrightness").hide();
+        $("#comboTemperatureAtSwitchOn").hide();
+        $("#comboTemperatureAtSwitchOnNightTime").hide();
+
+        // Enable options/tabs one by one
+        if (oLight.color !== undefined) {
+          $("#tabs").tabs("enable", "#tabs-4");
+          $("#divColorsAtSwitchOn").show();
+          $("#divColorsAtSwitchOnNightTime").show();
+          $("#divColorCycle").show();
+          $("#node-input-specifySwitchOnBrightness").append(
+            $("<option>")
+              .val("yes")
+              .text("Select color")
+          );
+          $("#node-input-enableDayNightLighting").append(
+            $("<option>")
+              .val("yes")
+              .text("Select color")
+          );
+        }
+        // Check temperature (if the light supports temperature, it support dimming as well)
+        if (oLight.color_temperature !== undefined) {
+          $("#tabs").tabs("enable", "#tabs-3");
+          $("#tabs").tabs("enable", "#tabs-2");
+          $("#node-input-specifySwitchOnBrightness").append(
+            $("<option>")
+              .val("temperature")
+              .text("Select temperature and brightness")
+          );
+          $("#node-input-enableDayNightLighting").append(
+            $("<option>")
+              .val("temperature")
+              .text("Select temperature and brightness")
+          );
+          $("#divTemperatureAtSwitchOn").show();
+          $("#divTemperatureAtSwitchOnNightTime").show();
+          $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
+          $("#divMinMaxBrightness").show();
+          $("#comboTemperatureAtSwitchOn").show();
+          $("#comboTemperatureAtSwitchOnNightTime").show();
+        } else {
+          $("#tabs").tabs("enable", "#tabs-2");
+          $("#node-input-specifySwitchOnBrightness").append(
+            $("<option>")
+              .val("temperature")
+              .text("Select brightness")
+          );
+          $("#node-input-enableDayNightLighting").append(
+            $("<option>")
+              .val("temperature")
+              .text("Select brightness")
+          );
+          $("#comboTemperatureAtSwitchOn").val(0);
+          $("#comboTemperatureAtSwitchOnNightTime").val(0);
+          $("#divTemperatureAtSwitchOn").show();
+          $("#divTemperatureAtSwitchOnNightTime").show();
+          $("#divUpdateKNXBrightnessStatusOnHUEOnOff").show();
+          $("#divMinMaxBrightness").show();
+        }
+        $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
+        $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
       });
 
-
-
       // Show/Hide the div of the color at swich on
-      if (this.specifySwitchOnBrightness === "yes") {
+      if (node.specifySwitchOnBrightness === "yes") {
         $("#divColorsAtSwitchOn").show();
         $("#divTemperatureAtSwitchOn").hide();
-      } else if (this.specifySwitchOnBrightness === "temperature") {
+      } else if (node.specifySwitchOnBrightness === "temperature") {
         $("#divColorsAtSwitchOn").hide();
         $("#divTemperatureAtSwitchOn").show();
       } else {
@@ -340,12 +328,12 @@
       });
 
       // Show/Hide and enable/disable day/night Lighting behaviour
-      if (this.enableDayNightLighting === "yes") {
+      if (node.enableDayNightLighting === "yes") {
         $("#divEnableDayNightLighting").show();
         $("#divCCSBoxAtNightLighting").css({ border: "1px solid dimgrey", "border-radius": "12px", padding: "5px" }); // Add little box to better understand the property page
         $("#divColorsAtSwitchOnNightTime").show();
         $("#divTemperatureAtSwitchOnNightTime").hide();
-      } else if (this.enableDayNightLighting === "temperature") {
+      } else if (node.enableDayNightLighting === "temperature") {
         $("#divEnableDayNightLighting").show();
         $("#divCCSBoxAtNightLighting").css({ border: "1px solid dimgrey", "border-radius": "12px", padding: "5px" }); // Add little box to better understand the property page
         $("#divColorsAtSwitchOnNightTime").hide();
@@ -374,79 +362,6 @@
         }
       });
 
-
-      // Get the HUE capabilities to enable/disable UI parts
-      $.getJSON("KNXUltimateGetResourcesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
-        data.devices.forEach((element) => {
-          if (element.id === this.hueDevice.split("#")[0] && element.deviceObject !== undefined) {
-
-            // Check color
-            if (element.deviceObject.color_temperature === undefined) $("#tabs").tabs("disable", "#tabs-3");
-            if (element.deviceObject.color === undefined || JSON.stringify(deviceObject.color) === "{}") {
-              $("#tabs").tabs("disable", "#tabs-4");
-              $("#divColorsAtSwitchOn").hide();
-              $("#divColorCycle").hide();
-              $("#node-input-specifySwitchOnBrightness").empty().append(
-                $("<option>")
-                  .val("no")
-                  .text("Last status")
-              ).append(
-                $("<option>")
-                  .val("temperature")
-                  .text("Select temperature and brightness")
-              );
-              $("#node-input-specifySwitchOnBrightness").val(this.specifySwitchOnBrightness).trigger('change');
-
-              $("#node-input-enableDayNightLighting").empty().append(
-                $("<option>")
-                  .val("no")
-                  .text("Last status")
-              ).append(
-                $("<option>")
-                  .val("temperature")
-                  .text("Select temperature and brightness")
-              );
-              $("#node-input-enableDayNightLighting").val(this.enableDayNightLighting).trigger('change');
-            }
-
-            // Check dimming
-            if (element.deviceObject.dimming === undefined) {
-              $("#tabs").tabs("disable", "#tabs-2");
-              $("#divColorsAtSwitchOn").hide();
-              $("#divColorCycle").hide();
-              $("#divUpdateKNXBrightnessStatusOnHUEOnOff").hide();
-              $("#divCCSBoxAtNightLighting").hide();
-              $("#node-input-specifySwitchOnBrightness").val("no");
-              $("#node-input-enableDayNightLighting").val("no");
-              $("#divMinMaxBrightness").hide();
-              $("#node-input-specifySwitchOnBrightness").empty().append(
-                $("<option>")
-                  .val("no")
-                  .text("Last status")
-              )
-              $("#node-input-specifySwitchOnBrightness").val(this.specifySwitchOnBrightness).trigger('change');
-
-              $("#node-input-enableDayNightLighting").empty().append(
-                $("<option>")
-                  .val("no")
-                  .text("Last status")
-              )
-            }
-            $("#node-input-enableDayNightLighting").val(this.enableDayNightLighting).trigger('change');
-
-            // Check if grouped, to hide/show the "Get current" buttons
-            if (element.deviceObject.type === "grouped_light") {
-              $("#getColorAtSwitchOnDayTimeButton").hide();
-              $("#getColorAtSwitchOnNightTimeButton").hide();
-            } else {
-              $("#getColorAtSwitchOnDayTimeButton").show();
-              $("#getColorAtSwitchOnNightTimeButton").show();
-            }
-            return;
-          }
-        });
-      });
-
       $("#getColorAtSwitchOnDayTimeButton").on("click", function () {
         $("#getColorAtSwitchOnDayTimeButton").text("Wait...");
         let jRet;
@@ -476,7 +391,7 @@
       });
 
       // Fill options for minDimLevel and maxDimLevel and comboBrightnessAtSwitchOn (for color brightness at switch on, with temperature toghedher)
-      for (let index = 0; index <= 100; index += 5) {
+      for (let index = 100; index >= 0; index -= 5) {
         if (index === 0) {
           $("#node-input-minDimLevelLight").append($("<option>").val(index).text(index.toString() + "% (Switch Off)"));
           $("#comboBrightnessAtSwitchOn").append($("<option>").val(index).text(index.toString() + "% (Switch Off)"));
@@ -519,18 +434,18 @@
 
       // 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
+      node.colorAtSwitchOnDayTime = node.colorAtSwitchOnDayTime.replace("geen", "green"); // Old bug in "geen" property
+      node.colorAtSwitchOnNightTime = node.colorAtSwitchOnNightTime.replace("geen", "green"); // Old bug in "geen" property
       try {
-        json = JSON.parse(this.colorAtSwitchOnDayTime);
+        json = JSON.parse(node.colorAtSwitchOnDayTime);
       } catch (error) {
-        console.log("json = JSON.parse(this.colorAtSwitchOnDayTime) in HTML: " + error.message)
+        console.log("json = JSON.parse(node.colorAtSwitchOnDayTime) in HTML: " + error.message)
       }
       if (json !== undefined && json.kelvin !== undefined) {
         // 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)
+        if (node.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
         try {
@@ -538,22 +453,22 @@
         } 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)
+        if (node.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)
+        $("#colorPickerDay").val(node.colorAtSwitchOnDayTime);
+        if (node.specifySwitchOnBrightness !== 'no') $("#node-input-specifySwitchOnBrightness").val('yes'); // Adjust in case of mismatch (from old geen bug)
       }
       //Night
       json = undefined;
       try {
-        json = JSON.parse(this.colorAtSwitchOnNightTime);
+        json = JSON.parse(node.colorAtSwitchOnNightTime);
       } catch (error) { }
       if (json !== undefined && json.kelvin !== undefined) {
         // 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)
+        if (node.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
         try {
@@ -561,11 +476,11 @@
         } 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)
+        if (node.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)
+        $("#colorPickerNight").val(node.colorAtSwitchOnNightTime);
+        if (node.enableDayNightLighting !== 'no') $("#node-input-enableDayNightLighting").val('yes'); // Adjust in case of mismatch (from old geen bug)
       }
 
 
@@ -585,7 +500,7 @@
       });
 
 
-      $("#node-input-minDimLevelLight").val(this.minDimLevelLight);
+      $("#node-input-minDimLevelLight").val(node.minDimLevelLight);
       for (let index = 100; index >= 10; index--) {
         $("#node-input-maxDimLevelLight").append(
           $("<option>")
@@ -593,106 +508,248 @@
             .text(index.toString() + "%")
         );
       }
-      $("#node-input-maxDimLevelLight").val(this.maxDimLevelLight);
-
-      if (this.hueDevice !== "") $("#tabs").show(); // Light options
+      $("#node-input-maxDimLevelLight").val(node.maxDimLevelLight);
 
-    },
-    oneditsave: function () {
-      //RED.sidebar.removeTab("tabNRColor");
-      //RED.sidebar.show("help");
-      if ($("#node-input-enableNodePINS").val() === "yes") {
-        this.outputs = 1;
-        this.inputs = 1;
-      } else {
-        this.outputs = 0;
-        this.inputs = 0;
-      }
-    },
-    oneditcancel: function () {
-      //RED.sidebar.removeTab("tabNRColor");
-      //RED.sidebar.show("help");
-    }
-  });
+      if (node.hueDevice !== "") $("#tabs").show(); // Light options
 
 
 
+      // Autocomplete suggestion with HUE Lights
+      $("#node-input-name").autocomplete({
+        minLength: 1,
+        source: function (request, response) {
+          $.getJSON("KNXUltimateGetResourcesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
+            response(
+              $.map(data.devices, function (value, key) {
+                //alert(JSON.stringify(value) + " "+ key)
+                var sSearch = value.name;
+                if (!value.name.includes("I'm still connecting")) {
+                  if (fullSearch(sSearch, request.term)) {
+                    return {
+                      hueDevice: value.id,
+                      value: value.name,
+                    };
+                  } else {
+                    return null;
+                  }
+                } else {
+                  return {
+                    hueDevice: value.id,
+                    value: value.name,
+                  };
+                }
+              })
+            );
+          });
+        },
+        select: function (event, ui) {
+          // Distinguish between group of lights an single light.
+          if (ui.item.value.toLowerCase().startsWith("grouped_light")) {
+            $("#node-input-hueDevice").val(ui.item.hueDevice + "#grouped_light");
+          } else {
+            $("#node-input-hueDevice").val(ui.item.hueDevice + "#light");
+          }
+          onEditPrepare(node);
+          $("#tabs").show();
+        },
+      });
+    }
 
-  function rgbHex(red, green, blue, alpha) {
-    const toHex = (red, green, blue, alpha) => ((blue | green << 8 | red << 16) | 1 << 24).toString(16).slice(1) + alpha;
-    const parseCssRgbString = (input) => {
-      const parts = input.replace(/rgba?\(([^)]+)\)/, '$1').split(/[,\s/]+/).filter(Boolean);
-      if (parts.length < 3) {
-        return;
+    RED.nodes.registerType("knxUltimateHueLight", {
+      category: "KNX Ultimate",
+      color: "#C0C7E9",
+      defaults: {
+        //buttonState: {value: true},
+        server: { type: "knxUltimate-config", required: false },
+        serverHue: { type: "hue-config", required: true },
+        name: { value: "" },
+
+        nameLightSwitch: { value: "" },
+        GALightSwitch: { value: "" },
+        dptLightSwitch: { value: "" },
+
+        nameLightState: { value: "" },
+        GALightState: { value: "" },
+        dptLightState: { value: "" },
+
+        nameLightDIM: { value: "" },
+        GALightDIM: { value: "" },
+        dptLightDIM: { value: "" },
+
+        nameLightColor: { value: "" },
+        GALightColor: { value: "" },
+        dptLightColor: { value: "" },
+
+        nameLightColorState: { value: "" },
+        GALightColorState: { value: "" },
+        dptLightColorState: { value: "" },
+
+        nameLightHSV: { value: "" },
+        GALightHSV: { value: "" },
+        dptLightHSV: { value: "" },
+
+        nameLightHSVPercentage: { value: "" },
+        GALightHSVPercentage: { value: "" },
+        dptLightHSVPercentage: { value: "" },
+
+        nameLightHSVState: { value: "" },
+        GALightHSVState: { value: "" },
+        dptLightHSVState: { value: "" },
+
+        nameLightBrightness: { value: "" },
+        GALightBrightness: { value: "" },
+        dptLightBrightness: { value: "" },
+
+        nameLightBrightnessState: { value: "" },
+        GALightBrightnessState: { value: "" },
+        dptLightBrightnessState: { value: "" },
+
+        nameLightBlink: { value: "" },
+        GALightBlink: { value: "" },
+        dptLightBlink: { value: "" },
+
+        nameLightColorCycle: { value: "" },
+        GALightColorCycle: { value: "" },
+        dptLightColorCycle: { value: "" },
+
+        nameDaylightSensor: { value: "" },
+        GADaylightSensor: { value: "" },
+        dptDaylightSensor: { value: "" },
+
+        nameLightKelvin: { value: "" },
+        GALightKelvin: { value: "" },
+        dptLightKelvin: { value: "" },
+
+        nameLightKelvinState: { value: "" },
+        GALightKelvinState: { value: "" },
+        dptLightKelvinState: { value: "" },
+
+        specifySwitchOnBrightness: { value: "temperature" },
+        colorAtSwitchOnDayTime: { value: '{"kelvin":3000, "brightness":100 }' },
+
+        enableDayNightLighting: { value: "no" },
+        colorAtSwitchOnNightTime: { value: '{ "kelvin":2700, "brightness":20 }' },
+
+        invertDayNight: { value: false },
+
+        updateKNXBrightnessStatusOnHUEOnOff: { value: "no" },
+        dimSpeed: { value: 5000, required: false },
+        minDimLevelLight: { value: 10, required: false },
+        maxDimLevelLight: { value: 100, required: false },
+        readStatusAtStartup: { value: "yes" },
+        enableNodePINS: { value: "no" },
+
+        outputs: { value: 0 },
+        inputs: { value: 0 },
+
+        hueDevice: { value: "" },
+        hueDeviceObject: { value: {} },
+      },
+      inputs: 0,
+      outputs: 0,
+      icon: "node-hue-icon.svg",
+      label: function () {
+        return this.name;
+      },
+      paletteLabel: "Hue Light (beta)",
+      oneditprepare: function () {
+        onEditPrepare(this);
+      },
+      oneditsave: function () {
+        //RED.sidebar.removeTab("tabNRColor");
+        //RED.sidebar.show("help");
+        if ($("#node-input-enableNodePINS").val() === "yes") {
+          this.outputs = 1;
+          this.inputs = 1;
+        } else {
+          this.outputs = 0;
+          this.inputs = 0;
+        }
+      },
+      oneditcancel: function () {
+        //RED.sidebar.removeTab("tabNRColor");
+        //RED.sidebar.show("help");
       }
+    });
+
 
-      const parseValue = (value, max) => {
-        value = value.trim();
 
-        if (value.endsWith('%')) {
-          return Math.min(Number.parseFloat(value) * max / 100, max);
+
+    function rgbHex(red, green, blue, alpha) {
+      const toHex = (red, green, blue, alpha) => ((blue | green << 8 | red << 16) | 1 << 24).toString(16).slice(1) + alpha;
+      const parseCssRgbString = (input) => {
+        const parts = input.replace(/rgba?\(([^)]+)\)/, '$1').split(/[,\s/]+/).filter(Boolean);
+        if (parts.length < 3) {
+          return;
         }
 
-        return Math.min(Number.parseFloat(value), max);
-      };
+        const parseValue = (value, max) => {
+          value = value.trim();
 
-      const red = parseValue(parts[0], 255);
-      const green = parseValue(parts[1], 255);
-      const blue = parseValue(parts[2], 255);
-      let alpha;
+          if (value.endsWith('%')) {
+            return Math.min(Number.parseFloat(value) * max / 100, max);
+          }
 
-      if (parts.length === 4) {
-        alpha = parseValue(parts[3], 1);
-      }
+          return Math.min(Number.parseFloat(value), max);
+        };
 
-      return [red, green, blue, alpha];
-    };
+        const red = parseValue(parts[0], 255);
+        const green = parseValue(parts[1], 255);
+        const blue = parseValue(parts[2], 255);
+        let alpha;
 
-    let isPercent = (red + (alpha || '')).toString().includes('%');
+        if (parts.length === 4) {
+          alpha = parseValue(parts[3], 1);
+        }
+
+        return [red, green, blue, alpha];
+      };
+
+      let isPercent = (red + (alpha || '')).toString().includes('%');
 
-    if (typeof red === 'string' && !green) { // Single string parameter.
-      const parsed = parseCssRgbString(red);
-      if (!parsed) {
-        throw new TypeError('Invalid or unsupported color format.');
+      if (typeof red === 'string' && !green) { // Single string parameter.
+        const parsed = parseCssRgbString(red);
+        if (!parsed) {
+          throw new TypeError('Invalid or unsupported color format.');
+        }
+
+        isPercent = false;
+        [red, green, blue, alpha] = parsed;
+      } else if (alpha !== undefined) {
+        alpha = Number.parseFloat(alpha);
       }
 
-      isPercent = false;
-      [red, green, blue, alpha] = parsed;
-    } else if (alpha !== undefined) {
-      alpha = Number.parseFloat(alpha);
-    }
+      if (typeof red !== 'number'
+        || typeof green !== 'number'
+        || typeof blue !== 'number'
+        || red > 255
+        || green > 255
+        || blue > 255
+      ) {
+        throw new TypeError('Expected three numbers below 256');
+      }
 
-    if (typeof red !== 'number'
-      || typeof green !== 'number'
-      || typeof blue !== 'number'
-      || red > 255
-      || green > 255
-      || blue > 255
-    ) {
-      throw new TypeError('Expected three numbers below 256');
-    }
+      if (typeof alpha === 'number') {
+        if (!isPercent && alpha >= 0 && alpha <= 1) {
+          alpha = Math.round(255 * alpha);
+        } else if (isPercent && alpha >= 0 && alpha <= 100) {
+          alpha = Math.round(255 * alpha / 100);
+        } else {
+          throw new TypeError(`Expected alpha value (${alpha}) as a fraction or percentage`);
+        }
 
-    if (typeof alpha === 'number') {
-      if (!isPercent && alpha >= 0 && alpha <= 1) {
-        alpha = Math.round(255 * alpha);
-      } else if (isPercent && alpha >= 0 && alpha <= 100) {
-        alpha = Math.round(255 * alpha / 100);
+        alpha = (alpha | 1 << 8).toString(16).slice(1); // eslint-disable-line no-mixed-operators
       } else {
-        throw new TypeError(`Expected alpha value (${alpha}) as a fraction or percentage`);
+        alpha = '';
       }
 
-      alpha = (alpha | 1 << 8).toString(16).slice(1); // eslint-disable-line no-mixed-operators
-    } else {
-      alpha = '';
+      return toHex(red, green, blue, alpha);
     }
 
-    return toHex(red, green, blue, alpha);
-  }
-
+  }())
 
 </script>
 
-
 <script type="text/html" data-template-name="knxUltimateHueLight">
 
 <div class="form-row">
@@ -1003,9 +1060,9 @@
         <i class="fa fa-tag"></i> Switch on behaviour
       </label>
       <select id="node-input-specifySwitchOnBrightness">
-        <option value="temperature">Select temperature and brightness</option>
-        <option value="yes">Select color</option>
         <option value="no">Last status</option>
+        <!-- <option value="temperature">Select temperature and brightness</option>
+        <option value="yes">Select color</option> -->
       </select>
     </div>
 
@@ -1019,8 +1076,8 @@
     <div class="form-row" id="divTemperatureAtSwitchOn" hidden>
       <label for="node-input-colorAtSwitchOnDayTime" style="width:260px">
       </label>
-      <select style="width:180px;" id="comboTemperatureAtSwitchOn"></select>
-      <select  style="width:180px;" id="comboBrightnessAtSwitchOn"></select>      
+      <select style="width:12%;" id="comboTemperatureAtSwitchOn"></select>
+      <select  style="width:25%;" id="comboBrightnessAtSwitchOn"></select>      
     </div>
 
     <div id="divCCSBoxAtNightLighting">
@@ -1029,9 +1086,9 @@
           <i class="fa fa-clone"></i> Night Lighting
         </label>
         <select id="node-input-enableDayNightLighting">
-          <option value="temperature">Select temperature and brightness</option>
-          <option value="yes">Select color</option>
           <option value="no">No night lighting</option>
+          <!-- <option value="temperature">Select temperature and brightness</option>
+          <option value="yes">Select color</option> -->
         </select>
       </div>
 
@@ -1110,7 +1167,10 @@
   <br />
   </script>
 
+
 <script type="text/markdown" data-help-name="knxUltimateHueLight">
+
+
 <p>This node lets you control your Philips HUE light and grouped lights and also gets the states of this lights, to be sent to the KNX bus.</p>
 
 **General**
@@ -1194,4 +1254,4 @@ The Dimming function works in **KNX mode `start` and `stop`**. To start dimming,
 [Find it useful?](https://www.paypal.me/techtoday)
 
 <br/>
-</script>-
+</script>

package/nodes/knxUltimateHueLight.js

@@ -99,36 +99,56 @@ module.exports = function (RED) {
           case config.GALightSwitch:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightSwitch));
             if (msg.payload === true) {
-              // Check wether the user selected specific color/brightness at switch on.
-              let jColorChoosen = null;
-              if (node.DayTime === true && (config.specifySwitchOnBrightness === "yes" || config.specifySwitchOnBrightness === "temperature")) {
-                jColorChoosen = config.colorAtSwitchOnDayTime;
-              } else if (node.DayTime === false && (config.enableDayNightLighting === "yes" || config.enableDayNightLighting === "temperature")) {
-                jColorChoosen = config.colorAtSwitchOnNightTime;
+              let colorChoosen;
+              let temperatureChoosen;
+              let brightnessChoosen;
+              // The light must support the temperature (in this case, colorAtSwitchOnNightTime is an object {kelvin:xx, brightness:yy})
+              if (node.currentHUEDevice.color_temperature !== undefined) {
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "temperature") {
+                  temperatureChoosen = config.colorAtSwitchOnDayTime.kelvin;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "temperature") {
+                  temperatureChoosen = config.colorAtSwitchOnNightTime.kelvin;
+                }
+              }
+              if (node.currentHUEDevice.dimming !== undefined) {
+                // Check wether the user selected specific brightness at switch on (in this case, colorAtSwitchOnNightTime is an object {kelvin:xx, brightness:yy})
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "temperature") {
+                  brightnessChoosen = config.colorAtSwitchOnDayTime.brightness;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "temperature") {
+                  brightnessChoosen = config.colorAtSwitchOnNightTime.brightness;
+                }
+              }
+              if (node.currentHUEDevice.color !== undefined) {
+                // Check wether the user selected specific color at switch on (in this case, colorAtSwitchOnDayTime is a text with HTML web color)
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "yes") {
+                  colorChoosen = config.colorAtSwitchOnDayTime;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "yes") {
+                  colorChoosen = config.colorAtSwitchOnNightTime;
+                }
               }
 
-              // Now we have a jColorChoosen. Proceed illuminating the light
-              if (jColorChoosen !== null && jColorChoosen.kelvin === undefined) {
-                // RGB
+              if (colorChoosen !== undefined) {
+                // Now we have a jColorChoosen. Proceed illuminating the light
                 let gamut = null;
-                if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty("color") && node.currentHUEDevice.color.hasOwnProperty("gamut_type")) {
+                if (node.currentHUEDevice.color.gamut_type !== undefined) {
                   gamut = node.currentHUEDevice.color.gamut_type;
                 }
-                const dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, gamut);
-                const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGBOrHex(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue);
+                const dretXY = hueColorConverter.ColorConverter.rgbToXy(colorChoosen.red, colorChoosen.green, colorChoosen.blue, gamut);
+                const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGBOrHex(colorChoosen.red, colorChoosen.green, colorChoosen.blue);
                 node.currentHUEDevice.dimming.brightness = Math.round(dbright, 0);
                 node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                 state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } };
-              } if (jColorChoosen !== null && jColorChoosen.kelvin !== undefined) {
+              } else if (temperatureChoosen !== undefined) {
                 // Kelvin
-                const dbright = jColorChoosen.brightness;
-                const mirek = hueColorConverter.ColorConverter.kelvinToMirek(jColorChoosen.kelvin);
+                const mirek = hueColorConverter.ColorConverter.kelvinToMirek(temperatureChoosen);
                 node.currentHUEDevice.color_temperature.mirek = mirek;
-                node.currentHUEDevice.dimming.brightness = dbright;
+                node.currentHUEDevice.dimming.brightness = brightnessChoosen;
                 node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                 // Kelvin temp
-                state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color_temperature: { mirek: mirek } } : { on: { on: false } };
-              } else if (jColorChoosen === null || jColorChoosen === undefined) {
+                state = brightnessChoosen > 0 ? { on: { on: true }, dimming: { brightness: brightnessChoosen }, color_temperature: { mirek: mirek } } : { on: { on: false } };
+              } else if (brightnessChoosen !== undefined) {
+                state = brightnessChoosen > 0 ? { on: { on: true }, dimming: { brightness: brightnessChoosen } } : { on: { on: false } };
+              } else {
                 state = { on: { on: true } };
               }
             } else {
@@ -238,8 +258,8 @@ module.exports = function (RED) {
             let gamut = null;
             if (
               node.currentHUEDevice !== undefined
-              && node.currentHUEDevice.hasOwnProperty("color")
-              && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+              && node.currentHUEDevice.color !== undefined
+              && node.currentHUEDevice.color.gamut_type !== undefined
             ) {
               gamut = node.currentHUEDevice.color.gamut_type;
             }
@@ -305,8 +325,8 @@ module.exports = function (RED) {
                     let gamut = null;
                     if (
                       node.currentHUEDevice !== undefined
-                      && node.currentHUEDevice.hasOwnProperty("color")
-                      && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+                      && node.currentHUEDevice.color !== undefined
+                      && node.currentHUEDevice.color.gamut_type !== undefined
                     ) {
                       gamut = node.currentHUEDevice.color.gamut_type;
                     }
@@ -411,7 +431,7 @@ module.exports = function (RED) {
           if (node.brightnessStep > maxDimLevelLight) node.brightnessStep = maxDimLevelLight;
           hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs } };
           // Switch on the light if off
-          if (node.currentHUEDevice.hasOwnProperty("on") !== undefined && node.currentHUEDevice.on.on === false) {
+          if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === false) {
             hueTelegram.on = { on: true };
           }
           node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
@@ -419,6 +439,7 @@ module.exports = function (RED) {
         }, _dimSpeedInMillisecs);
       }
       if (_KNXbrightness_delta > 0 && _KNXaction === 0) {
+        if (node.currentHUEDevice.on.on === false) return; // Don't dim down, if the light is already off.
         // DIM DOWN
         if (node.timerStepDim !== undefined) clearInterval(node.timerStepDim);
         node.timerStepDim = setInterval(() => {
@@ -427,7 +448,7 @@ module.exports = function (RED) {
           if (node.brightnessStep < minDimLevelLight) node.brightnessStep = minDimLevelLight;
           hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs } };
           // Switch off the light if on
-          if (node.currentHUEDevice.hasOwnProperty("on") !== undefined && node.currentHUEDevice.on.on === true && node.brightnessStep === 0) {
+          if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === true && node.brightnessStep === 0) {
             hueTelegram.on = { on: false };
           }
           node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
@@ -445,7 +466,7 @@ module.exports = function (RED) {
       let hueTelegram = {};
       _dimSpeedInMillisecs = _dimSpeedInMillisecs === undefined || _dimSpeedInMillisecs === "" ? 5000 : _dimSpeedInMillisecs;
       let delta = 0;
-      if (!node.currentHUEDevice.color_temperature.hasOwnProperty("mirek")) delta = 347 - Math.round(173, 0); // Unable to read the mirek, set medium as default
+      if (node.currentHUEDevice.color_temperature.mirek === undefined) delta = 347 - Math.round(173, 0); // Unable to read the mirek, set medium as default
       // We have also minDimLevelLight and maxDimLevelLight to take care of.
       // Mirek limits are not taken in consideration.
       // Maximum mirek is 347
@@ -456,12 +477,12 @@ module.exports = function (RED) {
         return;
       }
       if (_KNXbrightness_delta > 0 && _KNXaction === 1) {
-        if (node.currentHUEDevice.color_temperature.hasOwnProperty("mirek")) delta = 347 - Math.round(node.currentHUEDevice.color_temperature.mirek, 0);
+        if (node.currentHUEDevice.color_temperature.mirek !== undefined) delta = 347 - Math.round(node.currentHUEDevice.color_temperature.mirek, 0);
         dimDirection = "up";
       }
       if (_KNXbrightness_delta > 0 && _KNXaction === 0) {
         // Set the minumum delta, taking care of the minimum brightness specified either in the HUE lamp itself, or specified by the user (parameter node.minDimLevelLight)
-        if (node.currentHUEDevice.color_temperature.hasOwnProperty("mirek")) delta = Math.round(node.currentHUEDevice.color_temperature.mirek, 0);
+        if (node.currentHUEDevice.color_temperature.mirek !== undefined) delta = Math.round(node.currentHUEDevice.color_temperature.mirek, 0);
         dimDirection = "down";
       }
       // Calculate the dimming time based on delta
@@ -471,7 +492,7 @@ module.exports = function (RED) {
 
       hueTelegram = { color_temperature_delta: { action: dimDirection, mirek_delta: delta }, dynamics: { duration: _dimSpeedInMillisecs } };
       // Switch on the light if off
-      if (node.currentHUEDevice.hasOwnProperty("on") !== undefined && node.currentHUEDevice.on.on === false && dimDirection === "up") {
+      if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === false && dimDirection === "up") {
         hueTelegram.on = { on: true };
       }
       node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
@@ -506,17 +527,17 @@ module.exports = function (RED) {
             try {
               const firstLightInGroup = node.serverHue.getFirstLightInGroup(_event.id);
               if (firstLightInGroup !== null && firstLightInGroup !== undefined) {
-                if (_event.color === undefined || Object.keys(_event.color).length === 0) {
+                if (_event.color === undefined) {
                   _event.color = firstLightInGroup.color;
                 }
-                if (_event.color_temperature === undefined || Object.keys(_event.color_temperature).length === 0) {
+                if (_event.color_temperature === undefined) {
                   _event.color_temperature = firstLightInGroup.color_temperature;
                 }
               }
             } catch (error) { }
           }
 
-          if (_event.hasOwnProperty("on")) {
+          if (_event.on !== undefined) {
             node.updateKNXLightState(_event.on.on);
             // In case of switch off, set the dim to zero
             if (_event.on.on === false && (config.updateKNXBrightnessStatusOnHUEOnOff === undefined || config.updateKNXBrightnessStatusOnHUEOnOff === "onhueoff")) {
@@ -524,7 +545,7 @@ module.exports = function (RED) {
               //node.currentHUEDevice.dimming.brightness = 0;
             } else if (_event.on.on === true && node.currentHUEDevice.on.on === false) {
               // Turn on always update the dimming KNX Status value as well.
-              let brightVal = 100;
+              let brightVal = 50;
               if (node.currentHUEDevice.dimming !== undefined && node.currentHUEDevice.dimming.brightness !== undefined) brightVal = node.currentHUEDevice.dimming.brightness;
               node.updateKNXBrightnessState(brightVal);
             }
@@ -536,17 +557,17 @@ module.exports = function (RED) {
             node.currentHUEDevice.color = _event.color;
           }
 
-          if (_event.hasOwnProperty("dimming") && _event.dimming.brightness !== undefined) {
-            // Every once on a time, the light transmit the brightness value of 0.39.
+          if (_event.dimming !== undefined && _event.dimming.brightness !== undefined) {
+            // Once upon n a time, the light transmit the brightness value of 0.39.
             // To avoid wrongly turn light state on, exit
             if (_event.dimming.brightness < 1) _event.dimming.brightness = 0;
-            if (node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && _event.dimming.brightness === 0) {
+            if (node.currentHUEDevice.on !== undefined && 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.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && (!_event.hasOwnProperty("on") || (_event.hasOwnProperty("on") && _event.on.on === true))) node.updateKNXLightState(_event.dimming.brightness > 0);
+              if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === false && (!_event.on !== undefined || (_event.on !== undefined && _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 && node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === true) {
+              if (_event.dimming.brightness === 0 && node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === true) {
                 node.serverHue.hueManager.writeHueQueueAdd(
                   node.hueDevice,
                   { on: { on: false } },
@@ -557,7 +578,7 @@ module.exports = function (RED) {
               node.currentHUEDevice.dimming.brightness = _event.dimming.brightness;
             }
           }
-          if (_event.hasOwnProperty("color_temperature") && _event.color_temperature.mirek !== undefined) {
+          if (_event.color_temperature !== undefined && _event.color_temperature.mirek !== undefined) {
             node.updateKNXLightHSVState(_event.color_temperature.mirek);
             node.updateKNXLightKelvinState(_event.color_temperature.mirek);
             node.currentHUEDevice.color_temperature.mirek = _event.color_temperature.mirek;
@@ -666,7 +687,7 @@ module.exports = function (RED) {
 
     node.updateKNXLightColorState = function updateKNXLightColorState(_value, _outputtype = "write") {
       if (config.GALightColorState !== undefined && config.GALightColorState !== "") {
-        if (!_value.hasOwnProperty('xy') || _value.xy.x === undefined) return;
+        if (_value.xy === undefined || _value.xy.x === undefined) return;
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightColorState;
         knxMsgPayload.dpt = config.dptLightColorState;

package/package.json

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