rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Portduino WIP now compiles but does not link

Browse Source
This commit is contained in:
geeksville
2020-09-05 12:34:48 -07:00
parent 6a475d8288
commit fefd3d78f3
26 changed files with 41 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gps/GPS.cpp
View File

@@ -1,7 +1,6 @@
#include "GPS.h"
#include "configuration.h"
#include "timing.h"
#include <assert.h>
#include <time.h>
@@ -36,7 +35,7 @@ void readFromRTC()
struct timeval tv; /* btw settimeofday() is helpfull here too*/
if (!gettimeofday(&tv, NULL)) {
uint32_t now = timing::millis();
uint32_t now = millis();
DEBUG_MSG("Read RTC time as %ld (cur millis %u) valid=%d\n", tv.tv_sec, now, timeSetFromGPS);
timeStartMsec = now;
@@ -79,7 +78,7 @@ void perhapsSetRTC(struct tm &t)
uint32_t getTime()
{
return ((timing::millis() - timeStartMsec) / 1000) + zeroOffsetSecs;
return ((millis() - timeStartMsec) / 1000) + zeroOffsetSecs;
}
uint32_t getValidTime()