Merge pull request #2 from medentem/create-pull-request/patch

Update protobufs and classes
This commit is contained in:
medentem 2025-01-09 10:27:54 -06:00 committed by GitHub
commit 42b855d482
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 16 deletions

@ -1 +1 @@
Subproject commit a68f5e6455195dad13af9ff09b7474537abd9f5e Subproject commit 4f45d604eee11144739af8ceb7a3ce22b8f59c61

View File

@ -235,9 +235,9 @@ typedef enum _meshtastic_Constants {
pass int constants between two very different environments */ pass int constants between two very different environments */
meshtastic_Constants_ZERO = 0, meshtastic_Constants_ZERO = 0,
/* From mesh.options /* From mesh.options
note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 32 byte header is
outside of this envelope */ outside of this envelope */
meshtastic_Constants_DATA_PAYLOAD_LEN = 233 meshtastic_Constants_DATA_PAYLOAD_LEN = 217
} meshtastic_Constants; } meshtastic_Constants;
/* Error codes for critical errors /* Error codes for critical errors
@ -613,7 +613,7 @@ typedef struct _meshtastic_Routing {
}; };
} meshtastic_Routing; } meshtastic_Routing;
typedef PB_BYTES_ARRAY_T(233) meshtastic_Data_payload_t; typedef PB_BYTES_ARRAY_T(217) meshtastic_Data_payload_t;
/* (Formerly called SubPacket) /* (Formerly called SubPacket)
The payload portion fo a packet, this is the actual bytes that are sent The payload portion fo a packet, this is the actual bytes that are sent
inside a radio packet (because from/to are broken out by the comms library) */ inside a radio packet (because from/to are broken out by the comms library) */
@ -690,9 +690,10 @@ typedef struct _meshtastic_MqttClientProxyMessage {
typedef PB_BYTES_ARRAY_T(256) meshtastic_MeshPacket_encrypted_t; typedef PB_BYTES_ARRAY_T(256) meshtastic_MeshPacket_encrypted_t;
typedef PB_BYTES_ARRAY_T(32) meshtastic_MeshPacket_public_key_t; typedef PB_BYTES_ARRAY_T(32) meshtastic_MeshPacket_public_key_t;
typedef PB_BYTES_ARRAY_T(104) meshtastic_MeshPacket_coverage_filter_t;
/* A packet envelope sent/received over the mesh /* A packet envelope sent/received over the mesh
only payload_variant is sent in the payload portion of the LORA packet. only payload_variant is sent in the payload portion of the LORA packet.
The other fields are either not sent at all, or sent in the special 16 byte LORA header. */ The other fields are either not sent at all, or sent in the special 32 byte LORA header. */
typedef struct _meshtastic_MeshPacket { typedef struct _meshtastic_MeshPacket {
/* The sending node number. /* The sending node number.
Note: Our crypto implementation uses this field as well. Note: Our crypto implementation uses this field as well.
@ -769,13 +770,13 @@ typedef struct _meshtastic_MeshPacket {
uint8_t next_hop; uint8_t next_hop;
/* Last byte of the node number of the node that will relay/relayed this packet. /* Last byte of the node number of the node that will relay/relayed this packet.
Set by the firmware internally, clients are not supposed to set this. */ Set by the firmware internally, clients are not supposed to set this. */
uint8_t relay_node; uint32_t relay_node;
/* *Never* sent over the radio links. /* *Never* sent over the radio links.
Timestamp after which this packet may be sent. Timestamp after which this packet may be sent.
Set by the firmware internally, clients are not supposed to set this. */ Set by the firmware internally, clients are not supposed to set this. */
uint32_t tx_after; uint32_t tx_after;
/* A bloom filter storing the top 20 nodes for each hop using 2 hashes */ /* A bloom filter storing the top 20 nodes for each hop using 2 hashes */
pb_callback_t coverage_filter; meshtastic_MeshPacket_coverage_filter_t coverage_filter;
} meshtastic_MeshPacket; } meshtastic_MeshPacket;
/* The bluetooth to device link: /* The bluetooth to device link:
@ -1184,7 +1185,7 @@ extern "C" {
#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0} #define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
#define meshtastic_Waypoint_init_default {0, false, 0, false, 0, 0, 0, "", "", 0} #define meshtastic_Waypoint_init_default {0, false, 0, false, 0, 0, 0, "", "", 0}
#define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0} #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
#define meshtastic_MeshPacket_init_default {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, {{NULL}, NULL}} #define meshtastic_MeshPacket_init_default {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, {0, {0}}}
#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0} #define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0}
#define meshtastic_MyNodeInfo_init_default {0, 0, 0, {0, {0}}, ""} #define meshtastic_MyNodeInfo_init_default {0, 0, 0, {0, {0}}, ""}
#define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN} #define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@ -1209,7 +1210,7 @@ extern "C" {
#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0} #define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
#define meshtastic_Waypoint_init_zero {0, false, 0, false, 0, 0, 0, "", "", 0} #define meshtastic_Waypoint_init_zero {0, false, 0, false, 0, 0, 0, "", "", 0}
#define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0} #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
#define meshtastic_MeshPacket_init_zero {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, {{NULL}, NULL}} #define meshtastic_MeshPacket_init_zero {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, {0, {0}}}
#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0} #define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0}
#define meshtastic_MyNodeInfo_init_zero {0, 0, 0, {0, {0}}, ""} #define meshtastic_MyNodeInfo_init_zero {0, 0, 0, {0, {0}}, ""}
#define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN} #define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@ -1507,8 +1508,8 @@ X(a, STATIC, SINGULAR, BOOL, pki_encrypted, 17) \
X(a, STATIC, SINGULAR, UINT32, next_hop, 18) \ X(a, STATIC, SINGULAR, UINT32, next_hop, 18) \
X(a, STATIC, SINGULAR, UINT32, relay_node, 19) \ X(a, STATIC, SINGULAR, UINT32, relay_node, 19) \
X(a, STATIC, SINGULAR, UINT32, tx_after, 20) \ X(a, STATIC, SINGULAR, UINT32, tx_after, 20) \
X(a, CALLBACK, SINGULAR, BYTES, coverage_filter, 21) X(a, STATIC, SINGULAR, BYTES, coverage_filter, 21)
#define meshtastic_MeshPacket_CALLBACK pb_default_field_callback #define meshtastic_MeshPacket_CALLBACK NULL
#define meshtastic_MeshPacket_DEFAULT NULL #define meshtastic_MeshPacket_DEFAULT NULL
#define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data #define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data
@ -1745,20 +1746,19 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
#define meshtastic_ChunkedPayloadResponse_fields &meshtastic_ChunkedPayloadResponse_msg #define meshtastic_ChunkedPayloadResponse_fields &meshtastic_ChunkedPayloadResponse_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
/* meshtastic_MeshPacket_size depends on runtime parameters */
/* meshtastic_FromRadio_size depends on runtime parameters */
/* meshtastic_ToRadio_size depends on runtime parameters */
/* meshtastic_resend_chunks_size depends on runtime parameters */ /* meshtastic_resend_chunks_size depends on runtime parameters */
/* meshtastic_ChunkedPayloadResponse_size depends on runtime parameters */ /* meshtastic_ChunkedPayloadResponse_size depends on runtime parameters */
#define MESHTASTIC_MESHTASTIC_MESH_PB_H_MAX_SIZE meshtastic_MqttClientProxyMessage_size #define MESHTASTIC_MESHTASTIC_MESH_PB_H_MAX_SIZE meshtastic_FromRadio_size
#define meshtastic_ChunkedPayload_size 245 #define meshtastic_ChunkedPayload_size 245
#define meshtastic_ClientNotification_size 415 #define meshtastic_ClientNotification_size 415
#define meshtastic_Compressed_size 239 #define meshtastic_Compressed_size 239
#define meshtastic_Data_size 269 #define meshtastic_Data_size 253
#define meshtastic_DeviceMetadata_size 54 #define meshtastic_DeviceMetadata_size 54
#define meshtastic_FileInfo_size 236 #define meshtastic_FileInfo_size 236
#define meshtastic_FromRadio_size 510
#define meshtastic_Heartbeat_size 0 #define meshtastic_Heartbeat_size 0
#define meshtastic_LogRecord_size 426 #define meshtastic_LogRecord_size 426
#define meshtastic_MeshPacket_size 475
#define meshtastic_MqttClientProxyMessage_size 501 #define meshtastic_MqttClientProxyMessage_size 501
#define meshtastic_MyNodeInfo_size 77 #define meshtastic_MyNodeInfo_size 77
#define meshtastic_NeighborInfo_size 258 #define meshtastic_NeighborInfo_size 258
@ -1769,6 +1769,7 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
#define meshtastic_QueueStatus_size 23 #define meshtastic_QueueStatus_size 23
#define meshtastic_RouteDiscovery_size 256 #define meshtastic_RouteDiscovery_size 256
#define meshtastic_Routing_size 259 #define meshtastic_Routing_size 259
#define meshtastic_ToRadio_size 504
#define meshtastic_User_size 113 #define meshtastic_User_size 113
#define meshtastic_Waypoint_size 165 #define meshtastic_Waypoint_size 165