Merge pull request #5 from ApolloAutomation/8mb

Production Ready

Author: TrevorSchirmer

Integrations/ESPHome/BTN-1.yaml

@@ -121,63 +121,52 @@ api:
             
             // Trigger the corresponding binary sensor
             if (wake_button == "1") {
-              id(button_1).publish_state(true);
+              id(button_1_event).trigger("Single Click");
             } else if (wake_button == "2") {
-              id(button_2).publish_state(true);
+              id(button_2_event).trigger("Single Click");
             } else if (wake_button == "3") {
-              id(button_3).publish_state(true);
+              id(button_3_event).trigger("Single Click");
             } else if (wake_button == "4") {
-              id(button_4).publish_state(true);
+              id(button_4_event).trigger("Single Click");
             }
-          }
-      - delay: 1s
-      - lambda: |-
-          // Get which button woke up the device again
-          std::string wake_button = id(wakeup_button_pressed).state;
-          
-          if (wake_button != "0" && wake_button != "") {
-            // Release the corresponding binary sensor
-            if (wake_button == "1") {
-              id(button_1).publish_state(false);
-            } else if (wake_button == "2") {
-              id(button_2).publish_state(false);
-            } else if (wake_button == "3") {
-              id(button_3).publish_state(false);
-            } else if (wake_button == "4") {
-              id(button_4).publish_state(false);
-            }
-            
-            // Reset the wake button sensor to "0"
             id(wakeup_button_pressed).publish_state("0");
           }
+
+      # Send Wake up Button State
       - component.update: wakeup_button_pressed
-      - delay: 1s
+
+      # Check OTA Switch
+      - delay: 3s
       - if:
           condition:
             or:
               - binary_sensor.is_on: ota_mode
               - switch.is_on: prevent_sleep
           then:
-            - lambda: |-
+            - lambda: |- 
                 ESP_LOGW("Apollo", "Preventing Deep Sleep Due To OTA Or Switch");
-                id(deep_sleep_1).prevent_deep_sleep();
-          else:
-            - delay: 10s
+                id(deep_sleep_1).prevent_deep_sleep(); 
+          else: 
+            - lambda: |-
+                id(reportAllValues).execute();
+            - delay: 2s
             - deep_sleep.enter:
                 id: deep_sleep_1
 
 external_components:
   - source: github://ApolloAutomation/ExternalComponents
     components: [deep_sleep]
+  - source: github://ApolloAutomation/esphome-battery-component
+    components: [max17048] #Forked OptionZero
 
 dashboard_import:
   package_import_url: github://ApolloAutomation/BTN-1/Integrations/ESPHome/BTN-1.yaml
   import_full_config: false
 
-#improv_serial:
+improv_serial:
 
-#esp32_improv:
-#  authorizer: none
+esp32_improv:
+  authorizer: none
 
 ota:
   - platform: esphome
@@ -194,14 +183,14 @@ update:
   - platform: http_request
     id: firmware_update
     name: Firmware Update
-    source: https://apolloautomation.github.io/BTN-1/artifact/manifest.json
+    source: https://apolloautomation.github.io/BTN-1/firmware/manifest.json
 
 wifi:
-#  on_connect:
-#    - delay: 5s
-#    - ble.disable:
-#  on_disconnect:
-#    - ble.enable:
+  on_connect:
+    - delay: 5s
+    - ble.disable:
+  on_disconnect:
+    - ble.enable:
   ap:
     ssid: "Apollo BTN1 Hotspot"
 

Integrations/ESPHome/Core.yaml

@@ -1,42 +1,24 @@
 substitutions:
   name: apollo-btn-1
-  version: "25.6.1.3"
+  version: "25.8.21.1"
   device_description: ${name} made by Apollo Automation - version ${version}.
 
 esp32:
   board: esp32-c6-devkitm-1
   variant: esp32c6
-  flash_size: 4MB
+  flash_size: 8MB
   framework:
     type: esp-idf
 
 api:
+  id: api_server
   services:
     - service: play_buzzer
       variables:
         song_str: string
       then:
         - rtttl.play:
             rtttl: !lambda 'return song_str;'
-  reboot_timeout: 0s
-  on_client_connected:
-    then:
-      - delay: 5s
-      - if:
-          condition:
-            or:
-              - binary_sensor.is_on: ota_mode
-              - switch.is_on: prevent_sleep
-          then:
-            - lambda: |- 
-                ESP_LOGW("Apollo", "Preventing Deep Sleep Due To OTA Or Switch");
-                id(deep_sleep_1).prevent_deep_sleep(); 
-          else: 
-            - lambda: |-
-                id(reportAllValues).execute();
-            - delay: 2s
-            - deep_sleep.enter:
-                id: deep_sleep_1
 
 globals:
   - id: cycleCounter
