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

Merge pull request #4 from meshtastic/master

Browse Source 
Updating form head
This commit is contained in:
Jm Casler
2020-09-16 22:51:19 -07:00
committed by GitHub
parent 73b47a78aa 004f1f625b
commit c83ff03d66
11 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@@ -23,7 +23,7 @@
#include "MeshRadio.h"
#include "MeshService.h"
#include "NEMAGPS.h"
#include "NMEAGPS.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "UBloxGPS.h"
@@ -258,16 +258,16 @@ void setup()
if (GPS::_serial_gps) {
// Some boards might have only the TX line from the GPS connected, in that case, we can't configure it at all. Just
// assume NEMA at 9600 baud.
DEBUG_MSG("Hoping that NEMA might work\n");
// assume NMEA at 9600 baud.
DEBUG_MSG("Hoping that NMEA might work\n");
// dumb NEMA access only work for serial GPSes)
gps = new NEMAGPS();
// dumb NMEA access only work for serial GPSes)
gps = new NMEAGPS();
gps->setup();
}
}
#else
gps = new NEMAGPS();
gps = new NMEAGPS();
gps->setup();
#endif
gpsStatus->observe(&gps->newStatus);
@@ -412,7 +412,7 @@ void loop()
// Update the screen last, after we've figured out what to show.
screen.debug_info()->setChannelNameStatus(getChannelName());
// No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in)
// i.e. don't just keep spinning in loop as fast as we can.
// DEBUG_MSG("msecs %d\n", msecstosleep);