From c13dc929c930ec2ed2558d3f977d715e098d7d21 Mon Sep 17 00:00:00 2001 From: Anton Sergunov Date: Thu, 9 May 2024 02:23:03 +0000 Subject: [PATCH] Log message on callback set, move the calback out of any ifdef --- esphome/components/sntp/sntp_component.cpp | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp index b66b405d44..ec8de9a6f7 100644 --- a/esphome/components/sntp/sntp_component.cpp +++ b/esphome/components/sntp/sntp_component.cpp @@ -36,6 +36,22 @@ void SNTPComponent::setup() { sntp_stop(); } sntp_setoperatingmode(SNTP_OPMODE_POLL); +#endif +#ifdef USE_ESP8266 + sntp_stop(); +#endif + + sntp_setservername(0, strdup(this->server_1_.c_str())); + if (!this->server_2_.empty()) { + sntp_setservername(1, strdup(this->server_2_.c_str())); + } + if (!this->server_3_.empty()) { + sntp_setservername(2, strdup(this->server_3_.c_str())); + } +#ifdef USE_ESP_IDF + sntp_set_sync_interval(this->get_update_interval()); +#endif + g_sync_callback = [this](struct timeval *tv) { static struct timeval time_val; switch (sntp_get_sync_status()) { @@ -53,22 +69,8 @@ void SNTPComponent::setup() { if (tv) time_val = *tv; }; + ESP_LOGD(TAG, "Set notification callback"); sntp_set_time_sync_notification_cb(sntp_sync_time_cb); -#endif -#ifdef USE_ESP8266 - sntp_stop(); -#endif - - sntp_setservername(0, strdup(this->server_1_.c_str())); - if (!this->server_2_.empty()) { - sntp_setservername(1, strdup(this->server_2_.c_str())); - } - if (!this->server_3_.empty()) { - sntp_setservername(2, strdup(this->server_3_.c_str())); - } -#ifdef USE_ESP_IDF - sntp_set_sync_interval(this->get_update_interval()); -#endif sntp_init(); #endif