@haydendonald/node-red-contrib-hass-stuff 1.1.5 → 1.1.7

package/dist/LightControl/lightControlConfigNode.html

@@ -85,12 +85,12 @@
     </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 (7am-8am and 7-8pm) [scene] [brightnessPercent]</p>
+        <p>The scene to use for the relax scene (7am-8am and 7-10pm) [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 (6am - 7am) (8-11pm)  [scene] [brightnessPercent]</p>
+        <p>The scene to use for the rest scene (6am - 7am) (10-11pm)  [scene] [brightnessPercent]</p>
         <input type="text" id="node-config-input-restSettings" />
     </div>
     <div class="form-row">

package/dist/LightControl/lightControlConfigNode.js

@@ -87,6 +87,11 @@ module.exports = function LightControlConfigNode(RED) {
                 sceneName: config.relaxSettings.split(" ")[0],
                 brightnessPct: parseInt(config.relaxSettings.split(" ")[1])
             },
+            rest: {
+                friendlyName: "Rest",
+                sceneName: config.restSettings.split(" ")[0],
+                brightnessPct: parseInt(config.restSettings.split(" ")[1])
+            },
             nightLight: {
                 friendlyName: "Night Light",
                 sceneName: config.nightLightSettings.split(" ")[0],
@@ -129,7 +134,7 @@ module.exports = function LightControlConfigNode(RED) {
                     friendlyName: `${self.name} - ${sceneValue.friendlyName}`,
                     id: (0, utility_1.getEntityId)("scene", `${self.name}_${sceneKey}`),
                     creationCallback: (response) => { },
-                    activatedCallback: (serviceData) => {
+                    activatedCallback: (state, serviceData) => {
                         //Set our scene
                         connectionsConfigNode.sendHASSAction("select.select_option", { entity_id: [(0, utility_1.getEntityId)("select", `${self.name}_current_scene`)] }, {
                             option: sceneValue.friendlyName
@@ -143,7 +148,7 @@ module.exports = function LightControlConfigNode(RED) {
                 friendlyName: `${self.name} - Adaptive`,
                 id: (0, utility_1.getEntityId)("scene", `${self.name}_adaptive`),
                 creationCallback: (response) => { },
-                activatedCallback: (serviceData) => {
+                activatedCallback: (state, serviceData) => {
                     //Set our scene to adaptive
                     connectionsConfigNode.sendHASSAction("select.select_option", { entity_id: [(0, utility_1.getEntityId)("select", `${self.name}_current_scene`)] }, {
                         option: "Adaptive"
@@ -156,7 +161,7 @@ module.exports = function LightControlConfigNode(RED) {
                 friendlyName: `${self.name} - Turn On`,
                 id: (0, utility_1.getEntityId)("scene", `${self.name}_turn_on`),
                 creationCallback: (response) => { },
-                activatedCallback: (serviceData) => {
+                activatedCallback: (state, serviceData) => {
                     runLights(serviceData.transition || 1, true);
                 }
             });
@@ -165,7 +170,7 @@ module.exports = function LightControlConfigNode(RED) {
                 friendlyName: `${self.name} - Turn Off`,
                 id: (0, utility_1.getEntityId)("scene", `${self.name}_turn_off`),
                 creationCallback: (response) => { },
-                activatedCallback: (serviceData) => {
+                activatedCallback: (state, serviceData) => {
                     connectionsConfigNode.sendHASSAction("light.turn_off", { entity_id: [config.groupEntityId] }, {
                         transition: serviceData.transition || 1
                     });
@@ -176,7 +181,7 @@ module.exports = function LightControlConfigNode(RED) {
                 friendlyName: `${self.name} - Toggle`,
                 id: (0, utility_1.getEntityId)("scene", `${self.name}_toggle`),
                 creationCallback: (response) => { },
-                activatedCallback: (serviceData) => {
+                activatedCallback: (state, serviceData) => {
                     if (currentState.state == "off") {
                         runLights(serviceData.transition || 1, true);
                     }
@@ -313,10 +318,10 @@ module.exports = function LightControlConfigNode(RED) {
                     else if (currentHour >= 15 && currentHour < 19) {
                         scene = scenes["read"];
                     }
-                    else if (currentHour >= 19 && currentHour < 20) {
+                    else if (currentHour >= 19 && currentHour < 22) {
                         scene = scenes["relax"];
                     }
-                    else if (currentHour >= 20 && currentHour < 23) {
+                    else if (currentHour >= 22 && currentHour < 23) {
                         scene = scenes["rest"];
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haydendonald/node-red-contrib-hass-stuff",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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",