node-red-contrib-knx-ultimate 2.1.63 → 2.2.1

package/nodes/knxUltimateHueLight.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-param-reassign */
+/* eslint-disable camelcase */
 /* eslint-disable max-len */
 /* eslint-disable no-lonely-if */
 module.exports = function (RED) {
@@ -32,12 +34,16 @@ module.exports = function (RED) {
     node.currentKNXGALightState = false; // Stores the current KNX value for the GA
     node.DayTime = true;
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
-    config.hueDevice = config.hueDevice.split("#")[0];
+    node.hueDevice = config.hueDevice.split("#")[0];
 
     // Used to call the status update from the config node.
-    node.setNodeStatus = ({ fill, shape, text, payload }) => { };
+    node.setNodeStatus = ({
+      fill, shape, text, payload,
+    }) => { };
     // Used to call the status update from the HUE config node.
-    node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
+    node.setNodeStatusHue = ({
+      fill, shape, text, payload,
+    }) => {
       if (payload === undefined) return;
       const dDate = new Date();
       payload = typeof payload === "object" ? JSON.stringify(payload) : payload.toString();
@@ -48,7 +54,7 @@ module.exports = function (RED) {
       fill: "grey",
       shape: "ring",
       text: "Connecting to the Bridge...",
-      payload: ""
+      payload: "",
     });
 
     // This function is called by the hue-config.js
@@ -58,7 +64,7 @@ module.exports = function (RED) {
           fill: "red",
           shape: "ring",
           text: "Rejected KNX message. I'm connecting to the Bridge...",
-          payload: ""
+          payload: "",
         });
         return;
       }
@@ -104,7 +110,7 @@ module.exports = function (RED) {
             } else {
               state = { on: { on: false } };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+            node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
               fill: "green",
               shape: "dot",
@@ -116,22 +122,8 @@ module.exports = function (RED) {
             // { decr_incr: 1, data: 1 } : Start increasing until { decr_incr: 0, data: 0 } is received.
             // { decr_incr: 0, data: 1 } : Start decreasing until { decr_incr: 0, data: 0 } is received.
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightDIM));
-            if (msg.payload.data > 0) {
-              const dimDirection = msg.payload.decr_incr === 1 ? "up" : "down";
-              // First, switch on the light if off
-              if (node.currentHUEDevice.hasOwnProperty('on') !== undefined && node.currentHUEDevice.on.on === false && dimDirection === "up") {
-                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: true } }, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
-              }
-              node.startDimStopper(dimDirection);
-            } else {
-              node.startDimStopper("stop");
-            }
-            node.setNodeStatusHue({
-              fill: "green",
-              shape: "dot",
-              text: "KNX->HUE",
-              payload: msg.payload,
-            });
+            node.hueDimming(msg.payload.decr_incr, msg.payload.data, config.dimSpeed);
+            node.setNodeStatusHue({ fill: "green", shape: "dot", text: "KNX->HUE", payload: JSON.stringify(msg.payload) });
             break;
           case config.GADaylightSensor:
             if (config.enableDayNightLighting === "yes") {
@@ -153,19 +145,9 @@ module.exports = function (RED) {
               // { decr_incr: 1, data: 1 } : Start increasing until { decr_incr: 0, data: 0 } is received.
               // { decr_incr: 0, data: 1 } : Start decreasing until { decr_incr: 0, data: 0 } is received.
               msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSV));
-              if (msg.payload.data > 0) {
-                const dimDirectionTunableWhite = msg.payload.decr_incr === 1 ? "up" : "down";
-                node.startDimStopperTunableWhite(dimDirectionTunableWhite);
-              } else {
-                node.startDimStopperTunableWhite("stop");
-              }
+              node.hueDimmingTunableWhite(msg.payload.decr_incr, msg.payload.data, config.dimSpeed);
+              node.setNodeStatusHue({ fill: "green", shape: "dot", text: "KNX->HUE", payload: JSON.stringify(msg.payload) });
             }
