From adbed5de956bbdd623074d787acbf75a7de38420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 22 Nov 2022 17:19:24 +0100
Subject: [PATCH] - fix NTP sync on connect - disable extended GPS mode again -
 add --inline-suppr to cppflags

---
 platformio.ini                 | 8 +++-----
 src/mesh/http/WiFiAPClient.cpp | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 0581a84ec..8c30b11d0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -42,7 +42,7 @@ build_flags = -Wno-missing-field-initializers
   -Wno-format 
   -Isrc -Isrc/mesh -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
   -DUSE_THREAD_NAMES
-;  -DTINYGPS_OPTION_NO_CUSTOM_FIELDS // this should work now...
+  -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
   -DPB_ENABLE_MALLOC=1
   -DRADIOLIB_EXCLUDE_CC1101
   -DRADIOLIB_EXCLUDE_NRF24
@@ -73,20 +73,18 @@ check_skip_packages = yes
 check_flags =
   -DAPP_VERSION=1.0.0
   --suppressions-list=suppressions.txt
+  --inline-suppr
 
 ; Common settings for conventional (non Portduino) Arduino targets
 [arduino_base]
 framework = arduino
 lib_deps =
   ${env.lib_deps}
-  ; Portduino is using meshtastic fork for now
   jgromes/RadioLib@5.4.1
   mprograms/QMC5883LCompass@^1.1.1
   https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76
 
-build_flags = ${env.build_flags} -Os 
-  -DRADIOLIB_SPI_PARANOID=0
-# -DRADIOLIB_GODMODE
+build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0
 build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT 
diff --git a/src/mesh/http/WiFiAPClient.cpp b/src/mesh/http/WiFiAPClient.cpp
index c00738d1a..4e6019e4c 100644
--- a/src/mesh/http/WiFiAPClient.cpp
+++ b/src/mesh/http/WiFiAPClient.cpp
@@ -62,7 +62,7 @@ static int32_t reconnectWiFi()
     }
 
 #ifndef DISABLE_NTP
-    if (WiFi.isConnected() && ((millis() - lastrun_ntp) > 43200000)) { // every 12 hours
+    if (WiFi.isConnected() && (((millis() - lastrun_ntp) > 43200000) || (lastrun_ntp == 0))) { // every 12 hours
         DEBUG_MSG("Updating NTP time\n");
         if (timeClient.update()) {
             DEBUG_MSG("NTP Request Success - Setting RTCQualityNTP if needed\n");