From 42d2986cb82a44ead0e60636cedacf7ac99fed2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 12 Sep 2022 09:37:21 +0200 Subject: [PATCH] Reinstate GPS Flag --- src/gps/NMEAGPS.cpp | 3 ++- src/modules/PositionModule.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gps/NMEAGPS.cpp b/src/gps/NMEAGPS.cpp index fc8f72781..abba6fe7d 100644 --- a/src/gps/NMEAGPS.cpp +++ b/src/gps/NMEAGPS.cpp @@ -176,7 +176,8 @@ bool NMEAGPS::lookForLocation() p.latitude_i = toDegInt(loc.lat); 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.fix_quality = fixQual; diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp index 881dcc17a..39ef08a8e 100644 --- a/src/modules/PositionModule.cpp +++ b/src/modules/PositionModule.cpp @@ -34,7 +34,7 @@ bool PositionModule::handleReceivedProtobuf(const MeshPacket &mp, Position *pptr // 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, 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.time ? "TIME " : ""); @@ -75,6 +75,9 @@ MeshPacket *PositionModule::allocReply() p.altitude = node->position.altitude; else 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) {