bits and bobs

src/fdrs_datatypes.h

@@ -39,7 +39,7 @@ enum ping_t {
   ping_reply
 };
 
-enum state_t {
+enum pingstate_t {
   stReady,
   stInProcess,
   stCrcMismatch,
@@ -103,7 +103,7 @@ uint size;
 };
 
 struct Ping {
-  state_t status = stReady;
+  pingstate_t status = stReady;
   unsigned long start;
   uint timeout;
   uint16_t address;

src/fdrs_gateway_espnow.h

@@ -54,7 +54,7 @@ void OnDataRecv(const uint8_t *mac, const uint8_t *incomingData, int len)
   }
   else {
     memcpy(&theData, incomingData, sizeof(theData));
-    DBG("Incoming ESP-NOW Data Reading from 0x" + String(incMAC[5], HEX));
+    DBG("Incoming ESP-NOW DataReading from 0x" + String(incMAC[5], HEX));
     ln = len / sizeof(DataReading);
     if (memcmp(&incMAC, &ESPNOW1, 6) == 0)
     {

src/fdrs_gateway_serial.h

@@ -2,12 +2,16 @@
 
 #if defined (ESP32)
   #define UART_IF Serial1
-  #define GPS_IF Serial2
+  #ifdef USE_GPS
+    #define GPS_IF Serial2
+  #endif
 #elif defined (ESP8266)
   #define UART_IF Serial
 #else
   #define UART_IF Serial
-  #define GPS_IF Serial1
+  #ifdef USE_GPS
+    #define GPS_IF Serial1
+  #endif
 #endif
 
 #if defined(ESP32)
@@ -166,10 +170,10 @@ void getSerial() {
     }
     ln = s;
     newData = event_serial;
-    DBG1("Incoming Serial: DR");
+    DBG("Incoming Serial");
       String data;
       serializeJson(doc, data);
-      DBG1("Serial data: " + data);
+      DBG1("DR data: " + data);
     }
     else if(obj.containsKey("cmd")) { // SystemPacket
       cmd_t c = doc[0]["cmd"];

src/fdrs_node_espnow.h

@@ -154,7 +154,7 @@ void OnDataRecv(const uint8_t *mac, const uint8_t *incomingData, int len)
     {
         memcpy(&theData, incomingData, len);
         ln = len / sizeof(DataReading);
-        DBG2("Incoming ESP-NOW Data Reading from 0x" + String(incMAC[5], HEX));
+        DBG2("Incoming ESP-NOW DataReading from 0x" + String(incMAC[5], HEX));
         newData = event_espnowg;
         // Processing done by handleIncoming() in fdrs_node.h
     }

src/fdrs_time.h

@@ -127,7 +127,7 @@ void begin_rtc() {
 #endif // USE_RTC
 
 bool validTime() {
-  if(!VALID_TS(now) || timeSource.tmSource == TMS_NONE) {
+  if(!VALID_TS(now)) {
     if(validTimeFlag) {
       DBG1("Time no longer reliable.");
       validTimeFlag = false;