Skip to content

Commit e8c9baf

Browse files
thebenternthebentern
committed
Protos
1 parent 7868ca4 commit e8c9baf

File tree

8 files changed

+41
-21
lines changed

8 files changed

+41
-21
lines changed

‎bin/regen-protos.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src -I=..\protobufs meshtastic\*.proto
1+
cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src -I=..\protobufs ..\protobufs\meshtastic\*.proto

‎protobufs‎

‎src/meshtastic/admin.pb.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ typedef struct _meshtastic_AdminMessage {
131131
bool get_node_remote_hardware_pins_request;
132132
/* Respond with the mesh's nodes with their available gpio pins for RemoteHardware module use */
133133
meshtastic_NodeRemoteHardwarePinsResponse get_node_remote_hardware_pins_response;
134+
/* Enter (UF2) DFU mode
135+
Only implemented on NRF52 currently */
136+
bool enter_dfu_mode_request;
134137
/* Set the owner for this node */
135138
meshtastic_User set_owner;
136139
/* Set channels (using the new API).
@@ -224,6 +227,7 @@ extern "C" {
224227
#define meshtastic_AdminMessage_set_ham_mode_tag 18
225228
#define meshtastic_AdminMessage_get_node_remote_hardware_pins_request_tag 19
226229
#define meshtastic_AdminMessage_get_node_remote_hardware_pins_response_tag 20
230+
#define meshtastic_AdminMessage_enter_dfu_mode_request_tag 21
227231
#define meshtastic_AdminMessage_set_owner_tag 32
228232
#define meshtastic_AdminMessage_set_channel_tag 33
229233
#define meshtastic_AdminMessage_set_config_tag 34
@@ -261,6 +265,7 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,get_device_connection_status
261265
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_ham_mode,set_ham_mode), 18) \
262266
X(a, STATIC, ONEOF, BOOL, (payload_variant,get_node_remote_hardware_pins_request,get_node_remote_hardware_pins_request), 19) \
263267
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,get_node_remote_hardware_pins_response,get_node_remote_hardware_pins_response), 20) \
268+
X(a, STATIC, ONEOF, BOOL, (payload_variant,enter_dfu_mode_request,enter_dfu_mode_request), 21) \
264269
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_owner,set_owner), 32) \
265270
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_channel,set_channel), 33) \
266271
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_config,set_config), 34) \

‎src/meshtastic/apponly.pb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;
5454
#define meshtastic_ChannelSet_fields &meshtastic_ChannelSet_msg
5555

5656
/* Maximum encoded size of messages (where known) */
57-
#define meshtastic_ChannelSet_size 591
57+
#define meshtastic_ChannelSet_size 594
5858

5959
#ifdef __cplusplus
6060
} /* extern "C" */

‎src/meshtastic/config.pb.h‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
201201
/* Ukraine 433mhz */
202202
meshtastic_Config_LoRaConfig_RegionCode_UA_433 = 14,
203203
/* Ukraine 868mhz */
204-
meshtastic_Config_LoRaConfig_RegionCode_UA_868 = 15
204+
meshtastic_Config_LoRaConfig_RegionCode_UA_868 = 15,
205+
/* Malaysia 433mhz */
206+
meshtastic_Config_LoRaConfig_RegionCode_MY_433 = 16,
207+
/* Malaysia 919mhz */
208+
meshtastic_Config_LoRaConfig_RegionCode_MY_919 = 17
205209
} meshtastic_Config_LoRaConfig_RegionCode;
206210

207211
/* Standard predefined channel settings
@@ -281,10 +285,7 @@ typedef struct _meshtastic_Config_PositionConfig {
281285
or zero for the default of once every 30 seconds
282286
or a very large value (maxint) to update only once at boot. */
283287
uint32_t gps_update_interval;
284-
/* How long should we try to get our position during each gps_update_interval attempt? (in seconds)
285-
Or if zero, use the default of 30 seconds.
286-
If we don't get a new gps fix in that time, the gps will be put into sleep until the next gps_update_rate
287-
window. */
288+
/* Deprecated in favor of using smart / regular broadcast intervals as implicit attempt time */
288289
uint32_t gps_attempt_time;
289290
/* Bit field of boolean configuration options for POSITION messages
290291
(bitwise OR of PositionFlags) */
@@ -462,6 +463,8 @@ typedef struct _meshtastic_Config_LoRaConfig {
462463
in ignore_incoming will have packets they send dropped on receive (by router.cpp) */
463464
pb_size_t ignore_incoming_count;
464465
uint32_t ignore_incoming[3];
466+
/* If true, the device will not process any packets received via LoRa that passed via MQTT anywhere on the path towards it. */
467+
bool ignore_mqtt;
465468
} meshtastic_Config_LoRaConfig;
466469

