From 16f3c6a09a1745222329be6a621d0766d05f11d5 Mon Sep 17 00:00:00 2001 From: Tomasz Duda Date: Thu, 16 May 2024 19:29:18 +0200 Subject: [PATCH] change name dfu -> dfu_mode --- esphome/components/{dfu => dfu_mode}/__init__.py | 4 ++-- esphome/components/{dfu => dfu_mode}/dfu.cpp | 4 ++-- esphome/components/{dfu => dfu_mode}/dfu.h | 4 ++-- esphome/components/ota/__init__.py | 8 +++++++- tests/components/deep_sleep/test.nrf52-adafruit.yaml | 11 +++++++++++ tests/components/deep_sleep/test.nrf52.yaml | 11 +++++++++++ .../{dfu => dfu_mode}/test.nrf52-adafruit.yaml | 2 +- tests/components/{dfu => dfu_mode}/test.nrf52.yaml | 2 +- tests/test12.2.yaml | 2 +- tests/test12.3.yaml | 2 +- 10 files changed, 39 insertions(+), 11 deletions(-) rename esphome/components/{dfu => dfu_mode}/__init__.py (86%) rename esphome/components/{dfu => dfu_mode}/dfu.cpp (95%) rename esphome/components/{dfu => dfu_mode}/dfu.h (92%) create mode 100644 tests/components/deep_sleep/test.nrf52-adafruit.yaml create mode 100644 tests/components/deep_sleep/test.nrf52.yaml rename tests/components/{dfu => dfu_mode}/test.nrf52-adafruit.yaml (93%) rename tests/components/{dfu => dfu_mode}/test.nrf52.yaml (93%) diff --git a/esphome/components/dfu/__init__.py b/esphome/components/dfu_mode/__init__.py similarity index 86% rename from esphome/components/dfu/__init__.py rename to esphome/components/dfu_mode/__init__.py index 482e5ed573..f89bcd6e14 100644 --- a/esphome/components/dfu/__init__.py +++ b/esphome/components/dfu_mode/__init__.py @@ -7,8 +7,8 @@ from esphome.const import ( from esphome.components.zephyr import zephyr_add_prj_conf -dfu_ns = cg.esphome_ns.namespace("dfu") -DeviceFirmwareUpdate = dfu_ns.class_("DeviceFirmwareUpdate", cg.Component) +dfu_mode_ns = cg.esphome_ns.namespace("dfu_mode") +DeviceFirmwareUpdate = dfu_mode_ns.class_("DeviceFirmwareUpdate", cg.Component) CONF_RESET_OUTPUT = "reset_output" diff --git a/esphome/components/dfu/dfu.cpp b/esphome/components/dfu_mode/dfu.cpp similarity index 95% rename from esphome/components/dfu/dfu.cpp rename to esphome/components/dfu_mode/dfu.cpp index d923bb9da0..ca1e227253 100644 --- a/esphome/components/dfu/dfu.cpp +++ b/esphome/components/dfu_mode/dfu.cpp @@ -5,7 +5,7 @@ #include namespace esphome { -namespace dfu { +namespace dfu_mode { volatile bool goto_dfu = false; @@ -37,6 +37,6 @@ void DeviceFirmwareUpdate::loop() { } } -} // namespace dfu +} // namespace dfu_mode } // namespace esphome #endif diff --git a/esphome/components/dfu/dfu.h b/esphome/components/dfu_mode/dfu.h similarity index 92% rename from esphome/components/dfu/dfu.h rename to esphome/components/dfu_mode/dfu.h index 4b09f5373e..9a510bb2c6 100644 --- a/esphome/components/dfu/dfu.h +++ b/esphome/components/dfu_mode/dfu.h @@ -7,7 +7,7 @@ #endif namespace esphome { -namespace dfu { +namespace dfu_mode { class DeviceFirmwareUpdate : public Component { public: void setup() override; @@ -20,6 +20,6 @@ class DeviceFirmwareUpdate : public Component { output::BinaryOutput *reset_output_; #endif }; -} // namespace dfu +} // namespace dfu_mode } // namespace esphome #endif diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py index 3d2956931c..593809791c 100644 --- a/esphome/components/ota/__init__.py +++ b/esphome/components/ota/__init__.py @@ -6,7 +6,13 @@ from esphome.core import CORE, coroutine_with_priority from esphome.const import CONF_ESPHOME, CONF_OTA, CONF_PLATFORM, CONF_TRIGGER_ID CODEOWNERS = ["@esphome/core"] -AUTO_LOAD = ["md5"] + + +def AUTO_LOAD(): + if CORE.is_nrf52: + return [] + return ["md5"] + IS_PLATFORM_COMPONENT = True diff --git a/tests/components/deep_sleep/test.nrf52-adafruit.yaml b/tests/components/deep_sleep/test.nrf52-adafruit.yaml new file mode 100644 index 0000000000..7807abaa6f --- /dev/null +++ b/tests/components/deep_sleep/test.nrf52-adafruit.yaml @@ -0,0 +1,11 @@ +esphome: + on_boot: + then: + - deep_sleep.prevent + - delay: 1s + - deep_sleep.allow + +deep_sleep: + run_duration: + default: 10s + sleep_duration: 50s diff --git a/tests/components/deep_sleep/test.nrf52.yaml b/tests/components/deep_sleep/test.nrf52.yaml new file mode 100644 index 0000000000..7807abaa6f --- /dev/null +++ b/tests/components/deep_sleep/test.nrf52.yaml @@ -0,0 +1,11 @@ +esphome: + on_boot: + then: + - deep_sleep.prevent + - delay: 1s + - deep_sleep.allow + +deep_sleep: + run_duration: + default: 10s + sleep_duration: 50s diff --git a/tests/components/dfu/test.nrf52-adafruit.yaml b/tests/components/dfu_mode/test.nrf52-adafruit.yaml similarity index 93% rename from tests/components/dfu/test.nrf52-adafruit.yaml rename to tests/components/dfu_mode/test.nrf52-adafruit.yaml index 8d2e161578..54a35f4048 100644 --- a/tests/components/dfu/test.nrf52-adafruit.yaml +++ b/tests/components/dfu_mode/test.nrf52-adafruit.yaml @@ -7,5 +7,5 @@ output: output: true id: rest_gpio -dfu: +dfu_mode: reset_output: rest_gpio diff --git a/tests/components/dfu/test.nrf52.yaml b/tests/components/dfu_mode/test.nrf52.yaml similarity index 93% rename from tests/components/dfu/test.nrf52.yaml rename to tests/components/dfu_mode/test.nrf52.yaml index 8d2e161578..54a35f4048 100644 --- a/tests/components/dfu/test.nrf52.yaml +++ b/tests/components/dfu_mode/test.nrf52.yaml @@ -7,5 +7,5 @@ output: output: true id: rest_gpio -dfu: +dfu_mode: reset_output: rest_gpio diff --git a/tests/test12.2.yaml b/tests/test12.2.yaml index cb4dbe3b0e..83bfdf0048 100644 --- a/tests/test12.2.yaml +++ b/tests/test12.2.yaml @@ -40,7 +40,7 @@ output: output: true id: rest_gpio -dfu: +dfu_mode: reset_output: rest_gpio ota: diff --git a/tests/test12.3.yaml b/tests/test12.3.yaml index 9cc5b6997b..830767ab7f 100644 --- a/tests/test12.3.yaml +++ b/tests/test12.3.yaml @@ -33,7 +33,7 @@ output: output: true id: rest_gpio -dfu: +dfu_mode: reset_output: rest_gpio zephyr_ble_server: