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"})
     }

lightfx/processing-start.js

@@ -10,13 +10,6 @@ const segLivingRoom2 = [10,11,12,13,14,15,16,17,18,19]
 const segLivingRoom3 = [20,21,22,23,24,25,26,27,28,29]
 const segLivingRoom4 = [30,31,32,33,34,35,36,37,38,39]
 
-// Preset effect segments for living room LED strip
-const effectSegLivingRoom1 = [].concat(segLivingRoom1, segLivingRoom3)
-const effectSegLivingRoom2 = [].concat(segLivingRoom2, segLivingRoom4)
-
-// Full strip for living room LED strip
-const livingRoomFull = [].concat(halfLivingRoom1, halfLivingRoom2)
-
 // Half and half for basement LED strip
 const halfBasement1 = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
 const halfBasement2 = [16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31]
@@ -27,65 +20,18 @@ const segBasement2 = [8,9,10,11,12,13,14,15]
 const segBasement3 = [16,17,18,19,20,21,22,23]
 const segBasement4 = [24,25,26,27,28,29,30,31]
 
-// Preset effect segments for basement LED strip
-const effectSegBasement1 = [].concat(segBasement1, segBasement3)
-const effectSegBasement2 = [].concat(segBasement2, segBasement4)
-
-// Full strip for basement LED strip
-const basementFull = [].concat(halfBasement1, halfBasement2)
-
-// Adaptive Lighting switches
-const adaptiveFirstFloor = [
-    "switch.adaptive_lighting_living_room",
-    "switch.adaptive_lighting_dining_room_lamp",
-    "switch.adaptive_lighting_tina_lamp"]
-
-const adaptiveBasement = [
-    "switch.adaptive_lighting_basement_studio"
-]
-
-// Define light arrays for backup scenes
-const lightsTinaDesk = ['light.tina_desk_strip','light.tina_lamp_top','light.tina_lamp_side']
-const lightsBasement = ['light.basement_tall_lamp','light.basement_short_lamp','light.basement_stairwell','light.basement_led_strip_1']
-const lightsLivingRoom = ['light.living_room_color_1','light.living_room_color_2','light.living_room_color_3','light.living_room_led_strip']
-const lightsDiningRoom = ['light.dining_room_lamp']
-const lightsStairwell = ['light.stairwell_led_strip']
-
-// Write flow variables
 flow.set("halfLivingRoom1", halfLivingRoom1, "diskCon")
-flow.set("halfLivingRoom2", halfLivingRoom2, "diskCon")
+flow.set("halfLivingRoom2", halfLivingRoom1, "diskCon")
 
 flow.set("segLivingRoom1", segLivingRoom1, "diskCon")
 flow.set("segLivingRoom2", segLivingRoom2, "diskCon")
 flow.set("segLivingRoom3", segLivingRoom3, "diskCon")
 flow.set("segLivingRoom4", segLivingRoom4, "diskCon")
 
-flow.set("effectSegLivingRoom1", effectSegLivingRoom1, "diskCon")
-flow.set("effectSegLivingRoom2", effectSegLivingRoom2, "diskCon")
-
-flow.set("livingRoomFull", livingRoomFull, "diskCon")
-
 flow.set("halfBasement1", halfBasement1, "diskCon")
-flow.set("halfBasement2", halfBasement2, "diskCon")
+flow.set("halfBasement2", halfBasement1, "diskCon")
 
 flow.set("segBasement1", segBasement1, "diskCon")
 flow.set("segBasement2", segBasement2, "diskCon")
 flow.set("segBasement3", segBasement3, "diskCon")
 flow.set("segBasement4", segBasement4, "diskCon")
