ntp: remove legacy module

xoseperez · Mar 31, 2021 · 2de44ed · 2de44ed
1 parent b18322a
commit 2de44ed
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 384 deletions.
diff --git a/code/espurna/config/dependencies.h b/code/espurna/config/dependencies.h
@@ -172,15 +172,6 @@
 #define SSDP_SUPPORT 0
 #endif
 
-//------------------------------------------------------------------------------
-// Change ntp module depending on Core version
-
-#if NTP_SUPPORT && defined(ARDUINO_ESP8266_RELEASE_2_3_0)
-#define NTP_LEGACY_SUPPORT 1
-#else
-#define NTP_LEGACY_SUPPORT 0
-#endif
-
 //------------------------------------------------------------------------------
 // It looks more natural that one click will enable display
 // and long click will switch relay

diff --git a/code/espurna/libs/SecureClientHelpers.h b/code/espurna/libs/SecureClientHelpers.h
@@ -191,11 +191,7 @@ struct SecureClientChecks {
                 client.setFingerprint(_buffer);
             }
         } else if (check == SECURE_CLIENT_CHECK_CA) {
-            #if NTP_LEGACY_SUPPORT
-                client.setX509Time(ntpLocal2UTC(now()));
-            #else
-                client.setX509Time(now());
-            #endif
+            client.setX509Time(now());
             if (!certs.getCount()) {
                 if (config.on_certificate) certs.append(config.on_certificate());
             }

diff --git a/code/espurna/ntp.cpp b/code/espurna/ntp.cpp
@@ -13,7 +13,7 @@ Copyright (C) 2019 by Maxim Prokhorov <prokhorov dot max at outlook dot com>
 
 #include "ntp.h"
 
-#if NTP_SUPPORT && !NTP_LEGACY_SUPPORT
+#if NTP_SUPPORT
 
 #include <Arduino.h>
 #include <coredecls.h>
@@ -503,4 +503,4 @@ void ntpSetup() {
 
 }
 
-#endif // NTP_SUPPORT && !NTP_LEGACY_SUPPORT
+#endif // NTP_SUPPORT
diff --git a/code/espurna/ntp_legacy.cpp b/code/espurna/ntp_legacy.cpp