From d95da78343c86bab446adabfb50ad449cdc2c88d Mon Sep 17 00:00:00 2001 From: Trevor Schirmer Date: Fri, 5 Jul 2024 12:13:43 -0400 Subject: [PATCH 1/2] Remove Managed Updates System --- .github/workflows/ci.yml | 1 + Integrations/ESPHome/MTR-1.yaml | 19 +- Integrations/ESPHome/MTR-1_BLE.yaml | 563 ++++++++++++++++++++++++++++ 3 files changed, 567 insertions(+), 16 deletions(-) create mode 100644 Integrations/ESPHome/MTR-1_BLE.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaab2f7..cfc1a50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ jobs: matrix: file: - Integrations/ESPHome/MTR-1.yaml + - Integrations/ESPHome/MTR-1_BLE.yaml steps: - name: Checkout source code uses: actions/checkout@v4.1.7 diff --git a/Integrations/ESPHome/MTR-1.yaml b/Integrations/ESPHome/MTR-1.yaml index 16a0e97..dbe5321 100644 --- a/Integrations/ESPHome/MTR-1.yaml +++ b/Integrations/ESPHome/MTR-1.yaml @@ -1,7 +1,7 @@ #Define Project substitutions: name: apollo-mtr-1 - version: "24.7.4.1" + version: "24.7.5.1" device_description: ${name} made by Apollo Automation - version ${version}. esphome: @@ -25,6 +25,7 @@ esphome: - lambda: "return id(runTest);" then: - lambda: "id(testScript).execute();" + esp32: board: esp32-c3-devkitm-1 @@ -92,23 +93,11 @@ api: value: !lambda "return co2_ppm;" id: scd40 +logger: ota: - platform: esphome id: ota_default - - platform: http_request - id: ota_managed - -http_request: - useragent: esphome/device - timeout: 10s - verify_ssl: false - -update: - - platform: http_request - id: firmware_update - name: Firmware Update - source: https://apolloautomation.github.io/MTR-1/artifact/manifest.json wifi: @@ -571,5 +560,3 @@ script: blue: 0% - light.turn_off: id: rgb_light - - diff --git a/Integrations/ESPHome/MTR-1_BLE.yaml b/Integrations/ESPHome/MTR-1_BLE.yaml new file mode 100644 index 0000000..7ab8d4f --- /dev/null +++ b/Integrations/ESPHome/MTR-1_BLE.yaml @@ -0,0 +1,563 @@ +#Define Project +substitutions: + name: apollo-mtr-1 + version: "24.7.5.1" + device_description: ${name} made by Apollo Automation - version ${version}. + +esphome: + name: "${name}" + friendly_name: Apollo MTR-1 + comment: Apollo MTR-1 + name_add_mac_suffix: true + platformio_options: + board_build.flash_mode: dio + + project: + name: "ApolloAutomation.MTR-1" + version: "${version}" + + min_version: 2024.6.0 + on_boot: + priority: -10 + then: + - if: + condition: + - lambda: "return id(runTest);" + then: + - lambda: "id(testScript).execute();" + + +esp32: + board: esp32-c3-devkitm-1 + framework: + type: esp-idf + +dashboard_import: + package_import_url: github://ApolloAutomation/MTR-1/Integrations/ESPHome/MTR-1.yaml + import_full_config: false + +external_components: + - source: + type: git + url: https://github.com/TrevorSchirmer/esphome_ld2450 + ref: CorrectTargetDirection + components: [ ld2450 ] + +globals: + - id: button_press_timestamp + restore_value: no + type: uint32_t + initial_value: "0" + - id: runTest + restore_value: yes + type: bool + initial_value: "true" + - id: testCycleCount + type: int + restore_value: no + initial_value: "0" + - id: dps310Passed + restore_value: no + type: bool + initial_value: "false" + - id: ltr390lightPassed + restore_value: no + type: bool + initial_value: "false" + - id: ltr390uvindexPassed + restore_value: no + type: bool + initial_value: "false" + - id: ld2450Passed + restore_value: no + type: bool + initial_value: "false" + +# Enable Home Assistant API +# Also Add Buzzer Service Connection +api: + services: + - service: play_buzzer + variables: + song_str: string + then: + - rtttl.play: + rtttl: !lambda "return song_str;" + + #Co2 Calibration Service + - service: calibrate_co2_value + variables: + co2_ppm: float + then: + - scd4x.perform_forced_calibration: + value: !lambda "return co2_ppm;" + id: scd40 + +logger: + +ota: + - platform: esphome + id: ota_default + +bluetooth_proxy: + active: true + +wifi: + ap: + ssid: "Apollo MTR1 Hotspot" + +captive_portal: + +web_server: + port: 80 + +i2c: + sda: GPIO1 + scl: GPIO0 + id: bus_a + +uart: + id: uart_bus + tx_pin: + number: GPIO21 + mode: + input: true + pullup: true + rx_pin: + number: GPIO20 + mode: + input: true + pullup: true + baud_rate: 256000 + parity: NONE + stop_bits: 1 + +ld2450: + id: ld2450_radar + uart_id: uart_bus + throttle: 500ms + +# Numbers For Configuration +number: + - platform: ld2450 + ld2450_id: ld2450_radar + presence_timeout: + name: "Timeout" + zone_1: + x1: + name: Zone-1 X1 + y1: + name: Zone-1 Y1 + x2: + name: Zone-1 X2 + y2: + name: Zone-1 Y2 + zone_2: + x1: + name: Zone-2 X1 + y1: + name: Zone-2 Y1 + x2: + name: Zone-2 X2 + y2: + name: Zone-2 Y2 + zone_3: + x1: + name: Zone-3 X1 + y1: + name: Zone-3 Y1 + x2: + name: Zone-3 X2 + y2: + name: Zone-3 Y2 + - platform: template + name: DPS310 Temperature Offset + id: dps310_temperature_offset + restore_value: true + initial_value: 18.86 + min_value: -70.0 + max_value: 70.0 + entity_category: "CONFIG" + unit_of_measurement: "°C" + optimistic: true + update_interval: never + step: 0.1 + mode: box + - platform: template + name: SCD40 Temperature Offset + id: scd40_temperature_offset + restore_value: true + initial_value: 18.86 + min_value: -70.0 + max_value: 70.0 + entity_category: "CONFIG" + unit_of_measurement: "°C" + optimistic: true + update_interval: never + step: 0.1 + mode: box + disabled_by_default: true + - platform: template + name: SCD40 Humidity Offset + id: scd40_humidity_offset + restore_value: true + initial_value: 0 + min_value: -70.0 + max_value: 70.0 + entity_category: "CONFIG" + unit_of_measurement: "%" + optimistic: true + update_interval: never + step: 0.1 + mode: box + disabled_by_default: true + +# Buzzer +output: + - platform: ledc + pin: GPIO10 + id: buzzer +rtttl: + output: buzzer + +binary_sensor: + - platform: status + name: Online + id: ink_ha_connected + + - platform: gpio + pin: + number: GPIO9 + inverted: true + ignore_strapping_warning: true + mode: + input: true + pullup: true + id: reset_button + on_press: + then: + - lambda: |- + id(button_press_timestamp) = millis(); + + on_release: + then: + - lambda: |- + if (millis() - id(button_press_timestamp) >= 1000) { + id(testCycleCount) = 0; + id(runTest) = true; + id(testScript).execute(); + } + else if (millis() - id(button_press_timestamp) >= 8000) { + id(factory_reset_switch).turn_on(); + } + +sensor: + - platform: internal_temperature + name: "ESP Temperature" + id: sys_esp_temperature + + - platform: uptime + name: Uptime + id: sys_uptime + update_interval: 60s + + - platform: wifi_signal + name: RSSI + id: wifi_signal_db + update_interval: 60s + entity_category: "diagnostic" + + - platform: scd4x + id: scd40 + co2: + name: "CO2" + id: "co2" + temperature: + name: "SCD40 Temperature" + id: scd40_temperature + disabled_by_default: true + filters: + - lambda: return x - id(scd40_temperature_offset).state; + humidity: + name: "SCD40 Humidity" + id: scd40_humidity + disabled_by_default: true + filters: + - lambda: return x - id(scd40_humidity_offset).state; + automatic_self_calibration: false + update_interval: 60s + measurement_mode: "periodic" + i2c_id: bus_a + ambient_pressure_compensation_source: dps310pressure + + - platform: dps310 + id: dps_310 + pressure: + name: "DPS310 Pressure" + id: dps310pressure + temperature: + name: "DPS310 Temperature" + id: dps310temperature + filters: + - lambda: return x - id(dps310_temperature_offset).state; + update_interval: 30s + i2c_id: bus_a + + - platform: ltr390 + id: ltr_390 + light: + name: "LTR390 Light" + id: ltr390light + uv_index: + name: "LTR390 UV Index" + id: ltr390uvindex + update_interval: 5s + + - platform: ld2450 + ld2450_id: ld2450_radar + target_count: + name: Presence Target Count + id: presence_target_count + still_target_count: + name: Still Target Count + moving_target_count: + name: Moving Target Count + target_1: + x: + name: Target-1 X + y: + name: Target-1 Y + speed: + name: Target-1 Speed + angle: + name: Target-1 Angle + distance: + name: Target-1 Distance + resolution: + name: Target-1 Resolution + target_2: + x: + name: Target-2 X + y: + name: Target-2 Y + speed: + name: Target-2 Speed + angle: + name: Target-2 Angle + distance: + name: Target-2 Distance + resolution: + name: Target-2 Resolution + target_3: + x: + name: Target-3 X + y: + name: Target-3 Y + speed: + name: Target-3 Speed + angle: + name: Target-3 Angle + distance: + name: Target-3 Distance + resolution: + name: Target-3 Resolution + zone_1: + target_count: + name: Zone-1 All Target Count + still_target_count: + name: Zone-1 Still Target Count + moving_target_count: + name: Zone-1 Moving Target Count + zone_2: + target_count: + name: Zone-2 All Target Count + still_target_count: + name: Zone-2 Still Target Count + moving_target_count: + name: Zone-2 Moving Target Count + zone_3: + target_count: + name: Zone-3 All Target Count + still_target_count: + name: Zone-3 Still Target Count + moving_target_count: + name: Zone-3 Moving Target Count + +light: + - platform: esp32_rmt_led_strip + id: rgb_light + name: "RGB Light" + pin: GPIO3 + rmt_channel: 0 + default_transition_length: 0s + chipset: WS2812 + num_leds: 3 + rgb_order: grb + effects: + - pulse: + name: "Slow Pulse" + transition_length: 1000ms + update_interval: 1000ms + min_brightness: 50% + max_brightness: 100% + - pulse: + name: "Fast Pulse" + transition_length: 100ms + update_interval: 100ms + min_brightness: 50% + max_brightness: 100% + +button: + - platform: restart + icon: mdi:power-cycle + name: "ESP Reboot" + + - platform: factory_reset + disabled_by_default: True + name: "Factory Reset ESP" + id: factory_reset_all + - platform: template + name: "Calibrate SCD40 To 420ppm" + id: set_SCD40_calibrate + on_press: + - scd4x.perform_forced_calibration: + value: 420 + id: scd40 + + +switch: + - platform: template + name: "Startup Light Blink" + id: startup_light_blink + icon: mdi:lightbulb + restore_mode: RESTORE_DEFAULT_ON + optimistic: true + entity_category: "config" + - platform: factory_reset + id: factory_reset_switch + internal: true + - platform: ld2450 + ld2450_id: ld2450_radar + bluetooth: + name: "LD2450 Bluetooth" + multi_target: + name: "Multi Target Tracking" +select: + - platform: ld2450 + ld2450_id: ld2450_radar + baud_rate: + name: "Baud rate" + zone_type: + name: "Zone Type" + +text_sensor: + - platform: ld2450 + ld2450_id: ld2450_radar + version: + name: "LD2450 Firmware" + mac_address: + name: "LD2450 BT MAC" + target_1: + direction: + name: "Target-1 Direction" + target_2: + direction: + name: "Target-2 Direction" + target_3: + direction: + name: "Target-3 Direction" + + +script: + - id: testScript + then: + if: + condition: + - lambda: "return id(runTest) == true;" + then: + - lambda: "id(runTest) = false;" + - lambda: "id(testCycleCount) = 0;" + - while: + condition: + - lambda: "return id(testCycleCount) < 5;" + then: + - if: + condition: + - lambda: "return id(dps310Passed) == false;" + then: + - if: + condition: + - lambda: "return id(dps310pressure).state > 0;" + then: + - lambda: "id(dps310Passed) = true;" + - if: + condition: + - lambda: "return id(ltr390lightPassed) == false;" + then: + - if: + condition: + - lambda: "return id(ltr390light).state > 10;" + then: + - lambda: "id(ltr390lightPassed) = true;" + - if: + condition: + - lambda: "return id(ltr390uvindexPassed) == false;" + then: + - if: + condition: + - lambda: "return !isnan(id(ltr390uvindex).state);" + then: + - lambda: "id(ltr390uvindexPassed) = true;" + - if: + condition: + - lambda: "return id(ld2450Passed) == false;" + then: + - if: + condition: + - lambda: "return id(presence_target_count).state > 0;" + then: + - lambda: "id(ld2450Passed) = true;" + - if: + condition: + - lambda: "return id(dps310Passed) && id(ltr390lightPassed) && id(ltr390uvindexPassed) && id(ld2450Passed);" + then: + - lambda: "id(testCycleCount) = 10;" + - lambda: "id(runTest) = false;" + - delay: 1s + - lambda: "id(testCycleCount) += 1;" + + #Check If Test Passed To Trigger Lights + - if: + condition: + - lambda: "return id(dps310Passed) && id(ltr390lightPassed) && id(ltr390uvindexPassed) && id(ld2450Passed);" + then: + - lambda: "id(runTest) = false;" + - light.turn_on: + id: rgb_light + red: 0% + green: 100% + blue: 0% + - delay: 5s + - light.turn_on: + id: rgb_light + red: 0% + green: 0% + blue: 0% + - light.turn_off: + id: rgb_light + + else: + - lambda: "id(runTest) = false;" + - light.turn_on: + id: rgb_light + red: 100% + green: 0% + blue: 0% + - delay: 5s + - light.turn_on: + id: rgb_light + red: 0% + green: 0% + blue: 0% + - light.turn_off: + id: rgb_light From f33d6df4b2a94f13c300a7821f1ebd174ec9a29c Mon Sep 17 00:00:00 2001 From: Trevor Schirmer Date: Fri, 5 Jul 2024 12:23:26 -0400 Subject: [PATCH 2/2] No Logger --- Integrations/ESPHome/MTR-1.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Integrations/ESPHome/MTR-1.yaml b/Integrations/ESPHome/MTR-1.yaml index dbe5321..5ad2264 100644 --- a/Integrations/ESPHome/MTR-1.yaml +++ b/Integrations/ESPHome/MTR-1.yaml @@ -93,7 +93,6 @@ api: value: !lambda "return co2_ppm;" id: scd40 -logger: ota: - platform: esphome