Merge pull request #19 from ApolloAutomation/beta

Fix ESP Build & Bad Reporting On Wakeup
ApolloAutomation · Feb 20, 2025 · 110d83e · 110d83e
2 parents 8d40aa6 + ea78953
commit 110d83e
Show file tree

Hide file tree

Showing 20 changed files with 781 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,13 @@ jobs:
           - Integrations/ESPHome/TEMP-1_Beta.yaml
           - Integrations/ESPHome/TEMP-1_Minimal.yaml
           - Integrations/ESPHome/TEMP-1B_Minimal.yaml
+
+          - Integrations/ESPHome/TEMP-1_R2.yaml
+          - Integrations/ESPHome/TEMP-1B_R2.yaml
+          - Integrations/ESPHome/TEMP-1_BLE_R2.yaml
+          - Integrations/ESPHome/TEMP-1B_BLE_R2.yaml
+          - Integrations/ESPHome/TEMP-1_Minimal_R2.yaml
+          - Integrations/ESPHome/TEMP-1B_Minimal_R2.yaml
         esphome-version:
           - stable
           - beta

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,6 +35,30 @@ jobs:
       release-summary: ${{ github.event_name == 'release' && github.event.release.body || '' }}
       release-url: ${{ github.event_name == 'release' && github.event.release.html_url || '' }}
       release-version: ${{ (github.event_name == 'release' && github.event.release.tag_name) || (github.event_name == 'workflow_dispatch' && inputs.version) || '' }}
+
+  build-firmware2:
+    name: Build And Release
+    uses: esphome/workflows/.github/workflows/build.yml@main
+    with:
+      files: |
+        Integrations/ESPHome/TEMP-1_R2.yaml
+      esphome-version: stable
+      combined-name: firmware2
+      release-summary: ${{ github.event_name == 'release' && github.event.release.body || '' }}
+      release-url: ${{ github.event_name == 'release' && github.event.release.html_url || '' }}
+      release-version: ${{ (github.event_name == 'release' && github.event.release.tag_name) || (github.event_name == 'workflow_dispatch' && inputs.version) || '' }}
+
+  build-firmware-b2:
+    name: Build And Release
+    uses: esphome/workflows/.github/workflows/build.yml@main
+    with:
+      files: |
+        Integrations/ESPHome/TEMP-1B_R2.yaml
+      esphome-version: stable
+      combined-name: firmware-b2
+      release-summary: ${{ github.event_name == 'release' && github.event.release.body || '' }}
+      release-url: ${{ github.event_name == 'release' && github.event.release.html_url || '' }}
+      release-version: ${{ (github.event_name == 'release' && github.event.release.tag_name) || (github.event_name == 'workflow_dispatch' && inputs.version) || '' }}
 
   build-site:
     name: Build Site
@@ -59,6 +83,8 @@ jobs:
     needs:
       - build-firmware
       - build-firmware-b
+      - build-firmware2
+      - build-firmware-b2
       - build-site
     permissions:
       pages: write
@@ -75,6 +101,14 @@ jobs:
         with:
           name: firmware-b
           path: firmware-b
+      - uses: actions/[email protected]
+        with:
+          name: firmware-b2
+          path: firmware-b2
+      - uses: actions/[email protected]
+        with:
+          name: firmware2
+          path: firmware2
 
       - name: Copy firmware and manifest
         run: |-
