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

package/nodes/knxUltimateHueLight.js

@@ -57,6 +57,12 @@ module.exports = function (RED) {
       payload: "",
     });
 
+    function getRandomIntInclusive(min, max) {
+      min = Math.ceil(min);
+      max = Math.floor(max);
+      return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+    }
+
     // This function is called by the hue-config.js
     node.handleSend = (msg) => {
       if (node.currentHUEDevice === undefined) {
@@ -105,7 +111,7 @@ module.exports = function (RED) {
                 node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                 state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } };
               } else {
-                state = { on: { on: true }, dimming: node.currentHUEDevice.dimming };
+                state = { on: { on: true } };
               }
             } else {
               state = { on: { on: false } };
@@ -123,7 +129,9 @@ module.exports = function (RED) {
             // { 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));
             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) });
+            node.setNodeStatusHue({
+              fill: "green", shape: "dot", text: "KNX->HUE", payload: JSON.stringify(msg.payload),
+            });
             break;
           case config.GADaylightSensor:
             if (config.enableDayNightLighting === "yes") {
@@ -146,7 +154,9 @@ module.exports = function (RED) {
               // { 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));
               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: JSON.stringify(msg.payload),
+              });
             }
             break;
           case config.GALightHSVPercentage:
@@ -250,52 +260,45 @@ module.exports = function (RED) {
             });
             break;
           case config.GALightColorCycle:
-            if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
-            const gaValColorCycle = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColorCycle));
-            if (gaValColorCycle === true) {
-              node.serverHue.hueManager.writeHueQueueAdd(
-                node.hueDevice,
-                { on: { on: true } },
-                node.isGrouped_light === false ? "setLight" : "setGroupedLight",
-              );
-              node.timerColorCycle = setInterval(() => {
-                try {
-                  function getRandomIntInclusive(min, max) {
-                    min = Math.ceil(min);
-                    max = Math.floor(max);
-                    return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
-                  }
-                  const red = getRandomIntInclusive(0, 255);
-                  const green = getRandomIntInclusive(0, 255);
-                  const blue = getRandomIntInclusive(0, 255);
-                  let gamut = null;
-                  if (
-                    node.currentHUEDevice !== undefined
-                    && node.currentHUEDevice.hasOwnProperty("color")
-                    && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
-                  ) {
-                    gamut = node.currentHUEDevice.color.gamut_type;
-                  }
-                  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(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
-                } catch (error) { }
-              }, 10000);
-            } else {
+            {
               if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
-              node.serverHue.hueManager.writeHueQueueAdd(
-                node.hueDevice,
-                { on: { on: false } },
-                node.isGrouped_light === false ? "setLight" : "setGroupedLight",
-              );
+              const gaValColorCycle = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColorCycle));
+              if (gaValColorCycle === true) {
+                node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, { on: { on: true } }, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                node.timerColorCycle = setInterval(() => {
+                  try {
+                    const red = getRandomIntInclusive(0, 255);
+                    const green = getRandomIntInclusive(0, 255);
+                    const blue = getRandomIntInclusive(0, 255);
+                    let gamut = null;
+                    if (
+                      node.currentHUEDevice !== undefined
+                      && node.currentHUEDevice.hasOwnProperty("color")
+                      && node.currentHUEDevice.color.hasOwnProperty("gamut_type")
+                    ) {
+                      gamut = node.currentHUEDevice.color.gamut_type;
+                    }
+                    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(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                  } catch (error) { }
+                }, 10000);
+              } else {
+                if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
+                node.serverHue.hueManager.writeHueQueueAdd(
+                  node.hueDevice,
+                  { on: { on: false } },
+                  node.isGrouped_light === false ? "setLight" : "setGroupedLight",
+                );
+              }
+              node.setNodeStatusHue({
+                fill: "green",
+                shape: "dot",
+                text: "KNX->HUE",
+                payload: gaValColorCycle,
+              });
             }
-            node.setNodeStatusHue({
-              fill: "green",
-              shape: "dot",
-              text: "KNX->HUE",
-              payload: gaValColorCycle,
-            });
             break;
           default:
             break;
@@ -312,41 +315,63 @@ module.exports = function (RED) {
     // Start dimming
     // ***********************************************************
     node.hueDimming = function hueDimming(_KNXaction, _KNXbrightness_delta, _dimSpeedInMillisecs = undefined) {
-      let dimDirection = 'stop';
+      // 31/10/2023 after many attempts to use dimming_delta function of the HueApeV2, loosing days of my life, without a decent success
+      // i decide to go to the "step brightness" way.
       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.
+      const numStep = 10; // Steps from 0 to 100 by 10
+      if (_dimSpeedInMillisecs === undefined || _dimSpeedInMillisecs === '') _dimSpeedInMillisecs = 5000;
 
       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");
+        // STOP DIM
+        if (node.timerStepDim !== undefined) clearInterval(node.timerStepDim);
+        node.brightnessStep = null;
         return;
       }
+
+      // Set the actual brightness to start with
+      if (node.brightnessStep === null || node.brightnessStep === undefined) node.brightnessStep = node.currentHUEDevice.dimming.brightness || 50;
+      node.brightnessStep = Math.ceil(Number(node.brightnessStep));
+
+      // Set the speed
+      _dimSpeedInMillisecs /= numStep;
+
+      // We have also minDimLevelLight and maxDimLevelLight to take care of.
+      let minDimLevelLight = config.minDimLevelLight === undefined ? 10 : Number(config.minDimLevelLight);
+      if (config.minDimLevelLight === "useHueLightLevel" && node.currentHUEDevice.dimming.min_dim_level === undefined) minDimLevelLight = 10;
+      const maxDimLevelLight = config.maxDimLevelLight === undefined ? 100 : Number(config.maxDimLevelLight);
+
       if (_KNXbrightness_delta > 0 && _KNXaction === 1) {
-        delta = 100 - Math.round(node.currentHUEDevice.dimming.brightness, 0) - (100 - Number(maxDimLevelLight));
-        dimDirection = 'up';
+        // DIM UP
+        if (node.timerStepDim !== undefined) clearInterval(node.timerStepDim);
+        node.timerStepDim = setInterval(() => {
+          node.updateKNXBrightnessState(node.brightnessStep); // Unnecessary, but necessary to set the KNX Status in real time.
+          node.brightnessStep += numStep;
+          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) {
+            hueTelegram.on = { on: true };
+          }
+          node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+          if (node.brightnessStep >= maxDimLevelLight) clearInterval(node.timerStepDim);
+        }, _dimSpeedInMillisecs);
       }
       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 };
