From b8d2a6f574e4f49d12d3e677220c9dd92a364aae Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Mon, 3 Jun 2024 05:23:49 +0200
Subject: [PATCH] [sntp] fix for ESP-IDF > 5.0 (#6769)

* Make sntp work with ESP-IDF >= 5.0

* Set operatingmode on other than ESP-IDF

---------

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/sntp/sntp_component.cpp | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp
index 6a60e8d5c1..a0e791be75 100644
--- a/esphome/components/sntp/sntp_component.cpp
+++ b/esphome/components/sntp/sntp_component.cpp
@@ -1,16 +1,11 @@
 #include "sntp_component.h"
 #include "esphome/core/log.h"
 
-#if defined(USE_ESP32) || defined(USE_LIBRETINY)
-#include "lwip/apps/sntp.h"
 #ifdef USE_ESP_IDF
 #include "esp_sntp.h"
-#endif
-#endif
-#ifdef USE_ESP8266
+#elif USE_ESP8266
 #include "sntp.h"
-#endif
-#ifdef USE_RP2040
+#else
 #include "lwip/apps/sntp.h"
 #endif
 
@@ -27,14 +22,14 @@ static const char *const TAG = "sntp";
 void SNTPComponent::setup() {
 #ifndef USE_HOST
   ESP_LOGCONFIG(TAG, "Setting up SNTP...");
-#if defined(USE_ESP32) || defined(USE_LIBRETINY)
-  if (sntp_enabled()) {
-    sntp_stop();
+#if defined(USE_ESP_IDF)
+  if (esp_sntp_enabled()) {
+    esp_sntp_stop();
   }
-  sntp_setoperatingmode(SNTP_OPMODE_POLL);
-#endif
-#ifdef USE_ESP8266
+  esp_sntp_setoperatingmode(ESP_SNTP_OPMODE_POLL);
+#else
   sntp_stop();
+  sntp_setoperatingmode(SNTP_OPMODE_POLL);
 #endif
 
   sntp_setservername(0, strdup(this->server_1_.c_str()));
@@ -45,7 +40,7 @@ void SNTPComponent::setup() {
     sntp_setservername(2, strdup(this->server_3_.c_str()));
   }
 #ifdef USE_ESP_IDF
-  sntp_set_sync_interval(this->get_update_interval());
+  esp_sntp_set_sync_interval(this->get_update_interval());
 #endif
 
   sntp_init();