@@ -84,6 +118,14 @@ jobs:
         run: |-
           mkdir -p output/firmware-b
           cp -r firmware-b/${{ needs.build-firmware.outputs.version }}/* output/firmware-b/
+      - name: Copy firmware and manifest
+        run: |-
+          mkdir -p output/firmware2
+          cp -r firmware2/${{ needs.build-firmware.outputs.version }}/* output/firmware2/
+      - name: Copy firmware and manifest
+        run: |-
+          mkdir -p output/firmware-b2
+          cp -r firmware-b2/${{ needs.build-firmware.outputs.version }}/* output/firmware-b2/
 
       - uses: actions/[email protected]
         with:

diff --git a/Integrations/ESPHome/100Resistance.yaml b/Integrations/ESPHome/100Resistance.yaml
@@ -0,0 +1,10 @@
+sensor:
+  - platform: resistance
+    id: resistance_sensor
+    sensor: source_sensor
+    configuration: UPSTREAM
+    reference_voltage: 3.3V
+    resistor: 100kOhm
+    name: Resistance Sensor
+    internal: true
+    accuracy_decimals: 4
diff --git a/Integrations/ESPHome/Battery.yaml b/Integrations/ESPHome/Battery.yaml
@@ -50,17 +50,4 @@ script:
       - component.update: wifi_signal_db
       - component.update: sys_esp_temperature
       - component.update: sys_uptime
-      - component.update: max_17048
-
-interval:
-  - interval: 30s
-    then:
-      - switch.turn_on: accessory_power
-      - delay: 10s
-      - component.update: source_sensor
-      - component.update: aht_20
-      - component.update: temp_probe
-      - delay: 10s
-      - light.turn_off:
-          id: rgb_light
-      - switch.turn_off: accessory_power
+      - component.update: max_17048
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
@@ -1,10 +1,12 @@
 substitutions:
-  version: "25.1.30.1"
+  version: "25.2.19.1"
 
 esp32:
   board: esp32-c3-devkitm-1
   framework:
     type: esp-idf
+    version: 4.4.8
+    platform_version: 5.4.0   
 
 api:
   services:
@@ -28,6 +30,7 @@ api:
                 ESP_LOGW("Apollo", "Preventing Deep Sleep Due To OTA Or Switch");
                 id(deep_sleep_1).prevent_deep_sleep(); 
           else: 
+            - switch.turn_on: accessory_power
             - delay: 10s
             - lambda: |-
                 id(reportAllValues).execute();
@@ -72,6 +75,7 @@ i2c:
 
 one_wire:
   - platform: gpio
+    id: one_wire_bus
     pin: 
       number: GPIO6
 
@@ -134,7 +138,7 @@ number:
     restore_value: true
     initial_value: 125.0
     min_value: -55.0
-    max_value: 125.0
+    max_value: 300.0
     entity_category: "CONFIG"
     unit_of_measurement: "°C"
     optimistic: true
@@ -169,6 +173,7 @@ number:
     update_interval: never
     step: 0.1
     mode: box
+    disabled_by_default: true
 
 binary_sensor:
   - platform: status
@@ -245,15 +250,23 @@ sensor:
 
   - platform: dallas_temp
     name: "Temperature Probe"
-    update_interval: never
+    update_interval: 60s
     id: temp_probe
     filters:
       - lambda: |-
-          // If the Food probe is selected, return NaN (not a number)
+          if (isnan(x)) {
+            return NAN;
+          }
+
+          if (x == 85.0) {
+              return NAN;
+          }
+
           if (id(temp_probe_select).state == "Food") {
-            return NAN; // Report NaN
+            return NAN;
           }
-          return x; // Otherwise, return the normal value
+
+          return x;
     on_value:
       if:
         condition:
@@ -275,7 +288,7 @@ sensor:
       id: aht_humidity
       filters:
         - lambda: return x - id(aht_humidity_offset).state;
-    update_interval: never
+    update_interval: 60s
 
   - platform: ntc
     id: ntc_sensor
@@ -301,21 +314,16 @@ sensor:
           - lambda: |-
               id(tempRangeCheck).execute();
 
-  - platform: resistance
-    id: resistance_sensor
-    sensor: source_sensor
-    configuration: UPSTREAM
-    reference_voltage: 3.3V
-    resistor: 100kOhm
-    name: Resistance Sensor
-    internal: true
-
   - platform: adc
     pin: 
       number: GPIO4
     id: source_sensor
     update_interval: never
-    attenuation: auto
+    attenuation: 12db
+    filters:
+      - sliding_window_moving_average:
+          window_size: 3
+          send_every: 3
 
 light:
   - platform: esp32_rmt_led_strip
@@ -351,6 +359,7 @@ button:
     name: "Factory Reset ESP"
     id: factory_reset_all
 
+
 select:
   - platform: template
     name: "Select Probe"
@@ -424,6 +433,7 @@ switch:
     restore_mode: RESTORE_DEFAULT_OFF
     optimistic: true
     entity_category: "config"
+    disabled_by_default: true
 
 
 script:
@@ -548,3 +558,11 @@ script:
                 - light.turn_off:
                     id: rgb_light
 
+interval:  
+  - interval: 1s    
+    then:      
+      - if:          
+          condition:            
+            - switch.is_off: sensor_selector          
+          then:            
+            - component.update: source_sensor
diff --git a/Integrations/ESPHome/NewResistance.yaml b/Integrations/ESPHome/NewResistance.yaml
@@ -0,0 +1,10 @@
+sensor:
+  - platform: resistance
+    id: resistance_sensor
+    sensor: source_sensor
+    configuration: UPSTREAM
+    reference_voltage: 3.3V
+    resistor: 4.7kOhm
+    name: Resistance Sensor
+    internal: true
+    accuracy_decimals: 4
diff --git a/Integrations/ESPHome/NonBattery.yaml b/Integrations/ESPHome/NonBattery.yaml
@@ -31,15 +31,4 @@ script:
       - component.update: aht_20
       - component.update: wifi_signal_db
       - component.update: sys_esp_temperature
-      - component.update: sys_uptime
-
-interval:
-  - interval: 30s
-    then:
-      - switch.turn_on: accessory_power
-      - delay: 10s
-      - component.update: source_sensor
-      - component.update: aht_20
-      - component.update: temp_probe
-      - delay: 10s
-      - switch.turn_off: accessory_power
+      - component.update: sys_uptime
diff --git a/Integrations/ESPHome/TEMP-1.yaml b/Integrations/ESPHome/TEMP-1.yaml
@@ -31,6 +31,8 @@ esphome:
               switch.is_on: notify_only_outside_temp_difference
             then:
               - logger.log: "Apollo Automation: Notify Only Outside Temp Difference"
+              - switch.turn_on: accessory_power
+              - delay: 5s
               - lambda: |-
                   id(reportAllValues).execute();
               - delay: 5s          
@@ -123,3 +125,4 @@ logger:
 packages:
   core: !include Core.yaml
   nonbattery: !include NonBattery.yaml
+  100Resistance: !include 100Resistance.yaml
diff --git a/Integrations/ESPHome/TEMP-1B.yaml b/Integrations/ESPHome/TEMP-1B.yaml
@@ -31,6 +31,8 @@ esphome:
               switch.is_on: notify_only_outside_temp_difference
             then:
               - logger.log: "Apollo Automation: Notify Only Outside Temp Difference"
+              - switch.turn_on: accessory_power
+              - delay: 5s
               - lambda: |-
                   id(reportAllValues).execute();
               - delay: 5s          
@@ -123,3 +125,4 @@ logger:
 packages:
   core: !include Core.yaml
   battery: !include Battery.yaml
+  100Resistance: !include 100Resistance.yaml
diff --git a/Integrations/ESPHome/TEMP-1B_BLE.yaml b/Integrations/ESPHome/TEMP-1B_BLE.yaml
@@ -31,6 +31,8 @@ esphome:
             switch.is_on: notify_only_outside_temp_difference
           then:
             - logger.log: "Apollo Automation: Notify Only Outside Temp Difference"
+            - switch.turn_on: accessory_power
+            - delay: 5s
             - lambda: |-
                 id(reportAllValues).execute();
             - delay: 5s          
@@ -96,3 +98,4 @@ esp32_ble_tracker:
 packages:
   core: !include Core.yaml
   battery: !include Battery.yaml
+  100Resistance: !include 100Resistance.yaml