Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reset #12

Merged
merged 3 commits into from
Sep 22, 2024
Merged

Fix reset #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b888144
Fix Reset
TrevorSchirmer Aug 30, 2024
3cfb09d
Update Firmware Version
TrevorSchirmer Sep 12, 2024
4e5ff5d
Update Import URL
TrevorSchirmer Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Integrations/ESPHome/Core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
substitutions:
name: apollo-msr-2
version: "24.7.15.1"
version: "24.9.12.1"
device_description: ${name} made by Apollo Automation - version ${version}.

esp32:
Expand Down
11 changes: 5 additions & 6 deletions Integrations/ESPHome/MSR-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Define Project
substitutions:
name: apollo-msr-2
version: "24.7.15.1"
version: "24.9.12.1"
device_description: ${name} made by Apollo Automation - version ${version}.

esphome:
Expand Down Expand Up @@ -344,15 +344,14 @@ binary_sensor:
on_release:
then:
- lambda: |-
if (millis() - id(button_press_timestamp) >= 1000) {
if (millis() - id(button_press_timestamp) >= 10000) {
id(factory_reset_switch).turn_on();
}
else 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
Expand Down
2 changes: 1 addition & 1 deletion Integrations/ESPHome/MSR-2_Factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ esphome:


dashboard_import:
package_import_url: github://ApolloAutomation/MSR-2/Integrations/ESPHome/MSR-2.yaml
package_import_url: github://ApolloAutomation/MSR-2/Integrations/ESPHome/MSR-2_Factory.yaml
import_full_config: false


Expand Down