mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-11 16:07:13 +00:00
Fix #362 by @a-f-G-U-C - I was mispelling NMEA ;-)
This commit is contained in:
parent
8e988cc926
commit
fc20f658e6
@ -196,7 +196,7 @@ Nice ideas worth considering someday...
|
|||||||
- DONE neg 7 error code from receive
|
- DONE neg 7 error code from receive
|
||||||
- DONE remove unused sx1262 lib from github
|
- DONE remove unused sx1262 lib from github
|
||||||
- at boot we are starting our message IDs at 1, rather we should start them at a random number. also, seed random based on timer. this could be the cause of our first message not seen bug.
|
- at boot we are starting our message IDs at 1, rather we should start them at a random number. also, seed random based on timer. this could be the cause of our first message not seen bug.
|
||||||
- add a NEMA based GPS driver to test GPS
|
- add a NMEA based GPS driver to test GPS
|
||||||
- DONE use "variants" to get all gpio bindings
|
- DONE use "variants" to get all gpio bindings
|
||||||
- DONE plug in correct variants for the real board
|
- DONE plug in correct variants for the real board
|
||||||
- turn on DFU assistance in the appload using the nordic DFU helper lib call
|
- turn on DFU assistance in the appload using the nordic DFU helper lib call
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "NEMAGPS.h"
|
#include "NMEAGPS.h"
|
||||||
#include "configuration.h"
|
#include "configuration.h"
|
||||||
#include "timing.h"
|
#include "timing.h"
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ static int32_t toDegInt(RawDegrees d)
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NEMAGPS::loop()
|
void NMEAGPS::loop()
|
||||||
{
|
{
|
||||||
while (_serial_gps->available() > 0) {
|
while (_serial_gps->available() > 0) {
|
||||||
int c = _serial_gps->read();
|
int c = _serial_gps->read();
|
||||||
@ -69,7 +69,7 @@ void NEMAGPS::loop()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// expect gps pos lat=37.520825, lon=-122.309162, alt=158
|
// expect gps pos lat=37.520825, lon=-122.309162, alt=158
|
||||||
DEBUG_MSG("new NEMA GPS pos lat=%f, lon=%f, alt=%d, hdop=%f, heading=%f\n", latitude * 1e-7, longitude * 1e-7,
|
DEBUG_MSG("new NMEA GPS pos lat=%f, lon=%f, alt=%d, hdop=%f, heading=%f\n", latitude * 1e-7, longitude * 1e-7,
|
||||||
altitude, dop * 1e-2, heading * 1e-5);
|
altitude, dop * 1e-2, heading * 1e-5);
|
||||||
}
|
}
|
||||||
|
|
@ -1,16 +1,16 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "../concurrency/PeriodicTask.h"
|
||||||
#include "GPS.h"
|
#include "GPS.h"
|
||||||
#include "Observer.h"
|
#include "Observer.h"
|
||||||
#include "../concurrency/PeriodicTask.h"
|
|
||||||
#include "TinyGPS++.h"
|
#include "TinyGPS++.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A gps class thatreads from a NEMA GPS stream (and FIXME - eventually keeps the gps powered down except when reading)
|
* A gps class thatreads from a NMEA GPS stream (and FIXME - eventually keeps the gps powered down except when reading)
|
||||||
*
|
*
|
||||||
* When new data is available it will notify observers.
|
* When new data is available it will notify observers.
|
||||||
*/
|
*/
|
||||||
class NEMAGPS : public GPS
|
class NMEAGPS : public GPS
|
||||||
{
|
{
|
||||||
TinyGPSPlus reader;
|
TinyGPSPlus reader;
|
||||||
|
|
@ -103,7 +103,7 @@ bool UBloxGPS::factoryReset()
|
|||||||
{
|
{
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
|
|
||||||
// It is useful to force back into factory defaults (9600baud, NEMA to test the behavior of boards that don't have
|
// It is useful to force back into factory defaults (9600baud, NMEA to test the behavior of boards that don't have
|
||||||
// GPS_TX connected)
|
// GPS_TX connected)
|
||||||
ublox.factoryReset();
|
ublox.factoryReset();
|
||||||
delay(5000);
|
delay(5000);
|
||||||
|
12
src/main.cpp
12
src/main.cpp
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "MeshRadio.h"
|
#include "MeshRadio.h"
|
||||||
#include "MeshService.h"
|
#include "MeshService.h"
|
||||||
#include "NEMAGPS.h"
|
#include "NMEAGPS.h"
|
||||||
#include "NodeDB.h"
|
#include "NodeDB.h"
|
||||||
#include "PowerFSM.h"
|
#include "PowerFSM.h"
|
||||||
#include "UBloxGPS.h"
|
#include "UBloxGPS.h"
|
||||||
@ -256,16 +256,16 @@ void setup()
|
|||||||
|
|
||||||
if (GPS::_serial_gps) {
|
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
|
// 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.
|
// assume NMEA at 9600 baud.
|
||||||
DEBUG_MSG("Hoping that NEMA might work\n");
|
DEBUG_MSG("Hoping that NMEA might work\n");
|
||||||
|
|
||||||
// dumb NEMA access only work for serial GPSes)
|
// dumb NMEA access only work for serial GPSes)
|
||||||
gps = new NEMAGPS();
|
gps = new NMEAGPS();
|
||||||
gps->setup();
|
gps->setup();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
gps = new NEMAGPS();
|
gps = new NMEAGPS();
|
||||||
gps->setup();
|
gps->setup();
|
||||||
#endif
|
#endif
|
||||||
gpsStatus->observe(&gps->newStatus);
|
gpsStatus->observe(&gps->newStatus);
|
||||||
|
Loading…
Reference in New Issue
Block a user