Merge pull request #15 from ApolloAutomation/SimplifySleep

Simplify sleep
ApolloAutomation · Nov 9, 2024 · c864bb0 · c864bb0
2 parents 774c52f + 076fabc
commit c864bb0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 65 deletions.
diff --git a/Integrations/ESPHome/Battery.yaml b/Integrations/ESPHome/Battery.yaml
@@ -5,7 +5,7 @@ external_components:
 deep_sleep:
   id: deep_sleep_1
   sleep_duration: 12h
-  run_duration: 60s
+  run_duration: 90s
 
 sensor:
   - platform: max17048
@@ -28,25 +28,8 @@ switch:
     id: accessory_power
     restore_mode: ALWAYS_ON
     setup_priority: 1100
-number:
-  - platform: template
-    name: "Run Duration"
-    id: deep_sleep_run_duration
-    min_value: 20
-    max_value: 800
-    step: 1
-    mode: box
-    update_interval: never
-    optimistic: true
-    restore_value: true
-    initial_value: 60
-    icon: "mdi:arrow-collapse-right"
     entity_category: CONFIG
-    unit_of_measurement: "s"
-    on_value:
-      then:
-        - lambda: |-
-            id(deep_sleep_1).set_run_duration(x * 1000);
+number:
 
   - platform: template
     name: "Sleep Duration"

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  version: "24.11.6.1"
+  version: "24.11.9.1"
 
 esp32:
   board: esp32-c3-devkitm-1
@@ -26,15 +26,11 @@ api:
             - lambda: |- 
                 ESP_LOGW("Apollo", "Preventing Deep Sleep Due To OTA Or Switch");
                 id(deep_sleep_1).prevent_deep_sleep(); 
-          else: 
-            - if:
-                condition:
-                  switch.is_on: sleep_after_connecting
-                then:
-                  - lambda: |-
-                      id(reportAllValues).execute();
-                  - deep_sleep.enter:
-                      id: deep_sleep_1
+          else:
+            - lambda: |-
+                id(reportAllValues).execute();
+            - deep_sleep.enter:
+                id: deep_sleep_1
 
 globals:
   - id: cycleCounter
@@ -164,8 +160,6 @@ binary_sensor:
               // Remove Wifi
               id(testCycleCount) = 0;
               id(runTest) = true;
-              id(deep_sleep_run_duration).publish_state(60);
-              id(deep_sleep_sleep_duration).publish_state(60);
               id(prevent_sleep).turn_on();
               id(factory_reset_switch).turn_on();
             }
@@ -337,13 +331,6 @@ switch:
             then:
               - lambda: |- 
                   id(deep_sleep_1).allow_deep_sleep();
-  - platform: template
-    name: "Sleep After Connecting"
-    id: sleep_after_connecting
-    icon: mdi:sleep
-    restore_mode: RESTORE_DEFAULT_ON
-    optimistic: true
-    entity_category: "config"
 
 script:
   - id: statusCheck

diff --git a/Integrations/ESPHome/NonBattery.yaml b/Integrations/ESPHome/NonBattery.yaml
@@ -1,28 +1,9 @@
 deep_sleep:
   id: deep_sleep_1
   sleep_duration: 5min
-  run_duration: 1min
+  run_duration: 90s
 
 number:
-  - platform: template
-    name: "Run Duration"
-    id: deep_sleep_run_duration
-    min_value: 20
-    max_value: 800
-    step: 1
-    mode: box
-    update_interval: never
-    optimistic: true
-    restore_value: true
-    initial_value: 60
-    icon: "mdi:arrow-collapse-right"
-    entity_category: CONFIG
-    unit_of_measurement: "s"
-    on_value:
-      then:
-        - lambda: |-
-            id(deep_sleep_1).set_run_duration(x * 1000);
-  
   - platform: template
     name: "Sleep Duration"
     id: deep_sleep_sleep_duration

diff --git a/Integrations/ESPHome/PLT-1.yaml b/Integrations/ESPHome/PLT-1.yaml
@@ -15,7 +15,6 @@ esphome:
     - priority: 800.0
       then:
         - lambda: |-
-            id(deep_sleep_1).set_run_duration(id(deep_sleep_run_duration).state * 1000);
             id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 60 * 1000);
         - if:
             condition:

diff --git a/Integrations/ESPHome/PLT-1B.yaml b/Integrations/ESPHome/PLT-1B.yaml
@@ -14,10 +14,7 @@ esphome:
   on_boot:
     - priority: 999.0
       then:
-        - switch.turn_on: accessory_power
-
         - lambda: |-
-            id(deep_sleep_1).set_run_duration(id(deep_sleep_run_duration).state * 1000);
             id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 60 * 1000);
         - if:
             condition:

diff --git a/Integrations/ESPHome/PLT-1B_BLE.yaml b/Integrations/ESPHome/PLT-1B_BLE.yaml
@@ -14,9 +14,7 @@ esphome:
   on_boot:
     priority: 500
     then:
-      - switch.turn_on: accessory_power
       - lambda: |-
-          id(deep_sleep_1).set_run_duration(id(deep_sleep_run_duration).state * 1000);
           id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 60 * 1000);
       - if:
           condition:
@@ -46,6 +44,9 @@ safe_mode:
 bluetooth_proxy:
   active: true
 
+esp32_ble_tracker:
+  scan_parameters:
+    active: false
 
 wifi:
   ap:

diff --git a/Integrations/ESPHome/PLT-1_BLE.yaml b/Integrations/ESPHome/PLT-1_BLE.yaml
@@ -15,7 +15,6 @@ esphome:
     priority: 500
     then:
       - lambda: |-
-          id(deep_sleep_1).set_run_duration(id(deep_sleep_run_duration).state * 1000);
           id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 60 * 1000);
       - if:
           condition:
@@ -44,6 +43,10 @@ safe_mode:
 bluetooth_proxy:
   active: true
 
+esp32_ble_tracker:
+  scan_parameters:
+    active: false
+
 
 wifi:
   ap: