fix storage dumping; send latest location together with ping

Author: soshial

firmware_v5/telelogger/telelogger.ino

@@ -173,6 +173,20 @@ void processExtInputs(CBuffer* buffer)
 }
 #endif
 
+CStorageRAM latestLocationStore;
+
+void prepareData(CStorageRAM* store, CBuffer* buffer) {
+  // here we use CStorageRAM to serialize data correctly
+  store->purge();
+#if SERVER_PROTOCOL == PROTOCOL_UDP
+  store->header(devid);
+#endif
+
+  store->timestamp(buffer->timestamp);
+  buffer->serialize(*store);
+  store->tailer();
+}
+
 /*******************************************************************************
   HTTP API
 *******************************************************************************/
@@ -804,14 +818,14 @@ void process()
   processMEMS(buffer);
 #endif
 
-  processGPS(buffer);
+  bool receivedGPS = processGPS(buffer);
 
   float cpuTemp = readChipTemperature();
   buffer->add(PID_CPU_TEMP, (int) (cpuTemp * 10));
   if (!state.check(STATE_MEMS_READY)) {
     deviceTemp = cpuTemp;
   }
-  
+
   buffer->timestamp = millis();
   buffer->state = BUFFER_STATE_FILLED;
 
@@ -821,9 +835,10 @@ void process()
     lastStatsTime = startTime;
   }
 
+  prepareData(&latestLocationStore, buffer);
 #if STORAGE != STORAGE_NONE
   if (state.check(STATE_STORAGE_READY)) {
-    buffer->serialize(logger);
+    logger.dispatch(latestLocationStore.buffer(), latestLocationStore.length());
     uint16_t sizeKB = (uint16_t)(logger.size() >> 10);
     if (sizeKB != lastSizeKB) {
       logger.flush();
@@ -1027,6 +1042,7 @@ void telemetry(void* inst)
         if (initNetwork()) {
           Serial.print("Ping...");
           bool success = teleClient.ping();
+          bool successData = teleClient.transmit(latestLocationStore.buffer(), latestLocationStore.length());
           Serial.println(success ? "OK" : "NO");
         }
         teleClient.shutdown();
@@ -1056,17 +1072,12 @@ void telemetry(void* inst)
       }
 
       buffer->state = BUFFER_STATE_LOCKED;
-#if SERVER_PROTOCOL == PROTOCOL_UDP
-      store.header(devid);
-#endif
-      store.timestamp(buffer->timestamp);
-      buffer->serialize(store);
+      prepareData(&store, buffer);
       buffer->purge();
-      store.tailer();
-      //Serial.println(store.buffer());
 
       // start transmission
       if (ledMode == 0) digitalWrite(PIN_LED, HIGH);
+
       if (teleClient.transmit(store.buffer(), store.length())) {
         // successfully sent
         connErrors = 0;
@@ -1078,8 +1089,6 @@ void telemetry(void* inst)
       }
       if (ledMode == 0) digitalWrite(PIN_LED, LOW);
 
-      store.purge();
-
       teleClient.inbound();
       if (syncInterval > 10000 && millis() - teleClient.lastSyncTime > syncInterval) {
         Serial.println("Instable connection");
@@ -1353,6 +1362,7 @@ void setup()
       Serial.println("HTTPD:NO");
     }
 #endif
+    latestLocationStore.init(SERIALIZE_BUFFER_SIZE);
 
     state.set(STATE_WORKING);
     // initialize network and maintain connection