@haydendonald/node-red-contrib-hass-stuff 1.1.2 → 1.1.4

package/dist/LightControl/lightControlConfigNode.html

@@ -75,32 +75,32 @@
 
     <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-concentrateSettings">Concentrate Settings</label>
-        <p>The scene to use for the concentrate scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the concentrate scene (during the day) [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-concentrateSettings" />
     </div>
     <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-readSettings">Read Settings</label>
-        <p>The scene to use for the read scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the read scene (8am-10am and 3-7pm) [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-readSettings" />
     </div>
     <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-relaxSettings">Relax Settings</label>
-        <p>The scene to use for the relax scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the relax scene (7am-8am and 7-8pm) [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-relaxSettings" />
     </div>
     <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-restSettings">Rest Settings</label>
-        <p>The scene to use for the rest scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the rest scene (6am - 7am) (8-11pm)  [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-restSettings" />
     </div>
     <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-nightLightSettings">Night Light Settings</label>
-        <p>The scene to use for the night light scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the night light scene (11pm - 6am) [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-nightLightSettings" />
     </div>
         <div class="form-row">
         <label style="font-weight: bold;" for="node-config-input-nightSettings">Night Settings</label>
-        <p>The scene to use for the night light scene [scene] [brightnessPercent]</p>
+        <p>The scene to use for the night scene (when sleep mode is on) [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-nightSettings" />
     </div>
 </script>

package/dist/LightControl/lightControlConfigNode.js

@@ -109,7 +109,7 @@ module.exports = function LightControlConfigNode(RED) {
             //Get what entities exist in the group and set our internal state
             connectionsConfigNode.getHASSEntityState(config.groupEntityId, (payload, data) => {
                 groupEntities = data.data.attributes.entity_id;
-                currentState = data.data.state;
+                currentState = data.data;
                 entitiesOffDuringNight = config.entitiesOffAtNight.split(",");
                 entitiesOnDuringNight = groupEntities.filter((entity) => !entitiesOffDuringNight.includes(entity));
             });
@@ -298,7 +298,10 @@ module.exports = function LightControlConfigNode(RED) {
                     if (currentHour >= 23 || currentHour < 6) {
                         scene = scenes["nightLight"];
                     }
-                    else if (currentHour >= 6 && currentHour < 8) {
+                    else if (currentHour >= 6 && currentHour < 7) {
+                        scene = scenes["rest"];
+                    }
+                    else if (currentHour >= 7 && currentHour < 8) {
                         scene = scenes["relax"];
                     }
                     else if (currentHour >= 8 && currentHour < 10) {
@@ -307,11 +310,14 @@ module.exports = function LightControlConfigNode(RED) {
                     else if (currentHour >= 10 && currentHour < 15) {
                         scene = scenes["concentrate"];
                     }
-                    else if (currentHour >= 15 && currentHour < 20) {
+                    else if (currentHour >= 15 && currentHour < 19) {
+                        scene = scenes["read"];
+                    }
+                    else if (currentHour >= 19 && currentHour < 20) {
                         scene = scenes["relax"];
                     }
                     else if (currentHour >= 20 && currentHour < 23) {
-                        scene = scenes["read"];
+                        scene = scenes["rest"];
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haydendonald/node-red-contrib-hass-stuff",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "A collection of stuff I use on my Node Red + Home Assistant server. This could be of use for others, i don't know..",
   "devDependencies": {
     "@types/node": "^18.14.0",