-
-flow.set("effectSegBasement1", effectSegBasement1, "diskCon")
-flow.set("effectSegBasement2", effectSegBasement2, "diskCon")
-
-flow.set("basementFull", basementFull, "diskCon")
-
-flow.set("adaptiveFirstFloor", adaptiveFirstFloor, "diskCon")
-flow.set("adaptiveBasement", adaptiveBasement, "diskCon")
-
-flow.set('lightsTinaDesk', lightsTinaDesk, 'diskCon')
-flow.set('lightsBasement', lightsBasement, 'diskCon')
-flow.set('lightsLivingRoom', lightsLivingRoom, 'diskCon')
-flow.set('lightsDiningRoom', lightsDiningRoom, 'diskCon')
-flow.set('lightsStairwell', lightsStairwell, 'diskCon')
-
-flow.set('alertFirstFloor', false)
-flow.set('alertBasement', false)

lightfx/processing.js

@@ -1,368 +1,36 @@
-// Set constants
 const states = global.get('homeassistant.homeAssistant.states')
 const occupied = states["binary_sensor.basement_occupied"].state
 const quiet = states["input_boolean.studio_quiet"].state
-const stateTinaDesk = states["light.tina_desk_lights"].state
+const deskState = states["light.tina_desk_lights"].state
-const stateLivingRoom = states["light.living_room_lights"].state
+const livingRoomState = states["light.living_room_lights"].state
-const stateDiningRoom = states["light.dining_room_lamp"].state
+const diningRoomState = states["light.dining_room_lamp"].state
-const stateStairwell = states["light.stairwell_led_strip"].state
+const basementState = states["light.basement_studio_lights"].state
-const stateBasement = states["light.basement_studio_lights"].state
+const where = msg.payload.event.where
-const adaptLivingRoom = states["switch.adaptive_lighting_living_room"].state
+const type = msg.payload.event.type
-const adaptDiningRoom = states["switch.adaptive_lighting_dining_room_lamp"].state
-const adaptBasement = states["switch.adaptive_lighting_basement_studio"].state
-const nightLivingRoom = states["switch.adaptive_lighting_sleep_mode_living_room"].state
-const nightDiningRoom = states["switch.adaptive_lighting_sleep_mode_dining_room_lamp"].state
-const nightBasement = states["switch.adaptive_lighting_sleep_mode_basement_studio"].state
-const currentSceneBasement = states["input_text.basement_studio_selected_scene"].state
-const currentSceneLivingRoom = states["input_text.living_room_selected_scene"].state
-const currentSceneTinaDesk = states["input_text.tina_desk_selected_scene"].state
-const currentSceneDiningRoom = states["input_text.dining_room_lamp_selected_scene"].state
-const effectBasement = msg.payload.event.basement
-const effectFirstFloor = msg.payload.event.first_floor
-const effectColor = msg.payload.event.color
-const effectDivide = msg.payload.event.divide
 const duration = msg.payload.event.duration
-const delay = duration * 1000
-const adaptiveSwitchFirstFloor = flow.get("adaptiveFirstFloor", "diskCon")
-const adaptiveSwitchBasement = flow.get("adaptiveBasement", "diskCon")
-const lightsTinaDesk = flow.get('lightsTinaDesk', 'diskCon')
-const lightsBasement = flow.get('lightsBasement', 'diskCon')
-const lightsLivingRoom = flow.get('lightsLivingRoom', 'diskCon')
-const lightsDiningRoom = flow.get('lightsDiningRoom', 'diskCon')
-const alertFirstFloor = flow.get('alertFirstFloor')
-const alertBasement = flow.get('alertBasement')
 
-// Set flow contexts to be used later in the reset node
+let firstFloorLights = []
-flow.set("currentSceneBasement", currentSceneBasement)
+let basementLights = []
-flow.set("currentSceneLivingRoom", currentSceneLivingRoom)
-flow.set("currentSceneTinaDesk", currentSceneTinaDesk)
-flow.set('currentSceneDiningRoom', currentSceneDiningRoom)
-flow.set("adaptLivingRoom", adaptLivingRoom)
-flow.set("adaptBasement", adaptBasement)
-flow.set("nightLivingRoom", nightLivingRoom)
-flow.set("nightBasement", nightBasement)
-flow.set('nightDiningRoom', nightDiningRoom)
-flow.set("stateTinaDesk", stateTinaDesk)
-flow.set("stateLivingRoom", stateLivingRoom)
-flow.set("stateDiningRoom", stateDiningRoom)
-flow.set("stateStairwell", stateStairwell)
-flow.set("stateBasement", stateBasement)
 
