adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10725 from mathieucarbou/issue-10526

Browse source 
fix(sntp): Lock / Unlock LWIP if CONFIG_LWIP_TCPIP_CORE_LOCKING is set
This commit is contained in:
Me No Dev 2024-12-13 15:31:47 +02:00 committed by GitHub
commit 740fc0b78e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cores/esp32/esp32-hal-time.c
View file

@ -51,9 +51,6 @@ static void setTimeZone(long offset, int daylight) {
void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1, const char *server2, const char *server3) { void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1, const char *server2, const char *server3) {
//tcpip_adapter_init(); // Should not hurt anything if already inited //tcpip_adapter_init(); // Should not hurt anything if already inited
esp_netif_init(); esp_netif_init();
if (sntp_enabled()) {
sntp_stop();
}
#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING #ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) { if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
@ -61,6 +58,10 @@ void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1,
} }
#endif #endif
if (sntp_enabled()) {
sntp_stop();
}
sntp_setoperatingmode(SNTP_OPMODE_POLL); sntp_setoperatingmode(SNTP_OPMODE_POLL);
sntp_setservername(0, (char *)server1); sntp_setservername(0, (char *)server1);
sntp_setservername(1, (char *)server2); sntp_setservername(1, (char *)server2);
@ -83,9 +84,6 @@ void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1,
void configTzTime(const char *tz, const char *server1, const char *server2, const char *server3) { void configTzTime(const char *tz, const char *server1, const char *server2, const char *server3) {
//tcpip_adapter_init(); // Should not hurt anything if already inited //tcpip_adapter_init(); // Should not hurt anything if already inited
esp_netif_init(); esp_netif_init();
if (sntp_enabled()) {
sntp_stop();
}
#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING #ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) { if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
@ -93,6 +91,10 @@ void configTzTime(const char *tz, const char *server1, const char *server2, cons
} }
#endif #endif
if (sntp_enabled()) {
sntp_stop();
}
sntp_setoperatingmode(SNTP_OPMODE_POLL); sntp_setoperatingmode(SNTP_OPMODE_POLL);
sntp_setservername(0, (char *)server1); sntp_setservername(0, (char *)server1);
sntp_setservername(1, (char *)server2); sntp_setservername(1, (char *)server2);