Skip to content

Commit 768b38e

Browse files
caveman99caveman99
authored
Merge pull request #16 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2 parents 8efb5cc + 69aae30 commit 768b38e

File tree

5 files changed

+46
-24
lines changed

5 files changed

+46
-24
lines changed

‎protobufs‎

‎src/meshtastic/deviceonly.pb.h‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ typedef struct _meshtastic_NodeInfoLite {
6565
meshtastic_DeviceMetrics device_metrics;
6666
/* local channel index we heard that node on. Only populated if its not the default channel. */
6767
uint8_t channel;
68+
/* True if we witnessed the node over MQTT instead of LoRA transport */
69+
bool via_mqtt;
70+
/* Number of hops away from us this node is (0 if adjacent) */
71+
uint8_t hops_away;
6872
} meshtastic_NodeInfoLite;
6973

7074
/* The on-disk saved channels */
@@ -175,13 +179,13 @@ extern "C" {
175179

176180
/* Initializer values for message structs */
177181
#define meshtastic_DeviceState_init_default {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, 0, {meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default, meshtastic_NodeInfoLite_init_default}}
178-
#define meshtastic_NodeInfoLite_init_default {0, false, meshtastic_User_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0}
182+
#define meshtastic_NodeInfoLite_init_default {0, false, meshtastic_User_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, 0}
179183
#define meshtastic_PositionLite_init_default {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
180184
#define meshtastic_ChannelFile_init_default {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
181185
#define meshtastic_OEMStore_init_default {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
182186
#define meshtastic_NodeRemoteHardwarePin_init_default {0, false, meshtastic_RemoteHardwarePin_init_default}
183187
#define meshtastic_DeviceState_init_zero {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, 0, {meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero, meshtastic_NodeInfoLite_init_zero}}
184-
#define meshtastic_NodeInfoLite_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0}
188+
#define meshtastic_NodeInfoLite_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, 0}
185189
#define meshtastic_PositionLite_init_zero {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
186190
#define meshtastic_ChannelFile_init_zero {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
187191
#define meshtastic_OEMStore_init_zero {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
@@ -200,6 +204,8 @@ extern "C" {
200204
#define meshtastic_NodeInfoLite_last_heard_tag 5
201205
#define meshtastic_NodeInfoLite_device_metrics_tag 6
202206
#define meshtastic_NodeInfoLite_channel_tag 7
207+
#define meshtastic_NodeInfoLite_via_mqtt_tag 8
208+
#define meshtastic_NodeInfoLite_hops_away_tag 9
203209
#define meshtastic_ChannelFile_channels_tag 1
204210
#define meshtastic_ChannelFile_version_tag 2
205211
#define meshtastic_OEMStore_oem_icon_width_tag 1
@@ -252,7 +258,9 @@ X(a, STATIC, OPTIONAL, MESSAGE, position, 3) \
252258
X(a, STATIC, SINGULAR, FLOAT, snr, 4) \
253259
X(a, STATIC, SINGULAR, FIXED32, last_heard, 5) \
254260
X(a, STATIC, OPTIONAL, MESSAGE, device_metrics, 6) \
255-
X(a, STATIC, SINGULAR, UINT32, channel, 7)
261+
X(a, STATIC, SINGULAR, UINT32, channel, 7) \
262+
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 8) \
263+
X(a, STATIC, SINGULAR, UINT32, hops_away, 9)
256264
#define meshtastic_NodeInfoLite_CALLBACK NULL
257265
#define meshtastic_NodeInfoLite_DEFAULT NULL
258266
#define meshtastic_NodeInfoLite_user_MSGTYPE meshtastic_User
@@ -313,8 +321,8 @@ extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePin_msg;
313321

314322
/* Maximum encoded size of messages (where known) */
315323
#define meshtastic_ChannelFile_size 702
316-
#define meshtastic_DeviceState_size 17062
317-
#define meshtastic_NodeInfoLite_size 153
324+
#define meshtastic_DeviceState_size 17571
325+
#define meshtastic_NodeInfoLite_size 158
318326
#define meshtastic_NodeRemoteHardwarePin_size 29
319327
#define meshtastic_OEMStore_size 3246
320328
#define meshtastic_PositionLite_size 28

‎src/meshtastic/mesh.pb.h‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,7 @@ typedef struct _meshtastic_MeshPacket {
534534
Note: Our crypto implementation uses this field as well.
535535
See [crypto](/docs/overview/encryption) for details. */
536536
uint32_t from;
537-
/* The (immediatSee Priority description for more details.y should be fixed32 instead, this encoding only
538-
hurts the ble link though. */
537+
/* The (immediate) destination for this packet */
539538
uint32_t to;
540539
/* (Usually) If set, this indicates the index in the secondary_channels table that this packet was sent/received on.
541540
If unset, packet was on the primary channel.
@@ -594,6 +593,9 @@ typedef struct _meshtastic_MeshPacket {
594593
meshtastic_MeshPacket_Delayed delayed;
595594
/* Describes whether this packet passed via MQTT somewhere along the path it currently took. */
596595
bool via_mqtt;
596+
/* Hop limit with which the original packet started. Sent via LoRa using three bits in the unencrypted header.
597+
When receiving a packet, the difference between hop_start and hop_limit gives how many hops it traveled. */
598+
uint8_t hop_start;
597599
} meshtastic_MeshPacket;
598600

599601
/* The bluetooth to device link:
@@ -632,6 +634,10 @@ typedef struct _meshtastic_NodeInfo {
632634
meshtastic_DeviceMetrics device_metrics;
633635
/* local channel index we heard that node on. Only populated if its not the default channel. */
634636
uint8_t channel;
637+
/* True if we witnessed the node over MQTT instead of LoRA transport */
638+
bool via_mqtt;
639+
/* Number of hops away from us this node is (0 if adjacent) */
640+
uint8_t hops_away;
635641
} meshtastic_NodeInfo;
636642

637643
/* Unique local debugging info for this node
@@ -890,8 +896,8 @@ extern "C" {
890896
#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
891897
#define meshtastic_Waypoint_init_default {0, 0, 0, 0, 0, "", "", 0}
892898
#define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
893-
#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}
894-
#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0}
899+
#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}
900+
#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, 0}
895901
#define meshtastic_MyNodeInfo_init_default {0, 0, 0}
896902
#define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN}
897903
#define meshtastic_QueueStatus_init_default {0, 0, 0, 0}
@@ -908,8 +914,8 @@ extern "C" {
908914
#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
909915
#define meshtastic_Waypoint_init_zero {0, 0, 0, 0, 0, "", "", 0}
910916
#define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
911-
#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}
912-
#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0}
917+
#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}
918+
#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, 0}
913919
#define meshtastic_MyNodeInfo_init_zero {0, 0, 0}
914920
#define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN}
915921
#define meshtastic_QueueStatus_init_zero {0, 0, 0, 0}
@@ -989,13 +995,16 @@ extern "C" {
989995
#define meshtastic_MeshPacket_rx_rssi_tag 12
990996
#define meshtastic_MeshPacket_delayed_tag 13
991997
#define meshtastic_MeshPacket_via_mqtt_tag 14
998+
#define meshtastic_MeshPacket_hop_start_tag 15
992999
#define meshtastic_NodeInfo_num_tag 1
9931000
#define meshtastic_NodeInfo_user_tag 2
9941001
#define meshtastic_NodeInfo_position_tag 3
9951002
#define meshtastic_NodeInfo_snr_tag 4
9961003
#define meshtastic_NodeInfo_last_heard_tag 5
9971004
#define meshtastic_NodeInfo_device_metrics_tag 6
9981005
#define meshtastic_NodeInfo_channel_tag 7
1006+
#define meshtastic_NodeInfo_via_mqtt_tag 8
1007+
#define meshtastic_NodeInfo_hops_away_tag 9
9991008
#define meshtastic_MyNodeInfo_my_node_num_tag 1
10001009
#define meshtastic_MyNodeInfo_reboot_count_tag 8
10011010
#define meshtastic_MyNodeInfo_min_app_version_tag 11
@@ -1146,7 +1155,8 @@ X(a, STATIC, SINGULAR, BOOL, want_ack, 10) \
11461155
X(a, STATIC, SINGULAR, UENUM, priority, 11) \
11471156
X(a, STATIC, SINGULAR, INT32, rx_rssi, 12) \
11481157
X(a, STATIC, SINGULAR, UENUM, delayed, 13) \
1149-
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 14)
1158+
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 14) \
1159+
X(a, STATIC, SINGULAR, UINT32, hop_start, 15)
11501160
#define meshtastic_MeshPacket_CALLBACK NULL
11511161
#define meshtastic_MeshPacket_DEFAULT NULL
11521162
#define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data
@@ -1158,7 +1168,9 @@ X(a, STATIC, OPTIONAL, MESSAGE, position, 3) \
11581168
X(a, STATIC, SINGULAR, FLOAT, snr, 4) \
11591169
X(a, STATIC, SINGULAR, FIXED32, last_heard, 5) \
11601170
X(a, STATIC, OPTIONAL, MESSAGE, device_metrics, 6) \
1161-
X(a, STATIC, SINGULAR, UINT32, channel, 7)
1171+
X(a, STATIC, SINGULAR, UINT32, channel, 7) \
1172+
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 8) \
1173+
X(a, STATIC, SINGULAR, UINT32, hops_away, 9)
11621174
#define meshtastic_NodeInfo_CALLBACK NULL
11631175
#define meshtastic_NodeInfo_DEFAULT NULL
11641176
#define meshtastic_NodeInfo_user_MSGTYPE meshtastic_User
@@ -1311,12 +1323,12 @@ extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg;
13111323
#define meshtastic_DeviceMetadata_size 46
13121324
#define meshtastic_FromRadio_size 510
13131325
#define meshtastic_LogRecord_size 81
1314-
#define meshtastic_MeshPacket_size 323
1326+
#define meshtastic_MeshPacket_size 326
13151327
#define meshtastic_MqttClientProxyMessage_size 501
13161328
#define meshtastic_MyNodeInfo_size 18
13171329
#define meshtastic_NeighborInfo_size 258
13181330
#define meshtastic_Neighbor_size 22
1319-
#define meshtastic_NodeInfo_size 270
1331+
#define meshtastic_NodeInfo_size 275
13201332
#define meshtastic_Position_size 144
13211333
#define meshtastic_QueueStatus_size 23
13221334
#define meshtastic_RouteDiscovery_size 40

0 commit comments

Comments
 (0)