Port to lora_isp4520 board

src/RedirectablePrint.cpp

@@ -1,99 +1,97 @@
 #include "RedirectablePrint.h"
-#include "configuration.h"
+
 #include <assert.h>
-#include <sys/time.h>
-#include <time.h>
+
+#include "RTC.h"
 #include "concurrency/OSThread.h"
+#include "configuration.h"
 
 /**
  * A printer that doesn't go anywhere
  */
 NoopPrint noopPrint;
 
-void RedirectablePrint::setDestination(Print *_dest)
-{
-    assert(_dest);
-    dest = _dest;
+void RedirectablePrint::setDestination(Print *_dest) {
+  assert(_dest);
+  dest = _dest;
 }
 
-size_t RedirectablePrint::write(uint8_t c)
-{
-    // Always send the characters to our segger JTAG debugger
+size_t RedirectablePrint::write(uint8_t c) {
+  // Always send the characters to our segger JTAG debugger
 #ifdef SEGGER_STDOUT_CH
-    SEGGER_RTT_PutCharSkip(SEGGER_STDOUT_CH, c);
+  SEGGER_RTT_PutCharSkip(SEGGER_STDOUT_CH, c);
 #endif
 
-    dest->write(c);
-    return 1; // We always claim one was written, rather than trusting what the serial port said (which could be zero)
+  dest->write(c);
+  return 1;  // We always claim one was written, rather than trusting what the
+             // serial port said (which could be zero)
 }
 
-size_t RedirectablePrint::vprintf(const char *format, va_list arg)
-{
-    va_list copy;
+size_t RedirectablePrint::vprintf(const char *format, va_list arg) {
+  va_list copy;
 
-    va_copy(copy, arg);
-    int len = vsnprintf(printBuf, printBufLen, format, copy);
-    va_end(copy);
-    if (len < 0) {
-        va_end(arg);
-        return 0;
-    };
-    if (len >= printBufLen) {
-        delete[] printBuf;
-        printBufLen *= 2;
-        printBuf = new char[printBufLen];
-        len = vsnprintf(printBuf, printBufLen, format, arg);
-    }
+  va_copy(copy, arg);
+  int len = vsnprintf(printBuf, printBufLen, format, copy);
+  va_end(copy);
+  if (len < 0) {
+    va_end(arg);
+    return 0;
+  };
+  if (len >= printBufLen) {
+    delete[] printBuf;
+    printBufLen *= 2;
+    printBuf = new char[printBufLen];
+    len = vsnprintf(printBuf, printBufLen, format, arg);
+  }
 
-    len = Print::write(printBuf, len);
-    return len;
+  len = Print::write(printBuf, len);
+  return len;
 }
 
 #define SEC_PER_DAY 86400
 #define SEC_PER_HOUR 3600
 #define SEC_PER_MIN 60
 
-size_t RedirectablePrint::logDebug(const char *format, ...)
-{
-    va_list arg;
-    va_start(arg, format);
+size_t RedirectablePrint::logDebug(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
 
-    // Cope with 0 len format strings, but look for new line terminator
-    bool hasNewline = *format && format[strlen(format) - 1] == '\n';
+  // Cope with 0 len format strings, but look for new line terminator
+  bool hasNewline = *format && format[strlen(format) - 1] == '\n';
 
-    size_t r = 0;
+  size_t r = 0;
 
-    // If we are the first message on a report, include the header
-    if (!isContinuationMessage) {
-        struct timeval tv;
-        if (!gettimeofday(&tv, NULL)) {
-            long hms = tv.tv_sec % SEC_PER_DAY;
-            //hms += tz.tz_dsttime * SEC_PER_HOUR;
-            //hms -= tz.tz_minuteswest * SEC_PER_MIN;
-            // mod `hms` to ensure in positive range of [0...SEC_PER_DAY)
-            hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
+  // If we are the first message on a report, include the header
+  if (!isContinuationMessage) {
+    uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityFromNet);
+    if (rtc_sec > 0) {
+      long hms = rtc_sec % SEC_PER_DAY;
+      // hms += tz.tz_dsttime * SEC_PER_HOUR;
+      // hms -= tz.tz_minuteswest * SEC_PER_MIN;
+      // mod `hms` to ensure in positive range of [0...SEC_PER_DAY)
+      hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
 
-            // Tear apart hms into h:m:s
-            int hour = hms / SEC_PER_HOUR;
-            int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
-            int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
+      // Tear apart hms into h:m:s
+      int hour = hms / SEC_PER_HOUR;
+      int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
+      int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN;  // or hms % SEC_PER_MIN
 
-            r += printf("%02d:%02d:%02d ", hour, min, sec);
-        } else
-            r += printf("??:??:?? ");
+      r += printf("%02d:%02d:%02d ", hour, min, sec);
+    } else
+      r += printf("??:??:?? ");
 
-        auto thread = concurrency::OSThread::currentThread;
-        if(thread) {
-            print("[");
-            print(thread->ThreadName);
-            print("] ");
-        }
+    auto thread = concurrency::OSThread::currentThread;
+    if (thread) {
+      print("[");
+      print(thread->ThreadName);
+      print("] ");
     }
+  }
 
-    r += vprintf(format, arg);
-    va_end(arg);
+  r += vprintf(format, arg);
+  va_end(arg);
 
-    isContinuationMessage = !hasNewline;
+  isContinuationMessage = !hasNewline;
 
-    return r;
+  return r;
 }