From 30d23497efd3e71d807f62a65beb1f68c11823c8 Mon Sep 17 00:00:00 2001 From: Justin Bunton <130115204+Bunton33@users.noreply.github.com> Date: Wed, 14 May 2025 18:39:31 -0400 Subject: [PATCH 1/5] Reset Wi-Fi Credentials Fix boot button press for resetting Wi-Fi credentials --- Integrations/ESPHome/Core.yaml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index a7a87a9..55fb5bc 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -232,8 +232,6 @@ output: rtttl: output: buzzer - - binary_sensor: - platform: status name: Online @@ -248,6 +246,32 @@ binary_sensor: has_still_target: name: Radar Still Target id: radar_has_still_target + + - platform: gpio + pin: + number: GPIO0 + 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) >= 8000) { + id(factory_reset_switch).turn_on(); + } + else if (millis() - id(button_press_timestamp) >= 1000) { + //id(testCycleCount) = 0; + //id(runTest) = true; + //id(testScript).execute(); + } ## Set Up Radar Zones Based On Distance From 1a552dcebf76040ec1df89150115d2af34d5784a Mon Sep 17 00:00:00 2001 From: Justin Bunton <130115204+Bunton33@users.noreply.github.com> Date: Wed, 14 May 2025 18:40:50 -0400 Subject: [PATCH 2/5] Reset Wi-Fi Credentials Fixed code to allow boot button to reset Wi-Fi credentials. --- Integrations/ESPHome/Core.yaml | 35 +++++----------------------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 55fb5bc..f1780d3 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -232,6 +232,8 @@ output: rtttl: output: buzzer + + binary_sensor: - platform: status name: Online @@ -246,32 +248,6 @@ binary_sensor: has_still_target: name: Radar Still Target id: radar_has_still_target - - - platform: gpio - pin: - number: GPIO0 - 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) >= 8000) { - id(factory_reset_switch).turn_on(); - } - else if (millis() - id(button_press_timestamp) >= 1000) { - //id(testCycleCount) = 0; - //id(runTest) = true; - //id(testScript).execute(); - } ## Set Up Radar Zones Based On Distance @@ -334,15 +310,14 @@ binary_sensor: on_release: then: - lambda: |- + else if (millis() - id(button_press_timestamp) >= 8000) { + id(factory_reset_switch).turn_on(); + } 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(); - - } ld2410: id: ld2410_radar From 99e03403c26076d3166191af1b81d55b312c0a96 Mon Sep 17 00:00:00 2001 From: Justin Bunton <130115204+Bunton33@users.noreply.github.com> Date: Thu, 15 May 2025 09:20:26 -0400 Subject: [PATCH 3/5] Fix Reset Wi-Fi Fixed the reset Wi-Fi credentials function --- Integrations/ESPHome/Core.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index f1780d3..7046311 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -294,7 +294,7 @@ binary_sensor: return false; } - platform: gpio - pin: + pin: number: GPIO9 inverted: true ignore_strapping_warning: true @@ -306,14 +306,14 @@ binary_sensor: then: - lambda: |- id(button_press_timestamp) = millis(); - + on_release: then: - lambda: |- - else if (millis() - id(button_press_timestamp) >= 8000) { + if (millis() - id(button_press_timestamp) >= 8000) { id(factory_reset_switch).turn_on(); } - if (millis() - id(button_press_timestamp) >= 1000) { + else if (millis() - id(button_press_timestamp) >= 1000) { id(testCycleCount) = 0; id(runTest) = true; id(testScript).execute(); From 21309a44b8f83594968f6a1c13973ba2ab482c9b Mon Sep 17 00:00:00 2001 From: Justin Bunton <130115204+Bunton33@users.noreply.github.com> Date: Thu, 15 May 2025 12:01:15 -0400 Subject: [PATCH 4/5] Update Version Number Updated version number --- Integrations/ESPHome/Core.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 7046311..7936714 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,6 +1,6 @@ substitutions: name: apollo-msr-2 - version: "25.2.21.2" + version: "25.5.15.1" device_description: ${name} made by Apollo Automation - version ${version}. esp32: From 41c489a48e9006e540a421f3ceca584255f85533 Mon Sep 17 00:00:00 2001 From: Trevor Schirmer <24777085+TrevorSchirmer@users.noreply.github.com> Date: Tue, 24 Jun 2025 00:26:04 -0400 Subject: [PATCH 5/5] Update Core.yaml --- Integrations/ESPHome/Core.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 7936714..687aa8f 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,6 +1,6 @@ substitutions: name: apollo-msr-2 - version: "25.5.15.1" + version: "25.6.24.1" device_description: ${name} made by Apollo Automation - version ${version}. esp32: @@ -796,4 +796,4 @@ script: green: 0% blue: 0% - light.turn_off: - id: rgb_light \ No newline at end of file + id: rgb_light