467470
typedef struct _meshtastic_Config_BluetoothConfig {
@@ -525,8 +528,8 @@ extern "C" {
525528
#define _meshtastic_Config_DisplayConfig_DisplayMode_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayMode)(meshtastic_Config_DisplayConfig_DisplayMode_COLOR+1))
526529

527530
#define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET
528-
#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_UA_868
529-
#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_UA_868+1))
531+
#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_MY_919
532+
#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_MY_919+1))
530533

531534
#define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
532535
#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE
@@ -564,7 +567,7 @@ extern "C" {
564567
#define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, ""}
565568
#define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
566569
#define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0}
567-
#define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
570+
#define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0}
568571
#define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
569572
#define meshtastic_Config_init_zero {0, {meshtastic_Config_DeviceConfig_init_zero}}
570573
#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0}
@@ -573,7 +576,7 @@ extern "C" {
573576
#define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, ""}
574577
#define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
575578
#define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0}
576-
#define meshtastic_Config_LoRaConfig_init_zero {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
579+
#define meshtastic_Config_LoRaConfig_init_zero {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0}
577580
#define meshtastic_Config_BluetoothConfig_init_zero {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
578581

579582
/* Field tags (for use in manual encoding/decoding) */
@@ -644,6 +647,7 @@ extern "C" {
644647
#define meshtastic_Config_LoRaConfig_sx126x_rx_boosted_gain_tag 13
645648
#define meshtastic_Config_LoRaConfig_override_frequency_tag 14
646649
#define meshtastic_Config_LoRaConfig_ignore_incoming_tag 103
650+
#define meshtastic_Config_LoRaConfig_ignore_mqtt_tag 104
647651
#define meshtastic_Config_BluetoothConfig_enabled_tag 1
648652
#define meshtastic_Config_BluetoothConfig_mode_tag 2
649653
#define meshtastic_Config_BluetoothConfig_fixed_pin_tag 3
@@ -766,7 +770,8 @@ X(a, STATIC, SINGULAR, UINT32, channel_num, 11) \
766770
X(a, STATIC, SINGULAR, BOOL, override_duty_cycle, 12) \
767771
X(a, STATIC, SINGULAR, BOOL, sx126x_rx_boosted_gain, 13) \
768772
X(a, STATIC, SINGULAR, FLOAT, override_frequency, 14) \
769-
X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103)
773+
X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103) \
774+
X(a, STATIC, SINGULAR, BOOL, ignore_mqtt, 104)
770775
#define meshtastic_Config_LoRaConfig_CALLBACK NULL
771776
#define meshtastic_Config_LoRaConfig_DEFAULT NULL
772777

@@ -802,7 +807,7 @@ extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg;
802807
#define meshtastic_Config_BluetoothConfig_size 10
803808
#define meshtastic_Config_DeviceConfig_size 32
804809
#define meshtastic_Config_DisplayConfig_size 28
805-
#define meshtastic_Config_LoRaConfig_size 77
810+
#define meshtastic_Config_LoRaConfig_size 80
806811
#define meshtastic_Config_NetworkConfig_IpV4Config_size 20
807812
#define meshtastic_Config_NetworkConfig_size 196
808813
#define meshtastic_Config_PositionConfig_size 60

‎src/meshtastic/deviceonly.pb.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,10 @@ extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePin_msg;
313313

314314
/* Maximum encoded size of messages (where known) */
315315
#define meshtastic_ChannelFile_size 638
316-
#define meshtastic_DeviceState_size 17056
316+
#define meshtastic_DeviceState_size 17062
317317
#define meshtastic_NodeInfoLite_size 153
318318
#define meshtastic_NodeRemoteHardwarePin_size 29
319-
#define meshtastic_OEMStore_size 3241
319+
#define meshtastic_OEMStore_size 3244
320320
#define meshtastic_PositionLite_size 28
321321

322322
#ifdef __cplusplus

‎src/meshtastic/localonly.pb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
180180
#define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg
181181

182182
/* Maximum encoded size of messages (where known) */
183-
#define meshtastic_LocalConfig_size 464
183+
#define meshtastic_LocalConfig_size 467
184184
#define meshtastic_LocalModuleConfig_size 631
185185

186186
#ifdef __cplusplus

‎src/meshtastic/mesh.pb.h‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ typedef enum _meshtastic_HardwareModel {
119119
meshtastic_HardwareModel_HELTEC_HT62 = 53,
120120
/* EBYTE SPI LoRa module and ESP32-S3 */
121121
meshtastic_HardwareModel_EBYTE_ESP32_S3 = 54,
122+
/* Waveshare ESP32-S3-PICO with PICO LoRa HAT and 2.9inch e-Ink */
123+
meshtastic_HardwareModel_ESP32_S3_PICO = 55,
124+
/* CircuitMess Chatter 2 LLCC68 Lora Module and ESP32 Wroom
125+
Lora module can be swapped out for a Heltec RA-62 which is "almost" pin compatible
126+
with one cut and one jumper Meshtastic works */
127+
meshtastic_HardwareModel_CHATTER_2 = 56,
122128
/* ------------------------------------------------------------------------------------------------------------------------------------------
123129
Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
124130
------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -571,6 +577,8 @@ typedef struct _meshtastic_MeshPacket {
571577
int32_t rx_rssi;
572578
/* Describe if this message is delayed */
573579
meshtastic_MeshPacket_Delayed delayed;
580+
/* Describes whether this packet passed via MQTT somewhere along the path it currently took. */
581+
bool via_mqtt;
574582
} meshtastic_MeshPacket;
575583

576584
/* The bluetooth to device link:
@@ -867,7 +875,7 @@ extern "C" {
867875
#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
868876
#define meshtastic_Waypoint_init_default {0, 0, 0, 0, 0, "", "", 0}
869877
#define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
870-
#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}
878+
#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}
871879
#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0}
872880
#define meshtastic_MyNodeInfo_init_default {0, 0, 0}
873881
#define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -885,7 +893,7 @@ extern "C" {
885893
#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
886894
#define meshtastic_Waypoint_init_zero {0, 0, 0, 0, 0, "", "", 0}
887895
#define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
888-
#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}
896+
#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}
889897
#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0}
890898
#define meshtastic_MyNodeInfo_init_zero {0, 0, 0}
891899
#define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -964,6 +972,7 @@ extern "C" {
964972
#define meshtastic_MeshPacket_priority_tag 11
965973
#define meshtastic_MeshPacket_rx_rssi_tag 12
966974
#define meshtastic_MeshPacket_delayed_tag 13
975+
#define meshtastic_MeshPacket_via_mqtt_tag 14
967976
#define meshtastic_NodeInfo_num_tag 1
968977
#define meshtastic_NodeInfo_user_tag 2
969978
#define meshtastic_NodeInfo_position_tag 3
@@ -1119,7 +1128,8 @@ X(a, STATIC, SINGULAR, UINT32, hop_limit, 9) \
11191128
X(a, STATIC, SINGULAR, BOOL, want_ack, 10) \
11201129
X(a, STATIC, SINGULAR, UENUM, priority, 11) \
11211130
X(a, STATIC, SINGULAR, INT32, rx_rssi, 12) \
1122-
X(a, STATIC, SINGULAR, UENUM, delayed, 13)
1131+
X(a, STATIC, SINGULAR, UENUM, delayed, 13) \
1132+
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 14)
11231133
#define meshtastic_MeshPacket_CALLBACK NULL
11241134
#define meshtastic_MeshPacket_DEFAULT NULL
11251135
#define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data
@@ -1284,7 +1294,7 @@ extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg;
12841294
#define meshtastic_DeviceMetadata_size 46
12851295
#define meshtastic_FromRadio_size 510
12861296
#define meshtastic_LogRecord_size 81
1287-
#define meshtastic_MeshPacket_size 321
1297+
#define meshtastic_MeshPacket_size 323
12881298
#define meshtastic_MqttClientProxyMessage_size 501
12891299
#define meshtastic_MyNodeInfo_size 18
12901300
#define meshtastic_NeighborInfo_size 258

0 commit comments

Comments
 (0)