github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-19 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wifi] Build the wifi actions and conditions with the apply helpers (#20842)

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-18 15:23:31 -10:00
committed by GitHub
parent ab656acbf1
commit ded5ad6cb1
2 changed files with 18 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/wifi/__init__.py
+18 -47
View File
@@ -3,7 +3,6 @@ import math
from typing import Any
from esphome import automation, preferences
from esphome.automation import Condition
import esphome.codegen as cg
from esphome.components.const import CONF_ENABLED, CONF_USE_PSRAM
from esphome.components.esp32 import (
@@ -241,12 +240,6 @@ def _validate_dns_servers(value: list) -> list:
return value
WiFiConnectedCondition = wifi_ns.class_("WiFiConnectedCondition", Condition)
WiFiEnabledCondition = wifi_ns.class_("WiFiEnabledCondition", Condition)
WiFiAPActiveCondition = wifi_ns.class_("WiFiAPActiveCondition", Condition)
WiFiEnableAction = wifi_ns.class_("WiFiEnableAction", automation.Action)
WiFiDisableAction = wifi_ns.class_("WiFiDisableAction", automation.Action)
WiFiRoamAction = wifi_ns.class_("WiFiRoamAction", automation.Action)
WiFiConfigureAction = wifi_ns.class_(
"WiFiConfigureAction", automation.Action, cg.Component
)
@@ -1042,49 +1035,27 @@ async def to_code(config):
CORE.add_job(final_step)
automation.register_bare_condition(
"wifi.connected",
WiFiConnectedCondition,
cv.Schema({}),
WIFI_AUTOMATION_SCHEMA = cv.Schema(
{
cv.GenerateID(): cv.use_id(WiFiComponent),
}
)
for _name, _check in (
("wifi.connected", "is_connected()"),
("wifi.enabled", "is_disabled() == false"),
("wifi.ap_active", "is_ap_active()"),
):
automation.register_apply_condition(_name, WIFI_AUTOMATION_SCHEMA, _check)
automation.register_bare_condition(
"wifi.enabled",
WiFiEnabledCondition,
cv.Schema({}),
)
automation.register_bare_condition(
"wifi.ap_active",
WiFiAPActiveCondition,
cv.Schema({}),
)
automation.register_bare_action(
"wifi.enable",
WiFiEnableAction,
cv.Schema({}),
synchronous=True,
)
automation.register_bare_action(
"wifi.disable",
WiFiDisableAction,
cv.Schema({}),
synchronous=True,
)
automation.register_bare_action(
"wifi.roam",
WiFiRoamAction,
cv.Schema({}),
synchronous=True,
)
for _name, _call in (
("wifi.enable", "enable()"),
("wifi.disable", "disable()"),
("wifi.roam", "force_roam_check()"),
):
automation.register_apply_action(
_name, WIFI_AUTOMATION_SCHEMA, automation.ApplyCall(_call)
)
KEEP_SCAN_RESULTS_KEY = "wifi_keep_scan_results"
esphome/components/wifi/automation.h
-30
View File
@@ -6,36 +6,6 @@
namespace esphome::wifi {
template<typename... Ts> class WiFiConnectedCondition final : public Condition<Ts...> {
public:
bool check(const Ts &...x) override { return global_wifi_component->is_connected(); }
};
template<typename... Ts> class WiFiEnabledCondition final : public Condition<Ts...> {
public:
bool check(const Ts &...x) override { return !global_wifi_component->is_disabled(); }
};
template<typename... Ts> class WiFiAPActiveCondition final : public Condition<Ts...> {
public:
bool check(const Ts &...x) override { return global_wifi_component->is_ap_active(); }
};
template<typename... Ts> class WiFiEnableAction final : public Action<Ts...> {
public:
void play(const Ts &...x) override { global_wifi_component->enable(); }
};
template<typename... Ts> class WiFiDisableAction final : public Action<Ts...> {
public:
void play(const Ts &...x) override { global_wifi_component->disable(); }
};
template<typename... Ts> class WiFiRoamAction final : public Action<Ts...> {
public:
void play(const Ts &...x) override { global_wifi_component->force_roam_check(); }
};
template<typename... Ts> class WiFiConfigureAction final : public Action<Ts...>, public Component {
public:
TEMPLATABLE_VALUE(std::string, ssid)