Merge branch 'sunset-rework' into dev

time-based/light-level-filter.js

@@ -1,18 +1,27 @@
 const states = global.get('homeassistant.homeAssistant.states')
 const luxThresholdLivingRoom = states['input_number.living_room_lux_threshold'].state
 const luxThresholdStairwell = states['input_number.stairwell_lux_threshold'].state
-const timer = states['timer.sunset_lighting_timer'].state
+const luxThresholdOutdoor = states['input_number.sunset_lights_outdoor_lux_threshold'].state
+const earlyNight = states['binary_sensor.early_night_mode'].state
+const triggered = states['input_boolean.sunset_lights_triggered'].state
 const level = msg.level
 const room = msg.room
 
-if (timer === 'active') {
+if (earlyNight === 'on' && triggered === 'off') {
     if (room === 'living-room' && level <= luxThresholdLivingRoom) {
         node.status({fill:'green',shape:'dot',text:'Sent (Living Room)'})
-        node.send(msg)
+        node.send([msg,msg])
     } else if (room === 'stairwell-bottom' && level <= luxThresholdStairwell) {
         node.status({fill:'green',shape:'dot',text:'Sent (Stairwell Bottom)'})
-        node.send(msg)
+        node.send([msg,msg])
+    } else if (room === 'outdoor' && level <= luxThresholdOutdoor) {
+        node.status({fill:'green',shape:'dot',text:'Sent (Outdoor)'})
+        node.send([msg,msg])
     }
+} else if (earlyNight === 'off') {
+    node.status({fill:'red',shape:'ring',text:'Not Evening'})
+} else if (triggered === 'on') {
+    node.status({fill:'red',shape:'ring',text:'Already Triggered'})
 } else {
-    node.status({fill:'red',shape:'ring',text:'Blocked'})
+    node.status({fill:'red',shape:'ring',text:'No Action'})
 }

time-based/processing-start.js

@@ -64,7 +64,8 @@ const booleanOff = [
     "input_boolean.give_me_darkness",
     "input_boolean.goodnight",
     "input_boolean.kallen_computer_updates",
-    "input_boolean.night_mode"
+    "input_boolean.night_mode",
+    "input_boolean.sunset_lights_triggered"
 ]
 
 //! ---------- NIGHT MODE ----------

time-based/processing.js

@@ -11,22 +11,18 @@ const sunsetLights = states['input_boolean.sunset_lights_on'].state
 const vacation = states['input_boolean.vacation_mode'].state
 const upBathOcc = states['binary_sensor.upstairs_bathroom_occupied'].state
 const deskLights = states['light.tina_desk_lights'].state
-const luxLivingRoom = states['sensor.living_room_front_illuminance'].state
-const luxThresholdLivingRoom = states['input_number.living_room_lux_threshold'].state
-const luxStairwell = states['sensor.stairwell_bottom_illuminance'].state
-const luxThresholdStairwell = states['input_number.stairwell_lux_threshold'].state
 const adaptiveSleep = flow.get("adaptiveSleep", "diskCon")
 const selScenesMain = flow.get("selScenesMain", "diskCon")
 const selScenesTinaDesk = flow.get("selScenesTinaDesk", "diskCon")
 const booleanOff = flow.get("booleanOff", "diskCon")
+const triggered = states['input_boolean.sunset_lights_triggered'].state
 const payload = msg.payload
+const topic = msg.topic
 node.log("Time-based Automations: Constants Set")
 
 // Set a few important variables
 
 let time = {}
-let topic = {}
-let delay = {}
 let eventCall = {}
 
 if (payload == 0) {
@@ -37,17 +33,6 @@ if (payload == 0) {
     eventCall = "off"
 }
 
-if (msg.topic === 'timer-finished' || msg.topic === 'manual-trigger' || msg.topic === 'lux') {
-    topic = msg.topic
-}
-
-if (topic === 'timer-finished' || topic === 'manual-trigger' || topic === 'lux') {
-    delay = 'off'
-} else if (luxLivingRoom > luxThresholdLivingRoom && luxStairwell > luxThresholdStairwell) {
-    delay = 'on'
-} else {
-    delay = 'off'
-}
 node.log("Time-based Automations: Main variables defined")
 
 // ---------- Configuration ----------
@@ -96,19 +81,8 @@ if (sunsetLights === 'off') {
     sunsetStatus = "Skipped"
 } else {
     notifyTitle = "Sunset Lights On"
-    if (topic === 'timer-finished') {
-        notifyMsg = "Lights on because timer was finished manually"
-        sunsetStatus = "Manual Trigger"
-    } else if (topic === 'lux') {
-        notifyMsg = "Lights on because light level dropped below threshold"
-        sunsetStatus = "Light Level Trigger"
-    } else if (delay === 'on') {
-        notifyMsg = "Lights on after delay due to sufficient light"
-        sunsetStatus = "Delayed"
-    } else if (delay === 'off') {
-        notifyMsg = "Lights on early due to low light"
-        sunsetStatus = "Early"
-    }
+    notifyMsg = "It's getting dark, evening lighting is now active"
+    sunsetStatus = "Light Level Trigger"
 }
 
 // Holiday Settings
@@ -125,6 +99,17 @@ if (holidayMode === 'on') {
 node.log("Time-based Automations: Decision Logic Complete")
 
 // ---------- Service Calls ----------
+
+let sendTriggered = {
+    "payload": {
+        "action": "input_boolean.turn_on",
+        "target": {
+            "entity_id": ["input_boolean.sunset_lights_triggered"]
+        },
+        "data": {}
+    }
+}
+
 let sendLights = {
     "payload": {
         "action": "light.turn_off",
@@ -199,28 +184,6 @@ let sendHoliday = {
     }
 }
 
-let sendTimer = {
-    "payload": {
-        "action": "timer.start",
-        "target": {
-            "entity_id": timerEntity
-        },
-        "data": {
-            "duration": timerDuration
-        }
-    }
-}
-
-let sendTimerCancel = {
-    "payload": {
-        "action": "timer.cancel",
-        "target": {
-            "entity_id": timerEntity
-        },
-        "data": {}
-    }
-}
-
 let sendNotifyPhone = {
     "payload": {
         "action": "script.text_notify",
@@ -298,11 +261,6 @@ node.log("lightsOff: " + lightsOff)
 node.log("holidayMode: " + holidayMode)
 node.log("eventCall: " + eventCall)
 if (time === 'night') {
-    node.log("luxLivingRoom: " + luxLivingRoom)
-    node.log("luxThresholdLivingRoom: " + luxThresholdLivingRoom)
-    node.log("luxStairwell: " + luxStairwell)
-    node.log("luxThresholdStairwell: " + luxThresholdStairwell)
-    node.log("delay: " + delay)
     node.log("sunsetStatus: " + sunsetStatus)
 }
 if (holidayMode === 'on') {
@@ -324,18 +282,13 @@ if (vacation === 'off') {
             }
         }, 5000)
     } else if (time === "night") {
-        node.status({fill:"green",shape:"dot",text:"Sunset Flow"})
-        node.send([null,sendAdaptive,null,null])
-        if (holidayMode === 'on') {
-            setTimeout(() => {
-                node.send([null,sendHoliday,null,null])
-            }, 1000)
-        }
-        if (delay === 'on') {
-            node.send([null,sendTimer,null,null])
-        } else {
-            if (topic === 'lux') {
-                node.send([null,sendTimerCancel,null,null])
+        if (triggered === 'off') {
+            node.status({fill:"green",shape:"dot",text:"Sunset Flow"})
+            node.send([null,[sendAdaptive,sendTriggered],null,null])
+            if (holidayMode === 'on') {
+                setTimeout(() => {
+                    node.send([null,sendHoliday,null,null])
+                }, 1000)
             }
             node.send([null,null,[sendFirstFloorScene,sendSecondFloorScene],sendExtraLights])
             if (deskLights === 'on') {
@@ -344,6 +297,8 @@ if (vacation === 'off') {
             if (topic != 'manual-trigger') {
                 node.send([[sendNotifyPhone,sendNotifyTV],null,null,null])
             }
+        } else {
+            node.status({fill:'green',shape:'dot',text:'Sunset Flow (Already Triggered)'})
         }
     }
 }