Update .gitignore

Motion lighting should no longer reset lights to adaptive when scene or brightness has been changed manually

.gitignore

@@ -1 +1 @@
-/.vscode
+**.vscode

climate/basement/basement_off.js

@@ -13,7 +13,7 @@ if (outsideTemp > 32) {
     if (nightMode === 'on') {
         preset = "frost"
     } else {
-        preset = "eco"
+        preset = "activity"
     }
 }
 

first-floor-lighting/downstairs-bathroom/downstairs-bathroom.js

@@ -7,17 +7,22 @@ const payload = msg.payload
 const newDuration = duration * 60
 
 if (payload === 'on') {
-    if (lux <= threshold || lights === 'on') {
+    if (lux <= threshold && lights === 'off') {
-        node.status({fill:'green',shape:'dot',text:'Lights On'})
+        node.status({fill:'green',shape:'dot',text:'Turning lights on'})
-        node.send([msg,null])
+        node.send([msg,msg,null])
     } else {
-        node.status({fill:'red',shape:'ring',text:'Too bright'})
+        if (lights === 'on') {
+            node.status({fill:'red',shape:'ring',text:'Lights already on'})
+            node.send([null,msg,null])
+        } else {
+            node.status({fill:'red',shape:'ring',text:'Too bright'})
+        }
     }
 } else if (payload === 'off') {
     if (lights === 'on') {
         msg.duration = newDuration
         node.status({fill:"green",shape:"dot",text:parseInt(duration) + ' minutes'})
-        node.send([null,msg])
+        node.send([null,null,msg])
     } else {
         node.status({fill:"red",shape:"ring",text:"Lights already off"})
     }

first-floor-lighting/mud-room/mud-room.js

@@ -1,5 +1,6 @@
 const states = global.get('homeassistant.homeAssistant.states')
 const lights = states['light.mud_room_overhead'].state
+const selScene = states['input_text.mud_room_selected_scene'].state
 const duration = states['input_number.mud_room_lights_off_delay'].state
 const lux = parseInt(states['sensor.mud_room_illuminance'].state)
 const threshold = parseInt(states['input_number.mud_room_lux_threshold'].state)
@@ -7,17 +8,22 @@ const payload = msg.payload
 const newDuration = duration * 60
 
 if (payload === 'on') {
-    if (lux <= threshold || lights === 'on') {
+    if (lux <= threshold && (lights === 'off' || selScene === 'Nightlight')) {
-        node.status({fill:'green',shape:'dot',text:'Lights On'})
+        node.status({fill:'green',shape:'dot',text:'Turning lights on'})
-        node.send([msg,null])
+        node.send([msg,msg,null])
     } else {
-        node.status({fill:'red',shape:'ring',text:'Too bright'})
+        if (lights === 'on') {
+            node.status({fill:'red',shape:'ring',text:'Lights already on'})
+            node.send([null,msg,null])
+        } else {
+            node.status({fill:'red',shape:'ring',text:'Too bright'})
+        }
     }
 } else if (payload === 'off') {
     if (lights === 'on') {
         msg.duration = newDuration
         node.status({fill:"green",shape:"dot",text:parseInt(duration) + ' minutes'})
-        node.send([null,msg])
+        node.send([null,null,msg])
     } else {
         node.status({fill:"red",shape:"ring",text:"Lights already off"})
     }

second-floor-lighting/emma-bedroom/emma-bedroom.js

@@ -9,17 +9,22 @@ const newDuration = duration * 60
 
 if (sleeping === 'off') {
     if (payload === 'on') {
-        if (lux <= threshold || lights === 'on') {
+        if (lux <= threshold && lights === 'off') {
-            node.status({fill:'green',shape:'dot',text:'Lights On'})
+            node.status({fill:'green',shape:'dot',text:'Turning lights on'})
-            node.send([msg,null])
+            node.send([msg,msg,null])
         } else {
-            node.status({fill:'red',shape:'ring',text:'Too bright'})
+            if (lights === 'on') {
+                node.status({fill:'red',shape:'ring',text:'Lights already on'})
+                node.send([null,msg,null])
+            } else {
+                node.status({fill:'red',shape:'ring',text:'Too bright'})
+            }
         }
     } else if (payload === 'off') {
         if (lights === 'on') {
             msg.duration = newDuration
             node.status({fill:"green",shape:"dot",text:parseInt(duration) + ' minutes'})
-            node.send([null,msg])
+            node.send([null,null,msg])
         } else {
             node.status({fill:"red",shape:"ring",text:"Lights already off"})
         }

second-floor-lighting/kallen-bedroom/kallen-bedroom.js

@@ -9,17 +9,22 @@ const newDuration = duration * 60
 
 if (sleeping === 'off') {
     if (payload === 'on') {
-        if (lux <= threshold || lights === 'on') {
+        if (lux <= threshold && lights === 'off') {
-            node.status({fill:'green',shape:'dot',text:'Lights On'})
+            node.status({fill:'green',shape:'dot',text:'Turning lights on'})
-            node.send([msg,null])
+            node.send([msg,msg,null])
         } else {
-            node.status({fill:'red',shape:'ring',text:'Too bright'})
+            if (lights === 'on') {
+                node.status({fill:'red',shape:'ring',text:'Lights already on'})
+                node.send([null,msg,null])
+            } else {
+                node.status({fill:'red',shape:'ring',text:'Too bright'})
+            }
         }
     } else if (payload === 'off') {
         if (lights === 'on') {
             msg.duration = newDuration
             node.status({fill:"green",shape:"dot",text:parseInt(duration) + ' minutes'})
-            node.send([null,msg])
+            node.send([null,null,msg])
         } else {
             node.status({fill:"red",shape:"ring",text:"Lights already off"})
         }

second-floor-lighting/master-bedroom/master-bedroom.js

@@ -12,17 +12,22 @@ const newDuration = duration * 60
 
 if (peopleSleeping === false && nightMode === 'off') {
     if (payload === 'on') {
-        if (lux <= threshold || lights === 'on') {
+        if (lux <= threshold && lights === 'off') {
-            node.status({fill:'green',shape:'dot',text:'Lights On'})
+            node.status({fill:'green',shape:'dot',text:'Turning lights on'})
-            node.send([msg,null])
+            node.send([msg,msg,null])
         } else {
-            node.status({fill:'red',shape:'ring',text:'Too bright'})
+            if (lights === 'on') {
+                node.status({fill:'red',shape:'ring',text:'Lights already on'})
+                node.send([null,msg,null])
+            } else {
+                node.status({fill:'red',shape:'ring',text:'Too bright'})
+            }
         }
     } else if (payload === 'off') {
         if (lights === 'on') {
             msg.duration = newDuration
             node.status({fill:"green",shape:"dot",text:parseInt(duration) + ' minutes'})
-            node.send([null,msg])
+            node.send([null,null,msg])
         } else {
             node.status({fill:"red",shape:"ring",text:"Lights already off"})
         }