+        // DIM DOWN
+        if (node.timerStepDim !== undefined) clearInterval(node.timerStepDim);
+        node.timerStepDim = setInterval(() => {
+          node.updateKNXBrightnessState(node.brightnessStep); // Unnecessary, but necessary to set the KNX Status in real time.
+          node.brightnessStep -= numStep;
+          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) {
+            hueTelegram.on = { on: false };
+          }
+          node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+          if (node.brightnessStep <= minDimLevelLight) clearInterval(node.timerStepDim);
+        }, _dimSpeedInMillisecs);
       }
-      node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
     };
     // ***********************************************************
 
@@ -354,28 +379,28 @@ module.exports = function (RED) {
     // mirek: required(integer minimum: 153, maximum: 500)
     // ***********************************************************
     node.hueDimmingTunableWhite = function hueDimming(_KNXaction, _KNXbrightness_delta, _dimSpeedInMillisecs = undefined) {
-      let dimDirection = 'stop';
+      let dimDirection = "stop";
       let hueTelegram = {};
-      _dimSpeedInMillisecs = (_dimSpeedInMillisecs === undefined || _dimSpeedInMillisecs === '') ? 5000 : _dimSpeedInMillisecs;
+      _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';
+        dimDirection = "stop";
         hueTelegram = { color_temperature_delta: { action: dimDirection } };
         node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, hueTelegram, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
         return;
       }
       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';
+        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';
+        dimDirection = "down";
       }
       // Calculate the dimming time based on delta
       // 10000:x=347:delta