-// Define empty arrays for basement LED strip zones
+if (deskState === 'on') {
-let basement1 = []
+    firstFloorLights.push('light.tina_desk_strip','light.tina_lamp_top','light.tina_lamp_side')
-let basement2 = []
-let basementFull = []
-// Define empty arrays for living room LED strip zones
-let livingRoom1 = []
-let livingRoom2 = []
-let livingRoomFull = []
-// Color names are set by default, however certain effects can override them below
-let colorName1 = effectColor
-let colorName2 = "white"
-// Define empty object for LIFX effect settings
-let lifxData = {}
-let effectLifx = msg.payload.event.lifx
-
-// Setup the proper zones to use for the effect
-if (effectDivide === 'half') {
-    basement1 = flow.get("halfBasement1", "diskCon")
-    basement2 = flow.get("halfBasement2", "diskCon")
-    livingRoom1 = flow.get("halfLivingRoom1", "diskCon")
-    livingRoom2 = flow.get("halfLivingRoom2", "diskCon")
-} else if (effectDivide === 'quarter') {
-    basement1 = flow.get("effectSegBasement1", "diskCon")
-    basement2 = flow.get("effectSegBasement2", "diskCon")
-    livingRoom1 = flow.get("effectSegLivingRoom1", "diskCon")
-    livingRoom2 = flow.get("effectSegLivingRoom2", "diskCon")
-} else if (effectDivide === 'full') {
-    basementFull = flow.get("basementFull", "diskCon")
-    livingRoomFull = flow.get("livingRoomFull", "diskCon")
 }
 
-if (effectFirstFloor === true) {
+if (livingRoomState === 'on') {
-    flow.set('alertFirstFloor', true)
+    firstFloorLights.push('light.living_room_color_1','light.living_room_color_2','light.living_room_color_3','light.living_room_led_strip')
 }
 
-if (effectBasement === true) {
+if (diningRoomState === 'on') {
-    flow.set('alertBasement', true)
+    firstFloorLights.push('light.dining_room_lamp')
 }
 
-// Set/change colors if necessary
+if (basementState === 'on') {
-if (effectColor === 'police') {
+    basementLights.push('light.basement_tall_lamp','light.basement_short_lamp','light.basement_stairwell','light.basement_led_strip_1')
-    colorName1 = 'red'
-    colorName2 = 'blue'
 }
 
-// Define parameters for different LIFX effects
+flow.set("deskState", deskState)
-if (effectLifx === 'move') {
+flow.set("livingRoomState", livingRoomState)
-    lifxData = {
+flow.set("diningRoomState", diningRoomState)
-        "speed": 0.5,
+flow.set("basementState", basementState)
-        "direction": "right",
-        "power_on": false
-    }
-} else if (effectLifx === 'ping') {
-    effectLifx = 'pulse'
-    colorName2 = colorName1
-    lifxData = {
-        "power_on": false,
-        "mode": "ping",
-        "period": 1,
-        "cycles": duration,
-        "color_name": "white",
-        "brightness": 255
-    }
-} else if (effectLifx === 'blink') {
-    effectLifx = 'pulse'
-    colorName2 = colorName1
-    lifxData = {
-        "power_on": false,
-        "mode": "blink",
-        "period": 0.5,
-        "cycles": duration * 2,
-        "color_name": "white",
-        "brightness": 255
-    }
-}
 
-// Define messages
+// let segLivingRoom = [].concat(segLivingRoom1, segLivingRoom2)
-let sendBasementStripFX = {
-    "payload": {
-        "domain": "lifx",
-        "service": "effect_" + effectLifx,
-        "target": {
-            "entity_id": ["light.basement_led_strip_1"]
-        },
-        "data": lifxData
-    }
-}
-
-let sendBasementStrip1 = {
-    "payload": {
-        "domain": "lifx",
-        "service": "set_state",
-        "target": {
-            "entity_id": ["light.basement_led_strip_1"]
-        },
-        "data": {
-            "zones": basement1,
-            "color_name": colorName1,
-            "brightness": 255
-        }
-    }
-}
-
-let sendBasementStrip2 = {
-    "payload": {
-        "domain": "lifx",
-        "service": "set_state",
-        "target": {
-            "entity_id": ["light.basement_led_strip_1"]
-        },
-        "data": {
-            "zones": basement2,
-            "color_name": colorName2,
-            "brightness": 255,
-            "power": true
-        }
-    }
-}
-
-let sendBasementLights = {
-    "payload": {
-        "domain": "light",
-        "service": "turn_on",
-        "target": {
-            "entity_id": [
-                "light.basement_tall_lamp",
-                "light.basement_short_lamp",
-                "light.basement_stairwell"
-            ]
-        },
-        "data": {
-            "color_name": colorName1,
-            "brightness": 255
-        }
-    }
-}
-
-let sendLivingRoomStripFX = {
-    "payload": {
-        "domain": "lifx",
-        "service": "effect_" + effectLifx,
-        "target": {
-            "entity_id": ["light.living_room_led_strip"]
-        },
-        "data": lifxData
-    }
-}
-
-let sendLivingRoomStrip1 = {
-    "payload": {
-        "domain": "lifx",
-        "service": "set_state",
-        "target": {
-            "entity_id": ["light.living_room_led_strip"]
-        },
-        "data": {
-            "zones": livingRoom1,
-            "color_name": colorName1,
-            "brightness": 255
-        }
-    }
-}
-
-let sendLivingRoomStrip2 = {
-    "payload": {
-        "domain": "lifx",
-        "service": "set_state",
-        "target": {
-            "entity_id": ["light.living_room_led_strip"]
-        },
-        "data": {
-            "zones": livingRoom2,
-            "color_name": colorName2,
-            "brightness": 255,
-            "power": true
-        }
-    }
-}
-
-let sendLivingRoomLights = {
-    "payload": {
-        "domain": "light",
-        "service": "turn_on",
-        "target": {
-            "entity_id": [
-                "light.living_room_color_1",
-                "light.living_room_color_2",
-                "light.living_room_color_3",
-                "light.stairwell_led_strip"
-            ]
-        },
-        "data": {
-            "color_name": colorName1,
-            "brightness": 255
-        }
-    }
-}
-
-let sendTinaDeskLights = {
-    "payload": {
-        "domain": "light",
-        "service": "turn_on",
-        "target": {
-            "entity_id": ["light.tina_desk_lights"]
-        },
-        "data": {
-            "color_name": colorName1,
-            "brightness": 255
-        }
-    }
-}
-
-let sendDiningRoomLamp = {
-    "payload": {
-        "domain": "light",
-        "service": "turn_off",
-        "target": {
-            "entity_id": ["light.dining_room_lamp"]
-        },
-        "data": {}
-    }
-}
-
-let sendAdaptiveFirstFloor = {
-    "payload": {
-        "domain": "switch",
-        "service": "turn_off",
-        "target": {
-            "entity_id": adaptiveSwitchFirstFloor
-        },
-        "data": {}
-    }
-}
-
-let sendAdaptiveBasement = {
-    "payload": {
-        "domain": "switch",
-        "service": "turn_off",
-        "target": {
-            "entity_id": adaptiveSwitchBasement
-        },
-        "data": {}
-    }
-}
-
-let backupLivingRoom = {
-    "payload": {
-        "domain": "scene",
-        "service": "create",
-        "data": {
-            "scene_id": "living_room_alert_restore",
-            "snapshot_entities": lightsLivingRoom
-        }
-    }
-}
-
-let backupTinaDesk = {
-    "payload": {
-        "domain": "scene",
-        "service": "create",
-        "data": {
-            "scene_id": "tina_desk_alert_restore",
-            "snapshot_entities": lightsTinaDesk
-        }
-    }
-}
-
-let backupBasement = {
-    "payload": {
-        "domain": "scene",
-        "service": "create",
-        "data": {
-            "scene_id": "basement_alert_restore",
-            "snapshot_entities": lightsBasement
-        }
-    }
-}
-
-let sendReset = {
-    "delay": delay
-}
-
-let sendDebug = {
-    "topic": "debug",
-    "colorName1": colorName1,
-    "colorName2": colorName2,
-    "lifxData": lifxData,
-    "effectLifx": effectLifx,
-    "basement1": basement1,
-    "basement2": basement2
-}
-
-// Send backup messages
-if (stateLivingRoom === 'on' && alertFirstFloor === false) {
-    node.send([backupLivingRoom,null,null,null,null,null])
-}
-
-if (stateTinaDesk === 'on' && alertFirstFloor === false) {
-    node.send([backupTinaDesk,null,null,null,null,null])
-}
-
-if (stateBasement === 'on' && alertBasement === false) {
-    node.send([backupBasement,null,null,null,null,null])
-}
-
-// Send effect messages
-if (effectBasement === true) {
-    node.send([null,null,null,null,[sendAdaptiveBasement,sendBasementLights,sendBasementStripFX,sendBasementStrip1,sendBasementStrip2,sendDebug],null])
-}
-
-if (effectFirstFloor === true) {
-    node.send([null,[sendAdaptiveFirstFloor,sendLivingRoomLights,sendLivingRoomStripFX,sendLivingRoomStrip1,sendLivingRoomStrip2],sendTinaDeskLights,sendDiningRoomLamp,null,null])
-}
-
-// Send the reset message to start the timer
-node.send([null,null,null,null,null,sendReset])
-
-node.status({fill:'green',shape:'dot',text:'Alert Sent'})

lightfx/reset.js

@@ -1,326 +0,0 @@
-// Set constants
-const states = global.get('homeassistant.homeAssistant.states')
-const currentSceneBasement = flow.get('currentSceneBasement')
-const currentSceneLivingRoom = flow.get('currentSceneLivingRoom')
-const currentSceneTinaDesk = flow.get('currentSceneTinaDesk')
-const currentSceneDiningRoom = flow.get('currentSceneDiningRoom')
-const adaptLivingRoom = flow.get('adaptLivingRoom')
-const adaptBasement = flow.get('adaptBasement')
-const nightLivingRoom = flow.get('nightLivingRoom')
-const nightBasement = flow.get('nightBasement')
-const nightDiningRoom = flow.get('nightDiningRoom')
-const stateTinaDesk = flow.get('stateTinaDesk')
-const stateLivingRoom = flow.get('stateLivingRoom')
-const stateDiningRoom = flow.get('stateDiningRoom')
-const stateBasement = flow.get('stateBasement')
-const stateStairwell = flow.get('stateStairwell')
-const scenesLivingRoom = states["input_select.living_room_scenes"].attributes.options
-const scenesBasement = states["input_select.basement_studio_scenes"].attributes.options
-const scenesTinaDesk = states["input_select.tina_desk_scenes"].attributes.options
-const scenesDiningRoom = states["input_select.dining_room_lamp_scenes"].attributes.options
-const definedLivingRoom = scenesLivingRoom.includes(currentSceneLivingRoom)
-const definedBasement = scenesBasement.includes(currentSceneBasement)
-const definedTinaDesk = scenesTinaDesk.includes(currentSceneTinaDesk)
-const definedDiningRoom = scenesDiningRoom.includes(currentSceneDiningRoom)
-
-// Define variables
-let setSceneLivingRoom = []
-let setSceneTinaDesk = []
-let setSceneBasement = []
-let setSceneDiningRoom = []
-let setServiceLivingRoom = []
-let setServiceTinaDesk = []
-let setServiceDiningRoom = []
-let setServiceBasement = []
-let restoreLivingRoom = {}
-let restoreTinaDesk = {}
-let restoreBasement = {}
-
-// Decide what to restore for each room
-if (stateLivingRoom === 'on') {
-    setServiceLivingRoom = 'turn_on'
-    if (definedLivingRoom === true) {
-        restoreLivingRoom = 'defined'
-        setSceneLivingRoom = currentSceneLivingRoom
-    } else if (nightLivingRoom === 'on') {
-        restoreLivingRoom = 'night'
-        setSceneLivingRoom = 'Adaptive'
-    } else if (adaptLivingRoom === 'on') {
-        restoreLivingRoom = 'adaptive'
-        setSceneLivingRoom = 'Adaptive'
-    } else {
-        restoreLivingRoom = 'backup'
-        setSceneLivingRoom = 'living_room_alert_restore'
-    }
-} else {
-    restoreLivingRoom = 'off'
-    setServiceLivingRoom = 'turn_off'
-    setSceneLivingRoom = 'Adaptive'
-}
-
-if (stateTinaDesk === 'on') {
-    setServiceTinaDesk = 'turn_on'
-    if (definedTinaDesk === true) {
-        restoreTinaDesk = 'defined'
-        setSceneTinaDesk = currentSceneTinaDesk
-    } else {
-        restoreTinaDesk = 'adaptive'
-        setSceneTinaDesk = 'Reset'
-    }
-} else {
-    restoreTinaDesk = 'off'
-    setServiceTinaDesk = 'turn_off'
-}
-
-if (stateDiningRoom === 'on') {
-    setServiceDiningRoom = 'turn_on'
-    if (nightDiningRoom === 'on') {
-        setSceneDiningRoom = 'Nightlight'
-    } else {
-        setSceneDiningRoom = 'Adaptive'
-    }
-} else {
-    setServiceDiningRoom = 'turn_off'
-}
-
-if (stateBasement === 'on') {
-    setServiceBasement = 'turn_on'
-    if (definedBasement === true) {
-        restoreBasement = 'defined'
-        setSceneBasement = currentSceneBasement
-    } else if (nightBasement === 'on') {
-        restoreBasement = 'night'
-        setSceneBasement = 'Adaptive'
-    } else if (adaptBasement === 'on') {
-        restoreBasement = 'adaptive'
-        setSceneBasement = 'Adaptive'
-    } else {
-        restoreBasement = 'backup'
-        setSceneBasement = 'basement_alert_restore'
-    }
-} else {
-    restoreBasement = 'off'
-    setServiceBasement = 'turn_off'
-    setSceneBasement = 'Adaptive'
-}
-
-// Define messages
-let sendSceneLivingRoom = {
-    "payload": {
-        "domain": "input_select",
-        "service": "select_option",
-        "target": {
-            "entity_id": ["input_select.living_room_scenes"]
-        },
-        "data": {
-            "option": setSceneLivingRoom
-        }
-    }
-}
-
-let sendSceneTinaDesk = {
-    "payload": {
-        "domain": "input_select",
-        "service": "select_option",
-        "target": {
-            "entity_id": ["input_select.tina_desk_scenes"]
-        },
-        "data": {
-            "option": setSceneTinaDesk
-        }
-    }
-}
-
-let sendSceneBasement = {
-    "payload": {
-        "domain": "input_select",
-        "service": "select_option",
-        "target": {
-            "entity_id": ["input_select.basement_studio_scenes"]
-        },
-        "data": {
-            "option": setSceneBasement
-        }
-    }
-}
-
-let sendSceneDiningRoomLamp = {
-    "payload": {
-        "domain": "input_select",
-        "service": "select_option",
-        "target": {
-            "entity_id": ["input_select.dining_room_lamp_scenes"]
-        },
-        "data": {
-            "option": setSceneDiningRoom
-        }
-    }
-}
-
-
-let sendNightLivingRoom = {
-    "payload": {
-        "domain": "switch",
-        "service": "turn_on",
-        "target": {
-            "entity_id": ["switch.adaptive_lighting_sleep_mode_living_room"]
-        },
-        "data": {}
-    }
-}
-
-let sendNightTinaDesk = {
-    "payload": {
-        "domain": "switch",
-        "service": "turn_on",
-        "target": {
-            "entity_id": ["switch.adaptive_lighting_sleep_mode_tina_desk"]
-        },
-        "data": {}
-    }
-}
-
-let sendNightBasement = {
-    "payload": {
-        "domain": "switch",
-        "service": "turn_on",
-        "target": {
-            "entity_id": ["switch.adaptive_lighting_sleep_mode_basement_studio"]
-        },
-        "data": {}
-    }
-}
-
-let sendStateLivingRoom = {
-    "payload": {
-        "domain": "light",
-        "service": setServiceLivingRoom,
-        "target": {
-            "entity_id": ["light.living_room_lights"]
-        },
-        "data": {}
-    }
-}
-
-let sendStateTinaDesk = {
-    "payload": {
-        "domain": "light",
-        "service": setServiceTinaDesk,
-        "target": {
-            "entity_id": ["light.tina_desk_lights"]
-        },
-        "data": {}
-    }
-}
-
-let sendStateDiningRoom = {
-    "payload": {
-        "domain": "light",
-        "service": setServiceDiningRoom,
-        "target": {
-            "entity_id": ["light.dining_room_lamp"]
-        },
-        "data": {}
-    }
-}
-
-let sendStateBasement = {
-    "payload": {
-        "domain": "light",
-        "service": setServiceBasement,
-        "target": {
-            "entity_id": ["light.basement_studio_lights"]
-        },
-        "data": {}
-    }
-}
-
-let sendRestoreLivingRoom = {
-    "payload": {
-        "domain": "scene",
-        "service": "turn_on",
-        "target": {
-            "entity_id": setSceneLivingRoom
-        },
-        "data": {}
-    }
-}
-
-let sendRestoreTinaDesk = {
-    "payload": {
-        "domain": "scene",
-        "service": "turn_on",
-        "target": {
-            "entity_id": setSceneTinaDesk
-        },
-        "data": {}
-    }
-}
-
-let sendRestoreBasement = {
-    "payload": {
-        "domain": "scene",
-        "service": "turn_on",
-        "target": {
-            "entity_id": setSceneBasement
-        },
-        "data": {}
-    }
-}
-
-let sendStairwellScript = {
-    "payload": {
-        "domain": "script",
-        "service": "stairwell_led_strip",
-        "data": {}
-    }
-}
-
-let sendStairwellOff = {
-    "payload": {
-        "domain": "light",
-        "service": "turn_off",
-        "target": {
-            "entity_id": ["light.stairwell_led_strip"]
-        },
-        "data": {}
-    }
-}
-
-// Send messages
-if (restoreLivingRoom === 'backup') {
-    node.send([sendRestoreLivingRoom,null,null,null])
-} else if (restoreLivingRoom === 'off') {
-    node.send([sendStateLivingRoom,null,null,null])
-} else {
-    node.send([sendSceneLivingRoom,null,null,null])
-}
-
-if (restoreTinaDesk === 'backup') {
-    node.send([null,sendRestoreTinaDesk,null,null])
-} else if (restoreTinaDesk === 'off') {
-    node.send([null,sendStateTinaDesk,null,null])
-} else {
-    node.send([null,sendSceneTinaDesk,null,null])
-}
-
-node.send([null,null,[sendStateDiningRoom,sendSceneDiningRoomLamp],null])
-
-if (restoreBasement === 'backup') {
-    node.send([null,null,null,sendRestoreBasement])
-} else if (restoreBasement === 'off') {
-    node.send([null,null,null,sendStateBasement])
-} else {
-    node.send([null,null,null,sendSceneBasement])
-}
-
-if (stateStairwell === 'on') {
-    node.send([sendStairwellScript,null,null,null])
-} else {
-    node.send([sendStairwellOff,null,null,null])
-}
-
-flow.set('alertFirstFloor', false)
-flow.set('alertBasement', false)
-
-node.status({fill:'green',shape:'dot',text:'Scenes Reset'})

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"})
         }