Merge branch 'master' into tft-gui-work

meshtastic · Feb 22, 2024 · d14151e · d14151e
2 parents 4a34c4f + 880afb9
commit d14151e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/protobufs b/protobufs
diff --git a/src/mesh/generated/meshtastic/atak.pb.h b/src/mesh/generated/meshtastic/atak.pb.h
@@ -110,7 +110,7 @@ typedef struct _meshtastic_PLI {
  in floating point */
     int32_t longitude_i;
     /* Altitude (ATAK prefers HAE) */
-    uint32_t altitude;
+    int32_t altitude;
     /* Speed */
     uint32_t speed;
     /* Course in degrees */
@@ -238,7 +238,7 @@ X(a, STATIC,   SINGULAR, STRING,   device_callsign,   2)
 #define meshtastic_PLI_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        1) \
 X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       2) \
-X(a, STATIC,   SINGULAR, UINT32,   altitude,          3) \
+X(a, STATIC,   SINGULAR, INT32,    altitude,          3) \
 X(a, STATIC,   SINGULAR, UINT32,   speed,             4) \
 X(a, STATIC,   SINGULAR, UINT32,   course,            5)
 #define meshtastic_PLI_CALLBACK NULL
@@ -263,7 +263,7 @@ extern const pb_msgdesc_t meshtastic_PLI_msg;
 #define meshtastic_Contact_size                  242
 #define meshtastic_GeoChat_size                  323
 #define meshtastic_Group_size                    4
-#define meshtastic_PLI_size                      26
+#define meshtastic_PLI_size                      31
 #define meshtastic_Status_size                   3
 #define meshtastic_TAKPacket_size                584
 

diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
@@ -193,7 +193,7 @@ meshtastic_MeshPacket *PositionModule::allocAtakPli()
                                       {.pli = {
                                            .latitude_i = localPosition.latitude_i,
                                            .longitude_i = localPosition.longitude_i,
-                                           .altitude = localPosition.altitude_hae > 0 ? localPosition.altitude_hae : 0,
+                                           .altitude = localPosition.altitude_hae,
                                            .speed = localPosition.ground_speed,
                                            .course = static_cast<uint16_t>(localPosition.ground_track),
                                        }}};