From 880afb9477b945da94228e8e24b273789c903de0 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 22 Feb 2024 07:18:53 -0600 Subject: [PATCH] Protos --- protobufs | 2 +- src/mesh/generated/meshtastic/atak.pb.h | 6 +++--- src/modules/PositionModule.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/protobufs b/protobufs index 5f28be497a..b88889941c 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 5f28be497a5518334c86378335e8ffcd177ed661 +Subproject commit b88889941c1ac6bec7b3043913ccbc9007077d3d diff --git a/src/mesh/generated/meshtastic/atak.pb.h b/src/mesh/generated/meshtastic/atak.pb.h index 71c3c387f9..17d3cd3b9a 100644 --- 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 index e82362bc6e..eaa224d3b8 100644 --- 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(localPosition.ground_track), }}};