@@ -384,7 +409,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.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");
@@ -406,51 +431,64 @@ module.exports = function (RED) {
           if (_event.hasOwnProperty("on")) {
             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')) {
+            if (
+              _event.on.on === false
+              && (config.updateKNXBrightnessStatusOnHUEOnOff === undefined || config.updateKNXBrightnessStatusOnHUEOnOff === "onhueoff")
+            ) {
               node.updateKNXBrightnessState(0);
+              node.currentHUEDevice.dimming.brightness = 0;
             } else {
-              // Sends the previous brightness value
-              try {
-                node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
-              } catch (error) {
-                /* empty */
-              }
+              // // Sends the previous brightness value
+              // try {
+              //   node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
+              // } catch (error) {
+              //   /* empty */
+              // }
             }
+            node.currentHUEDevice.on.on = _event.on.on;
           }
           if (_event.hasOwnProperty("color")) {
             node.updateKNXLightColorState(_event.color);
+            node.currentHUEDevice.color = _event.color;
           }
-          if (_event.hasOwnProperty("dimming")) {
+          if (_event.hasOwnProperty("dimming") && _event.dimming.brightness !== undefined) {
             // Every once on 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) return;
+            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 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(node.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",
+              );
+              node.currentHUEDevice.on.on = false;
             }
+            node.currentHUEDevice.dimming.brightness = _event.dimming.brightness;
           }
-          if (_event.hasOwnProperty("color_temperature")) {
+          if (_event.hasOwnProperty("color_temperature") && _event.color_temperature.mirek !== undefined) {
             node.updateKNXLightHSVState(_event.color_temperature.mirek);
+            node.currentHUEDevice.color_temperature.mirek = _event.color_temperature.mirek;
           }
 
-          // 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);
+          // // 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({
@@ -481,7 +519,7 @@ module.exports = function (RED) {
         node.setNodeStatusHue({
           fill: "blue",
           shape: "ring",
-          text: "HUE->KNX State",
+          text: "HUE->KNX Bright",
           payload: knxMsgPayload.payload,
         });
       }
@@ -509,7 +547,7 @@ module.exports = function (RED) {
             node.setNodeStatusHue({
               fill: "blue",
               shape: "ring",
-              text: "HUE->KNX State",
+              text: "HUE->KNX On/Off",
               payload: knxMsgPayload.payload,
             });
           }
@@ -542,7 +580,7 @@ module.exports = function (RED) {
         node.setNodeStatusHue({
           fill: "blue",
           shape: "ring",
-          text: "HUE->KNX State",
+          text: "HUE->KNX HSV",
           payload: knxMsgPayload.payload,
         });
       }
@@ -571,7 +609,7 @@ module.exports = function (RED) {
         node.setNodeStatusHue({
           fill: "blue",
           shape: "ring",
-          text: "HUE->KNX State",
+          text: "HUE->KNX Color",
           payload: knxMsgPayload.payload,
         });
       }
@@ -585,12 +623,6 @@ module.exports = function (RED) {
     if (node.serverHue) {
       node.serverHue.removeClient(node);
       if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        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) {

package/nodes/knxUltimateHueLightSensor.js

@@ -1,110 +1,101 @@
 module.exports = function (RED) {
   function knxUltimateHueLightSensor(config) {
-    RED.nodes.createNode(this, config)
-    const node = this
-    node.server = RED.nodes.getNode(config.server)
-    node.serverHue = RED.nodes.getNode(config.serverHue)
-    node.topic = node.name
-    node.name = config.name === undefined ? 'Hue' : config.name
-    node.dpt = ''
-    node.notifyreadrequest = false
-    node.notifyreadrequestalsorespondtobus = 'false'
-    node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = ''
-    node.notifyresponse = false
-    node.notifywrite = true
-    node.initialread = true
-    node.listenallga = true // Don't remove
-    node.outputtype = 'write'
-    node.outputRBE = false // Apply or not RBE to the output (Messages coming from flow)
-    node.inputRBE = false // Apply or not RBE to the input (Messages coming from BUS)
-    node.currentPayload = '' // Current value for the RBE input and for the .previouspayload msg
-    node.passthrough = 'no'
-    node.formatmultiplyvalue = 1
-    node.formatnegativevalue = 'leave'
-    node.formatdecimalsvalue = 2
+    RED.nodes.createNode(this, config);
+    const node = this;
+    node.server = RED.nodes.getNode(config.server);
+    node.serverHue = RED.nodes.getNode(config.serverHue);
+    node.topic = node.name;
+    node.name = config.name === undefined ? 'Hue' : config.name;
+    node.dpt = '';
+    node.notifyreadrequest = false;
+    node.notifyreadrequestalsorespondtobus = 'false';
+    node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = '';
+    node.notifyresponse = false;
+    node.notifywrite = true;
+    node.initialread = true;
+    node.listenallga = true; // Don't remove
+    node.outputtype = 'write';
+    node.outputRBE = false; // Apply or not RBE to the output (Messages coming from flow)
+    node.inputRBE = false; // Apply or not RBE to the input (Messages coming from BUS)
+    node.currentPayload = ''; // Current value for the RBE input and for the .previouspayload msg
+    node.passthrough = 'no';
+    node.formatmultiplyvalue = 1;
+    node.formatnegativevalue = 'leave';
+    node.formatdecimalsvalue = 2;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
 
-    }
+    };
     // Used to call the status update from the HUE config node.
     node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
-      if (payload === undefined) return
-      const dDate = new Date()
-      payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString()
-      node.status({ fill, shape, text: text + ' ' + payload + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' })
-    }
+      if (payload === undefined) return;
+      const dDate = new Date();
+      payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
+      node.status({ fill, shape, text: text + ' ' + payload + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' });
+    };
 
     // This function is called by the knx-ultimate config node, to output a msg.payload.
     node.handleSend = msg => {
-    }
+    };
 
     node.handleSendHUE = _event => {
       try {
         if (_event.id === config.hueDevice) {
-          const knxMsgPayload = {}
-          knxMsgPayload.topic = config.GAlightsensor
-          knxMsgPayload.dpt = config.dptlightsensor
+          const knxMsgPayload = {};
+          knxMsgPayload.topic = config.GAlightsensor;
+          knxMsgPayload.dpt = config.dptlightsensor;
 
           if (_event.hasOwnProperty('light') && _event.light.hasOwnProperty('light_level')) {
             //console.log(Math.round(10 ** ((_event.light.light_level - 1) / 10000)))
             //console.log(_event.light.light_level === 0 ? 0 : Math.round(Math.pow(10, (_event.light.light_level - 1) / 10000)))
-            knxMsgPayload.payload = _event.light.light_level === 0 ? 0 : Math.round(Math.pow(10, (_event.light.light_level - 1) / 10000))
+            knxMsgPayload.payload = _event.light.light_level === 0 ? 0 : Math.round(Math.pow(10, (_event.light.light_level - 1) / 10000));
             // Send to KNX bus
-            if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
-            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+            if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id });
+            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });
 
             // Setup the output msg
-            knxMsgPayload.name = node.name
-            knxMsgPayload.event = 'light_level'
+            knxMsgPayload.name = node.name;
+            knxMsgPayload.event = 'light_level';
 
             // Send payload
-            knxMsgPayload.rawEvent = _event
-            node.send(knxMsgPayload)
-            node.setNodeStatusHue({ fill: 'blue', shape: 'ring', text: 'HUE->KNX', payload: knxMsgPayload.payload })
+            knxMsgPayload.rawEvent = _event;
+            node.send(knxMsgPayload);
+            node.setNodeStatusHue({ fill: 'blue', shape: 'ring', text: 'HUE->KNX', payload: knxMsgPayload.payload });
           }
         }
       } catch (error) {
-        node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+        node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });
       }