-            node.setNodeStatusHue({
-              fill: "green",
-              shape: "dot",
-              text: "KNX->HUE",
-              payload: msg.payload,
-            });
             break;
           case config.GALightHSVPercentage:
             if (config.dptLightHSVPercentage === "5.001") {
@@ -175,7 +157,7 @@ module.exports = function (RED) {
               const retMirek = hueColorConverter.ColorConverter.scale(msg.payload, [0, 100], [153, 500]);
               msg.payload = retMirek;
               state = { color_temperature: { mirek: msg.payload } };
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+              node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
               node.setNodeStatusHue({
                 fill: "green",
                 shape: "dot",
@@ -201,7 +183,7 @@ module.exports = function (RED) {
               if (node.currentHUEDevice.on.on === false && msg.payload > 0) state.on = { on: true };
               if (node.currentHUEDevice.on.on === true && msg.payload === 0) state.on = { on: false };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+            node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
               fill: "green",
               shape: "dot",
@@ -231,7 +213,7 @@ module.exports = function (RED) {
               if (node.currentHUEDevice.on.on === false && bright > 0) state.on = { on: true };
               if (node.currentHUEDevice.on.on === true && bright === 0) state = { on: { on: false }, dimming: { brightness: bright } };
             }
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+            node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             node.setNodeStatusHue({
               fill: "green",
               shape: "dot",
@@ -250,14 +232,14 @@ module.exports = function (RED) {
                 state = msg.payload === true
                   ? { on: { on: true }, dimming: { brightness: 100 }, dynamics: { duration: 0 } }
                   : { on: { on: false }, dimming: { brightness: 0 }, dynamics: { duration: 0 } };
-                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
               }, 1000);
             } else {
               if (node.timerBlink !== undefined) clearInterval(node.timerBlink);
               node.serverHue.hueManager.writeHueQueueAdd(
-                config.hueDevice,
+                node.hueDevice,
                 { on: { on: false } },
-                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight",
               );
             }
             node.setNodeStatusHue({
@@ -272,9 +254,9 @@ module.exports = function (RED) {
             const gaValColorCycle = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColorCycle));
             if (gaValColorCycle === true) {
               node.serverHue.hueManager.writeHueQueueAdd(
-                config.hueDevice,
+                node.hueDevice,
                 { on: { on: true } },
-                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight",
               );
               node.timerColorCycle = setInterval(() => {
                 try {
@@ -297,15 +279,15 @@ module.exports = function (RED) {
                   const retXY = hueColorConverter.ColorConverter.rgbToXy(red, green, blue, gamut);
                   const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(red, green, blue);
                   state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } };
-                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                  node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
                 } catch (error) { }
               }, 10000);
             } else {
               if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
               node.serverHue.hueManager.writeHueQueueAdd(
-                config.hueDevice,
+                node.hueDevice,
                 { on: { on: false } },
-                node.isGrouped_light === false ? "setLight" : "setGroupedLight"
+                node.isGrouped_light === false ? "setLight" : "setGroupedLight",
               );
             }
             node.setNodeStatusHue({
@@ -329,80 +311,95 @@ module.exports = function (RED) {
 
     // Start dimming
     // ***********************************************************
-    node.timerDim = undefined;
-    node.dimDirection = {};
-    node.timeoutDim = 0;
-    node.startDimStopper = function (_direction) {
-      node.timeoutDim = 0;
-      if (node.timerDim !== undefined) clearInterval(node.timerDim);
-      if (_direction === "stop") {
+    node.hueDimming = function hueDimming(_KNXaction, _KNXbrightness_delta, _dimSpeedInMillisecs = undefined) {
+      let dimDirection = 'stop';
+      let hueTelegram = {};
+      _dimSpeedInMillisecs = (_dimSpeedInMillisecs === undefined || _dimSpeedInMillisecs === '') ? 5000 : _dimSpeedInMillisecs;
+      let delta = 0;
+      const minDimLevelLight = config.minDimLevelLight === undefined ? 3 : config.minDimLevelLight;
+      const maxDimLevelLight = config.maxDimLevelLight === undefined ? 100 : config.maxDimLevelLight;
+
+      // We have also minDimLevelLight and maxDimLevelLight to take care of.
+
+      if (_KNXbrightness_delta === 0 && _KNXaction === 0) {
+        dimDirection = 'stop';
+        hueTelegram = { dimming_delta: { action: dimDirection } };
+        node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
         return;
       }
-      switch (_direction) {
-        case "up":
-          node.dimDirection = { dimming_delta: { action: "up", brightness_delta: 10 } };
-          break;
-        case "down":
-          node.dimDirection = { dimming_delta: { action: "down", brightness_delta: 10 } };
-          break;
-        default:
-          break;
+      if (_KNXbrightness_delta > 0 && _KNXaction === 1) {
+        delta = 100 - Math.round(node.currentHUEDevice.dimming.brightness, 0) - (100 - Number(maxDimLevelLight));
+        dimDirection = 'up';
       }
-      node.timerDim = setInterval(() => {
-        node.timeoutDim += 1;
-        if (node.timeoutDim > 150) {
-          node.timeoutDim = 0;
-          clearInterval(node.timerDim);
-        }
-        node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, node.dimDirection, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
-      }, 700);
+      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)
+        delta = Math.round(node.currentHUEDevice.dimming.brightness, 0) - (minDimLevelLight === 'useHueLightLevel' ? node.currentHUEDevice.dimming.min_dim_level : Number(minDimLevelLight));
+        dimDirection = 'down';
+      }
+      // Calculate the dimming time based on delta
+      // 10000:x=100:delta
+      // x = (10000 * delta) / 100
+      _dimSpeedInMillisecs = Math.round((_dimSpeedInMillisecs * delta) / 100, 0);
+
+      hueTelegram = { dimming_delta: { action: dimDirection, brightness_delta: delta }, dynamics: { duration: _dimSpeedInMillisecs } };
+      // Switch on the light if off
+      if (node.currentHUEDevice.hasOwnProperty('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");
     };
     // ***********************************************************
 
     // Start dimming tunable white
     // mirek: required(integer minimum: 153, maximum: 500)
     // ***********************************************************
-    node.timerDimTunableWhite = undefined;
-    node.dimDirectionTunableWhite = {};
-    node.timeoutDimTunableWhite = 0;
-    node.startDimStopperTunableWhite = function (_direction) {
-      node.timeoutDimTunableWhite = 0;
-      if (node.timerDimTunableWhite !== undefined) clearInterval(node.timerDimTunableWhite);
-      if (_direction === "stop") return;
-      switch (_direction) {
-        case "up":
-          node.dimDirectionTunableWhite = { color_temperature_delta: { action: "up", mirek_delta: 10 } };
-          break;
-        case "down":
-          node.dimDirectionTunableWhite = { color_temperature_delta: { action: "down", mirek_delta: 10 } };
-          break;
-        default:
-          break;
+    node.hueDimmingTunableWhite = function hueDimming(_KNXaction, _KNXbrightness_delta, _dimSpeedInMillisecs = undefined) {
+      let dimDirection = 'stop';
+      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
+      // We have also minDimLevelLight and maxDimLevelLight to take care of.
+      // Mirek limits are not taken in consideration.
+      // Maximum mirek is 347
+      if (_KNXbrightness_delta === 0 && _KNXaction === 0) {
+        dimDirection = 'stop';
+        hueTelegram = { color_temperature_delta: { action: dimDirection } };
+        node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+        return;
       }
-      node.timerDimTunableWhite = setInterval(() => {
-        node.timeoutDimTunableWhite += 1;
-        if (node.timeoutDimTunableWhite > 150) {
-          node.timeoutDimTunableWhite = 0;
-          clearInterval(node.timerDimTunableWhite);
-        }
-        node.serverHue.hueManager.writeHueQueueAdd(
-          config.hueDevice,
-          node.dimDirectionTunableWhite,
-          node.isGrouped_light === false ? "setLight" : "setGroupedLight"
-        );
-      }, 700);
+      if (_KNXbrightness_delta > 0 && _KNXaction === 1) {
+        if (node.currentHUEDevice.color_temperature.hasOwnProperty("mirek")) 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);
+        dimDirection = 'down';
+      }
+      // Calculate the dimming time based on delta
+      // 10000:x=347:delta
+      // x = (10000 * delta) / 347
+      _dimSpeedInMillisecs = Math.round((_dimSpeedInMillisecs * delta) / 347, 0);
+
+      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") {
+        hueTelegram.on = { on: true };
+      }
+      node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
     };
     // ***********************************************************
 
     node.handleSendHUE = (_event) => {
       try {
-        if (_event.id === config.hueDevice) {
+        if (_event.id === node.hueDevice) {
           if (node.currentHUEDevice === undefined) {
             node.setNodeStatusHue({
               fill: "red",
               shape: "ring",
               text: "Rejected HUE message. I'm connecting to the Bridge...",
-              payload: ""
+              payload: "",
             });
             return;
           }
@@ -419,13 +416,9 @@ module.exports = function (RED) {
                 /* empty */
               }
             }
-            if (node.currentHUEDevice !== undefined) node.currentHUEDevice.on = _event.on; // Update the internal object representing the current light
-            return;
           }
           if (_event.hasOwnProperty("color")) {
             node.updateKNXLightColorState(_event.color);
-            if (node.currentHUEDevice !== undefined) node.currentHUEDevice.color = _event.color; // Update the internal object representing the current light
-            return;
           }
           if (_event.hasOwnProperty("dimming")) {
             // Every once on a time, the light transmit the brightness value of 0.39.
@@ -434,29 +427,42 @@ module.exports = function (RED) {
             if (node.currentHUEDevice.hasOwnProperty('on') && node.currentHUEDevice.on.on === false && _event.dimming.brightness === 0) return;
             if (node.currentHUEDevice.on.on === false) node.updateKNXLightState(_event.dimming.brightness > 0);
             node.updateKNXBrightnessState(_event.dimming.brightness);
-            if (node.currentHUEDevice !== undefined) node.currentHUEDevice.dimming = _event.dimming; // Update the internal object representing the current light
             // If the brightness reaches zero, the hue lamp "on" property must be set to zero as well
             if (_event.dimming.brightness === 0) {
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+              node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, { on: { on: false } }, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
             }
-            return;
           }
           if (_event.hasOwnProperty("color_temperature")) {
             node.updateKNXLightHSVState(_event.color_temperature.mirek);
-            if (node.currentHUEDevice !== undefined) node.currentHUEDevice.color_temperature = _event.color_temperature; // Update the internal object representing the current light
-            return;
           }
+
+          // Update the current HUE Device with the new _event
+          function copiaOggettoRicorsivo(objDestinazione, objOrigine) {
+            for (const prop in objOrigine) {
+              if (typeof objOrigine[prop] === "object" && objOrigine[prop] !== null) {
+                // Se la proprietà è un oggetto, copiamola in modo ricorsivo
+                objDestinazione[prop] = objDestinazione[prop] || {};
+                copiaOggettoRicorsivo(objDestinazione[prop], objOrigine[prop]);
+              } else {
+                // Altrimenti, copia il valore della proprietà
+                objDestinazione[prop] = objOrigine[prop];
+              }
+            }
+          }
+          // Copia l'oggettoOrigine nell'oggettoDestinazione mantenendo le proprietà esistenti
+          copiaOggettoRicorsivo(node.currentHUEDevice, _event);
         }
       } catch (error) {
         node.status({
           fill: "red",
           shape: "dot",
-          text: 'HUE->KNX error ' + node.id + ' ' + error.message
+          text: `HUE->KNX error ${node.id} ${error.message}`,
         });
       }
     };
 
-    node.updateKNXBrightnessState = function (_value) {
+    // Leave the name after "function", to avoid <anonymous function> in the stack trace, in caso of errors.
+    node.updateKNXBrightnessState = function updateKNXBrightnessState(_value) {
       if (config.GALightBrightnessState !== undefined && config.GALightBrightnessState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightBrightnessState;
@@ -480,7 +486,8 @@ module.exports = function (RED) {
         });
       }
     };
-    node.updateKNXLightState = function (_value) {
+
+    node.updateKNXLightState = function updateKNXBrightnessState(_value) {
       try {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightState;
@@ -513,7 +520,7 @@ module.exports = function (RED) {
       }
     };
 
-    node.updateKNXLightHSVState = function (_value) {
+    node.updateKNXLightHSVState = function updateKNXLightState(_value) {
       if (config.GALightHSVState !== undefined && config.GALightHSVState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightHSVState;
@@ -541,7 +548,7 @@ module.exports = function (RED) {
       }
     };
 
-    node.updateKNXLightColorState = function (_value) {
+    node.updateKNXLightColorState = function updateKNXLightColorState(_value) {
       if (config.GALightColorState !== undefined && config.GALightColorState !== "") {
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightColorState;
@@ -549,7 +556,7 @@ module.exports = function (RED) {
         knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(
           _value.xy.x,
           _value.xy.y,
-          node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 100
+          node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 100,
         );
         // Send to KNX bus
         if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
@@ -577,30 +584,18 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
-      // I must get the light object, to store it in the node.currentHUEDevice variable
-      // I queue the state request, by passing the callback to call whenever the HUE bridge send me the light status async
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        (async () => {
-          try {
-            node.serverHue.addClient(node);
-            await node.serverHue.hueManager.writeHueQueueAdd(
-              config.hueDevice,
-              null,
-              node.isGrouped_light === false ? "getLight" : "getGroupedLight",
-              (jLight) => {
-                node.currentHUEDevice = jLight;
-                node.setNodeStatusHue({
-                  fill: "blue",
-                  shape: "ring",
-                  text: "Connected. Is on: ",
-                  payload: node.currentHUEDevice.on.on === true,
-                });
-              }
-            );
-          } catch (err) {
-            RED.log.error(`Errore knxUltimateHueLight node.currentHUEDevice ${err.message}`);
-          }
-        })();
+        try {
+          // Everytime the node is edited, it comes here to read the currentHueDevice, if any.
+          // It comes here also at node-red boot, but at node-red boot, the hueAllResources is null.
+          // The hue-config take cares of filling all properties of the node, after it has been connected to the hue Brigde.
+          if (node.serverHue.hueAllResources !== null) node.currentHUEDevice = node.serverHue.loadResourcesFromHUEBridge(node);
+        } catch (error) { }
+        try {
+          node.serverHue.addClient(node);
+        } catch (err) {
+          RED.log.error(`Errore knxUltimateHueLight node.currentHUEDevice ${err.message}`);
+        }
       }
     }
 

package/nodes/knxUltimateHueLightSensor.html

@@ -223,7 +223,7 @@
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueLightSensor">
-<p> This node lets you get the events from your HUE motion device.<br/>
+This node lets you get the events from your HUE motion device.  
 
 Here you can get the HUE Light Sensors light events, that represents a lux value, evetytime the ambient light changes.<br/>
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.

package/nodes/knxUltimateHueLightSensor.js

@@ -80,10 +80,10 @@ module.exports = function (RED) {
       // I queue the state request, by passing the callback to call whenever the HUE bridge send me the light status async
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
         (async () => {
-          node.serverHue.addClient(node)
+          node.serverHue.addClient(node);
           try {
             node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getLightLevel', (jLight) => {
-              node.handleSendHUE(jLight)
+              node.handleSendHUE(jLight);
             })
           } catch (error) {
             RED.log.error('Errore knxUltimateHueLightSensor subscribing: ' + error.message)

package/nodes/knxUltimateHueMotion.html

@@ -219,8 +219,8 @@ s<br/>
 </script>
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
-<script type="text/markdown" data-help-name="knxUltimateHueMotion">
-<p> This node lets you get the events from your HUE motion device.<br/>
+<script type="text/markdown" data-help-name="knxUltimateHueMotion"
+This node lets you get the events from your HUE motion device.  
 
 Here you can get the HUE motion events.<br/>
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.

package/nodes/knxUltimateHueScene.html

@@ -260,7 +260,7 @@
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueScene">
-<p> This node lets you recall a HUE scene, via KNX.<br/>
+This node lets you recall a HUE scene, via KNX.  
 
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
 

package/nodes/knxUltimateHueTapDial.html

@@ -226,7 +226,7 @@
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueTapDial">
-<p> This node lets you get the events from your HUE rotary device, for example the Tap Dial.<br/>
+This node lets you get the events from your HUE rotary device, for example the Tap Dial.  
 
 The Tap Dial device has 4 buttons and 1 rotary knob.  
 You can find the 4 buttons in the **Hue Button node**, not here!  

package/nodes/knxUltimateHueTapDial.js

@@ -147,7 +147,6 @@ module.exports = function (RED) {
       if (node.timerDimStop !== undefined) clearTimeout(node.timerDimStop);
       node.isTimerDimStopRunning = true;
       node.timerDimStop = setTimeout(() => {
-        console.log('Stop banana');
         // KNX Stop DIM
         knxMsgPayload.payload = { decr_incr: 0, data: 0 }; // Payload for the output msg
         // Send to KNX bus
@@ -158,7 +157,7 @@ module.exports = function (RED) {
         }
         if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX Stop DIM' + ` (${new Date().getDate()}, ${new Date().toLocaleTimeString()})` });
         node.isTimerDimStopRunning = false;
-      }, 1500);
+      }, 500);
     };
 
     // On each deploy, unsubscribe+resubscribe

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -220,8 +220,8 @@
 </script>
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
-<script type="text/markdown" data-help-name="knxUltimateHueTemperatureSensor">
-<p> This node lets you get the events from your HUE temperature device.<br/>
+<script type="text/markdown" data-help-name="knxUltimateHueTemperatureSensor"
+This node lets you get the events from your HUE temperature device.  
 
 Here you can get the HUE temperature events, that represents a celsius value, evetytime the ambient temp changes.<br/>
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.

package/nodes/knxUltimateLoadControl.html

@@ -376,7 +376,7 @@ The node turns off one device (or multiple devices) at a time, based on the orde
 
 Here you can add devices to turn off in case of overload. <br/>
 Choose the device to turn off. Enter the device name or its group address. <br/>
-Enter any group address that indicates the consumption of the device chosen in the first line. ** This is an optional parameter **. If the device is consuming more than a certain number of Watts, it means that it is in use. If it consumes less, the device will be considered "not in use" and both this and the next will be turned off at once.<br/>
+Enter any group address that indicates the consumption of the device chosen in the first line. **This is an optional parameter**. If the device is consuming more than a certain number of Watts, it means that it is in use. If it consumes less, the device will be considered "not in use" and both this and the next will be turned off at once.<br/>
 If *Automatic recovery* is enabled, the device is automatically reactivated when the "reset delay" expires.
 
 ### Inputs

package/nodes/utils/hueEngine.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 const { EventEmitter } = require('events');
 const EventSource = require('eventsource');
-const http = require('./http.js');
+const http = require('./http');
 
 class classHUE extends EventEmitter {
   constructor(_hueBridgeIP, _username, _clientkey, _bridgeid, _sysLogger) {
@@ -89,6 +89,7 @@ class classHUE extends EventEmitter {
     if (this.commandQueue.length > 0) {
       // const jRet = { ...this.commandQueue.shift() } //Clone the object by value
       const jRet = this.commandQueue.shift();
+      // jRet is ({ _lightID, _state, _operation });;
       switch (jRet._operation) {
         case 'setLight':
           // It can be a light or a grouped light
@@ -105,23 +106,6 @@ class classHUE extends EventEmitter {
             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info(`KNXUltimatehueEngine: classHUE: handleQueue: setLight grouped_light: ${error.message}`);
           }
           break;
-        case 'getLight':
-          try {
-            const jReturn = await this.hueApiV2.get(`/resource/light/${jRet._lightID}`);
-            jRet._callback(jReturn[0]); // Need to call the callback, because the event is absolutely async
-          } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info(`KNXUltimatehueEngine: classHUE: handleQueue: getLight light: ${error.message}`);
-          }
-          break;
-        case 'getGroupedLight':
-          try {
-            const jReturn = await this.hueApiV2.get(`/resource/grouped_light/${jRet._lightID}`);
-            // Need to call the callback, because the event is absolutely async
-            jRet._callback(jReturn[0]);
-          } catch (error) {
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.info(`KNXUltimatehueEngine: classHUE: handleQueue: getLight grouped_light: ${error.message}`);
-          }
-          break;
         case 'setScene':
           try {
             const sceneID = jRet._lightID;
@@ -146,14 +130,13 @@ class classHUE extends EventEmitter {
         case 'getBattery':
           try {
             const jReturn = await this.hueApiV2.get(`/resource/device_power/${jRet._lightID}`);
-            jRet._callback(jReturn[0]); // Need to call the callback, because the event is absolutely async
           } catch (error) {
             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getBattery: ${error.message}`);
           }
+          break;
         case 'getLightLevel':
           try {
             const jReturn = await this.hueApiV2.get(`/resource/light_level/${jRet._lightID}`);
-            jRet._callback(jReturn[0]); // Need to call the callback, because the event is absolutely async
           } catch (error) {
             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getLightLevel: ${error.message}`);
           }
@@ -161,7 +144,6 @@ class classHUE extends EventEmitter {
         case 'getTemperature':
           try {
             const jReturn = await this.hueApiV2.get(`/resource/temperature/${jRet._lightID}`);
-            jRet._callback(jReturn[0]); // Need to call the callback, because the event is absolutely async
           } catch (error) {
             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: getTemperature: ${error.message}`);
           }
@@ -174,11 +156,9 @@ class classHUE extends EventEmitter {
     this.timerwriteQueueAdd = setTimeout(this.handleQueue, 200);
   };
 
-  writeHueQueueAdd = async (_lightID, _state, _operation, _callback) => {
+  writeHueQueueAdd = async (_lightID, _state, _operation) => {
     // Add the new item
-    this.commandQueue.push({
-      _lightID, _state, _operation, _callback,
-    });
+    this.commandQueue.push({ _lightID, _state, _operation });
   };
   // ######################################