diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp index 1cca5e8043..1457045d29 100644 --- a/esphome/components/sntp/sntp_component.cpp +++ b/esphome/components/sntp/sntp_component.cpp @@ -27,7 +27,7 @@ void SNTPComponent::setup() { esp_sntp_setoperatingmode(ESP_SNTP_OPMODE_POLL); size_t i = 0; for (auto &server : this->servers_) { - esp_sntp_setservername(i++, server.c_str()); + esp_sntp_setservername(i++, server); } esp_sntp_set_sync_interval(this->get_update_interval()); esp_sntp_set_time_sync_notification_cb([](struct timeval *tv) { @@ -42,7 +42,16 @@ void SNTPComponent::setup() { size_t i = 0; for (auto &server : this->servers_) { - sntp_setservername(i++, server.c_str()); +#if defined(USE_ESP8266) + // On ESP8266, server is PGM_P pointing to PROGMEM + // LWIP's sntp_setservername is not PROGMEM-aware, so copy to stack buffer first + char server_buf[64]; + strncpy_P(server_buf, server, sizeof(server_buf) - 1); + server_buf[sizeof(server_buf) - 1] = '\0'; + sntp_setservername(i++, server_buf); +#else + sntp_setservername(i++, server); +#endif } #if defined(USE_ESP8266) @@ -59,7 +68,8 @@ void SNTPComponent::dump_config() { ESP_LOGCONFIG(TAG, "SNTP Time:"); size_t i = 0; for (auto &server : this->servers_) { - ESP_LOGCONFIG(TAG, " Server %zu: '%s'", i++, server.c_str()); + // LOG_STR_ARG handles both PROGMEM (ESP8266) and regular pointers + ESP_LOGCONFIG(TAG, " Server %zu: '%s'", i++, LOG_STR_ARG(server)); } } void SNTPComponent::update() { diff --git a/esphome/components/sntp/sntp_component.h b/esphome/components/sntp/sntp_component.h index dd4c71e082..d5ce25e8ee 100644 --- a/esphome/components/sntp/sntp_component.h +++ b/esphome/components/sntp/sntp_component.h @@ -2,10 +2,18 @@ #include "esphome/core/component.h" #include "esphome/components/time/real_time_clock.h" +#include + +#ifdef USE_ESP8266 +#include +#endif namespace esphome { namespace sntp { +// Server count is calculated at compile time by Python codegen +// SNTP_SERVER_COUNT will always be defined + /// The SNTP component allows you to configure local timekeeping via Simple Network Time Protocol. /// /// \note @@ -14,10 +22,7 @@ namespace sntp { /// \see https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html class SNTPComponent : public time::RealTimeClock { public: - SNTPComponent(const std::vector &servers) : servers_(servers) {} - - // Note: set_servers() has been removed and replaced by a constructor - calling set_servers after setup would - // have had no effect anyway, and making the strings immutable avoids the need to strdup their contents. + template SNTPComponent(Args... servers) : servers_{servers...} {} void setup() override; void dump_config() override; @@ -29,7 +34,13 @@ class SNTPComponent : public time::RealTimeClock { void time_synced(); protected: - std::vector servers_; +#ifdef USE_ESP8266 + // On ESP8266, store pointers to PROGMEM strings to save RAM + std::array servers_; +#else + // On other platforms, store regular const char pointers + std::array servers_; +#endif bool has_time_{false}; #if defined(USE_ESP32) diff --git a/esphome/components/sntp/time.py b/esphome/components/sntp/time.py index 1c8ee402ad..78b586ea5a 100644 --- a/esphome/components/sntp/time.py +++ b/esphome/components/sntp/time.py @@ -12,6 +12,7 @@ from esphome.const import ( PLATFORM_RTL87XX, ) from esphome.core import CORE +from esphome.cpp_generator import ProgmemAssignmentExpression DEPENDENCIES = ["network"] sntp_ns = cg.esphome_ns.namespace("sntp") @@ -43,7 +44,30 @@ CONFIG_SCHEMA = cv.All( async def to_code(config): servers = config[CONF_SERVERS] - var = cg.new_Pvariable(config[CONF_ID], servers) + server_count = len(servers) + + # Define server count at compile time + cg.add_define("SNTP_SERVER_COUNT", server_count) + + # Generate PROGMEM strings for ESP8266, regular strings for other platforms + if CORE.is_esp8266: + # On ESP8266, use PROGMEM to store strings in flash + server_vars = [] + for i, server in enumerate(servers): + var_name = f"{config[CONF_ID].id}_server_{i}" + # Create PROGMEM string: static const char var_name[] PROGMEM = "server"; + assignment = ProgmemAssignmentExpression( + "char", var_name, cg.safe_exp(server) + ) + cg.add(assignment) + server_vars.append(cg.RawExpression(var_name)) + # Pass PROGMEM string pointers to constructor using ArrayInitializer + var = cg.new_Pvariable(config[CONF_ID], cg.ArrayInitializer(*server_vars)) + else: + # On other platforms, pass regular string literals to constructor + var = cg.new_Pvariable( + config[CONF_ID], cg.ArrayInitializer(*[cg.safe_exp(s) for s in servers]) + ) await cg.register_component(var, config) await time_.register_time(var, config) diff --git a/esphome/core/defines.h b/esphome/core/defines.h index 39698c1004..8095ffed4a 100644 --- a/esphome/core/defines.h +++ b/esphome/core/defines.h @@ -87,6 +87,7 @@ #define USE_MDNS_STORE_SERVICES #define MDNS_SERVICE_COUNT 3 #define MDNS_DYNAMIC_TXT_COUNT 3 +#define SNTP_SERVER_COUNT 3 #define USE_MEDIA_PLAYER #define USE_NEXTION_TFT_UPLOAD #define USE_NUMBER