Moving some sensors to main configuration yaml

thejeffreystone · May 1, 2023 · 0c41d61 · 0c41d61
1 parent bf385b9
commit 0c41d61
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 62 deletions.
diff --git a/config/binary_sensors/calendar.yaml b/config/binary_sensors/calendar.yaml
@@ -1,55 +1,55 @@
 #
-#
+# MOVED to configuration.yaml
 # Workday Sensor
-- platform: workday
-  country: US
-  province: GA
-  workdays: [mon, tue, wed, thu, fri]
+# - platform: workday
+#   country: US
+#   province: GA
+#   workdays: [mon, tue, wed, thu, fri]
 
-- platform: workday
-  name: jeff_workday
-  country: US
-  province: GA
-  workdays: [mon, tue, wed, thu, fri]
-
-# Times Of Day
-- platform: tod
-  name: Night
-  after: sunset
-  before: sunrise
-
-- platform: tod
-  name: Day
-  after: sunrise
-  before: sunset
-
-- platform: tod
-  name: Quiet time
-  after: '21:00'
-  before: '06:00'
-
-- platform: tod
-  name: Lights Out
-  after: '23:00'
-  before: '06:00'
-
-- platform: tod
-  name: Morning
-  after: '06:00'
-  before: '08:30'
-
-- platform: tod
-  name: Midday
-  after: '08:30'
-  before: '17:00'
-
-- platform: tod
-  name: Evening
-  after: '17:00'
-  before: '21:00'
-
-- platform: tod
-  name: Overnight
-  after: '18:00'
-  before: '06:00'
+# - platform: workday
+#   name: jeff_workday
+#   country: US
+#   province: GA
+#   workdays: [mon, tue, wed, thu, fri]
+
+# # Times Of Day
+# - platform: tod
+#   name: Night
+#   after: sunset
+#   before: sunrise
+
+# - platform: tod
+#   name: Day
+#   after: sunrise
+#   before: sunset
+
+# - platform: tod
+#   name: Quiet time
+#   after: '21:00'
+#   before: '06:00'
+
+# - platform: tod
+#   name: Lights Out
+#   after: '23:00'
+#   before: '06:00'
+
+# - platform: tod
+#   name: Morning
+#   after: '06:00'
+#   before: '08:30'
+
+# - platform: tod
+#   name: Midday
+#   after: '08:30'
+#   before: '17:00'
+
+# - platform: tod
+#   name: Evening
+#   after: '17:00'
+#   before: '21:00'
+
+# - platform: tod
+#   name: Overnight
+#   after: '18:00'
+#   before: '06:00'
 
diff --git a/config/configuration.yaml b/config/configuration.yaml
@@ -50,16 +50,6 @@ device_tracker:
 
 discovery:
 
-template:
-  - trigger:
-      - platform: state
-        entity_id: sensor.recent_lighting_strikes
-    binary_sensor:
-      - name: lightning_detected
-        unique_id: lightning_detected_sensor
-        state: >
-          {{ states('sensor.recent_lightning_strikes') | int > 0 }}
-        device_class: safety
 
 
 sun:
@@ -72,12 +62,56 @@ zha:
   enable_quirks: true
   custom_quirks_path: /config/zha_quirks
 
+
+binary_sensor:
+- platform: workday
+  country: US
+  province: GA
+  workdays: [mon, tue, wed, thu, fri]
+- platform: workday
+  name: jeff_workday
+  country: US
+  province: GA
+  workdays: [mon, tue, wed, thu, fri]
+# Times Of Day
+- platform: tod
+  name: Night
+  after: sunset
+  before: sunrise
+- platform: tod
+  name: Day
+  after: sunrise
+  before: sunset
+- platform: tod
+  name: Quiet time
+  after: '21:00'
+  before: '06:00'
+- platform: tod
+  name: Lights Out
+  after: '23:00'
+  before: '06:00'
+- platform: tod
+  name: Morning
+  after: '06:00'
+  before: '08:30'
+- platform: tod
+  name: Midday
+  after: '08:30'
+  before: '17:00'
+- platform: tod
+  name: Evening
+  after: '17:00'
+  before: '21:00'
+- platform: tod
+  name: Overnight
+  after: '18:00'
+  before: '06:00'
+
 ### Includes ###
 automation: !include automations.yaml
 script: !include scripts.yaml
 sensor: !include_dir_merge_list sensors
 mqtt: !include mqtt.yaml
-binary_sensor: !include_dir_merge_list binary_sensors
 group: !include groups.yaml
 scene: !include scenes.yaml
 input_select: !include input_select.yaml