@@ -49,11 +31,14 @@ globals:
     initial_value: '0'
 
 captive_portal:
+  id: captive_portal_instance
 
 web_server:
+  id: web_server_instance
   port: 80
 
 i2c:
+  id: i2c_bus
   sda: GPIO1
   scl: GPIO0
 
@@ -199,27 +184,27 @@ binary_sensor:
           - ON for at most 300ms
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_1_event
-                    event_type: Single Click
+          - event.trigger:
+              id: button_1_event
+              event_type: Single Click
 
       - timing:
           - ON for at most 300ms
           - OFF for at most 0.5s
           - ON for at most 300ms
           - OFF for at least 0.2s
         then:
-                - event.trigger:
-                    id: button_1_event
-                    event_type: Double Click
+          - event.trigger:
+              id: button_1_event
+              event_type: Double Click
 
       - timing:
           - ON for 1s to 5s
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_1_event
-                    event_type: Long Press
+          - event.trigger:
+              id: button_1_event
+              event_type: Long Press
 
   - platform: gpio
     id: button_2
@@ -236,27 +221,27 @@ binary_sensor:
           - ON for at most 300ms
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_2_event
-                    event_type: Single Click
+          - event.trigger:
+              id: button_2_event
+              event_type: Single Click
 
       - timing:
           - ON for at most 300ms
           - OFF for at most 0.5s
           - ON for at most 300ms
           - OFF for at least 0.2s
         then:
-                - event.trigger:
-                    id: button_2_event
-                    event_type: Double Click
+          - event.trigger:
+              id: button_2_event
+              event_type: Double Click
 
       - timing:
           - ON for 1s to 5s
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_2_event
-                    event_type: Long Press
+          - event.trigger:
+              id: button_2_event
+              event_type: Long Press
 
   - platform: gpio
     id: button_3
@@ -275,27 +260,27 @@ binary_sensor:
           - ON for at most 300ms
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_3_event
-                    event_type: Single Click
+          - event.trigger:
+              id: button_3_event
+              event_type: Single Click
 
       - timing:
           - ON for at most 300ms
           - OFF for at most 0.5s
           - ON for at most 300ms
           - OFF for at least 0.2s
         then:
-                - event.trigger:
-                    id: button_3_event
-                    event_type: Double Click
+          - event.trigger:
+              id: button_3_event
+              event_type: Double Click
 
       - timing:
           - ON for 1s to 5s
           - OFF for at least 0.5s
         then:
-                - event.trigger:
-                    id: button_3_event
-                    event_type: Long Press
+          - event.trigger:
+              id: button_3_event
+              event_type: Long Press
 
   - platform: gpio
     id: button_4
@@ -369,6 +354,19 @@ sensor:
     update_interval: 60s
     entity_category: "diagnostic"
 
+  - platform: max17048
+    id: max_17048
+    battery_voltage:
+      name: Battery voltage
+      id: batt_v
+    battery_level:
+      name: Battery level
+      id: batt_pct
+      filters:
+        - lambda: |
+            if (x > 100) return 100;
+            else return (x);
+
 switch:
   - platform: template
     name: "Prevent Sleep"
@@ -407,12 +405,11 @@ switch:
     setup_priority: 2000
     internal: true
 
-# LED Configuration - Using monochromatic light since we have single GPIO
 light:
   - platform: partition
     name: "BTN 1 Light"
+    default_transition_length: 0s
     segments:
-      # Use first 10 LEDs from the light with ID light1
       - id: rgb_light
         from: 0
         to: 0
@@ -431,8 +428,8 @@ light:
           max_brightness: 100%
   - platform: partition
     name: "BTN 2 Light"
+    default_transition_length: 0s
     segments:
-      # Use first 10 LEDs from the light with ID light1
       - id: rgb_light
         from: 1
         to: 1
@@ -451,8 +448,8 @@ light:
           max_brightness: 100%
   - platform: partition
     name: "BTN 3 Light"
+    default_transition_length: 0s
     segments:
-      # Use first 10 LEDs from the light with ID light1
       - id: rgb_light
         from: 2
         to: 2
@@ -471,8 +468,8 @@ light:
           max_brightness: 100%
   - platform: partition
     name: "BTN 4 Light"
+    default_transition_length: 0s
     segments:
-      # Use first 10 LEDs from the light with ID light1
       - id: rgb_light
         from: 3
         to: 3