-    }
+    };
 
     // On each deploy, unsubscribe+resubscribe
     if (node.server) {
-      node.server.removeClient(node)
-      node.server.addClient(node)
+      node.server.removeClient(node);
+      node.server.addClient(node);
     }
     if (node.serverHue) {
-      node.serverHue.removeClient(node)
+      node.serverHue.removeClient(node);
       // I must get the object, to store read the status
       // 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);
-          try {
-            node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, null, 'getLightLevel', (jLight) => {
-              node.handleSendHUE(jLight);
-            })
-          } catch (error) {
-            RED.log.error('Errore knxUltimateHueLightSensor subscribing: ' + error.message)
-          }
-        })()
+        node.serverHue.addClient(node);
       }
     }
 
     node.on('input', function (msg) {
 
-    })
+    });
 
     node.on('close', function (done) {
       if (node.server) {
-        node.server.removeClient(node)
+        node.server.removeClient(node);
       }
       if (node.serverHue) {
-        node.serverHue.removeClient(node)
+        node.serverHue.removeClient(node);
       }
-      done()
-    })
+      done();
+    });
   }
-  RED.nodes.registerType('knxUltimateHueLightSensor', knxUltimateHueLightSensor)
-}
+  RED.nodes.registerType('knxUltimateHueLightSensor', knxUltimateHueLightSensor);
+};

package/nodes/knxUltimateHueMotion.html

@@ -211,7 +211,7 @@
         <input type="text" id="node-input-namemotion" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-s<br/>
+<br/>
 <br/>
 <br/>
 
@@ -219,10 +219,10 @@ s<br/>
 </script>
 <script src="https://kit.fontawesome.com/11f26b4500.js" crossorigin="anonymous"></script>
 
-<script type="text/markdown" data-help-name="knxUltimateHueMotion"
+<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/>
+Here you can get the HUE motion events.   
 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.
 
 **General**
@@ -245,7 +245,6 @@ Start typing in the GA field, the name or group address of your KNX device, the
 
 `msg.payload` is used as the payload of the published message.  
 It contains the detailed event sent by your Hue devicem so you can use it for whatever you want.  
-It contains the detailed event sent by your Hue devicem so you can use it for whatever you want.
 
 <br/>