From 10f590324b6fa97c3f5df849b343a58b21891a36 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:19:32 +1300 Subject: [PATCH 1/4] Mark webserver and captive portal as not available on rp2040 (#4023) --- esphome/components/async_tcp/__init__.py | 1 + esphome/components/captive_portal/__init__.py | 1 + esphome/components/web_server/__init__.py | 1 + 3 files changed, 3 insertions(+) diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py index 8789448792..c693544a2e 100644 --- a/esphome/components/async_tcp/__init__.py +++ b/esphome/components/async_tcp/__init__.py @@ -8,6 +8,7 @@ CODEOWNERS = ["@OttoWinter"] CONFIG_SCHEMA = cv.All( cv.Schema({}), cv.only_with_arduino, + cv.only_on(["esp32", "esp8266"]), ) diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py index b41095304e..f7b103d299 100644 --- a/esphome/components/captive_portal/__init__.py +++ b/esphome/components/captive_portal/__init__.py @@ -25,6 +25,7 @@ CONFIG_SCHEMA = cv.All( } ).extend(cv.COMPONENT_SCHEMA), cv.only_with_arduino, + cv.only_on(["esp32", "esp8266"]), ) diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py index 42683c8d77..d8343c6c39 100644 --- a/esphome/components/web_server/__init__.py +++ b/esphome/components/web_server/__init__.py @@ -75,6 +75,7 @@ CONFIG_SCHEMA = cv.All( } ).extend(cv.COMPONENT_SCHEMA), cv.only_with_arduino, + cv.only_on(["esp32", "esp8266"]), default_url, validate_local, ) From 608be4e050d5eb4acafc3ef8cbf6dd18ecd10313 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:29:41 +1300 Subject: [PATCH 2/4] Fix time components on rp2040 (#4024) --- esphome/components/sntp/sntp_component.cpp | 3 +++ esphome/components/time/real_time_clock.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp index 21fcb96842..3af21a9b23 100644 --- a/esphome/components/sntp/sntp_component.cpp +++ b/esphome/components/sntp/sntp_component.cpp @@ -10,6 +10,9 @@ #ifdef USE_ESP8266 #include "sntp.h" #endif +#ifdef USE_RP2040 +#include "lwip/apps/sntp.h" +#endif // Yes, the server names are leaked, but that's fine. #ifdef CLANG_TIDY diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp index 7b5f0aa49b..de76676a4d 100644 --- a/esphome/components/time/real_time_clock.cpp +++ b/esphome/components/time/real_time_clock.cpp @@ -4,6 +4,9 @@ #ifdef USE_ESP8266 #include "sys/time.h" #endif +#ifdef USE_RP2040 +#include +#endif #include namespace esphome { From 3bd6456fbe42b2d7d7a820442708fdaefe500970 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:29:53 +1300 Subject: [PATCH 3/4] Mark mqtt as unavailable on rp2040 (#4025) --- esphome/components/mqtt/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py index 3f9275e231..7207eaddc1 100644 --- a/esphome/components/mqtt/__init__.py +++ b/esphome/components/mqtt/__init__.py @@ -250,6 +250,7 @@ CONFIG_SCHEMA = cv.All( } ), validate_config, + cv.only_on(["esp32", "esp8266"]), ) From 6a73699a3831be69e16357a517ffec7dbac173ad Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Mon, 14 Nov 2022 13:31:48 +1300 Subject: [PATCH 4/4] Bump version to 2022.11.0b4 --- esphome/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/const.py b/esphome/const.py index e3de750798..beeb7d62b4 100644 --- a/esphome/const.py +++ b/esphome/const.py @@ -1,6 +1,6 @@ """Constants used by esphome.""" -__version__ = "2022.11.0b3" +__version__ = "2022.11.0b4" ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"