From 6a6e58423423f4cd92502b9f2c6246c23c928261 Mon Sep 17 00:00:00 2001
From: Verkehrsrot <cyberman@obh.snafu.de>
Date: Sun, 3 Mar 2019 17:06:36 +0100
Subject: [PATCH] get_gpstime optimization

---
 include/gpsread.h |  1 -
 src/gpsread.cpp   | 34 ++++++++++++++--------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/include/gpsread.h b/include/gpsread.h
index 62eb1a15..5413ffcb 100644
--- a/include/gpsread.h
+++ b/include/gpsread.h
@@ -16,7 +16,6 @@ extern TinyGPSPlus gps; // Make TinyGPS++ instance globally availabe
 extern gpsStatus_t
     gps_status; // Make struct for storing gps data globally available
 extern TaskHandle_t GpsTask;
-extern TickType_t const gpsDelay_ticks; // time to NMEA arrival
 
 int gps_init(void);
 void gps_read(void);
diff --git a/src/gpsread.cpp b/src/gpsread.cpp
index a41601c8..8b7f0d0a 100644
--- a/src/gpsread.cpp
+++ b/src/gpsread.cpp
@@ -11,10 +11,6 @@ TaskHandle_t GpsTask;
 
 #ifdef GPS_SERIAL
 HardwareSerial GPS_Serial(1); // use UART #1
-TickType_t const gpsDelay_ticks = pdMS_TO_TICKS(1000 - NMEA_BUFFERTIME) -
-                                  tx_Ticks(NMEA_FRAME_SIZE, GPS_SERIAL);
-#else
-TickType_t const gpsDelay_ticks = pdMS_TO_TICKS(1000 - NMEA_BUFFERTIME);
 #endif
 
 // initialize and configure GPS
@@ -27,13 +23,6 @@ int gps_init(void) {
     return 0;
   }
 
-// set timeout for reading recent time from GPS
-#ifdef GPS_SERIAL // serial GPS
-
-#else // I2C GPS
-
-#endif
-
 #if defined GPS_SERIAL
   GPS_Serial.begin(GPS_SERIAL);
   ESP_LOGI(TAG, "Using serial GPS");
@@ -88,20 +77,25 @@ void gps_read() {
 time_t get_gpstime(void) {
 
   // set time to wait for arrive next recent NMEA time record
-  static const uint32_t gpsDelay_ms = gpsDelay_ticks / portTICK_PERIOD_MS;
+  static const uint32_t gpsDelay_ms = 500;
 
   time_t t = 0;
 
-  if ((gps.time.age() < gpsDelay_ms) && (gps.time.isValid()) &&
-      (gps.date.isValid())) {
+  for (uint8_t i = 0; i <= 9; i++) { // trying to get a recent time.age
 
-    ESP_LOGD(TAG, "GPS time age: %dms, is valid: %s, second: %d",
-             gps.time.age(),
-             (gps.time.isValid() && gps.date.isValid()) ? "yes" : "no",
-             gps.time.second());
+    if ((gps.time.age() < gpsDelay_ms) && (gps.time.isValid()) &&
+        (gps.date.isValid())) {
 
-    t = tmConvert(gps.date.year(), gps.date.month(), gps.date.day(),
-                  gps.time.hour(), gps.time.minute(), gps.time.second());
+      ESP_LOGD(TAG, "GPS time age: %dms, is valid: %s, second: %d, trials: %d",
+               gps.time.age(),
+               (gps.time.isValid() && gps.date.isValid()) ? "yes" : "no",
+               gps.time.second(), i);
+
+      t = tmConvert(gps.date.year(), gps.date.month(), gps.date.day(),
+                    gps.time.hour(), gps.time.minute(), gps.time.second());
+
+      break; // exit for
+    }
   }
   return timeIsValid(t);
 } // get_gpstime()