pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-27 10:21:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #2127 from meshtastic/create-pull-request/patch

Browse Source 
Changes by create-pull-request action
This commit is contained in:
Ben Meadors 2023-01-11 19:40:51 -06:00 committed by GitHub
commit e3fd17772d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit 570cee3f31c8a1acfb31e0f3f434bf25b8451a52 Subproject commit e00b5ba7d06053d820f1123351881fc4fa9270d1

6
src/mesh/generated/mesh.pb.h
View File

@ -444,7 +444,7 @@ typedef struct _Waypoint {
/* Description of the waypoint - max 100 chars */ /* Description of the waypoint - max 100 chars */
char description[100]; char description[100];
/* Designator icon for the waypoint in the form of a unicode emoji */ /* Designator icon for the waypoint in the form of a unicode emoji */
uint32_t emoji; uint32_t icon;
} Waypoint; } Waypoint;
typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t; typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t;
@ -853,7 +853,7 @@ extern "C" {
#define Waypoint_locked_tag 5 #define Waypoint_locked_tag 5
#define Waypoint_name_tag 6 #define Waypoint_name_tag 6
#define Waypoint_description_tag 7 #define Waypoint_description_tag 7
#define Waypoint_emoji_tag 8 #define Waypoint_icon_tag 8
#define MeshPacket_from_tag 1 #define MeshPacket_from_tag 1
#define MeshPacket_to_tag 2 #define MeshPacket_to_tag 2
#define MeshPacket_channel_tag 3 #define MeshPacket_channel_tag 3
@ -985,7 +985,7 @@ X(a, STATIC, SINGULAR, UINT32, expire, 4) \
X(a, STATIC, SINGULAR, BOOL, locked, 5) \ X(a, STATIC, SINGULAR, BOOL, locked, 5) \
X(a, STATIC, SINGULAR, STRING, name, 6) \ X(a, STATIC, SINGULAR, STRING, name, 6) \
X(a, STATIC, SINGULAR, STRING, description, 7) \ X(a, STATIC, SINGULAR, STRING, description, 7) \
X(a, STATIC, SINGULAR, FIXED32, emoji, 8) X(a, STATIC, SINGULAR, FIXED32, icon, 8)
#define Waypoint_CALLBACK NULL #define Waypoint_CALLBACK NULL
#define Waypoint_DEFAULT NULL #define Waypoint_DEFAULT NULL