pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-18 11:02:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Reinstate GPS Flag

Browse Source
This commit is contained in:
Thomas Göttgens 2022-09-12 09:37:21 +02:00
parent 60b4dbfdcd
commit 42d2986cb8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gps/NMEAGPS.cpp
View File

@ -176,7 +176,8 @@ bool NMEAGPS::lookForLocation()
p.latitude_i = toDegInt(loc.lat); p.latitude_i = toDegInt(loc.lat);
p.longitude_i = toDegInt(loc.lng); p.longitude_i = toDegInt(loc.lng);
p.altitude_hae = reader.altitude.meters() + reader.geoidHeight.meters(); p.altitude_geoidal_seperation = reader.geoidHeight.meters();
p.altitude_hae = reader.altitude.meters() + p.altitude_geoidal_seperation;
p.altitude = reader.altitude.meters(); p.altitude = reader.altitude.meters();
p.fix_quality = fixQual; p.fix_quality = fixQual;

5
src/modules/PositionModule.cpp
View File

@ -34,7 +34,7 @@ bool PositionModule::handleReceivedProtobuf(const MeshPacket &mp, Position *pptr
// Log packet size and list of fields // Log packet size and list of fields
DEBUG_MSG("POSITION node=%08x l=%d %s%s%s%s%s%s%s%s%s%s%s%s%s\n", getFrom(&mp), mp.decoded.payload.size, DEBUG_MSG("POSITION node=%08x l=%d %s%s%s%s%s%s%s%s%s%s%s%s%s\n", getFrom(&mp), mp.decoded.payload.size,
p.latitude_i ? "LAT " : "", p.longitude_i ? "LON " : "", p.altitude ? "MSL " : "", p.altitude_hae ? "HAE " : "", p.latitude_i ? "LAT " : "", p.longitude_i ? "LON " : "", p.altitude ? "MSL " : "", p.altitude_hae ? "HAE " : "",
p.PDOP ? "PDOP " : "", p.HDOP ? "HDOP " : "", p.VDOP ? "VDOP " : "", p.altitude_geoidal_seperation ? "GEO " : "", p.PDOP ? "PDOP " : "", p.HDOP ? "HDOP " : "", p.VDOP ? "VDOP " : "",
p.sats_in_view ? "SIV " : "", p.fix_quality ? "FXQ " : "", p.fix_type ? "FXT " : "", p.timestamp ? "PTS " : "", p.sats_in_view ? "SIV " : "", p.fix_quality ? "FXQ " : "", p.fix_type ? "FXT " : "", p.timestamp ? "PTS " : "",
p.time ? "TIME " : ""); p.time ? "TIME " : "");
@ -75,6 +75,9 @@ MeshPacket *PositionModule::allocReply()
p.altitude = node->position.altitude; p.altitude = node->position.altitude;
else else
p.altitude_hae = node->position.altitude_hae; p.altitude_hae = node->position.altitude_hae;
if (pos_flags & Config_PositionConfig_PositionFlags_GEOIDAL_SEPERATION)
p.altitude_geoidal_seperation = node->position.altitude_geoidal_seperation;
} }
if (pos_flags & Config_PositionConfig_PositionFlags_DOP) { if (pos_flags & Config_PositionConfig_PositionFlags_DOP) {