diff --git a/ChangeLog.txt b/ChangeLog.txt index 2d348cf94ccfca61cd68d2e178140a2b7a6a6858..8af996447c1702f15d9e5310d758d0736fcdb565 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,16 +2,14 @@ # neOCampus operation # (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT -=== upcoming feature-SDKupgrade +=== Release 220815 / upcoming feature-SDKupgrade Bumps to esp32 2.0.4 Bumps to esp8266 3.0.2 - we're still using the deprecated SPIFFS filesystem - updated boards.local.txt - _http_get now makes use of newer API involving a WIFIClient variable - uniformized sntp includes for all ESP :) - TBC that NTP servers sent by the DHCP server are in use - WIFImanager now used without mod - TBC that options appears valid when setting up the device - switched noise ISR from ICACHE_RAM_ATTR to newer IRAM_ATTR [esp32] - recompiled lwip for NTP server support from DHCP answer (IDF 4.4.2) diff --git a/neosensor/neosensor.ino b/neosensor/neosensor.ino index 0f45b83fd5c360b39ff40d7e98f62a36525d4206..eccde3830f8d138035fef27f91db479f6cb757e5 100644 --- a/neosensor/neosensor.ino +++ b/neosensor/neosensor.ino @@ -394,25 +394,15 @@ void endLoop( void ) { // display NTP servers used for time sync if( _cbtime_call ) { _cbtime_call = false; - + + //log_debug(F("\n[NTP_sync] IP_ADDR_ANY = "));log_debug(ipaddr_ntoa(&ip_addr_any));log_flush(); + // list active ntp servers for( uint8_t i=0; i<SNTP_MAX_SERVERS; i++ ) { - IPAddress sntp = *(IPAddress *)sntp_getserver(i); - const char* sntp_name = sntp_getservername(i); - // check if address is valid -#ifdef ESP8266 - if( sntp.isSet() ) { -#elif defined(ESP32) - if( sntp != IPADDR_ANY ) { -#endif - log_debugF("\n[NTP][%d]: ", i); - if( sntp_name ) { - log_debugF("%s (%s) ", sntp_name, sntp.toString().c_str()); - } else { - log_debugF("%s ", sntp.toString().c_str()); - } - } - } + const ip_addr_t* p_cur = sntp_getserver(i); + if( ip_addr_cmp(p_cur, IP_ADDR_ANY) ) continue; + log_debug(F("\n[NTP_sync] IPaddr = "));log_debug(ipaddr_ntoa(p_cur));log_flush(); + } } // serial link activity marker ...