From 9d4c4f8bd145049503d2864ba27cb792669ba7e5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:57:23 -0600 Subject: [PATCH] [create-pull-request] automated change (#3186) Co-authored-by: thebentern --- protobufs | 2 +- src/mesh/generated/meshtastic/atak.pb.h | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/protobufs b/protobufs index 1a25fb62c..bdf9d6a81 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 1a25fb62c92e946cb386b602e0fe3109b92dfe42 +Subproject commit bdf9d6a81b06b919f4d01455a2eb766e30f1141c diff --git a/src/mesh/generated/meshtastic/atak.pb.h b/src/mesh/generated/meshtastic/atak.pb.h index 9a964702a..0ac6cb49f 100644 --- a/src/mesh/generated/meshtastic/atak.pb.h +++ b/src/mesh/generated/meshtastic/atak.pb.h @@ -95,7 +95,9 @@ typedef struct _meshtastic_Status { */ typedef struct _meshtastic_Contact { /* Callsign */ - char callsign[120]; /* IP address of endpoint in integer form (0.0.0.0 default) */ + char callsign[120]; + /* Device callsign */ + char device_callsign[120]; /* IP address of endpoint in integer form (0.0.0.0 default) */ } meshtastic_Contact; /* Position Location Information from ATAK */ @@ -164,13 +166,13 @@ extern "C" { #define meshtastic_GeoChat_init_default {"", {{NULL}, NULL}} #define meshtastic_Group_init_default {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN} #define meshtastic_Status_init_default {0} -#define meshtastic_Contact_init_default {""} +#define meshtastic_Contact_init_default {"", ""} #define meshtastic_PLI_init_default {0, 0, 0, 0, 0} #define meshtastic_TAKPacket_init_zero {0, false, meshtastic_Contact_init_zero, false, meshtastic_Group_init_zero, false, meshtastic_Status_init_zero, 0, {meshtastic_PLI_init_zero}} #define meshtastic_GeoChat_init_zero {"", {{NULL}, NULL}} #define meshtastic_Group_init_zero {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN} #define meshtastic_Status_init_zero {0} -#define meshtastic_Contact_init_zero {""} +#define meshtastic_Contact_init_zero {"", ""} #define meshtastic_PLI_init_zero {0, 0, 0, 0, 0} /* Field tags (for use in manual encoding/decoding) */ @@ -180,6 +182,7 @@ extern "C" { #define meshtastic_Group_team_tag 2 #define meshtastic_Status_battery_tag 1 #define meshtastic_Contact_callsign_tag 1 +#define meshtastic_Contact_device_callsign_tag 2 #define meshtastic_PLI_latitude_i_tag 1 #define meshtastic_PLI_longitude_i_tag 2 #define meshtastic_PLI_altitude_tag 3 @@ -226,7 +229,8 @@ X(a, STATIC, SINGULAR, UINT32, battery, 1) #define meshtastic_Status_DEFAULT NULL #define meshtastic_Contact_FIELDLIST(X, a) \ -X(a, STATIC, SINGULAR, STRING, callsign, 1) +X(a, STATIC, SINGULAR, STRING, callsign, 1) \ +X(a, STATIC, SINGULAR, STRING, device_callsign, 2) #define meshtastic_Contact_CALLBACK NULL #define meshtastic_Contact_DEFAULT NULL @@ -257,7 +261,7 @@ extern const pb_msgdesc_t meshtastic_PLI_msg; /* Maximum encoded size of messages (where known) */ /* meshtastic_TAKPacket_size depends on runtime parameters */ /* meshtastic_GeoChat_size depends on runtime parameters */ -#define meshtastic_Contact_size 121 +#define meshtastic_Contact_size 242 #define meshtastic_Group_size 4 #define meshtastic_PLI_size 26 #define meshtastic_Status_size 3