Florian/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-01 15:39:43 -05:00
parent 5b0c249272
commit 401523c854
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/ota/automation.h
View File

@@ -22,7 +22,7 @@ class OTAStartTrigger : public Trigger<> {
public:
explicit OTAStartTrigger(OTAComponent *parent) {
parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
if (state == ota::OTA_STARTED && !parent->is_failed()) {
if (state == OTA_STARTED && !parent->is_failed()) {
trigger();
}
});
@@ -33,7 +33,7 @@ class OTAProgressTrigger : public Trigger<float> {
public:
explicit OTAProgressTrigger(OTAComponent *parent) {
parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
if (state == ota::OTA_IN_PROGRESS && !parent->is_failed()) {
if (state == OTA_IN_PROGRESS && !parent->is_failed()) {
trigger(progress);
}
});
@@ -44,7 +44,7 @@ class OTAEndTrigger : public Trigger<> {
public:
explicit OTAEndTrigger(OTAComponent *parent) {
parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
if (state == ota::OTA_COMPLETED && !parent->is_failed()) {
if (state == OTA_COMPLETED && !parent->is_failed()) {
trigger();
}
});
@@ -55,7 +55,7 @@ class OTAAbortTrigger : public Trigger<> {
public:
explicit OTAAbortTrigger(OTAComponent *parent) {
parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
if (state == ota::OTA_ABORT && !parent->is_failed()) {
if (state == OTA_ABORT && !parent->is_failed()) {
trigger();
}
});
@@ -66,7 +66,7 @@ class OTAErrorTrigger : public Trigger<uint8_t> {
public:
explicit OTAErrorTrigger(OTAComponent *parent) {
parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
if (state == ota::OTA_ERROR && !parent->is_failed()) {
if (state == OTA_ERROR && !parent->is_failed()) {
trigger(error);
}
});

2
esphome/components/ota/ota_backend.cpp
View File

@@ -3,8 +3,6 @@
namespace esphome {
namespace ota {
// The make_ota_backend() implementation is provided by each platform-specific backend
#ifdef USE_OTA_STATE_CALLBACK
OTAGlobalCallback *global_ota_callback{nullptr}; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)