node-red-contrib-knx-ultimate 2.2.34 → 2.2.36

package/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 # CHANGELOG
 
+**Version 2.2.36** - December 2023<br/>
+- HUE Light Node: Ensure at least one liht belonging to a group was on before switching to nighttime. Otherwise turn all lights on at daytime.<br/>
+
+**Version 2.2.35** - December 2023<br/>
+- NEW: HUE Light Node: now it resumes the old status of all lights belonging to the selected group.<br/>
+
 **Version 2.2.34** - December 2023<br/>
 - NEW: HUE Light Node: there is a new tab that auto-generates the light entity for Home Assistant.<br/>
 - HUE Light: resuming the last daytime status after nighttime, if the switch on behaviour at daytime is set to None.<br/>

package/nodes/hue-config.js

@@ -242,6 +242,32 @@ module.exports = (RED) => {
       } catch (error) { }
     };
 
+    // Return an array of light belonging to the groupID
+    node.getAllLightsBelongingToTheGroup = async function getAllLightsBelongingToTheGroup(_groupID) {
+      if (node.hueAllResources === undefined || node.hueAllResources === null) return;
+      const retArr = [];
+      try {
+        await node.loadResourcesFromHUEBridge();
+        node.hueAllResources.forEach((res) => {
+          if (res.services !== undefined && res.services.length > 0) {
+            res.services.forEach((serv) => {
+              if (serv.rid === _groupID) {
+                if (res.children !== undefined) {
+                  const children = res.children.filter((a) => a.rtype === "light");
+                  for (let index = 0; index < children.length; index++) {
+                    const element = children[index];
+                    const oLight = node.hueAllResources.filter((a) => a.id === element.rid);
+                    if (oLight !== null && oLight !== undefined) retArr.push({ groupID: _groupID, light: oLight });
+                  }
+                }
+              }
+            });
+          }
+        });
+        return retArr;
+      } catch (error) { /* empty */ }
+    };
+
     // Returns the cached devices (node.hueAllResources) by type.
     node.getResources = function getResources(_rtype) {
       try {

package/nodes/knxUltimateHueLight.js

@@ -34,6 +34,7 @@ module.exports = function (RED) {
     node.formatdecimalsvalue = 2;
     node.currentHUEDevice = undefined; // At start, this value is filled by a call to HUE api. It stores a value representing the current light status.
     node.HUEDeviceWhileDaytime = null;// This retains the HUE device status while daytime, to be restored after nighttime elapsed.
+    node.HUELightsBelongingToGroupWhileDaytime = null; // Array contains all light belonging to the grouped_light (if grouped_light is selected)
     node.DayTime = true;
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
     node.hueDevice = config.hueDevice.split("#")[0];
@@ -107,11 +108,49 @@ module.exports = function (RED) {
                 // If you try and control multiple conflicting parameters at once e.g. {"color": {"xy": {"x":0.5,"y":0.5}}, "color_temperature": {"mirek": 250}}
                 // the lights can only physically do one, for this we apply the rule that xy beats ct. Simple.
                 // color_temperature.mirek: color temperature in mirek is null when the light color is not in the ct spectrum
-                if (node.DayTime === true && config.specifySwitchOnBrightness === "no" && node.HUEDeviceWhileDaytime !== null) {
-                  // The DayNight has switched into day, so restore the previous light status
-                  state = { on: { on: true }, dimming: node.HUEDeviceWhileDaytime.dimming, color: node.HUEDeviceWhileDaytime.color, color_temperature: node.HUEDeviceWhileDaytime.color_temperature };
-                  if (node.HUEDeviceWhileDaytime.color_temperature.mirek === null) delete state.color_temperature; // Otherwise the lamp will not turn on due to an error. color_temperature.mirek: color temperature in mirek is null when the light color is not in the ct spectrum
-                  node.HUEDeviceWhileDaytime = null; // Nullize the object.
+                if ((node.DayTime === true && config.specifySwitchOnBrightness === "no") && ((node.isGrouped_light === false && node.HUEDeviceWhileDaytime !== null) || (node.isGrouped_light === true && node.HUELightsBelongingToGroupWhileDaytime !== null))) {
+                  if (node.isGrouped_light === false && node.HUEDeviceWhileDaytime !== null) {
+                    // The DayNight has switched into day, so restore the previous light status
+                    state = { on: { on: true }, dimming: node.HUEDeviceWhileDaytime.dimming, color: node.HUEDeviceWhileDaytime.color, color_temperature: node.HUEDeviceWhileDaytime.color_temperature };
+                    if (node.HUEDeviceWhileDaytime.color_temperature.mirek === null) delete state.color_temperature; // Otherwise the lamp will not turn on due to an error. color_temperature.mirek: color temperature in mirek is null when the light color is not in the ct spectrum
+                    node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
+                    node.setNodeStatusHue({
+                      fill: "green",
+                      shape: "dot",
+                      text: "KNX->HUE",
+                      payload: "Restore light status",
+                    });
+                    node.HUEDeviceWhileDaytime = null; // Nullize the object.
+                  } else if (node.isGrouped_light === true && node.HUELightsBelongingToGroupWhileDaytime !== null) {
+                    // The DayNight has switched into day, so restore the previous light state, belonging to the group
+                    let bAtLeastOneIsOn = false;
+                    for (let index = 0; index < node.HUELightsBelongingToGroupWhileDaytime.length; index++) { // Ensure, at least 1 lamp was on, otherwise turn all lamps on
+                      const element = node.HUELightsBelongingToGroupWhileDaytime[index].light[0];
+                      if (element.on.on === true) {
+                        bAtLeastOneIsOn = true;
+                        break;
+                      }
+                    }
+                    for (let index = 0; index < node.HUELightsBelongingToGroupWhileDaytime.length; index++) {
+                      const element = node.HUELightsBelongingToGroupWhileDaytime[index].light[0];
+                      if (bAtLeastOneIsOn === true) {
+                        state = { on: element.on, dimming: element.dimming, color: element.color, color_temperature: element.color_temperature };
+                      } else {
+                        // Failsafe all on
+                        state = { on: { on: true }, dimming: element.dimming, color: element.color, color_temperature: element.color_temperature };
+                      }
+                      if (element.color_temperature.mirek === null) delete state.color_temperature; // Otherwise the lamp will not turn on due to an error. color_temperature.mirek: color temperature in mirek is null when the light color is not in the ct spectrum
+                      node.serverHue.hueManager.writeHueQueueAdd(element.id, state, "setLight");
+                    }
+                    node.setNodeStatusHue({
+                      fill: "green",
+                      shape: "dot",
+                      text: "KNX->HUE",
+                      payload: "Resuming all group's light",
+                    });
+                    node.HUELightsBelongingToGroupWhileDaytime = null; // Nullize the object.
+                    return;
+                  }
                 } else {
                   let colorChoosen;
                   let temperatureChoosen;
@@ -219,11 +258,19 @@ module.exports = function (RED) {
               if (config.specifySwitchOnBrightness === "no") {
                 // This retains the HUE device status while daytime, to be restored after nighttime elapsed. https://github.com/Supergiovane/node-red-contrib-knx-ultimate/issues/298
                 if (node.DayTime === false) {
-                  // DayTime has switched to false: save the currentHUEDevice into the HUEDeviceWhileDaytime
-                  node.HUEDeviceWhileDaytime = cloneDeep(node.currentHUEDevice);
+                  if (node.isGrouped_light === false) node.HUEDeviceWhileDaytime = cloneDeep(node.currentHUEDevice); // DayTime has switched to false: save the currentHUEDevice into the HUEDeviceWhileDaytime
+                  if (node.isGrouped_light === true) {
+                    (async () => {
+                      try {
+                        const retLights = await node.serverHue.getAllLightsBelongingToTheGroup(node.hueDevice);
+                        node.HUELightsBelongingToGroupWhileDaytime = cloneDeep(retLights); // DayTime has switched to false: save the lights belonging to the group into the HUELightsBelongingToGroupWhileDaytime array
+                      } catch (error) { }
+                    })();
+                  }
                 }
               } else {
                 node.HUEDeviceWhileDaytime = null;
+                node.HUELightsBelongingToGroupWhileDaytime = null;
               }
               node.setNodeStatusHue({
                 fill: "green",

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.34",
+  "version": "2.2.36",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",