pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-28 18:47:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #194 from geeksville/dev

Browse Source 
Fix #187, Ublox GPS fixes, see below:
This commit is contained in:
Kevin Hester 2020-06-18 11:25:45 -07:00 committed by GitHub
commit 698fcdad36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/version.sh
View File

@ -1,3 +1,3 @@
export VERSION=0.7.6 export VERSION=0.7.7

9
docs/software/TODO.md
View File

@ -2,18 +2,15 @@
You probably don't care about this section - skip to the next one. You probably don't care about this section - skip to the next one.
- fix hasGPS bug
- make new android release - make new android release
- check in our modified arduino binaries - check in our modified arduino binaries
- post bug on esp32-arduino - post bug on esp32-arduino
- router mode
- let users set arbitary params in android
- encryption review findings writeup - encryption review findings writeup
- NRF52 BLE - NRF52 BLE support
- DSR - DSR
- turn on modem-sleep mode - https://github.com/espressif/arduino-esp32/issues/1142#issuecomment-512428852
# Medium priority # Medium priority
Items to complete before the first beta release. Items to complete before the first beta release.

10
src/gps/UBloxGPS.cpp
View File

@ -86,14 +86,14 @@ void UBloxGPS::doTask()
// If we don't have a fix (a quick check), don't try waiting for a solution) // If we don't have a fix (a quick check), don't try waiting for a solution)
// Hmmm my fix type reading returns zeros for fix, which doesn't seem correct, because it is still sptting out positions // Hmmm my fix type reading returns zeros for fix, which doesn't seem correct, because it is still sptting out positions
// turn off for now // turn off for now
// fixtype = ublox.getFixType(); fixtype = ublox.getFixType(0);
// DEBUG_MSG("fix type %d\n", fixtype); DEBUG_MSG("GPS fix type %d\n", fixtype);
// DEBUG_MSG("sec %d\n", ublox.getSecond()); // DEBUG_MSG("sec %d\n", ublox.getSecond());
// DEBUG_MSG("lat %d\n", ublox.getLatitude()); // DEBUG_MSG("lat %d\n", ublox.getLatitude());
// any fix that has time // any fix that has time
if (ublox.getT()) { if (ublox.getT(0)) {
/* Convert to unix time /* Convert to unix time
The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of seconds that have elapsed since January 1, 1970 The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of seconds that have elapsed since January 1, 1970
(midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z). (midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z).
@ -109,7 +109,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
perhapsSetRTC(t); perhapsSetRTC(t);
} }
if ((fixtype >= 3 && fixtype <= 4) && ublox.getP()) // rd fixes only if ((fixtype >= 3 && fixtype <= 4) && ublox.getP(0)) // rd fixes only
{ {
// we only notify if position has changed // we only notify if position has changed
latitude = ublox.getLatitude(); latitude = ublox.getLatitude();
@ -117,7 +117,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
altitude = ublox.getAltitude() / 1000; // in mm convert to meters altitude = ublox.getAltitude() / 1000; // in mm convert to meters
DEBUG_MSG("new gps pos lat=%f, lon=%f, alt=%d\n", latitude * 1e-7, longitude * 1e-7, altitude); DEBUG_MSG("new gps pos lat=%f, lon=%f, alt=%d\n", latitude * 1e-7, longitude * 1e-7, altitude);
hasValidLocation = (latitude != 0) || (longitude != 0); // bogus lat lon is reported as 0,0 hasValidLocation = (latitude != 0) && (longitude != 0); // bogus lat lon is reported as 0 or 0 (can be bogus just for one)
if (hasValidLocation) { if (hasValidLocation) {
wantNewLocation = false; wantNewLocation = false;
notifyObservers(NULL); notifyObservers(NULL);