From 6a6a10fb9b74429f8036f06eb9d8dd3cfe1dc942 Mon Sep 17 00:00:00 2001 From: Slavomir Hustaty Date: Tue, 14 Jul 2020 17:26:17 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ae323e94..9fb276d7 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,14 @@ We currently support three models of radios. - [T-Beam V1.1 w/ NEO-6M - special Meshtastic version](https://www.aliexpress.com/item/4001178678568.html) (Includes built-in OLED display and they have **preinstalled** the meshtastic software) - [T-Beam V1.0 w/ NEO-M8N](https://www.aliexpress.com/item/33047631119.html) (slightly better GPS) - [T-Beam V0.7 w/ NEO-6M](https://www.aliexpress.com/item/4000574335430.html) (will work but **you must use the tbeam0.7 firmware ** - but the T-Beam V1.0 or later are better!) + - board labels "TTGO T22_V07 20180711" - 3D printable cases - [T-Beam V0](https://www.thingiverse.com/thing:3773717) - [T-Beam V1](https://www.thingiverse.com/thing:3830711) - [TTGO LORA32](https://www.aliexpress.com/item/4000211331316.html) - No GPS - + - version 2.1 + - board labels "TTGO T3_V1.6 20180606" - 3D printable case - [TTGO LORA32 v1](https://www.thingiverse.com/thing:3385109) From 8b4cf91f1f106d4ae8c6cec8abd13c92b0fcb00f Mon Sep 17 00:00:00 2001 From: Slavomir Hustaty Date: Tue, 14 Jul 2020 18:20:13 +0200 Subject: [PATCH 2/4] Create SupportedHardware.md idea on supported hardware matrix - maybe to be referenced from main README.md --- docs/SupportedHardware.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docs/SupportedHardware.md diff --git a/docs/SupportedHardware.md b/docs/SupportedHardware.md new file mode 100644 index 00000000..5cbc4661 --- /dev/null +++ b/docs/SupportedHardware.md @@ -0,0 +1,8 @@ +| Vendor | Product line | Version | Board labels | Notes | URL | +|---|---|---|---|---|---| +| TTGO | T-Beam | 0.7 | T22_V07 20180711 | LoRa 433/470MHz *OR* LoRa 868/915MHz ,
GPS ublox NEO-6M ,
battery holder for Li-Ion 18650 | [buy](https://www.aliexpress.com/item/4000574335430.html) | +| TTGO | T-Beam | 1.0 | | | [buy](https://www.aliexpress.com/item/4001178678568.html) | +| TTGO | T-Beam | 1.1 | T22_V11 20191212 | LoRa 433/470MHz *OR* LoRa 868/915MHz *OR* LoRa 923MHz ,
GPS ublox NEO-M8N ,
battery holder for Li-Ion 18650 | [buy](https://www.aliexpress.com/item/4001178678568.html) | +| TTGO | Lora32 | 2.0 | *missing* | LoRa 433/470MHz *OR* LoRa 868/915MHz ,
OLED SSD1306 ,
SD card holder | [buy](https://www.aliexpress.com/item/4000211331316.html) | +| TTGO | Lora32 | 2.1 | T3_V1.6 20180606 | LoRa 32 (V2) ,
SD card holder | [buy](https://www.aliexpress.com/item/4000119208093.html) | +| Heltec | Lora 32 | V2 | V2 | LoRa 433/470MHz *OR* LoRa 868/915MHz | [buy](https://heltec.org/project/wifi-lora-32/) | From 4d20865c67ccd13f6164be7a507a408fda08e225 Mon Sep 17 00:00:00 2001 From: Slavomir Hustaty Date: Tue, 14 Jul 2020 18:28:14 +0200 Subject: [PATCH 3/4] Update README.md the board referenced in that "buy" link has also label reference on board stating that it is V1.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae323e94..3c880d22 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ We currently support three models of radios. - TTGO T-Beam (usually the recommended choice) - [T-Beam V1.1 w/ NEO-6M - special Meshtastic version](https://www.aliexpress.com/item/4001178678568.html) (Includes built-in OLED display and they have **preinstalled** the meshtastic software) - - [T-Beam V1.0 w/ NEO-M8N](https://www.aliexpress.com/item/33047631119.html) (slightly better GPS) + - [T-Beam V1.1 w/ NEO-M8N](https://www.aliexpress.com/item/33047631119.html) (slightly better GPS) - [T-Beam V0.7 w/ NEO-6M](https://www.aliexpress.com/item/4000574335430.html) (will work but **you must use the tbeam0.7 firmware ** - but the T-Beam V1.0 or later are better!) - 3D printable cases - [T-Beam V0](https://www.thingiverse.com/thing:3773717) From e5fac4b78db7a1333e6c43051efab57e34e74824 Mon Sep 17 00:00:00 2001 From: Professr Date: Tue, 14 Jul 2020 22:53:36 -0700 Subject: [PATCH 4/4] UBlox GPS now detects loss of lock --- src/gps/UBloxGPS.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/gps/UBloxGPS.cpp b/src/gps/UBloxGPS.cpp index 8c3d7dd2..3d1a752b 100644 --- a/src/gps/UBloxGPS.cpp +++ b/src/gps/UBloxGPS.cpp @@ -141,19 +141,20 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s perhapsSetRTC(t); } + latitude = ublox.getLatitude(0); + longitude = ublox.getLongitude(0); + altitude = ublox.getAltitude(0) / 1000; // in mm convert to meters + dop = ublox.getPDOP(0); // PDOP (an accuracy metric) is reported in 10^2 units so we have to scale down when we use it + heading = ublox.getHeading(0); + numSatellites = ublox.getSIV(0); + + // bogus lat lon is reported as 0 or 0 (can be bogus just for one) + // Also: apparently when the GPS is initially reporting lock it can output a bogus latitude > 90 deg! + hasValidLocation = (latitude != 0) && (longitude != 0) && (latitude <= 900000000 && latitude >= -900000000) && (numSatellites > 0); + + // we only notify if position has changed due to a new fix if ((fixtype >= 3 && fixtype <= 4) && ublox.getP(maxWait)) // rd fixes only { - // we only notify if position has changed - latitude = ublox.getLatitude(0); - longitude = ublox.getLongitude(0); - altitude = ublox.getAltitude(0) / 1000; // in mm convert to meters - dop = ublox.getPDOP(0); // PDOP (an accuracy metric) is reported in 10^2 units so we have to scale down when we use it - heading = ublox.getHeading(0); - numSatellites = ublox.getSIV(0); - - // bogus lat lon is reported as 0 or 0 (can be bogus just for one) - // Also: apparently when the GPS is initially reporting lock it can output a bogus latitude > 90 deg! - hasValidLocation = (latitude != 0) && (longitude != 0) && (latitude <= 900000000 && latitude >= -900000000); if (hasValidLocation) { wantNewLocation = false; notifyObservers(NULL);