rg_network: Workaround for the constantly shifting SNTP API (#141)

ducalex · Jul 25, 2024 · f9e6db6 · f9e6db6
1 parent 1b0f380
commit f9e6db6
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/components/retro-go/rg_network.c b/components/retro-go/rg_network.c
@@ -12,6 +12,7 @@
     }
 
 #ifdef RG_ENABLE_NETWORKING
+#include <esp_idf_version.h>
 #include <esp_http_client.h>
 #include <esp_system.h>
 #include <esp_sntp.h>
@@ -21,6 +22,13 @@
 #include <lwip/err.h>
 #include <lwip/sys.h>
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0)
+#define esp_sntp_init sntp_init
+#define esp_sntp_stop sntp_stop
+#define esp_sntp_setoperatingmode sntp_setoperatingmode
+#define esp_sntp_setservername sntp_setservername
+#endif
+
 static rg_network_t network = {0};
 static rg_wifi_config_t wifi_config = {0};
 static bool initialized = false;
@@ -82,8 +90,8 @@ static void network_event_handler(void *arg, esp_event_base_t event_base, int32_
             RG_LOGI("Connected! IP: %s, RSSI: %d", network.ip_addr, network.rssi);
             rg_system_event(RG_EVENT_NETWORK_CONNECTED, NULL);
 
-            sntp_stop();
-            sntp_init();
+            esp_sntp_stop();
+            esp_sntp_init();
         }
         else if (event_id == IP_EVENT_AP_STAIPASSIGNED)
         {
@@ -248,9 +256,9 @@ bool rg_network_init(void)
     TRY(esp_wifi_set_storage(WIFI_STORAGE_RAM));
 
     // Setup SNTP client but don't query it yet
-    sntp_setoperatingmode(SNTP_OPMODE_POLL);
-    sntp_setservername(0, "pool.ntp.org");
-    // sntp_init();
+    esp_sntp_setoperatingmode(SNTP_OPMODE_POLL);
+    esp_sntp_setservername(0, "pool.ntp.org");
+    // esp_sntp_init();
 
     // Tell rg_network_get_info() that we're enabled but not yet connected
     network.state = RG_NETWORK_DISCONNECTED;