Incorporate improvements from @soshial/@tripplet + myself

firmware_v5/telelogger/README.md

@@ -16,14 +16,15 @@ Data Transmissions
 ------------------
 
 Data transmission over UDP and HTTP protocols are implemented with following hardware.
-
 * WiFi (ESP32 built-in)
 * WiFi Mesh (ESP-MDF for ESP32)
 * 3G WCDMA (SIM5360)
 * 4G LTE CAT-4 (SIM7600)
 * 4G LTE CAT-M1 (SIM7070)
 
-UDP mode implements a client for [Freematics Hub](https://freematics.com/hub/). HTTP mode implements a client for [Traccar](https://www.traccar.org) under [OsmAnd](https://www.traccar.org/osmand/) protocol.
+There two ways of sending data:
+1. UDP mode implements a `freematics` protocol client for [Freematics Hub](https://freematics.com/hub/) or [Traccar](https://www.traccar.org) (sends more data, [protocol's API](https://freematics.com/pages/hub/api/), uses 5170 port).
+2. HTTP/HTTPS mode implements a `osmand` protocol client for Traccar (sends only location data, [protocol's API](https://www.traccar.org/osmand/), uses 5055 port) 
 
 Data Storage
 ------------

firmware_v5/telelogger/config.h

@@ -5,7 +5,7 @@
 * Circular Buffer Configuration
 **************************************/
 #define BUFFER_SLOTS 32 /* max number of buffer */
-#define BUFFER_LENGTH 128 /* bytes per slot */
+#define BUFFER_LENGTH 256 /* bytes per slot */
 #define SERIALIZE_BUFFER_SIZE 1024 /* bytes */
 
 /**************************************
@@ -132,7 +132,9 @@
 // motion threshold for waking up
 #define MOTION_THRESHOLD 0.4f /* moving vehicle motion threshold in G */
 // engine jumpstart voltage
-#define JUMPSTART_VOLTAGE 14 /* V */
+#define JUMPSTART_VOLTAGE 13.5f /* V */
+#define LOW_BATTERY_VOLTAGE 11.6f /* V */
+#define USB_VOLTAGE 5.0f /* V, don't consider voltages below this, assume we are debugging on USB */
 
 /**************************************
 * Additional features
@@ -142,6 +144,8 @@
 #define PIN_SENSOR1 34
 #define PIN_SENSOR2 26
 
+#define BEEP_TABLE {2000} /* Hz, each value is a 100ms cycle (use "0" to add gaps) */
+
 #define COOLING_DOWN_TEMP 65 /* celsius degrees */
 
 #define ENABLE_BLE 0

firmware_v5/telelogger/dashboard/dashboard.js

@@ -79,8 +79,14 @@ function processInput(data)
 		if (ret = checkData(con, "HTTPD:")) {
 			document.getElementById("wifi").innerHTML = ret.indexOf("NO") >= 0 ? imgCross : imgTick;
 		}
+		if (ret = checkData(con, "Joining")) {
+			document.getElementById("wifi").innerText = ret;
+		}
 		if (ret = checkData(con, "WiFi IP:")) {
-			document.getElementById("wifi").innerHTML = imgTick + " IP:" + ret;
+			document.getElementById("wifi").innerHTML += " " + imgTick + " IP:" + ret;
+		}
+		if (ret = checkData(con, "No WiFi")) {
+			document.getElementById("wifi").innerHTML = imgCross;
 		}
 		if (ret = checkData(con, "IMEI:")) {
 			document.getElementById("sim_card").innerHTML = imgTick;

firmware_v5/telelogger/teleclient.cpp

@@ -160,11 +160,14 @@ bool TeleClientUDP::notify(byte event, const char* payload)
   netbuf.init(128);
   netbuf.header(devid);
   netbuf.dispatch(buf, sprintf(buf, "EV=%X", (unsigned int)event));
+  // ticker time in milliseconds
   netbuf.dispatch(buf, sprintf(buf, "TS=%lu", millis()));
+  // local device time in seconds
+  struct timeval timeval1;
+  gettimeofday(&timeval1, NULL);
+  uint32_t timestampSec = timeval1.tv_sec;
+  netbuf.dispatch(buf, sprintf(buf, "TM=%lu", timestampSec));
   netbuf.dispatch(buf, sprintf(buf, "ID=%s", devid));
-  if (rssi) {
-    netbuf.dispatch(buf, sprintf(buf, "SSI=%d", (int)rssi));
-  }
   if (vin[0]) {
     netbuf.dispatch(buf, sprintf(buf, "VIN=%s", vin));
   }
@@ -209,10 +212,18 @@ bool TeleClientUDP::notify(byte event, const char* payload)
     if (event == EVENT_LOGIN) {
       // extract info from server response
       char *p = strstr(data, "TM=");
+      unsigned long t_seconds = 0;
+      unsigned long t_microseconds = 0;
+      if (p) {
+        t_seconds = atol(p + 3);
+      }
+      p = strstr(data, "TN=");
       if (p) {
+        t_microseconds = atol(p + 3);
+      }
+      if (t_seconds > 0) {
         // set local time from server
-        unsigned long tm = atol(p + 3);
-        struct timeval tv = { .tv_sec = (time_t)tm, .tv_usec = 0 };
+        struct timeval tv = { .tv_sec = (time_t)t_seconds, .tv_usec = (time_t)t_microseconds };
         settimeofday(&tv, NULL);
       }
       p = strstr(data, "SN=");
@@ -283,6 +294,7 @@ bool TeleClientUDP::transmit(const char* packetBuffer, unsigned int packetSize)
     txBytes += packetSize;
     txCount++;
     success = true;
+    lastSyncTime = millis();
   }
   return success;
 }

firmware_v5/telelogger/teleclient.h

@@ -7,6 +7,7 @@
 #define EVENT_COMMAND 5
 #define EVENT_ACK 6
 #define EVENT_PING 7
+#define EVENT_LOW_BATTERY 8
 
 #define BUFFER_STATE_EMPTY 0
 #define BUFFER_STATE_FILLING 1
@@ -183,4 +184,4 @@ class TeleClientHTTP : public TeleClient
 #endif
 private:
     bool started = false;
-};
+};

firmware_v5/telelogger/telelogger.h

@@ -102,7 +102,7 @@ class CStorageRAM: public CStorage {
     void tailer()
     {
         //if (m_cache[m_cacheBytes - 1] == ',') m_cacheBytes--;
-        m_cacheBytes += sprintf(m_cache + m_cacheBytes, "*%X", (unsigned int)checksum(m_cache, m_cacheBytes));
+        m_cacheBytes += sprintf(m_cache + m_cacheBytes, "*%02X", (unsigned int)checksum(m_cache, m_cacheBytes));
     }
     void untailer()
     {