This commit is contained in:
Ben Meadors 2024-02-22 07:18:53 -06:00
parent 78b4a65635
commit 880afb9477
3 changed files with 5 additions and 5 deletions

@ -1 +1 @@
Subproject commit 5f28be497a5518334c86378335e8ffcd177ed661 Subproject commit b88889941c1ac6bec7b3043913ccbc9007077d3d

View File

@ -110,7 +110,7 @@ typedef struct _meshtastic_PLI {
in floating point */ in floating point */
int32_t longitude_i; int32_t longitude_i;
/* Altitude (ATAK prefers HAE) */ /* Altitude (ATAK prefers HAE) */
uint32_t altitude; int32_t altitude;
/* Speed */ /* Speed */
uint32_t speed; uint32_t speed;
/* Course in degrees */ /* Course in degrees */
@ -238,7 +238,7 @@ X(a, STATIC, SINGULAR, STRING, device_callsign, 2)
#define meshtastic_PLI_FIELDLIST(X, a) \ #define meshtastic_PLI_FIELDLIST(X, a) \
X(a, STATIC, SINGULAR, SFIXED32, latitude_i, 1) \ X(a, STATIC, SINGULAR, SFIXED32, latitude_i, 1) \
X(a, STATIC, SINGULAR, SFIXED32, longitude_i, 2) \ 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, speed, 4) \
X(a, STATIC, SINGULAR, UINT32, course, 5) X(a, STATIC, SINGULAR, UINT32, course, 5)
#define meshtastic_PLI_CALLBACK NULL #define meshtastic_PLI_CALLBACK NULL
@ -263,7 +263,7 @@ extern const pb_msgdesc_t meshtastic_PLI_msg;
#define meshtastic_Contact_size 242 #define meshtastic_Contact_size 242
#define meshtastic_GeoChat_size 323 #define meshtastic_GeoChat_size 323
#define meshtastic_Group_size 4 #define meshtastic_Group_size 4
#define meshtastic_PLI_size 26 #define meshtastic_PLI_size 31
#define meshtastic_Status_size 3 #define meshtastic_Status_size 3
#define meshtastic_TAKPacket_size 584 #define meshtastic_TAKPacket_size 584

View File

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