From 3cf07c6fac084cead8a5137c635b815a1cba6612 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Sat, 4 Jun 2022 03:32:23 -0400
Subject: [PATCH] Initial adjustments for new Ring system

---
 input_boolean.yaml     |  8 ++++++-
 packages/lighting.yaml | 48 ++++++++++++++++++++++++++++++++++++++++++
 scripts.yaml           | 21 ++++++++++++------
 3 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 packages/lighting.yaml

diff --git a/input_boolean.yaml b/input_boolean.yaml
index 820d725..3d8225d 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -33,4 +33,10 @@ kallen_overnight:
   icon: mdi:weather-night
 living_room_dynamic_scenes:
   name: Living Room Dynamic Scenes
-  icon: mdi:animation
\ No newline at end of file
+  icon: mdi:animation
+night_mode:
+  name: Night Mode
+  icon: mdi:lightbulb-night
+early_night_mode:
+  name: Early Night Mode
+  icon: mdi:lightbulb-night-outline
diff --git a/packages/lighting.yaml b/packages/lighting.yaml
new file mode 100644
index 0000000..f2978ab
--- /dev/null
+++ b/packages/lighting.yaml
@@ -0,0 +1,48 @@
+automation:
+  - id: 6fe64356-00a2-4cad-bb85-f6dd05f29de7
+    alias: Upstairs Bathroom Motion Lights
+    description: Turns up lights in the upstairs bathroom at night when someone walks into the room.
+    mode: queued
+    trigger:
+      - platform: state
+        entity_id: binary_sensor.upstairs_bathroom_motion
+        to: 'on'
+        id: motion-on
+      - platform: state
+        entity_id: binary_sensor.upstairs_bathroom_motion
+        to: 'off'
+        id: motion-off
+        for:
+          hours: 0
+          minutes: 2
+          seconds: 0
+    condition:
+      - condition: state
+        entity_id: light.upstairs_bathroom_lights
+        state: 'on'
+    action:
+      - if:
+          - condition: trigger
+            id: motion-on
+        then:
+          - service: input_select.select_option
+            target:
+              entity_id: input_select.upstairs_bathroom_scenes
+            data:
+              option: Adaptive
+      - if:
+          - condition: trigger
+            id: motion-off
+        then:
+          - service: input_select.select_option
+            target:
+              entity_id: input_select.upstairs_bathroom_scenes
+            data:
+              option: >-
+                {% if is_state('input_boolean.early_night_mode','on') and is_state('input_boolean.night_mode','off') %}
+                  Nightlight
+                {% elif is_state('input_boolean.night_mode','on') %}
+                  Single Nightlight
+                {% else %}
+                  Adaptive
+                {% endif %}
diff --git a/scripts.yaml b/scripts.yaml
index 5568375..aff4e96 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -21,14 +21,18 @@ stop_netflix:
 give_me_darkness:
   alias: Give Me Darkness
   sequence:
+  - service: input_boolean.turn_on
+    data: {}
+    target:
+      entity_id: input_boolean.early_night_mode
   - service: switch.turn_on
     target:
       entity_id:
       - switch.adaptive_lighting_sleep_mode_upstairs_hallway
       - switch.adaptive_lighting_sleep_mode_mud_room
       - switch.adaptive_lighting_sleep_mode_dining_room
-      - switch.adaptive_lighting_sleep_mode_upstairs_bathroom
       - switch.adaptive_lighting_sleep_mode_tina_lamp
+      - switch.adaptive_lighting_sleep_mode_upstairs_bathroom
     data: {}
   - service: light.turn_off
     target:
@@ -45,6 +49,11 @@ give_me_darkness:
       area_id:
       - upstairs_bathroom
       - dining_room
+  - service: input_select.select_option
+    data:
+      option: Nightlight
+    target:
+      entity_id: input_select.upstairs_bathroom_scenes
   mode: single
   icon: mdi:weather-night
 start_youtube:
@@ -141,9 +150,9 @@ family_is_away:
       - upstairs_bathroom
     data: {}
   - service: alarm_control_panel.alarm_arm_away
-    target:
-      entity_id: alarm_control_panel.alexa_guard_9ee3b
     data: {}
+    target:
+      entity_id: alarm_control_panel.stratton_ave_alarm
   mode: single
   icon: mdi:shield-lock
 family_is_home:
@@ -154,9 +163,9 @@ family_is_home:
       entity_id: switch.presence_simulation
     data: {}
   - service: alarm_control_panel.alarm_disarm
-    target:
-      entity_id: alarm_control_panel.alexa_guard_9ee3b
     data: {}
+    target:
+      entity_id: alarm_control_panel.stratton_ave_alarm
   - service: switch.turn_off
     target:
       entity_id:
@@ -261,14 +270,12 @@ going_upstairs:
       - switch.adaptive_lighting_sleep_mode_basement_studio
       - switch.adaptive_lighting_sleep_mode_mud_room
       - switch.adaptive_lighting_sleep_mode_upstairs_hallway
-      - switch.adaptive_lighting_sleep_mode_upstairs_bathroom
   - service: light.turn_on
     data: {}
     target:
       entity_id:
       - light.living_room_lights
       - light.basement_led_strip_1
-      - light.upstairs_bathroom_lights
   mode: single
   icon: hue:room-stairs
 basement_on: