diff --git a/src/mesh/generated/meshtastic/admin.pb.c b/src/mesh/generated/meshtastic/admin.pb.c index 7925075d6..8677e0feb 100644 --- a/src/mesh/generated/meshtastic/admin.pb.c +++ b/src/mesh/generated/meshtastic/admin.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_AdminMessage, meshtastic_AdminMessage, 2) +PB_BIND(AdminMessage, AdminMessage, 2) diff --git a/src/mesh/generated/meshtastic/admin.pb.h b/src/mesh/generated/meshtastic/admin.pb.h index 63f265a9c..83aa7bbff 100644 --- a/src/mesh/generated/meshtastic/admin.pb.h +++ b/src/mesh/generated/meshtastic/admin.pb.h @@ -16,69 +16,69 @@ /* Enum definitions */ /* TODO: REPLACE */ -typedef enum _meshtastic_AdminMessage_ConfigType { +typedef enum _AdminMessage_ConfigType { /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG = 0, + AdminMessage_ConfigType_DEVICE_CONFIG = 0, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_POSITION_CONFIG = 1, + AdminMessage_ConfigType_POSITION_CONFIG = 1, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_POWER_CONFIG = 2, + AdminMessage_ConfigType_POWER_CONFIG = 2, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_NETWORK_CONFIG = 3, + AdminMessage_ConfigType_NETWORK_CONFIG = 3, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_DISPLAY_CONFIG = 4, + AdminMessage_ConfigType_DISPLAY_CONFIG = 4, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_LORA_CONFIG = 5, + AdminMessage_ConfigType_LORA_CONFIG = 5, /* TODO: REPLACE */ - meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6 -} meshtastic_AdminMessage_ConfigType; + AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6 +} AdminMessage_ConfigType; /* TODO: REPLACE */ -typedef enum _meshtastic_AdminMessage_ModuleConfigType { +typedef enum _AdminMessage_ModuleConfigType { /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG = 0, + AdminMessage_ModuleConfigType_MQTT_CONFIG = 0, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_SERIAL_CONFIG = 1, + AdminMessage_ModuleConfigType_SERIAL_CONFIG = 1, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG = 2, + AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG = 2, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG = 3, + AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG = 3, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_RANGETEST_CONFIG = 4, + AdminMessage_ModuleConfigType_RANGETEST_CONFIG = 4, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_TELEMETRY_CONFIG = 5, + AdminMessage_ModuleConfigType_TELEMETRY_CONFIG = 5, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6, + AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7, + AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7, /* TODO: REPLACE */ - meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8 -} meshtastic_AdminMessage_ModuleConfigType; + AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8 +} AdminMessage_ModuleConfigType; /* Struct definitions */ /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations. This message is used to do settings operations to both remote AND local nodes. (Prior to 1.2 these operations were done via special ToRadio operations) */ -typedef struct _meshtastic_AdminMessage { +typedef struct _AdminMessage { pb_size_t which_payload_variant; union { /* Send the specified channel in the response to this message NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present) */ uint32_t get_channel_request; /* TODO: REPLACE */ - meshtastic_Channel get_channel_response; + Channel get_channel_response; /* Send the current owner data in the response to this message. */ bool get_owner_request; /* TODO: REPLACE */ - meshtastic_User get_owner_response; + User get_owner_response; /* Ask for the following config data to be sent */ - meshtastic_AdminMessage_ConfigType get_config_request; + AdminMessage_ConfigType get_config_request; /* Send the current Config in the response to this message. */ - meshtastic_Config get_config_response; + Config get_config_response; /* Ask for the following config data to be sent */ - meshtastic_AdminMessage_ModuleConfigType get_module_config_request; + AdminMessage_ModuleConfigType get_module_config_request; /* Send the current Config in the response to this message. */ - meshtastic_ModuleConfig get_module_config_response; + ModuleConfig get_module_config_response; /* Get the Canned Message Module messages in the response to this message. */ bool get_canned_message_module_messages_request; /* Get the Canned Message Module messages in the response to this message. */ @@ -86,23 +86,23 @@ typedef struct _meshtastic_AdminMessage { /* Request the node to send device metadata (firmware, protobuf version, etc) */ bool get_device_metadata_request; /* Device metadata response */ - meshtastic_DeviceMetadata get_device_metadata_response; + DeviceMetadata get_device_metadata_response; /* Get the Ringtone in the response to this message. */ bool get_ringtone_request; /* Get the Ringtone in the response to this message. */ char get_ringtone_response[231]; /* Set the owner for this node */ - meshtastic_User set_owner; + User set_owner; /* Set channels (using the new API). A special channel is the "primary channel". The other records are secondary channels. Note: only one channel can be marked as primary. If the client sets a particular channel to be primary, the previous channel will be set to SECONDARY automatically. */ - meshtastic_Channel set_channel; + Channel set_channel; /* Set the current Config */ - meshtastic_Config set_config; + Config set_config; /* Set the current Config */ - meshtastic_ModuleConfig set_module_config; + ModuleConfig set_module_config; /* Set the Canned Message Module messages text. */ char set_canned_message_module_messages[201]; /* Set the ringtone for ExternalNotification. */ @@ -134,7 +134,7 @@ typedef struct _meshtastic_AdminMessage { /* Tell the node to reset the nodedb. */ int32_t nodedb_reset; }; -} meshtastic_AdminMessage; +} AdminMessage; #ifdef __cplusplus @@ -142,56 +142,56 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_AdminMessage_ConfigType_MIN meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG -#define _meshtastic_AdminMessage_ConfigType_MAX meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG -#define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG+1)) +#define _AdminMessage_ConfigType_MIN AdminMessage_ConfigType_DEVICE_CONFIG +#define _AdminMessage_ConfigType_MAX AdminMessage_ConfigType_BLUETOOTH_CONFIG +#define _AdminMessage_ConfigType_ARRAYSIZE ((AdminMessage_ConfigType)(AdminMessage_ConfigType_BLUETOOTH_CONFIG+1)) -#define _meshtastic_AdminMessage_ModuleConfigType_MIN meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG -#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG -#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1)) +#define _AdminMessage_ModuleConfigType_MIN AdminMessage_ModuleConfigType_MQTT_CONFIG +#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG +#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1)) -#define meshtastic_AdminMessage_payload_variant_get_config_request_ENUMTYPE meshtastic_AdminMessage_ConfigType -#define meshtastic_AdminMessage_payload_variant_get_module_config_request_ENUMTYPE meshtastic_AdminMessage_ModuleConfigType +#define AdminMessage_payload_variant_get_config_request_ENUMTYPE AdminMessage_ConfigType +#define AdminMessage_payload_variant_get_module_config_request_ENUMTYPE AdminMessage_ModuleConfigType /* Initializer values for message structs */ -#define meshtastic_AdminMessage_init_default {0, {0}} -#define meshtastic_AdminMessage_init_zero {0, {0}} +#define AdminMessage_init_default {0, {0}} +#define AdminMessage_init_zero {0, {0}} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_AdminMessage_get_channel_request_tag 1 -#define meshtastic_AdminMessage_get_channel_response_tag 2 -#define meshtastic_AdminMessage_get_owner_request_tag 3 -#define meshtastic_AdminMessage_get_owner_response_tag 4 -#define meshtastic_AdminMessage_get_config_request_tag 5 -#define meshtastic_AdminMessage_get_config_response_tag 6 -#define meshtastic_AdminMessage_get_module_config_request_tag 7 -#define meshtastic_AdminMessage_get_module_config_response_tag 8 -#define meshtastic_AdminMessage_get_canned_message_module_messages_request_tag 10 -#define meshtastic_AdminMessage_get_canned_message_module_messages_response_tag 11 -#define meshtastic_AdminMessage_get_device_metadata_request_tag 12 -#define meshtastic_AdminMessage_get_device_metadata_response_tag 13 -#define meshtastic_AdminMessage_get_ringtone_request_tag 14 -#define meshtastic_AdminMessage_get_ringtone_response_tag 15 -#define meshtastic_AdminMessage_set_owner_tag 32 -#define meshtastic_AdminMessage_set_channel_tag 33 -#define meshtastic_AdminMessage_set_config_tag 34 -#define meshtastic_AdminMessage_set_module_config_tag 35 -#define meshtastic_AdminMessage_set_canned_message_module_messages_tag 36 -#define meshtastic_AdminMessage_set_ringtone_message_tag 37 -#define meshtastic_AdminMessage_begin_edit_settings_tag 64 -#define meshtastic_AdminMessage_commit_edit_settings_tag 65 -#define meshtastic_AdminMessage_confirm_set_channel_tag 66 -#define meshtastic_AdminMessage_confirm_set_radio_tag 67 -#define meshtastic_AdminMessage_reboot_ota_seconds_tag 95 -#define meshtastic_AdminMessage_exit_simulator_tag 96 -#define meshtastic_AdminMessage_reboot_seconds_tag 97 -#define meshtastic_AdminMessage_shutdown_seconds_tag 98 -#define meshtastic_AdminMessage_factory_reset_tag 99 -#define meshtastic_AdminMessage_nodedb_reset_tag 100 +#define AdminMessage_get_channel_request_tag 1 +#define AdminMessage_get_channel_response_tag 2 +#define AdminMessage_get_owner_request_tag 3 +#define AdminMessage_get_owner_response_tag 4 +#define AdminMessage_get_config_request_tag 5 +#define AdminMessage_get_config_response_tag 6 +#define AdminMessage_get_module_config_request_tag 7 +#define AdminMessage_get_module_config_response_tag 8 +#define AdminMessage_get_canned_message_module_messages_request_tag 10 +#define AdminMessage_get_canned_message_module_messages_response_tag 11 +#define AdminMessage_get_device_metadata_request_tag 12 +#define AdminMessage_get_device_metadata_response_tag 13 +#define AdminMessage_get_ringtone_request_tag 14 +#define AdminMessage_get_ringtone_response_tag 15 +#define AdminMessage_set_owner_tag 32 +#define AdminMessage_set_channel_tag 33 +#define AdminMessage_set_config_tag 34 +#define AdminMessage_set_module_config_tag 35 +#define AdminMessage_set_canned_message_module_messages_tag 36 +#define AdminMessage_set_ringtone_message_tag 37 +#define AdminMessage_begin_edit_settings_tag 64 +#define AdminMessage_commit_edit_settings_tag 65 +#define AdminMessage_confirm_set_channel_tag 66 +#define AdminMessage_confirm_set_radio_tag 67 +#define AdminMessage_reboot_ota_seconds_tag 95 +#define AdminMessage_exit_simulator_tag 96 +#define AdminMessage_reboot_seconds_tag 97 +#define AdminMessage_shutdown_seconds_tag 98 +#define AdminMessage_factory_reset_tag 99 +#define AdminMessage_nodedb_reset_tag 100 /* Struct field encoding specification for nanopb */ -#define meshtastic_AdminMessage_FIELDLIST(X, a) \ +#define AdminMessage_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, UINT32, (payload_variant,get_channel_request,get_channel_request), 1) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,get_channel_response,get_channel_response), 2) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,get_owner_request,get_owner_request), 3) \ @@ -222,25 +222,25 @@ X(a, STATIC, ONEOF, INT32, (payload_variant,reboot_seconds,reboot_second X(a, STATIC, ONEOF, INT32, (payload_variant,shutdown_seconds,shutdown_seconds), 98) \ X(a, STATIC, ONEOF, INT32, (payload_variant,factory_reset,factory_reset), 99) \ X(a, STATIC, ONEOF, INT32, (payload_variant,nodedb_reset,nodedb_reset), 100) -#define meshtastic_AdminMessage_CALLBACK NULL -#define meshtastic_AdminMessage_DEFAULT NULL -#define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel -#define meshtastic_AdminMessage_payload_variant_get_owner_response_MSGTYPE meshtastic_User -#define meshtastic_AdminMessage_payload_variant_get_config_response_MSGTYPE meshtastic_Config -#define meshtastic_AdminMessage_payload_variant_get_module_config_response_MSGTYPE meshtastic_ModuleConfig -#define meshtastic_AdminMessage_payload_variant_get_device_metadata_response_MSGTYPE meshtastic_DeviceMetadata -#define meshtastic_AdminMessage_payload_variant_set_owner_MSGTYPE meshtastic_User -#define meshtastic_AdminMessage_payload_variant_set_channel_MSGTYPE meshtastic_Channel -#define meshtastic_AdminMessage_payload_variant_set_config_MSGTYPE meshtastic_Config -#define meshtastic_AdminMessage_payload_variant_set_module_config_MSGTYPE meshtastic_ModuleConfig +#define AdminMessage_CALLBACK NULL +#define AdminMessage_DEFAULT NULL +#define AdminMessage_payload_variant_get_channel_response_MSGTYPE Channel +#define AdminMessage_payload_variant_get_owner_response_MSGTYPE User +#define AdminMessage_payload_variant_get_config_response_MSGTYPE Config +#define AdminMessage_payload_variant_get_module_config_response_MSGTYPE ModuleConfig +#define AdminMessage_payload_variant_get_device_metadata_response_MSGTYPE DeviceMetadata +#define AdminMessage_payload_variant_set_owner_MSGTYPE User +#define AdminMessage_payload_variant_set_channel_MSGTYPE Channel +#define AdminMessage_payload_variant_set_config_MSGTYPE Config +#define AdminMessage_payload_variant_set_module_config_MSGTYPE ModuleConfig -extern const pb_msgdesc_t meshtastic_AdminMessage_msg; +extern const pb_msgdesc_t AdminMessage_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg +#define AdminMessage_fields &AdminMessage_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_AdminMessage_size 234 +#define AdminMessage_size 234 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/apponly.pb.c b/src/mesh/generated/meshtastic/apponly.pb.c index 0f8c14d2b..8360eaa34 100644 --- a/src/mesh/generated/meshtastic/apponly.pb.c +++ b/src/mesh/generated/meshtastic/apponly.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_ChannelSet, meshtastic_ChannelSet, 2) +PB_BIND(ChannelSet, ChannelSet, 2) diff --git a/src/mesh/generated/meshtastic/apponly.pb.h b/src/mesh/generated/meshtastic/apponly.pb.h index 02230ee74..a37ba8ab5 100644 --- a/src/mesh/generated/meshtastic/apponly.pb.h +++ b/src/mesh/generated/meshtastic/apponly.pb.h @@ -17,14 +17,14 @@ any SECONDARY channels. No DISABLED channels are included. This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL */ -typedef struct _meshtastic_ChannelSet { +typedef struct _ChannelSet { /* Channel list with settings */ pb_size_t settings_count; - meshtastic_ChannelSettings settings[8]; + ChannelSettings settings[8]; /* LoRa config */ bool has_lora_config; - meshtastic_Config_LoRaConfig lora_config; -} meshtastic_ChannelSet; + Config_LoRaConfig lora_config; +} ChannelSet; #ifdef __cplusplus @@ -32,29 +32,29 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_ChannelSet_init_default {0, {meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default, meshtastic_ChannelSettings_init_default}, false, meshtastic_Config_LoRaConfig_init_default} -#define meshtastic_ChannelSet_init_zero {0, {meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero, meshtastic_ChannelSettings_init_zero}, false, meshtastic_Config_LoRaConfig_init_zero} +#define ChannelSet_init_default {0, {ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default}, false, Config_LoRaConfig_init_default} +#define ChannelSet_init_zero {0, {ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero}, false, Config_LoRaConfig_init_zero} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_ChannelSet_settings_tag 1 -#define meshtastic_ChannelSet_lora_config_tag 2 +#define ChannelSet_settings_tag 1 +#define ChannelSet_lora_config_tag 2 /* Struct field encoding specification for nanopb */ -#define meshtastic_ChannelSet_FIELDLIST(X, a) \ +#define ChannelSet_FIELDLIST(X, a) \ X(a, STATIC, REPEATED, MESSAGE, settings, 1) \ X(a, STATIC, OPTIONAL, MESSAGE, lora_config, 2) -#define meshtastic_ChannelSet_CALLBACK NULL -#define meshtastic_ChannelSet_DEFAULT NULL -#define meshtastic_ChannelSet_settings_MSGTYPE meshtastic_ChannelSettings -#define meshtastic_ChannelSet_lora_config_MSGTYPE meshtastic_Config_LoRaConfig +#define ChannelSet_CALLBACK NULL +#define ChannelSet_DEFAULT NULL +#define ChannelSet_settings_MSGTYPE ChannelSettings +#define ChannelSet_lora_config_MSGTYPE Config_LoRaConfig -extern const pb_msgdesc_t meshtastic_ChannelSet_msg; +extern const pb_msgdesc_t ChannelSet_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_ChannelSet_fields &meshtastic_ChannelSet_msg +#define ChannelSet_fields &ChannelSet_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_ChannelSet_size 584 +#define ChannelSet_size 584 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/cannedmessages.pb.c b/src/mesh/generated/meshtastic/cannedmessages.pb.c index 12d1e10cf..5fb8adfd0 100644 --- a/src/mesh/generated/meshtastic/cannedmessages.pb.c +++ b/src/mesh/generated/meshtastic/cannedmessages.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_CannedMessageModuleConfig, meshtastic_CannedMessageModuleConfig, AUTO) +PB_BIND(CannedMessageModuleConfig, CannedMessageModuleConfig, AUTO) diff --git a/src/mesh/generated/meshtastic/cannedmessages.pb.h b/src/mesh/generated/meshtastic/cannedmessages.pb.h index b81f65d0d..e2f0426f2 100644 --- a/src/mesh/generated/meshtastic/cannedmessages.pb.h +++ b/src/mesh/generated/meshtastic/cannedmessages.pb.h @@ -11,10 +11,10 @@ /* Struct definitions */ /* Canned message module configuration. */ -typedef struct _meshtastic_CannedMessageModuleConfig { +typedef struct _CannedMessageModuleConfig { /* Predefined messages for canned message module separated by '|' characters. */ char messages[201]; -} meshtastic_CannedMessageModuleConfig; +} CannedMessageModuleConfig; #ifdef __cplusplus @@ -22,25 +22,25 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_CannedMessageModuleConfig_init_default {""} -#define meshtastic_CannedMessageModuleConfig_init_zero {""} +#define CannedMessageModuleConfig_init_default {""} +#define CannedMessageModuleConfig_init_zero {""} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_CannedMessageModuleConfig_messages_tag 1 +#define CannedMessageModuleConfig_messages_tag 1 /* Struct field encoding specification for nanopb */ -#define meshtastic_CannedMessageModuleConfig_FIELDLIST(X, a) \ +#define CannedMessageModuleConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, messages, 1) -#define meshtastic_CannedMessageModuleConfig_CALLBACK NULL -#define meshtastic_CannedMessageModuleConfig_DEFAULT NULL +#define CannedMessageModuleConfig_CALLBACK NULL +#define CannedMessageModuleConfig_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_CannedMessageModuleConfig_msg; +extern const pb_msgdesc_t CannedMessageModuleConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_CannedMessageModuleConfig_fields &meshtastic_CannedMessageModuleConfig_msg +#define CannedMessageModuleConfig_fields &CannedMessageModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_CannedMessageModuleConfig_size 203 +#define CannedMessageModuleConfig_size 203 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/channel.pb.c b/src/mesh/generated/meshtastic/channel.pb.c index f3b2e37a3..b22ec0b36 100644 --- a/src/mesh/generated/meshtastic/channel.pb.c +++ b/src/mesh/generated/meshtastic/channel.pb.c @@ -6,10 +6,10 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_ChannelSettings, meshtastic_ChannelSettings, AUTO) +PB_BIND(ChannelSettings, ChannelSettings, AUTO) -PB_BIND(meshtastic_Channel, meshtastic_Channel, AUTO) +PB_BIND(Channel, Channel, AUTO) diff --git a/src/mesh/generated/meshtastic/channel.pb.h b/src/mesh/generated/meshtastic/channel.pb.h index 83ef7b5fc..8c287eca8 100644 --- a/src/mesh/generated/meshtastic/channel.pb.h +++ b/src/mesh/generated/meshtastic/channel.pb.h @@ -19,18 +19,18 @@ cross band routing as needed. If a device has only a single radio (the common case) only one channel can be PRIMARY at a time (but any number of SECONDARY channels can't be sent received on that common frequency) */ -typedef enum _meshtastic_Channel_Role { +typedef enum _Channel_Role { /* This channel is not in use right now */ - meshtastic_Channel_Role_DISABLED = 0, + Channel_Role_DISABLED = 0, /* This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY */ - meshtastic_Channel_Role_PRIMARY = 1, + Channel_Role_PRIMARY = 1, /* Secondary channels are only used for encryption/decryption/authentication purposes. Their radio settings (freq etc) are ignored, only psk is used. */ - meshtastic_Channel_Role_SECONDARY = 2 -} meshtastic_Channel_Role; + Channel_Role_SECONDARY = 2 +} Channel_Role; /* Struct definitions */ -typedef PB_BYTES_ARRAY_T(32) meshtastic_ChannelSettings_psk_t; +typedef PB_BYTES_ARRAY_T(32) ChannelSettings_psk_t; /* Full settings (center freq, spread factor, pre-shared secret key etc...) needed to configure a radio for speaking on a particular channel This information can be encoded as a QRcode/url so that other users can configure @@ -50,7 +50,7 @@ typedef PB_BYTES_ARRAY_T(32) meshtastic_ChannelSettings_psk_t; FIXME: Add description of multi-channel support and how primary vs secondary channels are used. FIXME: explain how apps use channels for security. explain how remote settings and remote gpio are managed as an example */ -typedef struct _meshtastic_ChannelSettings { +typedef struct _ChannelSettings { /* Deprecated in favor of LoraConfig.channel_num */ uint32_t channel_num; /* A simple pre-shared key for now for crypto. @@ -63,7 +63,7 @@ typedef struct _meshtastic_ChannelSettings { `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0xbf} `2` through 10 = The default channel key, except with 1 through 9 added to the last byte. Shown to user as simple1 through 10 */ - meshtastic_ChannelSettings_psk_t psk; + ChannelSettings_psk_t psk; /* A SHORT name that will be packed into the URL. Less than 12 bytes. Something for end users to call the channel @@ -89,20 +89,20 @@ typedef struct _meshtastic_ChannelSettings { bool uplink_enabled; /* If true, messages seen on the internet will be forwarded to the local mesh. */ bool downlink_enabled; -} meshtastic_ChannelSettings; +} ChannelSettings; /* A pair of a channel number, mode and the (sharable) settings for that channel */ -typedef struct _meshtastic_Channel { +typedef struct _Channel { /* The index of this channel in the channel table (from 0 to MAX_NUM_CHANNELS-1) (Someday - not currently implemented) An index of -1 could be used to mean "set by name", in which case the target node will find and set the channel by settings.name. */ int8_t index; /* The new settings, or NULL to disable that channel */ bool has_settings; - meshtastic_ChannelSettings settings; + ChannelSettings settings; /* TODO: REPLACE */ - meshtastic_Channel_Role role; -} meshtastic_Channel; + Channel_Role role; +} Channel; #ifdef __cplusplus @@ -110,60 +110,60 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_Channel_Role_MIN meshtastic_Channel_Role_DISABLED -#define _meshtastic_Channel_Role_MAX meshtastic_Channel_Role_SECONDARY -#define _meshtastic_Channel_Role_ARRAYSIZE ((meshtastic_Channel_Role)(meshtastic_Channel_Role_SECONDARY+1)) +#define _Channel_Role_MIN Channel_Role_DISABLED +#define _Channel_Role_MAX Channel_Role_SECONDARY +#define _Channel_Role_ARRAYSIZE ((Channel_Role)(Channel_Role_SECONDARY+1)) -#define meshtastic_Channel_role_ENUMTYPE meshtastic_Channel_Role +#define Channel_role_ENUMTYPE Channel_Role /* Initializer values for message structs */ -#define meshtastic_ChannelSettings_init_default {0, {0, {0}}, "", 0, 0, 0} -#define meshtastic_Channel_init_default {0, false, meshtastic_ChannelSettings_init_default, _meshtastic_Channel_Role_MIN} -#define meshtastic_ChannelSettings_init_zero {0, {0, {0}}, "", 0, 0, 0} -#define meshtastic_Channel_init_zero {0, false, meshtastic_ChannelSettings_init_zero, _meshtastic_Channel_Role_MIN} +#define ChannelSettings_init_default {0, {0, {0}}, "", 0, 0, 0} +#define Channel_init_default {0, false, ChannelSettings_init_default, _Channel_Role_MIN} +#define ChannelSettings_init_zero {0, {0, {0}}, "", 0, 0, 0} +#define Channel_init_zero {0, false, ChannelSettings_init_zero, _Channel_Role_MIN} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_ChannelSettings_channel_num_tag 1 -#define meshtastic_ChannelSettings_psk_tag 2 -#define meshtastic_ChannelSettings_name_tag 3 -#define meshtastic_ChannelSettings_id_tag 4 -#define meshtastic_ChannelSettings_uplink_enabled_tag 5 -#define meshtastic_ChannelSettings_downlink_enabled_tag 6 -#define meshtastic_Channel_index_tag 1 -#define meshtastic_Channel_settings_tag 2 -#define meshtastic_Channel_role_tag 3 +#define ChannelSettings_channel_num_tag 1 +#define ChannelSettings_psk_tag 2 +#define ChannelSettings_name_tag 3 +#define ChannelSettings_id_tag 4 +#define ChannelSettings_uplink_enabled_tag 5 +#define ChannelSettings_downlink_enabled_tag 6 +#define Channel_index_tag 1 +#define Channel_settings_tag 2 +#define Channel_role_tag 3 /* Struct field encoding specification for nanopb */ -#define meshtastic_ChannelSettings_FIELDLIST(X, a) \ +#define ChannelSettings_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, channel_num, 1) \ X(a, STATIC, SINGULAR, BYTES, psk, 2) \ X(a, STATIC, SINGULAR, STRING, name, 3) \ X(a, STATIC, SINGULAR, FIXED32, id, 4) \ X(a, STATIC, SINGULAR, BOOL, uplink_enabled, 5) \ X(a, STATIC, SINGULAR, BOOL, downlink_enabled, 6) -#define meshtastic_ChannelSettings_CALLBACK NULL -#define meshtastic_ChannelSettings_DEFAULT NULL +#define ChannelSettings_CALLBACK NULL +#define ChannelSettings_DEFAULT NULL -#define meshtastic_Channel_FIELDLIST(X, a) \ +#define Channel_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, INT32, index, 1) \ X(a, STATIC, OPTIONAL, MESSAGE, settings, 2) \ X(a, STATIC, SINGULAR, UENUM, role, 3) -#define meshtastic_Channel_CALLBACK NULL -#define meshtastic_Channel_DEFAULT NULL -#define meshtastic_Channel_settings_MSGTYPE meshtastic_ChannelSettings +#define Channel_CALLBACK NULL +#define Channel_DEFAULT NULL +#define Channel_settings_MSGTYPE ChannelSettings -extern const pb_msgdesc_t meshtastic_ChannelSettings_msg; -extern const pb_msgdesc_t meshtastic_Channel_msg; +extern const pb_msgdesc_t ChannelSettings_msg; +extern const pb_msgdesc_t Channel_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_ChannelSettings_fields &meshtastic_ChannelSettings_msg -#define meshtastic_Channel_fields &meshtastic_Channel_msg +#define ChannelSettings_fields &ChannelSettings_msg +#define Channel_fields &Channel_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_ChannelSettings_size 62 -#define meshtastic_Channel_size 77 +#define ChannelSettings_size 62 +#define Channel_size 77 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/config.pb.c b/src/mesh/generated/meshtastic/config.pb.c index d12cdeb8a..bd65fee30 100644 --- a/src/mesh/generated/meshtastic/config.pb.c +++ b/src/mesh/generated/meshtastic/config.pb.c @@ -6,31 +6,31 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_Config, meshtastic_Config, AUTO) +PB_BIND(Config, Config, AUTO) -PB_BIND(meshtastic_Config_DeviceConfig, meshtastic_Config_DeviceConfig, AUTO) +PB_BIND(Config_DeviceConfig, Config_DeviceConfig, AUTO) -PB_BIND(meshtastic_Config_PositionConfig, meshtastic_Config_PositionConfig, AUTO) +PB_BIND(Config_PositionConfig, Config_PositionConfig, AUTO) -PB_BIND(meshtastic_Config_PowerConfig, meshtastic_Config_PowerConfig, AUTO) +PB_BIND(Config_PowerConfig, Config_PowerConfig, AUTO) -PB_BIND(meshtastic_Config_NetworkConfig, meshtastic_Config_NetworkConfig, AUTO) +PB_BIND(Config_NetworkConfig, Config_NetworkConfig, AUTO) -PB_BIND(meshtastic_Config_NetworkConfig_IpV4Config, meshtastic_Config_NetworkConfig_IpV4Config, AUTO) +PB_BIND(Config_NetworkConfig_IpV4Config, Config_NetworkConfig_IpV4Config, AUTO) -PB_BIND(meshtastic_Config_DisplayConfig, meshtastic_Config_DisplayConfig, AUTO) +PB_BIND(Config_DisplayConfig, Config_DisplayConfig, AUTO) -PB_BIND(meshtastic_Config_LoRaConfig, meshtastic_Config_LoRaConfig, 2) +PB_BIND(Config_LoRaConfig, Config_LoRaConfig, 2) -PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AUTO) +PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO) diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h index ed8396d5f..52f3ed207 100644 --- a/src/mesh/generated/meshtastic/config.pb.h +++ b/src/mesh/generated/meshtastic/config.pb.h @@ -11,182 +11,182 @@ /* Enum definitions */ /* Defines the device's role on the Mesh network */ -typedef enum _meshtastic_Config_DeviceConfig_Role { +typedef enum _Config_DeviceConfig_Role { /* Client device role */ - meshtastic_Config_DeviceConfig_Role_CLIENT = 0, + Config_DeviceConfig_Role_CLIENT = 0, /* Client Mute device role Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. */ - meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE = 1, + Config_DeviceConfig_Role_CLIENT_MUTE = 1, /* Router device role. Mesh packets will prefer to be routed over this node. This node will not be used by client apps. The wifi/ble radios and the oled screen will be put to sleep. */ - meshtastic_Config_DeviceConfig_Role_ROUTER = 2, + Config_DeviceConfig_Role_ROUTER = 2, /* Router Client device role Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. */ - meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT = 3 -} meshtastic_Config_DeviceConfig_Role; + Config_DeviceConfig_Role_ROUTER_CLIENT = 3 +} Config_DeviceConfig_Role; /* Bit field of boolean configuration options, indicating which optional fields to include when assembling POSITION messages Longitude and latitude are always included (also time if GPS-synced) NOTE: the more fields are included, the larger the message will be - leading to longer airtime and a higher risk of packet loss */ -typedef enum _meshtastic_Config_PositionConfig_PositionFlags { +typedef enum _Config_PositionConfig_PositionFlags { /* Required for compilation */ - meshtastic_Config_PositionConfig_PositionFlags_UNSET = 0, + Config_PositionConfig_PositionFlags_UNSET = 0, /* Include an altitude value (if available) */ - meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE = 1, + Config_PositionConfig_PositionFlags_ALTITUDE = 1, /* Altitude value is MSL */ - meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE_MSL = 2, + Config_PositionConfig_PositionFlags_ALTITUDE_MSL = 2, /* Include geoidal separation */ - meshtastic_Config_PositionConfig_PositionFlags_GEOIDAL_SEPARATION = 4, + Config_PositionConfig_PositionFlags_GEOIDAL_SEPARATION = 4, /* Include the DOP value ; PDOP used by default, see below */ - meshtastic_Config_PositionConfig_PositionFlags_DOP = 8, + Config_PositionConfig_PositionFlags_DOP = 8, /* If POS_DOP set, send separate HDOP / VDOP values instead of PDOP */ - meshtastic_Config_PositionConfig_PositionFlags_HVDOP = 16, + Config_PositionConfig_PositionFlags_HVDOP = 16, /* Include number of "satellites in view" */ - meshtastic_Config_PositionConfig_PositionFlags_SATINVIEW = 32, + Config_PositionConfig_PositionFlags_SATINVIEW = 32, /* Include a sequence number incremented per packet */ - meshtastic_Config_PositionConfig_PositionFlags_SEQ_NO = 64, + Config_PositionConfig_PositionFlags_SEQ_NO = 64, /* Include positional timestamp (from GPS solution) */ - meshtastic_Config_PositionConfig_PositionFlags_TIMESTAMP = 128, + Config_PositionConfig_PositionFlags_TIMESTAMP = 128, /* Include positional heading Intended for use with vehicle not walking speeds walking speeds are likely to be error prone like the compass */ - meshtastic_Config_PositionConfig_PositionFlags_HEADING = 256, + Config_PositionConfig_PositionFlags_HEADING = 256, /* Include positional speed Intended for use with vehicle not walking speeds walking speeds are likely to be error prone like the compass */ - meshtastic_Config_PositionConfig_PositionFlags_SPEED = 512 -} meshtastic_Config_PositionConfig_PositionFlags; + Config_PositionConfig_PositionFlags_SPEED = 512 +} Config_PositionConfig_PositionFlags; -typedef enum _meshtastic_Config_NetworkConfig_AddressMode { +typedef enum _Config_NetworkConfig_AddressMode { /* obtain ip address via DHCP */ - meshtastic_Config_NetworkConfig_AddressMode_DHCP = 0, + Config_NetworkConfig_AddressMode_DHCP = 0, /* use static ip address */ - meshtastic_Config_NetworkConfig_AddressMode_STATIC = 1 -} meshtastic_Config_NetworkConfig_AddressMode; + Config_NetworkConfig_AddressMode_STATIC = 1 +} Config_NetworkConfig_AddressMode; /* How the GPS coordinates are displayed on the OLED screen. */ -typedef enum _meshtastic_Config_DisplayConfig_GpsCoordinateFormat { +typedef enum _Config_DisplayConfig_GpsCoordinateFormat { /* GPS coordinates are displayed in the normal decimal degrees format: DD.DDDDDD DDD.DDDDDD */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DEC = 0, + Config_DisplayConfig_GpsCoordinateFormat_DEC = 0, /* GPS coordinates are displayed in the degrees minutes seconds format: DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DMS = 1, + Config_DisplayConfig_GpsCoordinateFormat_DMS = 1, /* Universal Transverse Mercator format: ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_UTM = 2, + Config_DisplayConfig_GpsCoordinateFormat_UTM = 2, /* Military Grid Reference System format: ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square, E is easting, N is northing */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MGRS = 3, + Config_DisplayConfig_GpsCoordinateFormat_MGRS = 3, /* Open Location Code (aka Plus Codes). */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OLC = 4, + Config_DisplayConfig_GpsCoordinateFormat_OLC = 4, /* Ordnance Survey Grid Reference (the National Grid System of the UK). Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square, E is the easting, N is the northing */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OSGR = 5 -} meshtastic_Config_DisplayConfig_GpsCoordinateFormat; + Config_DisplayConfig_GpsCoordinateFormat_OSGR = 5 +} Config_DisplayConfig_GpsCoordinateFormat; /* Unit display preference */ -typedef enum _meshtastic_Config_DisplayConfig_DisplayUnits { +typedef enum _Config_DisplayConfig_DisplayUnits { /* Metric (Default) */ - meshtastic_Config_DisplayConfig_DisplayUnits_METRIC = 0, + Config_DisplayConfig_DisplayUnits_METRIC = 0, /* Imperial */ - meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL = 1 -} meshtastic_Config_DisplayConfig_DisplayUnits; + Config_DisplayConfig_DisplayUnits_IMPERIAL = 1 +} Config_DisplayConfig_DisplayUnits; /* Override OLED outo detect with this if it fails. */ -typedef enum _meshtastic_Config_DisplayConfig_OledType { +typedef enum _Config_DisplayConfig_OledType { /* Default / Auto */ - meshtastic_Config_DisplayConfig_OledType_OLED_AUTO = 0, + Config_DisplayConfig_OledType_OLED_AUTO = 0, /* Default / Auto */ - meshtastic_Config_DisplayConfig_OledType_OLED_SSD1306 = 1, + Config_DisplayConfig_OledType_OLED_SSD1306 = 1, /* Default / Auto */ - meshtastic_Config_DisplayConfig_OledType_OLED_SH1106 = 2 -} meshtastic_Config_DisplayConfig_OledType; + Config_DisplayConfig_OledType_OLED_SH1106 = 2 +} Config_DisplayConfig_OledType; -typedef enum _meshtastic_Config_DisplayConfig_DisplayMode { +typedef enum _Config_DisplayConfig_DisplayMode { /* Default. The old style for the 128x64 OLED screen */ - meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT = 0, + Config_DisplayConfig_DisplayMode_DEFAULT = 0, /* Rearrange display elements to cater for bicolor OLED displays */ - meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR = 1, + Config_DisplayConfig_DisplayMode_TWOCOLOR = 1, /* Same as TwoColor, but with inverted top bar. Not so good for Epaper displays */ - meshtastic_Config_DisplayConfig_DisplayMode_INVERTED = 2, + Config_DisplayConfig_DisplayMode_INVERTED = 2, /* TFT Full Color Displays (not implemented yet) */ - meshtastic_Config_DisplayConfig_DisplayMode_COLOR = 3 -} meshtastic_Config_DisplayConfig_DisplayMode; + Config_DisplayConfig_DisplayMode_COLOR = 3 +} Config_DisplayConfig_DisplayMode; -typedef enum _meshtastic_Config_LoRaConfig_RegionCode { +typedef enum _Config_LoRaConfig_RegionCode { /* Region is not set */ - meshtastic_Config_LoRaConfig_RegionCode_UNSET = 0, + Config_LoRaConfig_RegionCode_UNSET = 0, /* United States */ - meshtastic_Config_LoRaConfig_RegionCode_US = 1, + Config_LoRaConfig_RegionCode_US = 1, /* European Union 433mhz */ - meshtastic_Config_LoRaConfig_RegionCode_EU_433 = 2, + Config_LoRaConfig_RegionCode_EU_433 = 2, /* European Union 433mhz */ - meshtastic_Config_LoRaConfig_RegionCode_EU_868 = 3, + Config_LoRaConfig_RegionCode_EU_868 = 3, /* China */ - meshtastic_Config_LoRaConfig_RegionCode_CN = 4, + Config_LoRaConfig_RegionCode_CN = 4, /* Japan */ - meshtastic_Config_LoRaConfig_RegionCode_JP = 5, + Config_LoRaConfig_RegionCode_JP = 5, /* Australia / New Zealand */ - meshtastic_Config_LoRaConfig_RegionCode_ANZ = 6, + Config_LoRaConfig_RegionCode_ANZ = 6, /* Korea */ - meshtastic_Config_LoRaConfig_RegionCode_KR = 7, + Config_LoRaConfig_RegionCode_KR = 7, /* Taiwan */ - meshtastic_Config_LoRaConfig_RegionCode_TW = 8, + Config_LoRaConfig_RegionCode_TW = 8, /* Russia */ - meshtastic_Config_LoRaConfig_RegionCode_RU = 9, + Config_LoRaConfig_RegionCode_RU = 9, /* India */ - meshtastic_Config_LoRaConfig_RegionCode_IN = 10, + Config_LoRaConfig_RegionCode_IN = 10, /* New Zealand 865mhz */ - meshtastic_Config_LoRaConfig_RegionCode_NZ_865 = 11, + Config_LoRaConfig_RegionCode_NZ_865 = 11, /* Thailand */ - meshtastic_Config_LoRaConfig_RegionCode_TH = 12, + Config_LoRaConfig_RegionCode_TH = 12, /* WLAN Band */ - meshtastic_Config_LoRaConfig_RegionCode_LORA_24 = 13, + Config_LoRaConfig_RegionCode_LORA_24 = 13, /* Ukraine 433mhz */ - meshtastic_Config_LoRaConfig_RegionCode_UA_433 = 14, + Config_LoRaConfig_RegionCode_UA_433 = 14, /* Ukraine 868mhz */ - meshtastic_Config_LoRaConfig_RegionCode_UA_868 = 15 -} meshtastic_Config_LoRaConfig_RegionCode; + Config_LoRaConfig_RegionCode_UA_868 = 15 +} Config_LoRaConfig_RegionCode; /* Standard predefined channel settings Note: these mappings must match ModemPreset Choice in the device code. */ -typedef enum _meshtastic_Config_LoRaConfig_ModemPreset { +typedef enum _Config_LoRaConfig_ModemPreset { /* Long Range - Fast */ - meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST = 0, + Config_LoRaConfig_ModemPreset_LONG_FAST = 0, /* Long Range - Slow */ - meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW = 1, + Config_LoRaConfig_ModemPreset_LONG_SLOW = 1, /* Very Long Range - Slow */ - meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW = 2, + Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW = 2, /* Medium Range - Slow */ - meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW = 3, + Config_LoRaConfig_ModemPreset_MEDIUM_SLOW = 3, /* Medium Range - Fast */ - meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST = 4, + Config_LoRaConfig_ModemPreset_MEDIUM_FAST = 4, /* Short Range - Slow */ - meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW = 5, + Config_LoRaConfig_ModemPreset_SHORT_SLOW = 5, /* Short Range - Fast */ - meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST = 6 -} meshtastic_Config_LoRaConfig_ModemPreset; + Config_LoRaConfig_ModemPreset_SHORT_FAST = 6 +} Config_LoRaConfig_ModemPreset; -typedef enum _meshtastic_Config_BluetoothConfig_PairingMode { +typedef enum _Config_BluetoothConfig_PairingMode { /* Device generates a random pin that will be shown on the screen of the device for pairing */ - meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN = 0, + Config_BluetoothConfig_PairingMode_RANDOM_PIN = 0, /* Device requires a specified fixed pin for pairing */ - meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN = 1, + Config_BluetoothConfig_PairingMode_FIXED_PIN = 1, /* Device requires no pin for pairing */ - meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN = 2 -} meshtastic_Config_BluetoothConfig_PairingMode; + Config_BluetoothConfig_PairingMode_NO_PIN = 2 +} Config_BluetoothConfig_PairingMode; /* Struct definitions */ /* Configuration */ -typedef struct _meshtastic_Config_DeviceConfig { +typedef struct _Config_DeviceConfig { /* Sets the role of node */ - meshtastic_Config_DeviceConfig_Role role; + Config_DeviceConfig_Role role; /* Disabling this will disable the SerialConsole by not initilizing the StreamAPI */ bool serial_enabled; /* By default we turn off logging as soon as an API client connects (to keep shared serial link quiet). @@ -198,10 +198,10 @@ typedef struct _meshtastic_Config_DeviceConfig { /* For boards without a PWM buzzer, this is the pin number that will be used Defaults to PIN_BUZZER if defined. */ uint32_t buzzer_gpio; -} meshtastic_Config_DeviceConfig; +} Config_DeviceConfig; /* Position Config */ -typedef struct _meshtastic_Config_PositionConfig { +typedef struct _Config_PositionConfig { /* We should send our position this often (but only if it has changed significantly) Defaults to 15 minutes */ uint32_t position_broadcast_secs; @@ -229,11 +229,11 @@ typedef struct _meshtastic_Config_PositionConfig { uint32_t rx_gpio; /* (Re)define GPS_TX_PIN for your board. */ uint32_t tx_gpio; -} meshtastic_Config_PositionConfig; +} Config_PositionConfig; /* Power Config\ See [Power Config](/docs/settings/config/power) for additional power config details. */ -typedef struct _meshtastic_Config_PowerConfig { +typedef struct _Config_PowerConfig { /* If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in we should try to minimize power consumption as much as possible. YOU DO NOT NEED TO SET THIS IF YOU'VE set is_router (it is implied in that case). @@ -269,9 +269,9 @@ typedef struct _meshtastic_Config_PowerConfig { While in light sleep when we receive packets on the LoRa radio we will wake and handle them and stay awake in no BLE mode for this value 0 for default of 10 seconds */ uint32_t min_wake_secs; -} meshtastic_Config_PowerConfig; +} Config_PowerConfig; -typedef struct _meshtastic_Config_NetworkConfig_IpV4Config { +typedef struct _Config_NetworkConfig_IpV4Config { /* Static IP address */ uint32_t ip; /* Static gateway address */ @@ -280,10 +280,10 @@ typedef struct _meshtastic_Config_NetworkConfig_IpV4Config { uint32_t subnet; /* Static DNS server address */ uint32_t dns; -} meshtastic_Config_NetworkConfig_IpV4Config; +} Config_NetworkConfig_IpV4Config; /* Network Config */ -typedef struct _meshtastic_Config_NetworkConfig { +typedef struct _Config_NetworkConfig { /* Enable WiFi (disables Bluetooth) */ bool wifi_enabled; /* If set, this node will try to join the specified wifi network and @@ -296,19 +296,19 @@ typedef struct _meshtastic_Config_NetworkConfig { /* Enable Ethernet */ bool eth_enabled; /* acquire an address via DHCP or assign static */ - meshtastic_Config_NetworkConfig_AddressMode address_mode; + Config_NetworkConfig_AddressMode address_mode; /* struct to keep static address */ bool has_ipv4_config; - meshtastic_Config_NetworkConfig_IpV4Config ipv4_config; -} meshtastic_Config_NetworkConfig; + Config_NetworkConfig_IpV4Config ipv4_config; +} Config_NetworkConfig; /* Display Config */ -typedef struct _meshtastic_Config_DisplayConfig { +typedef struct _Config_DisplayConfig { /* Number of seconds the screen stays on after pressing the user button or receiving a message 0 for default of one minute MAXUINT for always on */ uint32_t screen_on_secs; /* How the GPS coordinates are formatted on the OLED screen. */ - meshtastic_Config_DisplayConfig_GpsCoordinateFormat gps_format; + Config_DisplayConfig_GpsCoordinateFormat gps_format; /* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds. Potentially useful for devices without user buttons. */ uint32_t auto_screen_carousel_secs; @@ -318,17 +318,17 @@ typedef struct _meshtastic_Config_DisplayConfig { /* Flip screen vertically, for cases that mount the screen upside down */ bool flip_screen; /* Perferred display units */ - meshtastic_Config_DisplayConfig_DisplayUnits units; + Config_DisplayConfig_DisplayUnits units; /* Override auto-detect in screen */ - meshtastic_Config_DisplayConfig_OledType oled; + Config_DisplayConfig_OledType oled; /* Display Mode */ - meshtastic_Config_DisplayConfig_DisplayMode displaymode; + Config_DisplayConfig_DisplayMode displaymode; /* Print first line in pseudo-bold? FALSE is original style, TRUE is bold */ bool heading_bold; -} meshtastic_Config_DisplayConfig; +} Config_DisplayConfig; /* Lora Config */ -typedef struct _meshtastic_Config_LoRaConfig { +typedef struct _Config_LoRaConfig { /* When enabled, the `modem_preset` fields will be adheared to, else the `bandwidth`/`spread_factor`/`coding_rate` will be taked from their respective manually defined fields */ bool use_preset; @@ -337,7 +337,7 @@ typedef struct _meshtastic_Config_LoRaConfig { Because protobufs take ZERO space when the value is zero this works out nicely. This value is replaced by bandwidth/spread_factor/coding_rate. If you'd like to experiment with other options add them to MeshRadio.cpp in the device code. */ - meshtastic_Config_LoRaConfig_ModemPreset modem_preset; + Config_LoRaConfig_ModemPreset modem_preset; /* Bandwidth in MHz Certain bandwidth numbers are 'special' and will be converted to the appropriate floating point value: 31 -> 31.25MHz */ @@ -353,7 +353,7 @@ typedef struct _meshtastic_Config_LoRaConfig { Used to correct for crystal calibration errors. */ float frequency_offset; /* The region code for the radio (US, CN, EU433, etc...) */ - meshtastic_Config_LoRaConfig_RegionCode region; + Config_LoRaConfig_RegionCode region; /* Maximum number of hops. This can't be greater than 7. Default of 3 */ uint32_t hop_limit; @@ -382,29 +382,29 @@ typedef struct _meshtastic_Config_LoRaConfig { in ignore_incoming will have packets they send droped on receive (by router.cpp) */ pb_size_t ignore_incoming_count; uint32_t ignore_incoming[3]; -} meshtastic_Config_LoRaConfig; +} Config_LoRaConfig; -typedef struct _meshtastic_Config_BluetoothConfig { +typedef struct _Config_BluetoothConfig { /* Enable Bluetooth on the device */ bool enabled; /* Determines the pairing strategy for the device */ - meshtastic_Config_BluetoothConfig_PairingMode mode; + Config_BluetoothConfig_PairingMode mode; /* Specified pin for PairingMode.FixedPin */ uint32_t fixed_pin; -} meshtastic_Config_BluetoothConfig; +} Config_BluetoothConfig; -typedef struct _meshtastic_Config { +typedef struct _Config { pb_size_t which_payload_variant; union { - meshtastic_Config_DeviceConfig device; - meshtastic_Config_PositionConfig position; - meshtastic_Config_PowerConfig power; - meshtastic_Config_NetworkConfig network; - meshtastic_Config_DisplayConfig display; - meshtastic_Config_LoRaConfig lora; - meshtastic_Config_BluetoothConfig bluetooth; + Config_DeviceConfig device; + Config_PositionConfig position; + Config_PowerConfig power; + Config_NetworkConfig network; + Config_DisplayConfig display; + Config_LoRaConfig lora; + Config_BluetoothConfig bluetooth; } payload_variant; -} meshtastic_Config; +} Config; #ifdef __cplusplus @@ -412,154 +412,154 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_Config_DeviceConfig_Role_MIN meshtastic_Config_DeviceConfig_Role_CLIENT -#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT -#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT+1)) +#define _Config_DeviceConfig_Role_MIN Config_DeviceConfig_Role_CLIENT +#define _Config_DeviceConfig_Role_MAX Config_DeviceConfig_Role_ROUTER_CLIENT +#define _Config_DeviceConfig_Role_ARRAYSIZE ((Config_DeviceConfig_Role)(Config_DeviceConfig_Role_ROUTER_CLIENT+1)) -#define _meshtastic_Config_PositionConfig_PositionFlags_MIN meshtastic_Config_PositionConfig_PositionFlags_UNSET -#define _meshtastic_Config_PositionConfig_PositionFlags_MAX meshtastic_Config_PositionConfig_PositionFlags_SPEED -#define _meshtastic_Config_PositionConfig_PositionFlags_ARRAYSIZE ((meshtastic_Config_PositionConfig_PositionFlags)(meshtastic_Config_PositionConfig_PositionFlags_SPEED+1)) +#define _Config_PositionConfig_PositionFlags_MIN Config_PositionConfig_PositionFlags_UNSET +#define _Config_PositionConfig_PositionFlags_MAX Config_PositionConfig_PositionFlags_SPEED +#define _Config_PositionConfig_PositionFlags_ARRAYSIZE ((Config_PositionConfig_PositionFlags)(Config_PositionConfig_PositionFlags_SPEED+1)) -#define _meshtastic_Config_NetworkConfig_AddressMode_MIN meshtastic_Config_NetworkConfig_AddressMode_DHCP -#define _meshtastic_Config_NetworkConfig_AddressMode_MAX meshtastic_Config_NetworkConfig_AddressMode_STATIC -#define _meshtastic_Config_NetworkConfig_AddressMode_ARRAYSIZE ((meshtastic_Config_NetworkConfig_AddressMode)(meshtastic_Config_NetworkConfig_AddressMode_STATIC+1)) +#define _Config_NetworkConfig_AddressMode_MIN Config_NetworkConfig_AddressMode_DHCP +#define _Config_NetworkConfig_AddressMode_MAX Config_NetworkConfig_AddressMode_STATIC +#define _Config_NetworkConfig_AddressMode_ARRAYSIZE ((Config_NetworkConfig_AddressMode)(Config_NetworkConfig_AddressMode_STATIC+1)) -#define _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DEC -#define _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MAX meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OSGR -#define _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_ARRAYSIZE ((meshtastic_Config_DisplayConfig_GpsCoordinateFormat)(meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OSGR+1)) +#define _Config_DisplayConfig_GpsCoordinateFormat_MIN Config_DisplayConfig_GpsCoordinateFormat_DEC +#define _Config_DisplayConfig_GpsCoordinateFormat_MAX Config_DisplayConfig_GpsCoordinateFormat_OSGR +#define _Config_DisplayConfig_GpsCoordinateFormat_ARRAYSIZE ((Config_DisplayConfig_GpsCoordinateFormat)(Config_DisplayConfig_GpsCoordinateFormat_OSGR+1)) -#define _meshtastic_Config_DisplayConfig_DisplayUnits_MIN meshtastic_Config_DisplayConfig_DisplayUnits_METRIC -#define _meshtastic_Config_DisplayConfig_DisplayUnits_MAX meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL -#define _meshtastic_Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayUnits)(meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL+1)) +#define _Config_DisplayConfig_DisplayUnits_MIN Config_DisplayConfig_DisplayUnits_METRIC +#define _Config_DisplayConfig_DisplayUnits_MAX Config_DisplayConfig_DisplayUnits_IMPERIAL +#define _Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((Config_DisplayConfig_DisplayUnits)(Config_DisplayConfig_DisplayUnits_IMPERIAL+1)) -#define _meshtastic_Config_DisplayConfig_OledType_MIN meshtastic_Config_DisplayConfig_OledType_OLED_AUTO -#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1106 -#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1106+1)) +#define _Config_DisplayConfig_OledType_MIN Config_DisplayConfig_OledType_OLED_AUTO +#define _Config_DisplayConfig_OledType_MAX Config_DisplayConfig_OledType_OLED_SH1106 +#define _Config_DisplayConfig_OledType_ARRAYSIZE ((Config_DisplayConfig_OledType)(Config_DisplayConfig_OledType_OLED_SH1106+1)) -#define _meshtastic_Config_DisplayConfig_DisplayMode_MIN meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT -#define _meshtastic_Config_DisplayConfig_DisplayMode_MAX meshtastic_Config_DisplayConfig_DisplayMode_COLOR -#define _meshtastic_Config_DisplayConfig_DisplayMode_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayMode)(meshtastic_Config_DisplayConfig_DisplayMode_COLOR+1)) +#define _Config_DisplayConfig_DisplayMode_MIN Config_DisplayConfig_DisplayMode_DEFAULT +#define _Config_DisplayConfig_DisplayMode_MAX Config_DisplayConfig_DisplayMode_COLOR +#define _Config_DisplayConfig_DisplayMode_ARRAYSIZE ((Config_DisplayConfig_DisplayMode)(Config_DisplayConfig_DisplayMode_COLOR+1)) -#define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET -#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_UA_868 -#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_UA_868+1)) +#define _Config_LoRaConfig_RegionCode_MIN Config_LoRaConfig_RegionCode_UNSET +#define _Config_LoRaConfig_RegionCode_MAX Config_LoRaConfig_RegionCode_UA_868 +#define _Config_LoRaConfig_RegionCode_ARRAYSIZE ((Config_LoRaConfig_RegionCode)(Config_LoRaConfig_RegionCode_UA_868+1)) -#define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST -#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST -#define _meshtastic_Config_LoRaConfig_ModemPreset_ARRAYSIZE ((meshtastic_Config_LoRaConfig_ModemPreset)(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST+1)) +#define _Config_LoRaConfig_ModemPreset_MIN Config_LoRaConfig_ModemPreset_LONG_FAST +#define _Config_LoRaConfig_ModemPreset_MAX Config_LoRaConfig_ModemPreset_SHORT_FAST +#define _Config_LoRaConfig_ModemPreset_ARRAYSIZE ((Config_LoRaConfig_ModemPreset)(Config_LoRaConfig_ModemPreset_SHORT_FAST+1)) -#define _meshtastic_Config_BluetoothConfig_PairingMode_MIN meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN -#define _meshtastic_Config_BluetoothConfig_PairingMode_MAX meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN -#define _meshtastic_Config_BluetoothConfig_PairingMode_ARRAYSIZE ((meshtastic_Config_BluetoothConfig_PairingMode)(meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN+1)) +#define _Config_BluetoothConfig_PairingMode_MIN Config_BluetoothConfig_PairingMode_RANDOM_PIN +#define _Config_BluetoothConfig_PairingMode_MAX Config_BluetoothConfig_PairingMode_NO_PIN +#define _Config_BluetoothConfig_PairingMode_ARRAYSIZE ((Config_BluetoothConfig_PairingMode)(Config_BluetoothConfig_PairingMode_NO_PIN+1)) -#define meshtastic_Config_DeviceConfig_role_ENUMTYPE meshtastic_Config_DeviceConfig_Role +#define Config_DeviceConfig_role_ENUMTYPE Config_DeviceConfig_Role -#define meshtastic_Config_NetworkConfig_address_mode_ENUMTYPE meshtastic_Config_NetworkConfig_AddressMode +#define Config_NetworkConfig_address_mode_ENUMTYPE Config_NetworkConfig_AddressMode -#define meshtastic_Config_DisplayConfig_gps_format_ENUMTYPE meshtastic_Config_DisplayConfig_GpsCoordinateFormat -#define meshtastic_Config_DisplayConfig_units_ENUMTYPE meshtastic_Config_DisplayConfig_DisplayUnits -#define meshtastic_Config_DisplayConfig_oled_ENUMTYPE meshtastic_Config_DisplayConfig_OledType -#define meshtastic_Config_DisplayConfig_displaymode_ENUMTYPE meshtastic_Config_DisplayConfig_DisplayMode +#define Config_DisplayConfig_gps_format_ENUMTYPE Config_DisplayConfig_GpsCoordinateFormat +#define Config_DisplayConfig_units_ENUMTYPE Config_DisplayConfig_DisplayUnits +#define Config_DisplayConfig_oled_ENUMTYPE Config_DisplayConfig_OledType +#define Config_DisplayConfig_displaymode_ENUMTYPE Config_DisplayConfig_DisplayMode -#define meshtastic_Config_LoRaConfig_modem_preset_ENUMTYPE meshtastic_Config_LoRaConfig_ModemPreset -#define meshtastic_Config_LoRaConfig_region_ENUMTYPE meshtastic_Config_LoRaConfig_RegionCode +#define Config_LoRaConfig_modem_preset_ENUMTYPE Config_LoRaConfig_ModemPreset +#define Config_LoRaConfig_region_ENUMTYPE Config_LoRaConfig_RegionCode -#define meshtastic_Config_BluetoothConfig_mode_ENUMTYPE meshtastic_Config_BluetoothConfig_PairingMode +#define Config_BluetoothConfig_mode_ENUMTYPE Config_BluetoothConfig_PairingMode /* Initializer values for message structs */ -#define meshtastic_Config_init_default {0, {meshtastic_Config_DeviceConfig_init_default}} -#define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} -#define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default} -#define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0} -#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} -#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}} -#define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0} -#define meshtastic_Config_init_zero {0, {meshtastic_Config_DeviceConfig_init_zero}} -#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} -#define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_Config_PowerConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero} -#define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0} -#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} -#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}} -#define meshtastic_Config_BluetoothConfig_init_zero {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0} +#define Config_init_default {0, {Config_DeviceConfig_init_default}} +#define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} +#define Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0} +#define Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0} +#define Config_NetworkConfig_init_default {0, "", "", "", 0, _Config_NetworkConfig_AddressMode_MIN, false, Config_NetworkConfig_IpV4Config_init_default} +#define Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0} +#define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_MIN, 0} +#define Config_LoRaConfig_init_default {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, {0, 0, 0}} +#define Config_BluetoothConfig_init_default {0, _Config_BluetoothConfig_PairingMode_MIN, 0} +#define Config_init_zero {0, {Config_DeviceConfig_init_zero}} +#define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} +#define Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0} +#define Config_PowerConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0} +#define Config_NetworkConfig_init_zero {0, "", "", "", 0, _Config_NetworkConfig_AddressMode_MIN, false, Config_NetworkConfig_IpV4Config_init_zero} +#define Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0} +#define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_MIN, 0} +#define Config_LoRaConfig_init_zero {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, {0, 0, 0}} +#define Config_BluetoothConfig_init_zero {0, _Config_BluetoothConfig_PairingMode_MIN, 0} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_Config_DeviceConfig_role_tag 1 -#define meshtastic_Config_DeviceConfig_serial_enabled_tag 2 -#define meshtastic_Config_DeviceConfig_debug_log_enabled_tag 3 -#define meshtastic_Config_DeviceConfig_button_gpio_tag 4 -#define meshtastic_Config_DeviceConfig_buzzer_gpio_tag 5 -#define meshtastic_Config_PositionConfig_position_broadcast_secs_tag 1 -#define meshtastic_Config_PositionConfig_position_broadcast_smart_enabled_tag 2 -#define meshtastic_Config_PositionConfig_fixed_position_tag 3 -#define meshtastic_Config_PositionConfig_gps_enabled_tag 4 -#define meshtastic_Config_PositionConfig_gps_update_interval_tag 5 -#define meshtastic_Config_PositionConfig_gps_attempt_time_tag 6 -#define meshtastic_Config_PositionConfig_position_flags_tag 7 -#define meshtastic_Config_PositionConfig_rx_gpio_tag 8 -#define meshtastic_Config_PositionConfig_tx_gpio_tag 9 -#define meshtastic_Config_PowerConfig_is_power_saving_tag 1 -#define meshtastic_Config_PowerConfig_on_battery_shutdown_after_secs_tag 2 -#define meshtastic_Config_PowerConfig_adc_multiplier_override_tag 3 -#define meshtastic_Config_PowerConfig_wait_bluetooth_secs_tag 4 -#define meshtastic_Config_PowerConfig_mesh_sds_timeout_secs_tag 5 -#define meshtastic_Config_PowerConfig_sds_secs_tag 6 -#define meshtastic_Config_PowerConfig_ls_secs_tag 7 -#define meshtastic_Config_PowerConfig_min_wake_secs_tag 8 -#define meshtastic_Config_NetworkConfig_IpV4Config_ip_tag 1 -#define meshtastic_Config_NetworkConfig_IpV4Config_gateway_tag 2 -#define meshtastic_Config_NetworkConfig_IpV4Config_subnet_tag 3 -#define meshtastic_Config_NetworkConfig_IpV4Config_dns_tag 4 -#define meshtastic_Config_NetworkConfig_wifi_enabled_tag 1 -#define meshtastic_Config_NetworkConfig_wifi_ssid_tag 3 -#define meshtastic_Config_NetworkConfig_wifi_psk_tag 4 -#define meshtastic_Config_NetworkConfig_ntp_server_tag 5 -#define meshtastic_Config_NetworkConfig_eth_enabled_tag 6 -#define meshtastic_Config_NetworkConfig_address_mode_tag 7 -#define meshtastic_Config_NetworkConfig_ipv4_config_tag 8 -#define meshtastic_Config_DisplayConfig_screen_on_secs_tag 1 -#define meshtastic_Config_DisplayConfig_gps_format_tag 2 -#define meshtastic_Config_DisplayConfig_auto_screen_carousel_secs_tag 3 -#define meshtastic_Config_DisplayConfig_compass_north_top_tag 4 -#define meshtastic_Config_DisplayConfig_flip_screen_tag 5 -#define meshtastic_Config_DisplayConfig_units_tag 6 -#define meshtastic_Config_DisplayConfig_oled_tag 7 -#define meshtastic_Config_DisplayConfig_displaymode_tag 8 -#define meshtastic_Config_DisplayConfig_heading_bold_tag 9 -#define meshtastic_Config_LoRaConfig_use_preset_tag 1 -#define meshtastic_Config_LoRaConfig_modem_preset_tag 2 -#define meshtastic_Config_LoRaConfig_bandwidth_tag 3 -#define meshtastic_Config_LoRaConfig_spread_factor_tag 4 -#define meshtastic_Config_LoRaConfig_coding_rate_tag 5 -#define meshtastic_Config_LoRaConfig_frequency_offset_tag 6 -#define meshtastic_Config_LoRaConfig_region_tag 7 -#define meshtastic_Config_LoRaConfig_hop_limit_tag 8 -#define meshtastic_Config_LoRaConfig_tx_enabled_tag 9 -#define meshtastic_Config_LoRaConfig_tx_power_tag 10 -#define meshtastic_Config_LoRaConfig_channel_num_tag 11 -#define meshtastic_Config_LoRaConfig_override_duty_cycle_tag 12 -#define meshtastic_Config_LoRaConfig_ignore_incoming_tag 103 -#define meshtastic_Config_BluetoothConfig_enabled_tag 1 -#define meshtastic_Config_BluetoothConfig_mode_tag 2 -#define meshtastic_Config_BluetoothConfig_fixed_pin_tag 3 -#define meshtastic_Config_device_tag 1 -#define meshtastic_Config_position_tag 2 -#define meshtastic_Config_power_tag 3 -#define meshtastic_Config_network_tag 4 -#define meshtastic_Config_display_tag 5 -#define meshtastic_Config_lora_tag 6 -#define meshtastic_Config_bluetooth_tag 7 +#define Config_DeviceConfig_role_tag 1 +#define Config_DeviceConfig_serial_enabled_tag 2 +#define Config_DeviceConfig_debug_log_enabled_tag 3 +#define Config_DeviceConfig_button_gpio_tag 4 +#define Config_DeviceConfig_buzzer_gpio_tag 5 +#define Config_PositionConfig_position_broadcast_secs_tag 1 +#define Config_PositionConfig_position_broadcast_smart_enabled_tag 2 +#define Config_PositionConfig_fixed_position_tag 3 +#define Config_PositionConfig_gps_enabled_tag 4 +#define Config_PositionConfig_gps_update_interval_tag 5 +#define Config_PositionConfig_gps_attempt_time_tag 6 +#define Config_PositionConfig_position_flags_tag 7 +#define Config_PositionConfig_rx_gpio_tag 8 +#define Config_PositionConfig_tx_gpio_tag 9 +#define Config_PowerConfig_is_power_saving_tag 1 +#define Config_PowerConfig_on_battery_shutdown_after_secs_tag 2 +#define Config_PowerConfig_adc_multiplier_override_tag 3 +#define Config_PowerConfig_wait_bluetooth_secs_tag 4 +#define Config_PowerConfig_mesh_sds_timeout_secs_tag 5 +#define Config_PowerConfig_sds_secs_tag 6 +#define Config_PowerConfig_ls_secs_tag 7 +#define Config_PowerConfig_min_wake_secs_tag 8 +#define Config_NetworkConfig_IpV4Config_ip_tag 1 +#define Config_NetworkConfig_IpV4Config_gateway_tag 2 +#define Config_NetworkConfig_IpV4Config_subnet_tag 3 +#define Config_NetworkConfig_IpV4Config_dns_tag 4 +#define Config_NetworkConfig_wifi_enabled_tag 1 +#define Config_NetworkConfig_wifi_ssid_tag 3 +#define Config_NetworkConfig_wifi_psk_tag 4 +#define Config_NetworkConfig_ntp_server_tag 5 +#define Config_NetworkConfig_eth_enabled_tag 6 +#define Config_NetworkConfig_address_mode_tag 7 +#define Config_NetworkConfig_ipv4_config_tag 8 +#define Config_DisplayConfig_screen_on_secs_tag 1 +#define Config_DisplayConfig_gps_format_tag 2 +#define Config_DisplayConfig_auto_screen_carousel_secs_tag 3 +#define Config_DisplayConfig_compass_north_top_tag 4 +#define Config_DisplayConfig_flip_screen_tag 5 +#define Config_DisplayConfig_units_tag 6 +#define Config_DisplayConfig_oled_tag 7 +#define Config_DisplayConfig_displaymode_tag 8 +#define Config_DisplayConfig_heading_bold_tag 9 +#define Config_LoRaConfig_use_preset_tag 1 +#define Config_LoRaConfig_modem_preset_tag 2 +#define Config_LoRaConfig_bandwidth_tag 3 +#define Config_LoRaConfig_spread_factor_tag 4 +#define Config_LoRaConfig_coding_rate_tag 5 +#define Config_LoRaConfig_frequency_offset_tag 6 +#define Config_LoRaConfig_region_tag 7 +#define Config_LoRaConfig_hop_limit_tag 8 +#define Config_LoRaConfig_tx_enabled_tag 9 +#define Config_LoRaConfig_tx_power_tag 10 +#define Config_LoRaConfig_channel_num_tag 11 +#define Config_LoRaConfig_override_duty_cycle_tag 12 +#define Config_LoRaConfig_ignore_incoming_tag 103 +#define Config_BluetoothConfig_enabled_tag 1 +#define Config_BluetoothConfig_mode_tag 2 +#define Config_BluetoothConfig_fixed_pin_tag 3 +#define Config_device_tag 1 +#define Config_position_tag 2 +#define Config_power_tag 3 +#define Config_network_tag 4 +#define Config_display_tag 5 +#define Config_lora_tag 6 +#define Config_bluetooth_tag 7 /* Struct field encoding specification for nanopb */ -#define meshtastic_Config_FIELDLIST(X, a) \ +#define Config_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,device,payload_variant.device), 1) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,position,payload_variant.position), 2) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,power,payload_variant.power), 3) \ @@ -567,26 +567,26 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,network,payload_variant.netw X(a, STATIC, ONEOF, MESSAGE, (payload_variant,display,payload_variant.display), 5) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,lora,payload_variant.lora), 6) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,bluetooth,payload_variant.bluetooth), 7) -#define meshtastic_Config_CALLBACK NULL -#define meshtastic_Config_DEFAULT NULL -#define meshtastic_Config_payload_variant_device_MSGTYPE meshtastic_Config_DeviceConfig -#define meshtastic_Config_payload_variant_position_MSGTYPE meshtastic_Config_PositionConfig -#define meshtastic_Config_payload_variant_power_MSGTYPE meshtastic_Config_PowerConfig -#define meshtastic_Config_payload_variant_network_MSGTYPE meshtastic_Config_NetworkConfig -#define meshtastic_Config_payload_variant_display_MSGTYPE meshtastic_Config_DisplayConfig -#define meshtastic_Config_payload_variant_lora_MSGTYPE meshtastic_Config_LoRaConfig -#define meshtastic_Config_payload_variant_bluetooth_MSGTYPE meshtastic_Config_BluetoothConfig +#define Config_CALLBACK NULL +#define Config_DEFAULT NULL +#define Config_payload_variant_device_MSGTYPE Config_DeviceConfig +#define Config_payload_variant_position_MSGTYPE Config_PositionConfig +#define Config_payload_variant_power_MSGTYPE Config_PowerConfig +#define Config_payload_variant_network_MSGTYPE Config_NetworkConfig +#define Config_payload_variant_display_MSGTYPE Config_DisplayConfig +#define Config_payload_variant_lora_MSGTYPE Config_LoRaConfig +#define Config_payload_variant_bluetooth_MSGTYPE Config_BluetoothConfig -#define meshtastic_Config_DeviceConfig_FIELDLIST(X, a) \ +#define Config_DeviceConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, role, 1) \ X(a, STATIC, SINGULAR, BOOL, serial_enabled, 2) \ X(a, STATIC, SINGULAR, BOOL, debug_log_enabled, 3) \ X(a, STATIC, SINGULAR, UINT32, button_gpio, 4) \ X(a, STATIC, SINGULAR, UINT32, buzzer_gpio, 5) -#define meshtastic_Config_DeviceConfig_CALLBACK NULL -#define meshtastic_Config_DeviceConfig_DEFAULT NULL +#define Config_DeviceConfig_CALLBACK NULL +#define Config_DeviceConfig_DEFAULT NULL -#define meshtastic_Config_PositionConfig_FIELDLIST(X, a) \ +#define Config_PositionConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, position_broadcast_secs, 1) \ X(a, STATIC, SINGULAR, BOOL, position_broadcast_smart_enabled, 2) \ X(a, STATIC, SINGULAR, BOOL, fixed_position, 3) \ @@ -596,10 +596,10 @@ X(a, STATIC, SINGULAR, UINT32, gps_attempt_time, 6) \ X(a, STATIC, SINGULAR, UINT32, position_flags, 7) \ X(a, STATIC, SINGULAR, UINT32, rx_gpio, 8) \ X(a, STATIC, SINGULAR, UINT32, tx_gpio, 9) -#define meshtastic_Config_PositionConfig_CALLBACK NULL -#define meshtastic_Config_PositionConfig_DEFAULT NULL +#define Config_PositionConfig_CALLBACK NULL +#define Config_PositionConfig_DEFAULT NULL -#define meshtastic_Config_PowerConfig_FIELDLIST(X, a) \ +#define Config_PowerConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, is_power_saving, 1) \ X(a, STATIC, SINGULAR, UINT32, on_battery_shutdown_after_secs, 2) \ X(a, STATIC, SINGULAR, FLOAT, adc_multiplier_override, 3) \ @@ -608,10 +608,10 @@ X(a, STATIC, SINGULAR, UINT32, mesh_sds_timeout_secs, 5) \ X(a, STATIC, SINGULAR, UINT32, sds_secs, 6) \ X(a, STATIC, SINGULAR, UINT32, ls_secs, 7) \ X(a, STATIC, SINGULAR, UINT32, min_wake_secs, 8) -#define meshtastic_Config_PowerConfig_CALLBACK NULL -#define meshtastic_Config_PowerConfig_DEFAULT NULL +#define Config_PowerConfig_CALLBACK NULL +#define Config_PowerConfig_DEFAULT NULL -#define meshtastic_Config_NetworkConfig_FIELDLIST(X, a) \ +#define Config_NetworkConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, wifi_enabled, 1) \ X(a, STATIC, SINGULAR, STRING, wifi_ssid, 3) \ X(a, STATIC, SINGULAR, STRING, wifi_psk, 4) \ @@ -619,19 +619,19 @@ X(a, STATIC, SINGULAR, STRING, ntp_server, 5) \ X(a, STATIC, SINGULAR, BOOL, eth_enabled, 6) \ X(a, STATIC, SINGULAR, UENUM, address_mode, 7) \ X(a, STATIC, OPTIONAL, MESSAGE, ipv4_config, 8) -#define meshtastic_Config_NetworkConfig_CALLBACK NULL -#define meshtastic_Config_NetworkConfig_DEFAULT NULL -#define meshtastic_Config_NetworkConfig_ipv4_config_MSGTYPE meshtastic_Config_NetworkConfig_IpV4Config +#define Config_NetworkConfig_CALLBACK NULL +#define Config_NetworkConfig_DEFAULT NULL +#define Config_NetworkConfig_ipv4_config_MSGTYPE Config_NetworkConfig_IpV4Config -#define meshtastic_Config_NetworkConfig_IpV4Config_FIELDLIST(X, a) \ +#define Config_NetworkConfig_IpV4Config_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, FIXED32, ip, 1) \ X(a, STATIC, SINGULAR, FIXED32, gateway, 2) \ X(a, STATIC, SINGULAR, FIXED32, subnet, 3) \ X(a, STATIC, SINGULAR, FIXED32, dns, 4) -#define meshtastic_Config_NetworkConfig_IpV4Config_CALLBACK NULL -#define meshtastic_Config_NetworkConfig_IpV4Config_DEFAULT NULL +#define Config_NetworkConfig_IpV4Config_CALLBACK NULL +#define Config_NetworkConfig_IpV4Config_DEFAULT NULL -#define meshtastic_Config_DisplayConfig_FIELDLIST(X, a) \ +#define Config_DisplayConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, screen_on_secs, 1) \ X(a, STATIC, SINGULAR, UENUM, gps_format, 2) \ X(a, STATIC, SINGULAR, UINT32, auto_screen_carousel_secs, 3) \ @@ -641,10 +641,10 @@ X(a, STATIC, SINGULAR, UENUM, units, 6) \ X(a, STATIC, SINGULAR, UENUM, oled, 7) \ X(a, STATIC, SINGULAR, UENUM, displaymode, 8) \ X(a, STATIC, SINGULAR, BOOL, heading_bold, 9) -#define meshtastic_Config_DisplayConfig_CALLBACK NULL -#define meshtastic_Config_DisplayConfig_DEFAULT NULL +#define Config_DisplayConfig_CALLBACK NULL +#define Config_DisplayConfig_DEFAULT NULL -#define meshtastic_Config_LoRaConfig_FIELDLIST(X, a) \ +#define Config_LoRaConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, use_preset, 1) \ X(a, STATIC, SINGULAR, UENUM, modem_preset, 2) \ X(a, STATIC, SINGULAR, UINT32, bandwidth, 3) \ @@ -658,47 +658,47 @@ X(a, STATIC, SINGULAR, INT32, tx_power, 10) \ X(a, STATIC, SINGULAR, UINT32, channel_num, 11) \ X(a, STATIC, SINGULAR, BOOL, override_duty_cycle, 12) \ X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103) -#define meshtastic_Config_LoRaConfig_CALLBACK NULL -#define meshtastic_Config_LoRaConfig_DEFAULT NULL +#define Config_LoRaConfig_CALLBACK NULL +#define Config_LoRaConfig_DEFAULT NULL -#define meshtastic_Config_BluetoothConfig_FIELDLIST(X, a) \ +#define Config_BluetoothConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, UENUM, mode, 2) \ X(a, STATIC, SINGULAR, UINT32, fixed_pin, 3) -#define meshtastic_Config_BluetoothConfig_CALLBACK NULL -#define meshtastic_Config_BluetoothConfig_DEFAULT NULL +#define Config_BluetoothConfig_CALLBACK NULL +#define Config_BluetoothConfig_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_Config_msg; -extern const pb_msgdesc_t meshtastic_Config_DeviceConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_PositionConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_PowerConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_NetworkConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_NetworkConfig_IpV4Config_msg; -extern const pb_msgdesc_t meshtastic_Config_DisplayConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_LoRaConfig_msg; -extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg; +extern const pb_msgdesc_t Config_msg; +extern const pb_msgdesc_t Config_DeviceConfig_msg; +extern const pb_msgdesc_t Config_PositionConfig_msg; +extern const pb_msgdesc_t Config_PowerConfig_msg; +extern const pb_msgdesc_t Config_NetworkConfig_msg; +extern const pb_msgdesc_t Config_NetworkConfig_IpV4Config_msg; +extern const pb_msgdesc_t Config_DisplayConfig_msg; +extern const pb_msgdesc_t Config_LoRaConfig_msg; +extern const pb_msgdesc_t Config_BluetoothConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_Config_fields &meshtastic_Config_msg -#define meshtastic_Config_DeviceConfig_fields &meshtastic_Config_DeviceConfig_msg -#define meshtastic_Config_PositionConfig_fields &meshtastic_Config_PositionConfig_msg -#define meshtastic_Config_PowerConfig_fields &meshtastic_Config_PowerConfig_msg -#define meshtastic_Config_NetworkConfig_fields &meshtastic_Config_NetworkConfig_msg -#define meshtastic_Config_NetworkConfig_IpV4Config_fields &meshtastic_Config_NetworkConfig_IpV4Config_msg -#define meshtastic_Config_DisplayConfig_fields &meshtastic_Config_DisplayConfig_msg -#define meshtastic_Config_LoRaConfig_fields &meshtastic_Config_LoRaConfig_msg -#define meshtastic_Config_BluetoothConfig_fields &meshtastic_Config_BluetoothConfig_msg +#define Config_fields &Config_msg +#define Config_DeviceConfig_fields &Config_DeviceConfig_msg +#define Config_PositionConfig_fields &Config_PositionConfig_msg +#define Config_PowerConfig_fields &Config_PowerConfig_msg +#define Config_NetworkConfig_fields &Config_NetworkConfig_msg +#define Config_NetworkConfig_IpV4Config_fields &Config_NetworkConfig_IpV4Config_msg +#define Config_DisplayConfig_fields &Config_DisplayConfig_msg +#define Config_LoRaConfig_fields &Config_LoRaConfig_msg +#define Config_BluetoothConfig_fields &Config_BluetoothConfig_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_Config_BluetoothConfig_size 10 -#define meshtastic_Config_DeviceConfig_size 18 -#define meshtastic_Config_DisplayConfig_size 26 -#define meshtastic_Config_LoRaConfig_size 70 -#define meshtastic_Config_NetworkConfig_IpV4Config_size 20 -#define meshtastic_Config_NetworkConfig_size 161 -#define meshtastic_Config_PositionConfig_size 42 -#define meshtastic_Config_PowerConfig_size 43 -#define meshtastic_Config_size 164 +#define Config_BluetoothConfig_size 10 +#define Config_DeviceConfig_size 18 +#define Config_DisplayConfig_size 26 +#define Config_LoRaConfig_size 70 +#define Config_NetworkConfig_IpV4Config_size 20 +#define Config_NetworkConfig_size 161 +#define Config_PositionConfig_size 42 +#define Config_PowerConfig_size 43 +#define Config_size 164 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/device_metadata.pb.c b/src/mesh/generated/meshtastic/device_metadata.pb.c index dd9084166..725ac4c9f 100644 --- a/src/mesh/generated/meshtastic/device_metadata.pb.c +++ b/src/mesh/generated/meshtastic/device_metadata.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_DeviceMetadata, meshtastic_DeviceMetadata, AUTO) +PB_BIND(DeviceMetadata, DeviceMetadata, AUTO) diff --git a/src/mesh/generated/meshtastic/device_metadata.pb.h b/src/mesh/generated/meshtastic/device_metadata.pb.h index 5d61248c4..53d99f66e 100644 --- a/src/mesh/generated/meshtastic/device_metadata.pb.h +++ b/src/mesh/generated/meshtastic/device_metadata.pb.h @@ -12,7 +12,7 @@ /* Struct definitions */ /* Device metadata response */ -typedef struct _meshtastic_DeviceMetadata { +typedef struct _DeviceMetadata { /* Device firmware version string */ char firmware_version[18]; /* Device state version */ @@ -26,10 +26,10 @@ typedef struct _meshtastic_DeviceMetadata { /* Indicates that the device has an ethernet peripheral */ bool hasEthernet; /* Indicates that the device's role in the mesh */ - meshtastic_Config_DeviceConfig_Role role; + Config_DeviceConfig_Role role; /* Indicates the device's current enabled position flags */ - meshtastic_Config_PositionConfig_PositionFlags position_flags; -} meshtastic_DeviceMetadata; + Config_PositionConfig_PositionFlags position_flags; +} DeviceMetadata; #ifdef __cplusplus @@ -37,21 +37,21 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_DeviceMetadata_init_default {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_Config_PositionConfig_PositionFlags_MIN} -#define meshtastic_DeviceMetadata_init_zero {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_Config_PositionConfig_PositionFlags_MIN} +#define DeviceMetadata_init_default {"", 0, 0, 0, 0, 0, _Config_DeviceConfig_Role_MIN, _Config_PositionConfig_PositionFlags_MIN} +#define DeviceMetadata_init_zero {"", 0, 0, 0, 0, 0, _Config_DeviceConfig_Role_MIN, _Config_PositionConfig_PositionFlags_MIN} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_DeviceMetadata_firmware_version_tag 1 -#define meshtastic_DeviceMetadata_device_state_version_tag 2 -#define meshtastic_DeviceMetadata_canShutdown_tag 3 -#define meshtastic_DeviceMetadata_hasWifi_tag 4 -#define meshtastic_DeviceMetadata_hasBluetooth_tag 5 -#define meshtastic_DeviceMetadata_hasEthernet_tag 6 -#define meshtastic_DeviceMetadata_role_tag 7 -#define meshtastic_DeviceMetadata_position_flags_tag 8 +#define DeviceMetadata_firmware_version_tag 1 +#define DeviceMetadata_device_state_version_tag 2 +#define DeviceMetadata_canShutdown_tag 3 +#define DeviceMetadata_hasWifi_tag 4 +#define DeviceMetadata_hasBluetooth_tag 5 +#define DeviceMetadata_hasEthernet_tag 6 +#define DeviceMetadata_role_tag 7 +#define DeviceMetadata_position_flags_tag 8 /* Struct field encoding specification for nanopb */ -#define meshtastic_DeviceMetadata_FIELDLIST(X, a) \ +#define DeviceMetadata_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, firmware_version, 1) \ X(a, STATIC, SINGULAR, UINT32, device_state_version, 2) \ X(a, STATIC, SINGULAR, BOOL, canShutdown, 3) \ @@ -60,16 +60,16 @@ X(a, STATIC, SINGULAR, BOOL, hasBluetooth, 5) \ X(a, STATIC, SINGULAR, BOOL, hasEthernet, 6) \ X(a, STATIC, SINGULAR, UENUM, role, 7) \ X(a, STATIC, SINGULAR, UENUM, position_flags, 8) -#define meshtastic_DeviceMetadata_CALLBACK NULL -#define meshtastic_DeviceMetadata_DEFAULT NULL +#define DeviceMetadata_CALLBACK NULL +#define DeviceMetadata_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg; +extern const pb_msgdesc_t DeviceMetadata_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_DeviceMetadata_fields &meshtastic_DeviceMetadata_msg +#define DeviceMetadata_fields &DeviceMetadata_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_DeviceMetadata_size 38 +#define DeviceMetadata_size 38 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/deviceonly.pb.c b/src/mesh/generated/meshtastic/deviceonly.pb.c index 4c7abf96f..0b26e68d1 100644 --- a/src/mesh/generated/meshtastic/deviceonly.pb.c +++ b/src/mesh/generated/meshtastic/deviceonly.pb.c @@ -6,13 +6,13 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_DeviceState, meshtastic_DeviceState, 4) +PB_BIND(DeviceState, DeviceState, 4) -PB_BIND(meshtastic_ChannelFile, meshtastic_ChannelFile, 2) +PB_BIND(ChannelFile, ChannelFile, 2) -PB_BIND(meshtastic_OEMStore, meshtastic_OEMStore, 2) +PB_BIND(OEMStore, OEMStore, 2) diff --git a/src/mesh/generated/meshtastic/deviceonly.pb.h b/src/mesh/generated/meshtastic/deviceonly.pb.h index bc004d0aa..234b65d00 100644 --- a/src/mesh/generated/meshtastic/deviceonly.pb.h +++ b/src/mesh/generated/meshtastic/deviceonly.pb.h @@ -13,14 +13,14 @@ /* Enum definitions */ /* TODO: REPLACE */ -typedef enum _meshtastic_ScreenFonts { +typedef enum _ScreenFonts { /* TODO: REPLACE */ - meshtastic_ScreenFonts_FONT_SMALL = 0, + ScreenFonts_FONT_SMALL = 0, /* TODO: REPLACE */ - meshtastic_ScreenFonts_FONT_MEDIUM = 1, + ScreenFonts_FONT_MEDIUM = 1, /* TODO: REPLACE */ - meshtastic_ScreenFonts_FONT_LARGE = 2 -} meshtastic_ScreenFonts; + ScreenFonts_FONT_LARGE = 2 +} ScreenFonts; /* Struct definitions */ /* This message is never sent over the wire, but it is used for serializing DB @@ -28,24 +28,24 @@ typedef enum _meshtastic_ScreenFonts { FIXME, since we write this each time we enter deep sleep (and have infinite flash) it would be better to use some sort of append only data structure for the receive queue and use the preferences store for the other stuff */ -typedef struct _meshtastic_DeviceState { +typedef struct _DeviceState { /* Read only settings/info about this node */ bool has_my_node; - meshtastic_MyNodeInfo my_node; + MyNodeInfo my_node; /* My owner info */ bool has_owner; - meshtastic_User owner; + User owner; /* TODO: REPLACE */ pb_size_t node_db_count; - meshtastic_NodeInfo node_db[80]; + NodeInfo node_db[80]; /* Received packets saved for delivery to the phone */ pb_size_t receive_queue_count; - meshtastic_MeshPacket receive_queue[1]; + MeshPacket receive_queue[1]; /* We keep the last received text message (only) stored in the device flash, so we can show it on the screen. Might be null */ bool has_rx_text_message; - meshtastic_MeshPacket rx_text_message; + MeshPacket rx_text_message; /* A version integer used to invalidate old save files when we make incompatible changes This integer is set at build time and is private to NodeDB.cpp in the device code. */ @@ -55,37 +55,37 @@ typedef struct _meshtastic_DeviceState { bool no_save; /* Some GPSes seem to have bogus settings from the factory, so we always do one factory reset. */ bool did_gps_reset; -} meshtastic_DeviceState; +} DeviceState; /* The on-disk saved channels */ -typedef struct _meshtastic_ChannelFile { +typedef struct _ChannelFile { /* The channels our node knows about */ pb_size_t channels_count; - meshtastic_Channel channels[8]; + Channel channels[8]; /* A version integer used to invalidate old save files when we make incompatible changes This integer is set at build time and is private to NodeDB.cpp in the device code. */ uint32_t version; -} meshtastic_ChannelFile; +} ChannelFile; -typedef PB_BYTES_ARRAY_T(2048) meshtastic_OEMStore_oem_icon_bits_t; -typedef PB_BYTES_ARRAY_T(32) meshtastic_OEMStore_oem_aes_key_t; +typedef PB_BYTES_ARRAY_T(2048) OEMStore_oem_icon_bits_t; +typedef PB_BYTES_ARRAY_T(32) OEMStore_oem_aes_key_t; /* This can be used for customizing the firmware distribution. If populated, show a secondary bootup screen with cuatom logo and text for 2.5 seconds. */ -typedef struct _meshtastic_OEMStore { +typedef struct _OEMStore { /* The Logo width in Px */ uint32_t oem_icon_width; /* The Logo height in Px */ uint32_t oem_icon_height; /* The Logo in xbm bytechar format */ - meshtastic_OEMStore_oem_icon_bits_t oem_icon_bits; + OEMStore_oem_icon_bits_t oem_icon_bits; /* Use this font for the OEM text. */ - meshtastic_ScreenFonts oem_font; + ScreenFonts oem_font; /* Use this font for the OEM text. */ char oem_text[40]; /* The default device encryption key, 16 or 32 byte */ - meshtastic_OEMStore_oem_aes_key_t oem_aes_key; -} meshtastic_OEMStore; + OEMStore_oem_aes_key_t oem_aes_key; +} OEMStore; #ifdef __cplusplus @@ -93,43 +93,43 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_ScreenFonts_MIN meshtastic_ScreenFonts_FONT_SMALL -#define _meshtastic_ScreenFonts_MAX meshtastic_ScreenFonts_FONT_LARGE -#define _meshtastic_ScreenFonts_ARRAYSIZE ((meshtastic_ScreenFonts)(meshtastic_ScreenFonts_FONT_LARGE+1)) +#define _ScreenFonts_MIN ScreenFonts_FONT_SMALL +#define _ScreenFonts_MAX ScreenFonts_FONT_LARGE +#define _ScreenFonts_ARRAYSIZE ((ScreenFonts)(ScreenFonts_FONT_LARGE+1)) -#define meshtastic_OEMStore_oem_font_ENUMTYPE meshtastic_ScreenFonts +#define OEMStore_oem_font_ENUMTYPE ScreenFonts /* Initializer values for message structs */ -#define meshtastic_DeviceState_init_default {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default, meshtastic_NodeInfo_init_default}, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0} -#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} -#define meshtastic_OEMStore_init_default {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}} -#define meshtastic_DeviceState_init_zero {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero, meshtastic_NodeInfo_init_zero}, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0} -#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} -#define meshtastic_OEMStore_init_zero {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}} +#define DeviceState_init_default {false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0, 0, 0} +#define ChannelFile_init_default {0, {Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default}, 0} +#define OEMStore_init_default {0, 0, {0, {0}}, _ScreenFonts_MIN, "", {0, {0}}} +#define DeviceState_init_zero {false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0, 0, 0} +#define ChannelFile_init_zero {0, {Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero}, 0} +#define OEMStore_init_zero {0, 0, {0, {0}}, _ScreenFonts_MIN, "", {0, {0}}} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_DeviceState_my_node_tag 2 -#define meshtastic_DeviceState_owner_tag 3 -#define meshtastic_DeviceState_node_db_tag 4 -#define meshtastic_DeviceState_receive_queue_tag 5 -#define meshtastic_DeviceState_rx_text_message_tag 7 -#define meshtastic_DeviceState_version_tag 8 -#define meshtastic_DeviceState_no_save_tag 9 -#define meshtastic_DeviceState_did_gps_reset_tag 11 -#define meshtastic_ChannelFile_channels_tag 1 -#define meshtastic_ChannelFile_version_tag 2 -#define meshtastic_OEMStore_oem_icon_width_tag 1 -#define meshtastic_OEMStore_oem_icon_height_tag 2 -#define meshtastic_OEMStore_oem_icon_bits_tag 3 -#define meshtastic_OEMStore_oem_font_tag 4 -#define meshtastic_OEMStore_oem_text_tag 5 -#define meshtastic_OEMStore_oem_aes_key_tag 6 +#define DeviceState_my_node_tag 2 +#define DeviceState_owner_tag 3 +#define DeviceState_node_db_tag 4 +#define DeviceState_receive_queue_tag 5 +#define DeviceState_rx_text_message_tag 7 +#define DeviceState_version_tag 8 +#define DeviceState_no_save_tag 9 +#define DeviceState_did_gps_reset_tag 11 +#define ChannelFile_channels_tag 1 +#define ChannelFile_version_tag 2 +#define OEMStore_oem_icon_width_tag 1 +#define OEMStore_oem_icon_height_tag 2 +#define OEMStore_oem_icon_bits_tag 3 +#define OEMStore_oem_font_tag 4 +#define OEMStore_oem_text_tag 5 +#define OEMStore_oem_aes_key_tag 6 /* Struct field encoding specification for nanopb */ -#define meshtastic_DeviceState_FIELDLIST(X, a) \ +#define DeviceState_FIELDLIST(X, a) \ X(a, STATIC, OPTIONAL, MESSAGE, my_node, 2) \ X(a, STATIC, OPTIONAL, MESSAGE, owner, 3) \ X(a, STATIC, REPEATED, MESSAGE, node_db, 4) \ @@ -138,44 +138,44 @@ X(a, STATIC, OPTIONAL, MESSAGE, rx_text_message, 7) \ X(a, STATIC, SINGULAR, UINT32, version, 8) \ X(a, STATIC, SINGULAR, BOOL, no_save, 9) \ X(a, STATIC, SINGULAR, BOOL, did_gps_reset, 11) -#define meshtastic_DeviceState_CALLBACK NULL -#define meshtastic_DeviceState_DEFAULT NULL -#define meshtastic_DeviceState_my_node_MSGTYPE meshtastic_MyNodeInfo -#define meshtastic_DeviceState_owner_MSGTYPE meshtastic_User -#define meshtastic_DeviceState_node_db_MSGTYPE meshtastic_NodeInfo -#define meshtastic_DeviceState_receive_queue_MSGTYPE meshtastic_MeshPacket -#define meshtastic_DeviceState_rx_text_message_MSGTYPE meshtastic_MeshPacket +#define DeviceState_CALLBACK NULL +#define DeviceState_DEFAULT NULL +#define DeviceState_my_node_MSGTYPE MyNodeInfo +#define DeviceState_owner_MSGTYPE User +#define DeviceState_node_db_MSGTYPE NodeInfo +#define DeviceState_receive_queue_MSGTYPE MeshPacket +#define DeviceState_rx_text_message_MSGTYPE MeshPacket -#define meshtastic_ChannelFile_FIELDLIST(X, a) \ +#define ChannelFile_FIELDLIST(X, a) \ X(a, STATIC, REPEATED, MESSAGE, channels, 1) \ X(a, STATIC, SINGULAR, UINT32, version, 2) -#define meshtastic_ChannelFile_CALLBACK NULL -#define meshtastic_ChannelFile_DEFAULT NULL -#define meshtastic_ChannelFile_channels_MSGTYPE meshtastic_Channel +#define ChannelFile_CALLBACK NULL +#define ChannelFile_DEFAULT NULL +#define ChannelFile_channels_MSGTYPE Channel -#define meshtastic_OEMStore_FIELDLIST(X, a) \ +#define OEMStore_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, oem_icon_width, 1) \ X(a, STATIC, SINGULAR, UINT32, oem_icon_height, 2) \ X(a, STATIC, SINGULAR, BYTES, oem_icon_bits, 3) \ X(a, STATIC, SINGULAR, UENUM, oem_font, 4) \ X(a, STATIC, SINGULAR, STRING, oem_text, 5) \ X(a, STATIC, SINGULAR, BYTES, oem_aes_key, 6) -#define meshtastic_OEMStore_CALLBACK NULL -#define meshtastic_OEMStore_DEFAULT NULL +#define OEMStore_CALLBACK NULL +#define OEMStore_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_DeviceState_msg; -extern const pb_msgdesc_t meshtastic_ChannelFile_msg; -extern const pb_msgdesc_t meshtastic_OEMStore_msg; +extern const pb_msgdesc_t DeviceState_msg; +extern const pb_msgdesc_t ChannelFile_msg; +extern const pb_msgdesc_t OEMStore_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_DeviceState_fields &meshtastic_DeviceState_msg -#define meshtastic_ChannelFile_fields &meshtastic_ChannelFile_msg -#define meshtastic_OEMStore_fields &meshtastic_OEMStore_msg +#define DeviceState_fields &DeviceState_msg +#define ChannelFile_fields &ChannelFile_msg +#define OEMStore_fields &OEMStore_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_ChannelFile_size 638 -#define meshtastic_DeviceState_size 21800 -#define meshtastic_OEMStore_size 2140 +#define ChannelFile_size 638 +#define DeviceState_size 21800 +#define OEMStore_size 2140 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/localonly.pb.c b/src/mesh/generated/meshtastic/localonly.pb.c index 4b62403d6..b6be65c46 100644 --- a/src/mesh/generated/meshtastic/localonly.pb.c +++ b/src/mesh/generated/meshtastic/localonly.pb.c @@ -6,10 +6,10 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_LocalConfig, meshtastic_LocalConfig, 2) +PB_BIND(LocalConfig, LocalConfig, 2) -PB_BIND(meshtastic_LocalModuleConfig, meshtastic_LocalModuleConfig, 2) +PB_BIND(LocalModuleConfig, LocalModuleConfig, 2) diff --git a/src/mesh/generated/meshtastic/localonly.pb.h b/src/mesh/generated/meshtastic/localonly.pb.h index 582523abe..39d99157d 100644 --- a/src/mesh/generated/meshtastic/localonly.pb.h +++ b/src/mesh/generated/meshtastic/localonly.pb.h @@ -12,67 +12,67 @@ #endif /* Struct definitions */ -typedef struct _meshtastic_LocalConfig { +typedef struct _LocalConfig { /* The part of the config that is specific to the Device */ bool has_device; - meshtastic_Config_DeviceConfig device; + Config_DeviceConfig device; /* The part of the config that is specific to the GPS Position */ bool has_position; - meshtastic_Config_PositionConfig position; + Config_PositionConfig position; /* The part of the config that is specific to the Power settings */ bool has_power; - meshtastic_Config_PowerConfig power; + Config_PowerConfig power; /* The part of the config that is specific to the Wifi Settings */ bool has_network; - meshtastic_Config_NetworkConfig network; + Config_NetworkConfig network; /* The part of the config that is specific to the Display */ bool has_display; - meshtastic_Config_DisplayConfig display; + Config_DisplayConfig display; /* The part of the config that is specific to the Lora Radio */ bool has_lora; - meshtastic_Config_LoRaConfig lora; + Config_LoRaConfig lora; /* The part of the config that is specific to the Bluetooth settings */ bool has_bluetooth; - meshtastic_Config_BluetoothConfig bluetooth; + Config_BluetoothConfig bluetooth; /* A version integer used to invalidate old save files when we make incompatible changes This integer is set at build time and is private to NodeDB.cpp in the device code. */ uint32_t version; -} meshtastic_LocalConfig; +} LocalConfig; -typedef struct _meshtastic_LocalModuleConfig { +typedef struct _LocalModuleConfig { /* The part of the config that is specific to the MQTT module */ bool has_mqtt; - meshtastic_ModuleConfig_MQTTConfig mqtt; + ModuleConfig_MQTTConfig mqtt; /* The part of the config that is specific to the Serial module */ bool has_serial; - meshtastic_ModuleConfig_SerialConfig serial; + ModuleConfig_SerialConfig serial; /* The part of the config that is specific to the ExternalNotification module */ bool has_external_notification; - meshtastic_ModuleConfig_ExternalNotificationConfig external_notification; + ModuleConfig_ExternalNotificationConfig external_notification; /* The part of the config that is specific to the Store & Forward module */ bool has_store_forward; - meshtastic_ModuleConfig_StoreForwardConfig store_forward; + ModuleConfig_StoreForwardConfig store_forward; /* The part of the config that is specific to the RangeTest module */ bool has_range_test; - meshtastic_ModuleConfig_RangeTestConfig range_test; + ModuleConfig_RangeTestConfig range_test; /* The part of the config that is specific to the Telemetry module */ bool has_telemetry; - meshtastic_ModuleConfig_TelemetryConfig telemetry; + ModuleConfig_TelemetryConfig telemetry; /* The part of the config that is specific to the Canned Message module */ bool has_canned_message; - meshtastic_ModuleConfig_CannedMessageConfig canned_message; + ModuleConfig_CannedMessageConfig canned_message; /* A version integer used to invalidate old save files when we make incompatible changes This integer is set at build time and is private to NodeDB.cpp in the device code. */ uint32_t version; /* The part of the config that is specific to the Audio module */ bool has_audio; - meshtastic_ModuleConfig_AudioConfig audio; + ModuleConfig_AudioConfig audio; /* The part of the config that is specific to the Remote Hardware module */ bool has_remote_hardware; - meshtastic_ModuleConfig_RemoteHardwareConfig remote_hardware; -} meshtastic_LocalModuleConfig; + ModuleConfig_RemoteHardwareConfig remote_hardware; +} LocalModuleConfig; #ifdef __cplusplus @@ -80,33 +80,33 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_LocalConfig_init_default {false, meshtastic_Config_DeviceConfig_init_default, false, meshtastic_Config_PositionConfig_init_default, false, meshtastic_Config_PowerConfig_init_default, false, meshtastic_Config_NetworkConfig_init_default, false, meshtastic_Config_DisplayConfig_init_default, false, meshtastic_Config_LoRaConfig_init_default, false, meshtastic_Config_BluetoothConfig_init_default, 0} -#define meshtastic_LocalModuleConfig_init_default {false, meshtastic_ModuleConfig_MQTTConfig_init_default, false, meshtastic_ModuleConfig_SerialConfig_init_default, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_default, false, meshtastic_ModuleConfig_StoreForwardConfig_init_default, false, meshtastic_ModuleConfig_RangeTestConfig_init_default, false, meshtastic_ModuleConfig_TelemetryConfig_init_default, false, meshtastic_ModuleConfig_CannedMessageConfig_init_default, 0, false, meshtastic_ModuleConfig_AudioConfig_init_default, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_default} -#define meshtastic_LocalConfig_init_zero {false, meshtastic_Config_DeviceConfig_init_zero, false, meshtastic_Config_PositionConfig_init_zero, false, meshtastic_Config_PowerConfig_init_zero, false, meshtastic_Config_NetworkConfig_init_zero, false, meshtastic_Config_DisplayConfig_init_zero, false, meshtastic_Config_LoRaConfig_init_zero, false, meshtastic_Config_BluetoothConfig_init_zero, 0} -#define meshtastic_LocalModuleConfig_init_zero {false, meshtastic_ModuleConfig_MQTTConfig_init_zero, false, meshtastic_ModuleConfig_SerialConfig_init_zero, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero, false, meshtastic_ModuleConfig_StoreForwardConfig_init_zero, false, meshtastic_ModuleConfig_RangeTestConfig_init_zero, false, meshtastic_ModuleConfig_TelemetryConfig_init_zero, false, meshtastic_ModuleConfig_CannedMessageConfig_init_zero, 0, false, meshtastic_ModuleConfig_AudioConfig_init_zero, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero} +#define LocalConfig_init_default {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_NetworkConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_init_default, false, Config_BluetoothConfig_init_default, 0} +#define LocalModuleConfig_init_default {false, ModuleConfig_MQTTConfig_init_default, false, ModuleConfig_SerialConfig_init_default, false, ModuleConfig_ExternalNotificationConfig_init_default, false, ModuleConfig_StoreForwardConfig_init_default, false, ModuleConfig_RangeTestConfig_init_default, false, ModuleConfig_TelemetryConfig_init_default, false, ModuleConfig_CannedMessageConfig_init_default, 0, false, ModuleConfig_AudioConfig_init_default, false, ModuleConfig_RemoteHardwareConfig_init_default} +#define LocalConfig_init_zero {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_NetworkConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_init_zero, false, Config_BluetoothConfig_init_zero, 0} +#define LocalModuleConfig_init_zero {false, ModuleConfig_MQTTConfig_init_zero, false, ModuleConfig_SerialConfig_init_zero, false, ModuleConfig_ExternalNotificationConfig_init_zero, false, ModuleConfig_StoreForwardConfig_init_zero, false, ModuleConfig_RangeTestConfig_init_zero, false, ModuleConfig_TelemetryConfig_init_zero, false, ModuleConfig_CannedMessageConfig_init_zero, 0, false, ModuleConfig_AudioConfig_init_zero, false, ModuleConfig_RemoteHardwareConfig_init_zero} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_LocalConfig_device_tag 1 -#define meshtastic_LocalConfig_position_tag 2 -#define meshtastic_LocalConfig_power_tag 3 -#define meshtastic_LocalConfig_network_tag 4 -#define meshtastic_LocalConfig_display_tag 5 -#define meshtastic_LocalConfig_lora_tag 6 -#define meshtastic_LocalConfig_bluetooth_tag 7 -#define meshtastic_LocalConfig_version_tag 8 -#define meshtastic_LocalModuleConfig_mqtt_tag 1 -#define meshtastic_LocalModuleConfig_serial_tag 2 -#define meshtastic_LocalModuleConfig_external_notification_tag 3 -#define meshtastic_LocalModuleConfig_store_forward_tag 4 -#define meshtastic_LocalModuleConfig_range_test_tag 5 -#define meshtastic_LocalModuleConfig_telemetry_tag 6 -#define meshtastic_LocalModuleConfig_canned_message_tag 7 -#define meshtastic_LocalModuleConfig_version_tag 8 -#define meshtastic_LocalModuleConfig_audio_tag 9 -#define meshtastic_LocalModuleConfig_remote_hardware_tag 10 +#define LocalConfig_device_tag 1 +#define LocalConfig_position_tag 2 +#define LocalConfig_power_tag 3 +#define LocalConfig_network_tag 4 +#define LocalConfig_display_tag 5 +#define LocalConfig_lora_tag 6 +#define LocalConfig_bluetooth_tag 7 +#define LocalConfig_version_tag 8 +#define LocalModuleConfig_mqtt_tag 1 +#define LocalModuleConfig_serial_tag 2 +#define LocalModuleConfig_external_notification_tag 3 +#define LocalModuleConfig_store_forward_tag 4 +#define LocalModuleConfig_range_test_tag 5 +#define LocalModuleConfig_telemetry_tag 6 +#define LocalModuleConfig_canned_message_tag 7 +#define LocalModuleConfig_version_tag 8 +#define LocalModuleConfig_audio_tag 9 +#define LocalModuleConfig_remote_hardware_tag 10 /* Struct field encoding specification for nanopb */ -#define meshtastic_LocalConfig_FIELDLIST(X, a) \ +#define LocalConfig_FIELDLIST(X, a) \ X(a, STATIC, OPTIONAL, MESSAGE, device, 1) \ X(a, STATIC, OPTIONAL, MESSAGE, position, 2) \ X(a, STATIC, OPTIONAL, MESSAGE, power, 3) \ @@ -115,17 +115,17 @@ X(a, STATIC, OPTIONAL, MESSAGE, display, 5) \ X(a, STATIC, OPTIONAL, MESSAGE, lora, 6) \ X(a, STATIC, OPTIONAL, MESSAGE, bluetooth, 7) \ X(a, STATIC, SINGULAR, UINT32, version, 8) -#define meshtastic_LocalConfig_CALLBACK NULL -#define meshtastic_LocalConfig_DEFAULT NULL -#define meshtastic_LocalConfig_device_MSGTYPE meshtastic_Config_DeviceConfig -#define meshtastic_LocalConfig_position_MSGTYPE meshtastic_Config_PositionConfig -#define meshtastic_LocalConfig_power_MSGTYPE meshtastic_Config_PowerConfig -#define meshtastic_LocalConfig_network_MSGTYPE meshtastic_Config_NetworkConfig -#define meshtastic_LocalConfig_display_MSGTYPE meshtastic_Config_DisplayConfig -#define meshtastic_LocalConfig_lora_MSGTYPE meshtastic_Config_LoRaConfig -#define meshtastic_LocalConfig_bluetooth_MSGTYPE meshtastic_Config_BluetoothConfig +#define LocalConfig_CALLBACK NULL +#define LocalConfig_DEFAULT NULL +#define LocalConfig_device_MSGTYPE Config_DeviceConfig +#define LocalConfig_position_MSGTYPE Config_PositionConfig +#define LocalConfig_power_MSGTYPE Config_PowerConfig +#define LocalConfig_network_MSGTYPE Config_NetworkConfig +#define LocalConfig_display_MSGTYPE Config_DisplayConfig +#define LocalConfig_lora_MSGTYPE Config_LoRaConfig +#define LocalConfig_bluetooth_MSGTYPE Config_BluetoothConfig -#define meshtastic_LocalModuleConfig_FIELDLIST(X, a) \ +#define LocalModuleConfig_FIELDLIST(X, a) \ X(a, STATIC, OPTIONAL, MESSAGE, mqtt, 1) \ X(a, STATIC, OPTIONAL, MESSAGE, serial, 2) \ X(a, STATIC, OPTIONAL, MESSAGE, external_notification, 3) \ @@ -136,28 +136,28 @@ X(a, STATIC, OPTIONAL, MESSAGE, canned_message, 7) \ X(a, STATIC, SINGULAR, UINT32, version, 8) \ X(a, STATIC, OPTIONAL, MESSAGE, audio, 9) \ X(a, STATIC, OPTIONAL, MESSAGE, remote_hardware, 10) -#define meshtastic_LocalModuleConfig_CALLBACK NULL -#define meshtastic_LocalModuleConfig_DEFAULT NULL -#define meshtastic_LocalModuleConfig_mqtt_MSGTYPE meshtastic_ModuleConfig_MQTTConfig -#define meshtastic_LocalModuleConfig_serial_MSGTYPE meshtastic_ModuleConfig_SerialConfig -#define meshtastic_LocalModuleConfig_external_notification_MSGTYPE meshtastic_ModuleConfig_ExternalNotificationConfig -#define meshtastic_LocalModuleConfig_store_forward_MSGTYPE meshtastic_ModuleConfig_StoreForwardConfig -#define meshtastic_LocalModuleConfig_range_test_MSGTYPE meshtastic_ModuleConfig_RangeTestConfig -#define meshtastic_LocalModuleConfig_telemetry_MSGTYPE meshtastic_ModuleConfig_TelemetryConfig -#define meshtastic_LocalModuleConfig_canned_message_MSGTYPE meshtastic_ModuleConfig_CannedMessageConfig -#define meshtastic_LocalModuleConfig_audio_MSGTYPE meshtastic_ModuleConfig_AudioConfig -#define meshtastic_LocalModuleConfig_remote_hardware_MSGTYPE meshtastic_ModuleConfig_RemoteHardwareConfig +#define LocalModuleConfig_CALLBACK NULL +#define LocalModuleConfig_DEFAULT NULL +#define LocalModuleConfig_mqtt_MSGTYPE ModuleConfig_MQTTConfig +#define LocalModuleConfig_serial_MSGTYPE ModuleConfig_SerialConfig +#define LocalModuleConfig_external_notification_MSGTYPE ModuleConfig_ExternalNotificationConfig +#define LocalModuleConfig_store_forward_MSGTYPE ModuleConfig_StoreForwardConfig +#define LocalModuleConfig_range_test_MSGTYPE ModuleConfig_RangeTestConfig +#define LocalModuleConfig_telemetry_MSGTYPE ModuleConfig_TelemetryConfig +#define LocalModuleConfig_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig +#define LocalModuleConfig_audio_MSGTYPE ModuleConfig_AudioConfig +#define LocalModuleConfig_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig -extern const pb_msgdesc_t meshtastic_LocalConfig_msg; -extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg; +extern const pb_msgdesc_t LocalConfig_msg; +extern const pb_msgdesc_t LocalModuleConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_LocalConfig_fields &meshtastic_LocalConfig_msg -#define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg +#define LocalConfig_fields &LocalConfig_msg +#define LocalModuleConfig_fields &LocalModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_LocalConfig_size 391 -#define meshtastic_LocalModuleConfig_size 412 +#define LocalConfig_size 391 +#define LocalModuleConfig_size 412 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/mesh.pb.c b/src/mesh/generated/meshtastic/mesh.pb.c index ec61edf7f..bc9af848f 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.c +++ b/src/mesh/generated/meshtastic/mesh.pb.c @@ -6,46 +6,46 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_Position, meshtastic_Position, AUTO) +PB_BIND(Position, Position, AUTO) -PB_BIND(meshtastic_User, meshtastic_User, AUTO) +PB_BIND(User, User, AUTO) -PB_BIND(meshtastic_RouteDiscovery, meshtastic_RouteDiscovery, AUTO) +PB_BIND(RouteDiscovery, RouteDiscovery, AUTO) -PB_BIND(meshtastic_Routing, meshtastic_Routing, AUTO) +PB_BIND(Routing, Routing, AUTO) -PB_BIND(meshtastic_Data, meshtastic_Data, 2) +PB_BIND(Data, Data, 2) -PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO) +PB_BIND(Waypoint, Waypoint, AUTO) -PB_BIND(meshtastic_MeshPacket, meshtastic_MeshPacket, 2) +PB_BIND(MeshPacket, MeshPacket, 2) -PB_BIND(meshtastic_NodeInfo, meshtastic_NodeInfo, AUTO) +PB_BIND(NodeInfo, NodeInfo, AUTO) -PB_BIND(meshtastic_MyNodeInfo, meshtastic_MyNodeInfo, AUTO) +PB_BIND(MyNodeInfo, MyNodeInfo, AUTO) -PB_BIND(meshtastic_LogRecord, meshtastic_LogRecord, AUTO) +PB_BIND(LogRecord, LogRecord, AUTO) -PB_BIND(meshtastic_QueueStatus, meshtastic_QueueStatus, AUTO) +PB_BIND(QueueStatus, QueueStatus, AUTO) -PB_BIND(meshtastic_FromRadio, meshtastic_FromRadio, 2) +PB_BIND(FromRadio, FromRadio, 2) -PB_BIND(meshtastic_ToRadio, meshtastic_ToRadio, 2) +PB_BIND(ToRadio, ToRadio, 2) -PB_BIND(meshtastic_Compressed, meshtastic_Compressed, AUTO) +PB_BIND(Compressed, Compressed, AUTO) diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 0623a327c..98cf8238b 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -20,179 +20,179 @@ bin/build-all.sh script. Because they will be used to find firmware filenames in the android app for OTA updates. To match the old style filenames, _ is converted to -, p is converted to . */ -typedef enum _meshtastic_HardwareModel { +typedef enum _HardwareModel { /* TODO: REPLACE */ - meshtastic_HardwareModel_UNSET = 0, + HardwareModel_UNSET = 0, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_V2 = 1, + HardwareModel_TLORA_V2 = 1, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_V1 = 2, + HardwareModel_TLORA_V1 = 2, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_V2_1_1P6 = 3, + HardwareModel_TLORA_V2_1_1P6 = 3, /* TODO: REPLACE */ - meshtastic_HardwareModel_TBEAM = 4, + HardwareModel_TBEAM = 4, /* The original heltec WiFi_Lora_32_V2, which had battery voltage sensing hooked to GPIO 13 (see HELTEC_V2 for the new version). */ - meshtastic_HardwareModel_HELTEC_V2_0 = 5, + HardwareModel_HELTEC_V2_0 = 5, /* TODO: REPLACE */ - meshtastic_HardwareModel_TBEAM_V0P7 = 6, + HardwareModel_TBEAM_V0P7 = 6, /* TODO: REPLACE */ - meshtastic_HardwareModel_T_ECHO = 7, + HardwareModel_T_ECHO = 7, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_V1_1P3 = 8, + HardwareModel_TLORA_V1_1P3 = 8, /* TODO: REPLACE */ - meshtastic_HardwareModel_RAK4631 = 9, + HardwareModel_RAK4631 = 9, /* The new version of the heltec WiFi_Lora_32_V2 board that has battery sensing hooked to GPIO 37. Sadly they did not update anything on the silkscreen to identify this board */ - meshtastic_HardwareModel_HELTEC_V2_1 = 10, + HardwareModel_HELTEC_V2_1 = 10, /* Ancient heltec WiFi_Lora_32 board */ - meshtastic_HardwareModel_HELTEC_V1 = 11, + HardwareModel_HELTEC_V1 = 11, /* New T-BEAM with ESP32-S3 CPU */ - meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE = 12, + HardwareModel_LILYGO_TBEAM_S3_CORE = 12, /* RAK WisBlock ESP32 core: https://docs.rakwireless.com/Product-Categories/WisBlock/RAK11200/Overview/ */ - meshtastic_HardwareModel_RAK11200 = 13, + HardwareModel_RAK11200 = 13, /* B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano */ - meshtastic_HardwareModel_NANO_G1 = 14, + HardwareModel_NANO_G1 = 14, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_V2_1_1P8 = 15, + HardwareModel_TLORA_V2_1_1P8 = 15, /* TODO: REPLACE */ - meshtastic_HardwareModel_TLORA_T3_S3 = 16, + HardwareModel_TLORA_T3_S3 = 16, /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */ - meshtastic_HardwareModel_STATION_G1 = 25, + HardwareModel_STATION_G1 = 25, /* Less common/prototype boards listed here (needs one more byte over the air) */ - meshtastic_HardwareModel_LORA_RELAY_V1 = 32, + HardwareModel_LORA_RELAY_V1 = 32, /* TODO: REPLACE */ - meshtastic_HardwareModel_NRF52840DK = 33, + HardwareModel_NRF52840DK = 33, /* TODO: REPLACE */ - meshtastic_HardwareModel_PPR = 34, + HardwareModel_PPR = 34, /* TODO: REPLACE */ - meshtastic_HardwareModel_GENIEBLOCKS = 35, + HardwareModel_GENIEBLOCKS = 35, /* TODO: REPLACE */ - meshtastic_HardwareModel_NRF52_UNKNOWN = 36, + HardwareModel_NRF52_UNKNOWN = 36, /* TODO: REPLACE */ - meshtastic_HardwareModel_PORTDUINO = 37, + HardwareModel_PORTDUINO = 37, /* The simulator built into the android app */ - meshtastic_HardwareModel_ANDROID_SIM = 38, + HardwareModel_ANDROID_SIM = 38, /* Custom DIY device based on @NanoVHF schematics: https://github.com/NanoVHF/Meshtastic-DIY/tree/main/Schematics */ - meshtastic_HardwareModel_DIY_V1 = 39, + HardwareModel_DIY_V1 = 39, /* nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ */ - meshtastic_HardwareModel_NRF52840_PCA10059 = 40, + HardwareModel_NRF52840_PCA10059 = 40, /* Custom Disaster Radio esp32 v3 device https://github.com/sudomesh/disaster-radio/tree/master/hardware/board_esp32_v3 */ - meshtastic_HardwareModel_DR_DEV = 41, + HardwareModel_DR_DEV = 41, /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */ - meshtastic_HardwareModel_M5STACK = 42, + HardwareModel_M5STACK = 42, /* New Heltec LoRA32 with ESP32-S3 CPU */ - meshtastic_HardwareModel_HELTEC_V3 = 43, + HardwareModel_HELTEC_V3 = 43, /* New Heltec Wireless Stick Lite with ESP32-S3 CPU */ - meshtastic_HardwareModel_HELTEC_WSL_V3 = 44, + HardwareModel_HELTEC_WSL_V3 = 44, /* New BETAFPV ELRS Micro TX Module 2.4G with ESP32 CPU */ - meshtastic_HardwareModel_BETAFPV_2400_TX = 45, + HardwareModel_BETAFPV_2400_TX = 45, /* 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. */ - meshtastic_HardwareModel_PRIVATE_HW = 255 -} meshtastic_HardwareModel; + HardwareModel_PRIVATE_HW = 255 +} HardwareModel; /* Shared constants between device and phone */ -typedef enum _meshtastic_Constants { +typedef enum _Constants { /* First enum must be zero, and we are just using this enum to pass int constants between two very different environments */ - meshtastic_Constants_ZERO = 0, + Constants_ZERO = 0, /* 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 outside of this envelope */ - meshtastic_Constants_DATA_PAYLOAD_LEN = 237 -} meshtastic_Constants; + Constants_DATA_PAYLOAD_LEN = 237 +} Constants; /* Error codes for critical errors The device might report these fault codes on the screen. If you encounter a fault code, please post on the meshtastic.discourse.group and we'll try to help. */ -typedef enum _meshtastic_CriticalErrorCode { +typedef enum _CriticalErrorCode { /* TODO: REPLACE */ - meshtastic_CriticalErrorCode_NONE = 0, + CriticalErrorCode_NONE = 0, /* A software bug was detected while trying to send lora */ - meshtastic_CriticalErrorCode_TX_WATCHDOG = 1, + CriticalErrorCode_TX_WATCHDOG = 1, /* A software bug was detected on entry to sleep */ - meshtastic_CriticalErrorCode_SLEEP_ENTER_WAIT = 2, + CriticalErrorCode_SLEEP_ENTER_WAIT = 2, /* No Lora radio hardware could be found */ - meshtastic_CriticalErrorCode_NO_RADIO = 3, + CriticalErrorCode_NO_RADIO = 3, /* Not normally used */ - meshtastic_CriticalErrorCode_UNSPECIFIED = 4, + CriticalErrorCode_UNSPECIFIED = 4, /* We failed while configuring a UBlox GPS */ - meshtastic_CriticalErrorCode_UBLOX_UNIT_FAILED = 5, + CriticalErrorCode_UBLOX_UNIT_FAILED = 5, /* This board was expected to have a power management chip and it is missing or broken */ - meshtastic_CriticalErrorCode_NO_AXP192 = 6, + CriticalErrorCode_NO_AXP192 = 6, /* The channel tried to set a radio setting which is not supported by this chipset, radio comms settings are now undefined. */ - meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING = 7, + CriticalErrorCode_INVALID_RADIO_SETTING = 7, /* Radio transmit hardware failure. We sent data to the radio chip, but it didn't reply with an interrupt. */ - meshtastic_CriticalErrorCode_TRANSMIT_FAILED = 8, + CriticalErrorCode_TRANSMIT_FAILED = 8, /* We detected that the main CPU voltage dropped below the minumum acceptable value */ - meshtastic_CriticalErrorCode_BROWNOUT = 9, + CriticalErrorCode_BROWNOUT = 9, /* Selftest of SX1262 radio chip failed */ - meshtastic_CriticalErrorCode_SX1262_FAILURE = 10, + CriticalErrorCode_SX1262_FAILURE = 10, /* A (likely software but possibly hardware) failure was detected while trying to send packets. If this occurs on your board, please post in the forum so that we can ask you to collect some information to allow fixing this bug */ - meshtastic_CriticalErrorCode_RADIO_SPI_BUG = 11 -} meshtastic_CriticalErrorCode; + CriticalErrorCode_RADIO_SPI_BUG = 11 +} CriticalErrorCode; /* How the location was acquired: manual, onboard GPS, external (EUD) GPS */ -typedef enum _meshtastic_Position_LocSource { +typedef enum _Position_LocSource { /* TODO: REPLACE */ - meshtastic_Position_LocSource_LOC_UNSET = 0, + Position_LocSource_LOC_UNSET = 0, /* TODO: REPLACE */ - meshtastic_Position_LocSource_LOC_MANUAL = 1, + Position_LocSource_LOC_MANUAL = 1, /* TODO: REPLACE */ - meshtastic_Position_LocSource_LOC_INTERNAL = 2, + Position_LocSource_LOC_INTERNAL = 2, /* TODO: REPLACE */ - meshtastic_Position_LocSource_LOC_EXTERNAL = 3 -} meshtastic_Position_LocSource; + Position_LocSource_LOC_EXTERNAL = 3 +} Position_LocSource; /* How the altitude was acquired: manual, GPS int/ext, etc Default: same as location_source if present */ -typedef enum _meshtastic_Position_AltSource { +typedef enum _Position_AltSource { /* TODO: REPLACE */ - meshtastic_Position_AltSource_ALT_UNSET = 0, + Position_AltSource_ALT_UNSET = 0, /* TODO: REPLACE */ - meshtastic_Position_AltSource_ALT_MANUAL = 1, + Position_AltSource_ALT_MANUAL = 1, /* TODO: REPLACE */ - meshtastic_Position_AltSource_ALT_INTERNAL = 2, + Position_AltSource_ALT_INTERNAL = 2, /* TODO: REPLACE */ - meshtastic_Position_AltSource_ALT_EXTERNAL = 3, + Position_AltSource_ALT_EXTERNAL = 3, /* TODO: REPLACE */ - meshtastic_Position_AltSource_ALT_BAROMETRIC = 4 -} meshtastic_Position_AltSource; + Position_AltSource_ALT_BAROMETRIC = 4 +} Position_AltSource; /* A failure in delivering a message (usually used for routing control messages, but might be provided in addition to ack.fail_id to provide details on the type of failure). */ -typedef enum _meshtastic_Routing_Error { +typedef enum _Routing_Error { /* This message is not a failure */ - meshtastic_Routing_Error_NONE = 0, + Routing_Error_NONE = 0, /* Our node doesn't have a route to the requested destination anymore. */ - meshtastic_Routing_Error_NO_ROUTE = 1, + Routing_Error_NO_ROUTE = 1, /* We received a nak while trying to forward on your behalf */ - meshtastic_Routing_Error_GOT_NAK = 2, + Routing_Error_GOT_NAK = 2, /* TODO: REPLACE */ - meshtastic_Routing_Error_TIMEOUT = 3, + Routing_Error_TIMEOUT = 3, /* No suitable interface could be found for delivering this packet */ - meshtastic_Routing_Error_NO_INTERFACE = 4, + Routing_Error_NO_INTERFACE = 4, /* We reached the max retransmission count (typically for naive flood routing) */ - meshtastic_Routing_Error_MAX_RETRANSMIT = 5, + Routing_Error_MAX_RETRANSMIT = 5, /* No suitable channel was found for sending this packet (i.e. was requested channel index disabled?) */ - meshtastic_Routing_Error_NO_CHANNEL = 6, + Routing_Error_NO_CHANNEL = 6, /* The packet was too big for sending (exceeds interface MTU after encoding) */ - meshtastic_Routing_Error_TOO_LARGE = 7, + Routing_Error_TOO_LARGE = 7, /* The request had want_response set, the request reached the destination node, but no service on that node wants to send a response (possibly due to bad channel permissions) */ - meshtastic_Routing_Error_NO_RESPONSE = 8, + Routing_Error_NO_RESPONSE = 8, /* Cannot send currently because duty cycle regulations will be violated. */ - meshtastic_Routing_Error_DUTY_CYCLE_LIMIT = 9, + Routing_Error_DUTY_CYCLE_LIMIT = 9, /* The application layer service on the remote node received your request, but considered your request somehow invalid */ - meshtastic_Routing_Error_BAD_REQUEST = 32, + Routing_Error_BAD_REQUEST = 32, /* The application layer service on the remote node received your request, but considered your request not authorized (i.e you did not send the request on the required bound channel) */ - meshtastic_Routing_Error_NOT_AUTHORIZED = 33 -} meshtastic_Routing_Error; + Routing_Error_NOT_AUTHORIZED = 33 +} Routing_Error; /* The priority of this message for sending. Higher priorities are sent first (when managing the transmit queue). @@ -212,57 +212,57 @@ typedef enum _meshtastic_Routing_Error { So I bit the bullet and implemented a new (internal - not sent over the air) field in MeshPacket called ‘priority’. And the transmission queue in the router object is now a priority queue. */ -typedef enum _meshtastic_MeshPacket_Priority { +typedef enum _MeshPacket_Priority { /* Treated as Priority.DEFAULT */ - meshtastic_MeshPacket_Priority_UNSET = 0, + MeshPacket_Priority_UNSET = 0, /* TODO: REPLACE */ - meshtastic_MeshPacket_Priority_MIN = 1, + MeshPacket_Priority_MIN = 1, /* Background position updates are sent with very low priority - if the link is super congested they might not go out at all */ - meshtastic_MeshPacket_Priority_BACKGROUND = 10, + MeshPacket_Priority_BACKGROUND = 10, /* This priority is used for most messages that don't have a priority set */ - meshtastic_MeshPacket_Priority_DEFAULT = 64, + MeshPacket_Priority_DEFAULT = 64, /* If priority is unset but the message is marked as want_ack, assume it is important and use a slightly higher priority */ - meshtastic_MeshPacket_Priority_RELIABLE = 70, + MeshPacket_Priority_RELIABLE = 70, /* Ack/naks are sent with very high priority to ensure that retransmission stops as soon as possible */ - meshtastic_MeshPacket_Priority_ACK = 120, + MeshPacket_Priority_ACK = 120, /* TODO: REPLACE */ - meshtastic_MeshPacket_Priority_MAX = 127 -} meshtastic_MeshPacket_Priority; + MeshPacket_Priority_MAX = 127 +} MeshPacket_Priority; /* Identify if this is a delayed packet */ -typedef enum _meshtastic_MeshPacket_Delayed { +typedef enum _MeshPacket_Delayed { /* If unset, the message is being sent in real time. */ - meshtastic_MeshPacket_Delayed_NO_DELAY = 0, + MeshPacket_Delayed_NO_DELAY = 0, /* The message is delayed and was originally a broadcast */ - meshtastic_MeshPacket_Delayed_DELAYED_BROADCAST = 1, + MeshPacket_Delayed_DELAYED_BROADCAST = 1, /* The message is delayed and was originally a direct message */ - meshtastic_MeshPacket_Delayed_DELAYED_DIRECT = 2 -} meshtastic_MeshPacket_Delayed; + MeshPacket_Delayed_DELAYED_DIRECT = 2 +} MeshPacket_Delayed; /* Log levels, chosen to match python logging conventions. */ -typedef enum _meshtastic_LogRecord_Level { +typedef enum _LogRecord_Level { /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_UNSET = 0, + LogRecord_Level_UNSET = 0, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_CRITICAL = 50, + LogRecord_Level_CRITICAL = 50, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_ERROR = 40, + LogRecord_Level_ERROR = 40, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_WARNING = 30, + LogRecord_Level_WARNING = 30, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_INFO = 20, + LogRecord_Level_INFO = 20, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_DEBUG = 10, + LogRecord_Level_DEBUG = 10, /* Log levels, chosen to match python logging conventions. */ - meshtastic_LogRecord_Level_TRACE = 5 -} meshtastic_LogRecord_Level; + LogRecord_Level_TRACE = 5 +} LogRecord_Level; /* Struct definitions */ /* a gps position */ -typedef struct _meshtastic_Position { +typedef struct _Position { /* The new preferred location encoding, multiply by 1e-7 to get degrees in floating point */ int32_t latitude_i; @@ -277,9 +277,9 @@ typedef struct _meshtastic_Position { seconds since 1970 */ uint32_t time; /* TODO: REPLACE */ - meshtastic_Position_LocSource location_source; + Position_LocSource location_source; /* TODO: REPLACE */ - meshtastic_Position_AltSource altitude_source; + Position_AltSource altitude_source; /* Positional timestamp (actual timestamp of GPS solution) in integer epoch seconds */ uint32_t timestamp; /* Pos. timestamp milliseconds adjustment (rarely available or required) */ @@ -327,7 +327,7 @@ typedef struct _meshtastic_Position { /* A sequence number, incremented with each Position message to help detect lost updates if needed */ uint32_t seq_number; -} meshtastic_Position; +} Position; /* Broadcast when a newly powered mesh node wants to find a node num it can use Sent from the phone over bluetooth to set the user id for the owner of this node. @@ -349,7 +349,7 @@ typedef struct _meshtastic_Position { A few nodenums are reserved and will never be requested: 0xff - broadcast 0 through 3 - for future use */ -typedef struct _meshtastic_User { +typedef struct _User { /* A globally unique ID string for this user. In the case of Signal that would mean +16504442323, for the default macaddr derived id it would be !<8 hexidecimal bytes>. Note: app developers are encouraged to also use the following standard @@ -367,43 +367,43 @@ typedef struct _meshtastic_User { Starting in 1.2.11 moved to hw_model enum in the NodeInfo object. Apps will still need the string here for older builds (so OTA update can find the right image), but if the enum is available it will be used instead. */ - meshtastic_HardwareModel hw_model; + HardwareModel hw_model; /* In some regions Ham radio operators have different bandwidth limitations than others. If this user is a licensed operator, set this flag. Also, "long_name" should be their licence number. */ bool is_licensed; -} meshtastic_User; +} User; /* A message used in our Dynamic Source Routing protocol (RFC 4728 based) */ -typedef struct _meshtastic_RouteDiscovery { +typedef struct _RouteDiscovery { /* The list of nodenums this packet has visited so far */ pb_size_t route_count; uint32_t route[8]; -} meshtastic_RouteDiscovery; +} RouteDiscovery; /* A Routing control Data packet handled by the routing module */ -typedef struct _meshtastic_Routing { +typedef struct _Routing { pb_size_t which_variant; union { /* A route request going from the requester */ - meshtastic_RouteDiscovery route_request; + RouteDiscovery route_request; /* A route reply */ - meshtastic_RouteDiscovery route_reply; + RouteDiscovery route_reply; /* A failure in delivering a message (usually used for routing control messages, but might be provided in addition to ack.fail_id to provide details on the type of failure). */ - meshtastic_Routing_Error error_reason; + Routing_Error error_reason; }; -} meshtastic_Routing; +} Routing; -typedef PB_BYTES_ARRAY_T(237) meshtastic_Data_payload_t; +typedef PB_BYTES_ARRAY_T(237) Data_payload_t; /* (Formerly called SubPacket) 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) */ -typedef struct _meshtastic_Data { +typedef struct _Data { /* Formerly named typ and of type Type */ - meshtastic_PortNum portnum; + PortNum portnum; /* TODO: REPLACE */ - meshtastic_Data_payload_t payload; + Data_payload_t payload; /* Not normally used, but for testing a sender can request that recipient responds in kind (i.e. if it received a position, it should unicast back it's position). Note: that if you set this on a broadcast you will receive many replies. */ @@ -426,10 +426,10 @@ typedef struct _meshtastic_Data { /* Defaults to false. If true, then what is in the payload should be treated as an emoji like giving a message a heart or poop emoji. */ uint32_t emoji; -} meshtastic_Data; +} Data; /* Waypoint message, used to share arbitrary locations across the mesh */ -typedef struct _meshtastic_Waypoint { +typedef struct _Waypoint { /* Id of the waypoint */ uint32_t id; /* latitude_i */ @@ -447,13 +447,13 @@ typedef struct _meshtastic_Waypoint { char description[100]; /* Designator icon for the waypoint in the form of a unicode emoji */ uint32_t icon; -} meshtastic_Waypoint; +} Waypoint; -typedef PB_BYTES_ARRAY_T(256) meshtastic_MeshPacket_encrypted_t; +typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t; /* A packet envelope sent/received over the mesh 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. */ -typedef struct _meshtastic_MeshPacket { +typedef struct _MeshPacket { /* The sending node number. Note: Our crypto implementation uses this field as well. See [crypto](/docs/overview/encryption) for details. @@ -473,9 +473,9 @@ typedef struct _meshtastic_MeshPacket { pb_size_t which_payload_variant; union { /* TODO: REPLACE */ - meshtastic_Data decoded; + Data decoded; /* TODO: REPLACE */ - meshtastic_MeshPacket_encrypted_t encrypted; + MeshPacket_encrypted_t encrypted; }; /* A unique ID for this packet. Always 0 for no-ack packets or non broadcast packets (and therefore take zero bytes of space). @@ -514,12 +514,12 @@ typedef struct _meshtastic_MeshPacket { bool want_ack; /* The priority of this message for sending. See MeshPacket.Priority description for more details. */ - meshtastic_MeshPacket_Priority priority; + MeshPacket_Priority priority; /* rssi of received packet. Only sent to phone for dispay purposes. */ int32_t rx_rssi; /* Describe if this message is delayed */ - meshtastic_MeshPacket_Delayed delayed; -} meshtastic_MeshPacket; + MeshPacket_Delayed delayed; +} MeshPacket; /* The bluetooth to device link: Old BTLE protocol docs from TODO, merge in above and make real docs... @@ -537,16 +537,16 @@ typedef struct _meshtastic_MeshPacket { level etc) SET_CONFIG (switches device to a new set of radio params and preshared key, drops all existing nodes, force our node to rejoin this new group) Full information about a node on the mesh */ -typedef struct _meshtastic_NodeInfo { +typedef struct _NodeInfo { /* The node number */ uint32_t num; /* The user info for this node */ bool has_user; - meshtastic_User user; + User user; /* This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true. Position.time now indicates the last time we received a POSITION from that node. */ bool has_position; - meshtastic_Position position; + Position position; /* Returns the Signal-to-noise ratio (SNR) of the last received message, as measured by the receiver. Return SNR of the last received message in dB */ float snr; @@ -554,13 +554,13 @@ typedef struct _meshtastic_NodeInfo { uint32_t last_heard; /* The latest device metrics for the node. */ bool has_device_metrics; - meshtastic_DeviceMetrics device_metrics; -} meshtastic_NodeInfo; + DeviceMetrics device_metrics; +} NodeInfo; /* Unique local debugging info for this node Note: we don't include position or the user info, because that will come in the Sent to the phone in response to WantNodes. */ -typedef struct _meshtastic_MyNodeInfo { +typedef struct _MyNodeInfo { /* Tells the phone what our node number is, default starting value is lowbyte of macaddr, but it will be fixed if that is already in use */ uint32_t my_node_num; @@ -577,7 +577,7 @@ typedef struct _meshtastic_MyNodeInfo { This field will be cleared after the phone reads MyNodeInfo (i.e. it will only be reported once) a numeric error code to go with error message, zero means no error */ - meshtastic_CriticalErrorCode error_code; + CriticalErrorCode error_code; /* A numeric error address (nonzero if available) */ uint32_t error_address; /* The total number of errors this node has ever encountered @@ -608,14 +608,14 @@ typedef struct _meshtastic_MyNodeInfo { float channel_utilization; /* Percent of airtime for transmission used within the last hour. */ float air_util_tx; -} meshtastic_MyNodeInfo; +} MyNodeInfo; /* Debug output from the device. To minimize the size of records inside the device code, if a time/source/level is not set on the message it is assumed to be a continuation of the previously sent message. This allows the device code to use fixed maxlen 64 byte strings for messages, and then extend as needed by emitting multiple records. */ -typedef struct _meshtastic_LogRecord { +typedef struct _LogRecord { /* Log levels, chosen to match python logging conventions. */ char message[64]; /* Seconds since 1970 - or 0 for unknown/unset */ @@ -623,10 +623,10 @@ typedef struct _meshtastic_LogRecord { /* Usually based on thread name - if known */ char source[8]; /* Not yet set */ - meshtastic_LogRecord_Level level; -} meshtastic_LogRecord; + LogRecord_Level level; +} LogRecord; -typedef struct _meshtastic_QueueStatus { +typedef struct _QueueStatus { /* Last attempt to queue status, ErrorCode */ int8_t res; /* Free entries in the outgoing queue */ @@ -635,30 +635,30 @@ typedef struct _meshtastic_QueueStatus { uint8_t maxlen; /* What was mesh packet id that generated this response? */ uint32_t mesh_packet_id; -} meshtastic_QueueStatus; +} QueueStatus; /* Packets from the radio to the phone will appear on the fromRadio characteristic. It will support READ and NOTIFY. When a new packet arrives the device will BLE notify? It will sit in that descriptor until consumed by the phone, at which point the next item in the FIFO will be populated. */ -typedef struct _meshtastic_FromRadio { +typedef struct _FromRadio { /* The packet id, used to allow the phone to request missing read packets from the FIFO, see our bluetooth docs */ uint32_t id; pb_size_t which_payload_variant; union { /* Log levels, chosen to match python logging conventions. */ - meshtastic_MeshPacket packet; + MeshPacket packet; /* Tells the phone what our node number is, can be -1 if we've not yet joined a mesh. NOTE: This ID must not change - to keep (minimal) compatibility with <1.2 version of android apps. */ - meshtastic_MyNodeInfo my_info; + MyNodeInfo my_info; /* One packet is sent for each node in the on radio DB starts over with the first node in our DB */ - meshtastic_NodeInfo node_info; + NodeInfo node_info; /* Include a part of the config (was: RadioConfig radio) */ - meshtastic_Config config; + Config config; /* Set to send debug console output over our protobuf stream */ - meshtastic_LogRecord log_record; + LogRecord log_record; /* Sent as true once the device has finished sending all of the responses to want_config recipient should check if this ID matches our original request nonce, if not, it means your config responses haven't started yet. @@ -670,23 +670,23 @@ typedef struct _meshtastic_FromRadio { NOTE: This ID must not change - to keep (minimal) compatibility with <1.2 version of android apps. */ bool rebooted; /* Include module config */ - meshtastic_ModuleConfig moduleConfig; + ModuleConfig moduleConfig; /* One packet is sent for each channel */ - meshtastic_Channel channel; + Channel channel; /* Queue status info */ - meshtastic_QueueStatus queueStatus; + QueueStatus queueStatus; /* File Transfer Chunk */ - meshtastic_XModem xmodemPacket; + XModem xmodemPacket; }; -} meshtastic_FromRadio; +} FromRadio; /* Packets/commands to the radio will be written (reliably) to the toRadio characteristic. Once the write completes the phone can assume it is handled. */ -typedef struct _meshtastic_ToRadio { +typedef struct _ToRadio { pb_size_t which_payload_variant; union { /* Send this packet on the mesh */ - meshtastic_MeshPacket packet; + MeshPacket packet; /* Phone wants radio to send full node db to the phone, This is typically the first packet sent to the radio when the phone gets a bluetooth connection. The radio will respond by sending back a @@ -700,18 +700,18 @@ typedef struct _meshtastic_ToRadio { This is useful for serial links where there is no hardware/protocol based notification that the client has dropped the link. (Sending this message is optional for clients) */ bool disconnect; - meshtastic_XModem xmodemPacket; + XModem xmodemPacket; }; -} meshtastic_ToRadio; +} ToRadio; -typedef PB_BYTES_ARRAY_T(237) meshtastic_Compressed_data_t; +typedef PB_BYTES_ARRAY_T(237) Compressed_data_t; /* Compressed message payload */ -typedef struct _meshtastic_Compressed { +typedef struct _Compressed { /* PortNum to determine the how to handle the compressed payload. */ - meshtastic_PortNum portnum; + PortNum portnum; /* Compressed data. */ - meshtastic_Compressed_data_t data; -} meshtastic_Compressed; + Compressed_data_t data; +} Compressed; #ifdef __cplusplus @@ -719,210 +719,210 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_HardwareModel_MIN meshtastic_HardwareModel_UNSET -#define _meshtastic_HardwareModel_MAX meshtastic_HardwareModel_PRIVATE_HW -#define _meshtastic_HardwareModel_ARRAYSIZE ((meshtastic_HardwareModel)(meshtastic_HardwareModel_PRIVATE_HW+1)) +#define _HardwareModel_MIN HardwareModel_UNSET +#define _HardwareModel_MAX HardwareModel_PRIVATE_HW +#define _HardwareModel_ARRAYSIZE ((HardwareModel)(HardwareModel_PRIVATE_HW+1)) -#define _meshtastic_Constants_MIN meshtastic_Constants_ZERO -#define _meshtastic_Constants_MAX meshtastic_Constants_DATA_PAYLOAD_LEN -#define _meshtastic_Constants_ARRAYSIZE ((meshtastic_Constants)(meshtastic_Constants_DATA_PAYLOAD_LEN+1)) +#define _Constants_MIN Constants_ZERO +#define _Constants_MAX Constants_DATA_PAYLOAD_LEN +#define _Constants_ARRAYSIZE ((Constants)(Constants_DATA_PAYLOAD_LEN+1)) -#define _meshtastic_CriticalErrorCode_MIN meshtastic_CriticalErrorCode_NONE -#define _meshtastic_CriticalErrorCode_MAX meshtastic_CriticalErrorCode_RADIO_SPI_BUG -#define _meshtastic_CriticalErrorCode_ARRAYSIZE ((meshtastic_CriticalErrorCode)(meshtastic_CriticalErrorCode_RADIO_SPI_BUG+1)) +#define _CriticalErrorCode_MIN CriticalErrorCode_NONE +#define _CriticalErrorCode_MAX CriticalErrorCode_RADIO_SPI_BUG +#define _CriticalErrorCode_ARRAYSIZE ((CriticalErrorCode)(CriticalErrorCode_RADIO_SPI_BUG+1)) -#define _meshtastic_Position_LocSource_MIN meshtastic_Position_LocSource_LOC_UNSET -#define _meshtastic_Position_LocSource_MAX meshtastic_Position_LocSource_LOC_EXTERNAL -#define _meshtastic_Position_LocSource_ARRAYSIZE ((meshtastic_Position_LocSource)(meshtastic_Position_LocSource_LOC_EXTERNAL+1)) +#define _Position_LocSource_MIN Position_LocSource_LOC_UNSET +#define _Position_LocSource_MAX Position_LocSource_LOC_EXTERNAL +#define _Position_LocSource_ARRAYSIZE ((Position_LocSource)(Position_LocSource_LOC_EXTERNAL+1)) -#define _meshtastic_Position_AltSource_MIN meshtastic_Position_AltSource_ALT_UNSET -#define _meshtastic_Position_AltSource_MAX meshtastic_Position_AltSource_ALT_BAROMETRIC -#define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1)) +#define _Position_AltSource_MIN Position_AltSource_ALT_UNSET +#define _Position_AltSource_MAX Position_AltSource_ALT_BAROMETRIC +#define _Position_AltSource_ARRAYSIZE ((Position_AltSource)(Position_AltSource_ALT_BAROMETRIC+1)) -#define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE -#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_NOT_AUTHORIZED -#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_NOT_AUTHORIZED+1)) +#define _Routing_Error_MIN Routing_Error_NONE +#define _Routing_Error_MAX Routing_Error_NOT_AUTHORIZED +#define _Routing_Error_ARRAYSIZE ((Routing_Error)(Routing_Error_NOT_AUTHORIZED+1)) -#define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET -#define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX -#define _meshtastic_MeshPacket_Priority_ARRAYSIZE ((meshtastic_MeshPacket_Priority)(meshtastic_MeshPacket_Priority_MAX+1)) +#define _MeshPacket_Priority_MIN MeshPacket_Priority_UNSET +#define _MeshPacket_Priority_MAX MeshPacket_Priority_MAX +#define _MeshPacket_Priority_ARRAYSIZE ((MeshPacket_Priority)(MeshPacket_Priority_MAX+1)) -#define _meshtastic_MeshPacket_Delayed_MIN meshtastic_MeshPacket_Delayed_NO_DELAY -#define _meshtastic_MeshPacket_Delayed_MAX meshtastic_MeshPacket_Delayed_DELAYED_DIRECT -#define _meshtastic_MeshPacket_Delayed_ARRAYSIZE ((meshtastic_MeshPacket_Delayed)(meshtastic_MeshPacket_Delayed_DELAYED_DIRECT+1)) +#define _MeshPacket_Delayed_MIN MeshPacket_Delayed_NO_DELAY +#define _MeshPacket_Delayed_MAX MeshPacket_Delayed_DELAYED_DIRECT +#define _MeshPacket_Delayed_ARRAYSIZE ((MeshPacket_Delayed)(MeshPacket_Delayed_DELAYED_DIRECT+1)) -#define _meshtastic_LogRecord_Level_MIN meshtastic_LogRecord_Level_UNSET -#define _meshtastic_LogRecord_Level_MAX meshtastic_LogRecord_Level_CRITICAL -#define _meshtastic_LogRecord_Level_ARRAYSIZE ((meshtastic_LogRecord_Level)(meshtastic_LogRecord_Level_CRITICAL+1)) +#define _LogRecord_Level_MIN LogRecord_Level_UNSET +#define _LogRecord_Level_MAX LogRecord_Level_CRITICAL +#define _LogRecord_Level_ARRAYSIZE ((LogRecord_Level)(LogRecord_Level_CRITICAL+1)) -#define meshtastic_Position_location_source_ENUMTYPE meshtastic_Position_LocSource -#define meshtastic_Position_altitude_source_ENUMTYPE meshtastic_Position_AltSource +#define Position_location_source_ENUMTYPE Position_LocSource +#define Position_altitude_source_ENUMTYPE Position_AltSource -#define meshtastic_User_hw_model_ENUMTYPE meshtastic_HardwareModel +#define User_hw_model_ENUMTYPE HardwareModel -#define meshtastic_Routing_variant_error_reason_ENUMTYPE meshtastic_Routing_Error +#define Routing_variant_error_reason_ENUMTYPE Routing_Error -#define meshtastic_Data_portnum_ENUMTYPE meshtastic_PortNum +#define Data_portnum_ENUMTYPE PortNum -#define meshtastic_MeshPacket_priority_ENUMTYPE meshtastic_MeshPacket_Priority -#define meshtastic_MeshPacket_delayed_ENUMTYPE meshtastic_MeshPacket_Delayed +#define MeshPacket_priority_ENUMTYPE MeshPacket_Priority +#define MeshPacket_delayed_ENUMTYPE MeshPacket_Delayed -#define meshtastic_MyNodeInfo_error_code_ENUMTYPE meshtastic_CriticalErrorCode +#define MyNodeInfo_error_code_ENUMTYPE CriticalErrorCode -#define meshtastic_LogRecord_level_ENUMTYPE meshtastic_LogRecord_Level +#define LogRecord_level_ENUMTYPE LogRecord_Level -#define meshtastic_Compressed_portnum_ENUMTYPE meshtastic_PortNum +#define Compressed_portnum_ENUMTYPE PortNum /* Initializer values for message structs */ -#define meshtastic_Position_init_default {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_User_init_default {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0} -#define meshtastic_RouteDiscovery_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}} -#define meshtastic_Routing_init_default {0, {meshtastic_RouteDiscovery_init_default}} -#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0} -#define meshtastic_Waypoint_init_default {0, 0, 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} -#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default} -#define meshtastic_MyNodeInfo_init_default {0, 0, 0, "", _meshtastic_CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0} -#define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN} -#define meshtastic_QueueStatus_init_default {0, 0, 0, 0} -#define meshtastic_FromRadio_init_default {0, 0, {meshtastic_MeshPacket_init_default}} -#define meshtastic_ToRadio_init_default {0, {meshtastic_MeshPacket_init_default}} -#define meshtastic_Compressed_init_default {_meshtastic_PortNum_MIN, {0, {0}}} -#define meshtastic_Position_init_zero {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_User_init_zero {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0} -#define meshtastic_RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} -#define meshtastic_Routing_init_zero {0, {meshtastic_RouteDiscovery_init_zero}} -#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0} -#define meshtastic_Waypoint_init_zero {0, 0, 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} -#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero} -#define meshtastic_MyNodeInfo_init_zero {0, 0, 0, "", _meshtastic_CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0} -#define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN} -#define meshtastic_QueueStatus_init_zero {0, 0, 0, 0} -#define meshtastic_FromRadio_init_zero {0, 0, {meshtastic_MeshPacket_init_zero}} -#define meshtastic_ToRadio_init_zero {0, {meshtastic_MeshPacket_init_zero}} -#define meshtastic_Compressed_init_zero {_meshtastic_PortNum_MIN, {0, {0}}} +#define Position_init_default {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define User_init_default {"", "", "", {0}, _HardwareModel_MIN, 0} +#define RouteDiscovery_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}} +#define Routing_init_default {0, {RouteDiscovery_init_default}} +#define Data_init_default {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0} +#define Waypoint_init_default {0, 0, 0, 0, 0, "", "", 0} +#define MeshPacket_init_default {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN} +#define NodeInfo_init_default {0, false, User_init_default, false, Position_init_default, 0, 0, false, DeviceMetrics_init_default} +#define MyNodeInfo_init_default {0, 0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0} +#define LogRecord_init_default {"", 0, "", _LogRecord_Level_MIN} +#define QueueStatus_init_default {0, 0, 0, 0} +#define FromRadio_init_default {0, 0, {MeshPacket_init_default}} +#define ToRadio_init_default {0, {MeshPacket_init_default}} +#define Compressed_init_default {_PortNum_MIN, {0, {0}}} +#define Position_init_zero {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define User_init_zero {"", "", "", {0}, _HardwareModel_MIN, 0} +#define RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} +#define Routing_init_zero {0, {RouteDiscovery_init_zero}} +#define Data_init_zero {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0} +#define Waypoint_init_zero {0, 0, 0, 0, 0, "", "", 0} +#define MeshPacket_init_zero {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN} +#define NodeInfo_init_zero {0, false, User_init_zero, false, Position_init_zero, 0, 0, false, DeviceMetrics_init_zero} +#define MyNodeInfo_init_zero {0, 0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0} +#define LogRecord_init_zero {"", 0, "", _LogRecord_Level_MIN} +#define QueueStatus_init_zero {0, 0, 0, 0} +#define FromRadio_init_zero {0, 0, {MeshPacket_init_zero}} +#define ToRadio_init_zero {0, {MeshPacket_init_zero}} +#define Compressed_init_zero {_PortNum_MIN, {0, {0}}} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_Position_latitude_i_tag 1 -#define meshtastic_Position_longitude_i_tag 2 -#define meshtastic_Position_altitude_tag 3 -#define meshtastic_Position_time_tag 4 -#define meshtastic_Position_location_source_tag 5 -#define meshtastic_Position_altitude_source_tag 6 -#define meshtastic_Position_timestamp_tag 7 -#define meshtastic_Position_timestamp_millis_adjust_tag 8 -#define meshtastic_Position_altitude_hae_tag 9 -#define meshtastic_Position_altitude_geoidal_separation_tag 10 -#define meshtastic_Position_PDOP_tag 11 -#define meshtastic_Position_HDOP_tag 12 -#define meshtastic_Position_VDOP_tag 13 -#define meshtastic_Position_gps_accuracy_tag 14 -#define meshtastic_Position_ground_speed_tag 15 -#define meshtastic_Position_ground_track_tag 16 -#define meshtastic_Position_fix_quality_tag 17 -#define meshtastic_Position_fix_type_tag 18 -#define meshtastic_Position_sats_in_view_tag 19 -#define meshtastic_Position_sensor_id_tag 20 -#define meshtastic_Position_next_update_tag 21 -#define meshtastic_Position_seq_number_tag 22 -#define meshtastic_User_id_tag 1 -#define meshtastic_User_long_name_tag 2 -#define meshtastic_User_short_name_tag 3 -#define meshtastic_User_macaddr_tag 4 -#define meshtastic_User_hw_model_tag 5 -#define meshtastic_User_is_licensed_tag 6 -#define meshtastic_RouteDiscovery_route_tag 1 -#define meshtastic_Routing_route_request_tag 1 -#define meshtastic_Routing_route_reply_tag 2 -#define meshtastic_Routing_error_reason_tag 3 -#define meshtastic_Data_portnum_tag 1 -#define meshtastic_Data_payload_tag 2 -#define meshtastic_Data_want_response_tag 3 -#define meshtastic_Data_dest_tag 4 -#define meshtastic_Data_source_tag 5 -#define meshtastic_Data_request_id_tag 6 -#define meshtastic_Data_reply_id_tag 7 -#define meshtastic_Data_emoji_tag 8 -#define meshtastic_Waypoint_id_tag 1 -#define meshtastic_Waypoint_latitude_i_tag 2 -#define meshtastic_Waypoint_longitude_i_tag 3 -#define meshtastic_Waypoint_expire_tag 4 -#define meshtastic_Waypoint_locked_to_tag 5 -#define meshtastic_Waypoint_name_tag 6 -#define meshtastic_Waypoint_description_tag 7 -#define meshtastic_Waypoint_icon_tag 8 -#define meshtastic_MeshPacket_from_tag 1 -#define meshtastic_MeshPacket_to_tag 2 -#define meshtastic_MeshPacket_channel_tag 3 -#define meshtastic_MeshPacket_decoded_tag 4 -#define meshtastic_MeshPacket_encrypted_tag 5 -#define meshtastic_MeshPacket_id_tag 6 -#define meshtastic_MeshPacket_rx_time_tag 7 -#define meshtastic_MeshPacket_rx_snr_tag 8 -#define meshtastic_MeshPacket_hop_limit_tag 9 -#define meshtastic_MeshPacket_want_ack_tag 10 -#define meshtastic_MeshPacket_priority_tag 11 -#define meshtastic_MeshPacket_rx_rssi_tag 12 -#define meshtastic_MeshPacket_delayed_tag 13 -#define meshtastic_NodeInfo_num_tag 1 -#define meshtastic_NodeInfo_user_tag 2 -#define meshtastic_NodeInfo_position_tag 3 -#define meshtastic_NodeInfo_snr_tag 4 -#define meshtastic_NodeInfo_last_heard_tag 5 -#define meshtastic_NodeInfo_device_metrics_tag 6 -#define meshtastic_MyNodeInfo_my_node_num_tag 1 -#define meshtastic_MyNodeInfo_has_gps_tag 2 -#define meshtastic_MyNodeInfo_max_channels_tag 3 -#define meshtastic_MyNodeInfo_firmware_version_tag 4 -#define meshtastic_MyNodeInfo_error_code_tag 5 -#define meshtastic_MyNodeInfo_error_address_tag 6 -#define meshtastic_MyNodeInfo_error_count_tag 7 -#define meshtastic_MyNodeInfo_reboot_count_tag 8 -#define meshtastic_MyNodeInfo_bitrate_tag 9 -#define meshtastic_MyNodeInfo_message_timeout_msec_tag 10 -#define meshtastic_MyNodeInfo_min_app_version_tag 11 -#define meshtastic_MyNodeInfo_air_period_tx_tag 12 -#define meshtastic_MyNodeInfo_air_period_rx_tag 13 -#define meshtastic_MyNodeInfo_has_wifi_tag 14 -#define meshtastic_MyNodeInfo_channel_utilization_tag 15 -#define meshtastic_MyNodeInfo_air_util_tx_tag 16 -#define meshtastic_LogRecord_message_tag 1 -#define meshtastic_LogRecord_time_tag 2 -#define meshtastic_LogRecord_source_tag 3 -#define meshtastic_LogRecord_level_tag 4 -#define meshtastic_QueueStatus_res_tag 1 -#define meshtastic_QueueStatus_free_tag 2 -#define meshtastic_QueueStatus_maxlen_tag 3 -#define meshtastic_QueueStatus_mesh_packet_id_tag 4 -#define meshtastic_FromRadio_id_tag 1 -#define meshtastic_FromRadio_packet_tag 2 -#define meshtastic_FromRadio_my_info_tag 3 -#define meshtastic_FromRadio_node_info_tag 4 -#define meshtastic_FromRadio_config_tag 5 -#define meshtastic_FromRadio_log_record_tag 6 -#define meshtastic_FromRadio_config_complete_id_tag 7 -#define meshtastic_FromRadio_rebooted_tag 8 -#define meshtastic_FromRadio_moduleConfig_tag 9 -#define meshtastic_FromRadio_channel_tag 10 -#define meshtastic_FromRadio_queueStatus_tag 11 -#define meshtastic_FromRadio_xmodemPacket_tag 12 -#define meshtastic_ToRadio_packet_tag 1 -#define meshtastic_ToRadio_want_config_id_tag 3 -#define meshtastic_ToRadio_disconnect_tag 4 -#define meshtastic_ToRadio_xmodemPacket_tag 5 -#define meshtastic_Compressed_portnum_tag 1 -#define meshtastic_Compressed_data_tag 2 +#define Position_latitude_i_tag 1 +#define Position_longitude_i_tag 2 +#define Position_altitude_tag 3 +#define Position_time_tag 4 +#define Position_location_source_tag 5 +#define Position_altitude_source_tag 6 +#define Position_timestamp_tag 7 +#define Position_timestamp_millis_adjust_tag 8 +#define Position_altitude_hae_tag 9 +#define Position_altitude_geoidal_separation_tag 10 +#define Position_PDOP_tag 11 +#define Position_HDOP_tag 12 +#define Position_VDOP_tag 13 +#define Position_gps_accuracy_tag 14 +#define Position_ground_speed_tag 15 +#define Position_ground_track_tag 16 +#define Position_fix_quality_tag 17 +#define Position_fix_type_tag 18 +#define Position_sats_in_view_tag 19 +#define Position_sensor_id_tag 20 +#define Position_next_update_tag 21 +#define Position_seq_number_tag 22 +#define User_id_tag 1 +#define User_long_name_tag 2 +#define User_short_name_tag 3 +#define User_macaddr_tag 4 +#define User_hw_model_tag 5 +#define User_is_licensed_tag 6 +#define RouteDiscovery_route_tag 1 +#define Routing_route_request_tag 1 +#define Routing_route_reply_tag 2 +#define Routing_error_reason_tag 3 +#define Data_portnum_tag 1 +#define Data_payload_tag 2 +#define Data_want_response_tag 3 +#define Data_dest_tag 4 +#define Data_source_tag 5 +#define Data_request_id_tag 6 +#define Data_reply_id_tag 7 +#define Data_emoji_tag 8 +#define Waypoint_id_tag 1 +#define Waypoint_latitude_i_tag 2 +#define Waypoint_longitude_i_tag 3 +#define Waypoint_expire_tag 4 +#define Waypoint_locked_to_tag 5 +#define Waypoint_name_tag 6 +#define Waypoint_description_tag 7 +#define Waypoint_icon_tag 8 +#define MeshPacket_from_tag 1 +#define MeshPacket_to_tag 2 +#define MeshPacket_channel_tag 3 +#define MeshPacket_decoded_tag 4 +#define MeshPacket_encrypted_tag 5 +#define MeshPacket_id_tag 6 +#define MeshPacket_rx_time_tag 7 +#define MeshPacket_rx_snr_tag 8 +#define MeshPacket_hop_limit_tag 9 +#define MeshPacket_want_ack_tag 10 +#define MeshPacket_priority_tag 11 +#define MeshPacket_rx_rssi_tag 12 +#define MeshPacket_delayed_tag 13 +#define NodeInfo_num_tag 1 +#define NodeInfo_user_tag 2 +#define NodeInfo_position_tag 3 +#define NodeInfo_snr_tag 4 +#define NodeInfo_last_heard_tag 5 +#define NodeInfo_device_metrics_tag 6 +#define MyNodeInfo_my_node_num_tag 1 +#define MyNodeInfo_has_gps_tag 2 +#define MyNodeInfo_max_channels_tag 3 +#define MyNodeInfo_firmware_version_tag 4 +#define MyNodeInfo_error_code_tag 5 +#define MyNodeInfo_error_address_tag 6 +#define MyNodeInfo_error_count_tag 7 +#define MyNodeInfo_reboot_count_tag 8 +#define MyNodeInfo_bitrate_tag 9 +#define MyNodeInfo_message_timeout_msec_tag 10 +#define MyNodeInfo_min_app_version_tag 11 +#define MyNodeInfo_air_period_tx_tag 12 +#define MyNodeInfo_air_period_rx_tag 13 +#define MyNodeInfo_has_wifi_tag 14 +#define MyNodeInfo_channel_utilization_tag 15 +#define MyNodeInfo_air_util_tx_tag 16 +#define LogRecord_message_tag 1 +#define LogRecord_time_tag 2 +#define LogRecord_source_tag 3 +#define LogRecord_level_tag 4 +#define QueueStatus_res_tag 1 +#define QueueStatus_free_tag 2 +#define QueueStatus_maxlen_tag 3 +#define QueueStatus_mesh_packet_id_tag 4 +#define FromRadio_id_tag 1 +#define FromRadio_packet_tag 2 +#define FromRadio_my_info_tag 3 +#define FromRadio_node_info_tag 4 +#define FromRadio_config_tag 5 +#define FromRadio_log_record_tag 6 +#define FromRadio_config_complete_id_tag 7 +#define FromRadio_rebooted_tag 8 +#define FromRadio_moduleConfig_tag 9 +#define FromRadio_channel_tag 10 +#define FromRadio_queueStatus_tag 11 +#define FromRadio_xmodemPacket_tag 12 +#define ToRadio_packet_tag 1 +#define ToRadio_want_config_id_tag 3 +#define ToRadio_disconnect_tag 4 +#define ToRadio_xmodemPacket_tag 5 +#define Compressed_portnum_tag 1 +#define Compressed_data_tag 2 /* Struct field encoding specification for nanopb */ -#define meshtastic_Position_FIELDLIST(X, a) \ +#define Position_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, SFIXED32, latitude_i, 1) \ X(a, STATIC, SINGULAR, SFIXED32, longitude_i, 2) \ X(a, STATIC, SINGULAR, INT32, altitude, 3) \ @@ -945,34 +945,34 @@ X(a, STATIC, SINGULAR, UINT32, sats_in_view, 19) \ X(a, STATIC, SINGULAR, UINT32, sensor_id, 20) \ X(a, STATIC, SINGULAR, UINT32, next_update, 21) \ X(a, STATIC, SINGULAR, UINT32, seq_number, 22) -#define meshtastic_Position_CALLBACK NULL -#define meshtastic_Position_DEFAULT NULL +#define Position_CALLBACK NULL +#define Position_DEFAULT NULL -#define meshtastic_User_FIELDLIST(X, a) \ +#define User_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, id, 1) \ X(a, STATIC, SINGULAR, STRING, long_name, 2) \ X(a, STATIC, SINGULAR, STRING, short_name, 3) \ X(a, STATIC, SINGULAR, FIXED_LENGTH_BYTES, macaddr, 4) \ X(a, STATIC, SINGULAR, UENUM, hw_model, 5) \ X(a, STATIC, SINGULAR, BOOL, is_licensed, 6) -#define meshtastic_User_CALLBACK NULL -#define meshtastic_User_DEFAULT NULL +#define User_CALLBACK NULL +#define User_DEFAULT NULL -#define meshtastic_RouteDiscovery_FIELDLIST(X, a) \ +#define RouteDiscovery_FIELDLIST(X, a) \ X(a, STATIC, REPEATED, FIXED32, route, 1) -#define meshtastic_RouteDiscovery_CALLBACK NULL -#define meshtastic_RouteDiscovery_DEFAULT NULL +#define RouteDiscovery_CALLBACK NULL +#define RouteDiscovery_DEFAULT NULL -#define meshtastic_Routing_FIELDLIST(X, a) \ +#define Routing_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, MESSAGE, (variant,route_request,route_request), 1) \ X(a, STATIC, ONEOF, MESSAGE, (variant,route_reply,route_reply), 2) \ X(a, STATIC, ONEOF, UENUM, (variant,error_reason,error_reason), 3) -#define meshtastic_Routing_CALLBACK NULL -#define meshtastic_Routing_DEFAULT NULL -#define meshtastic_Routing_variant_route_request_MSGTYPE meshtastic_RouteDiscovery -#define meshtastic_Routing_variant_route_reply_MSGTYPE meshtastic_RouteDiscovery +#define Routing_CALLBACK NULL +#define Routing_DEFAULT NULL +#define Routing_variant_route_request_MSGTYPE RouteDiscovery +#define Routing_variant_route_reply_MSGTYPE RouteDiscovery -#define meshtastic_Data_FIELDLIST(X, a) \ +#define Data_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, portnum, 1) \ X(a, STATIC, SINGULAR, BYTES, payload, 2) \ X(a, STATIC, SINGULAR, BOOL, want_response, 3) \ @@ -981,10 +981,10 @@ X(a, STATIC, SINGULAR, FIXED32, source, 5) \ X(a, STATIC, SINGULAR, FIXED32, request_id, 6) \ X(a, STATIC, SINGULAR, FIXED32, reply_id, 7) \ X(a, STATIC, SINGULAR, FIXED32, emoji, 8) -#define meshtastic_Data_CALLBACK NULL -#define meshtastic_Data_DEFAULT NULL +#define Data_CALLBACK NULL +#define Data_DEFAULT NULL -#define meshtastic_Waypoint_FIELDLIST(X, a) \ +#define Waypoint_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, id, 1) \ X(a, STATIC, SINGULAR, SFIXED32, latitude_i, 2) \ X(a, STATIC, SINGULAR, SFIXED32, longitude_i, 3) \ @@ -993,10 +993,10 @@ X(a, STATIC, SINGULAR, UINT32, locked_to, 5) \ X(a, STATIC, SINGULAR, STRING, name, 6) \ X(a, STATIC, SINGULAR, STRING, description, 7) \ X(a, STATIC, SINGULAR, FIXED32, icon, 8) -#define meshtastic_Waypoint_CALLBACK NULL -#define meshtastic_Waypoint_DEFAULT NULL +#define Waypoint_CALLBACK NULL +#define Waypoint_DEFAULT NULL -#define meshtastic_MeshPacket_FIELDLIST(X, a) \ +#define MeshPacket_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, FIXED32, from, 1) \ X(a, STATIC, SINGULAR, FIXED32, to, 2) \ X(a, STATIC, SINGULAR, UINT32, channel, 3) \ @@ -1010,24 +1010,24 @@ X(a, STATIC, SINGULAR, BOOL, want_ack, 10) \ X(a, STATIC, SINGULAR, UENUM, priority, 11) \ X(a, STATIC, SINGULAR, INT32, rx_rssi, 12) \ X(a, STATIC, SINGULAR, UENUM, delayed, 13) -#define meshtastic_MeshPacket_CALLBACK NULL -#define meshtastic_MeshPacket_DEFAULT NULL -#define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data +#define MeshPacket_CALLBACK NULL +#define MeshPacket_DEFAULT NULL +#define MeshPacket_payload_variant_decoded_MSGTYPE Data -#define meshtastic_NodeInfo_FIELDLIST(X, a) \ +#define NodeInfo_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, num, 1) \ X(a, STATIC, OPTIONAL, MESSAGE, user, 2) \ X(a, STATIC, OPTIONAL, MESSAGE, position, 3) \ X(a, STATIC, SINGULAR, FLOAT, snr, 4) \ X(a, STATIC, SINGULAR, FIXED32, last_heard, 5) \ X(a, STATIC, OPTIONAL, MESSAGE, device_metrics, 6) -#define meshtastic_NodeInfo_CALLBACK NULL -#define meshtastic_NodeInfo_DEFAULT NULL -#define meshtastic_NodeInfo_user_MSGTYPE meshtastic_User -#define meshtastic_NodeInfo_position_MSGTYPE meshtastic_Position -#define meshtastic_NodeInfo_device_metrics_MSGTYPE meshtastic_DeviceMetrics +#define NodeInfo_CALLBACK NULL +#define NodeInfo_DEFAULT NULL +#define NodeInfo_user_MSGTYPE User +#define NodeInfo_position_MSGTYPE Position +#define NodeInfo_device_metrics_MSGTYPE DeviceMetrics -#define meshtastic_MyNodeInfo_FIELDLIST(X, a) \ +#define MyNodeInfo_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, my_node_num, 1) \ X(a, STATIC, SINGULAR, BOOL, has_gps, 2) \ X(a, STATIC, SINGULAR, UINT32, max_channels, 3) \ @@ -1044,26 +1044,26 @@ X(a, STATIC, REPEATED, UINT32, air_period_rx, 13) \ X(a, STATIC, SINGULAR, BOOL, has_wifi, 14) \ X(a, STATIC, SINGULAR, FLOAT, channel_utilization, 15) \ X(a, STATIC, SINGULAR, FLOAT, air_util_tx, 16) -#define meshtastic_MyNodeInfo_CALLBACK NULL -#define meshtastic_MyNodeInfo_DEFAULT NULL +#define MyNodeInfo_CALLBACK NULL +#define MyNodeInfo_DEFAULT NULL -#define meshtastic_LogRecord_FIELDLIST(X, a) \ +#define LogRecord_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, message, 1) \ X(a, STATIC, SINGULAR, FIXED32, time, 2) \ X(a, STATIC, SINGULAR, STRING, source, 3) \ X(a, STATIC, SINGULAR, UENUM, level, 4) -#define meshtastic_LogRecord_CALLBACK NULL -#define meshtastic_LogRecord_DEFAULT NULL +#define LogRecord_CALLBACK NULL +#define LogRecord_DEFAULT NULL -#define meshtastic_QueueStatus_FIELDLIST(X, a) \ +#define QueueStatus_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, INT32, res, 1) \ X(a, STATIC, SINGULAR, UINT32, free, 2) \ X(a, STATIC, SINGULAR, UINT32, maxlen, 3) \ X(a, STATIC, SINGULAR, UINT32, mesh_packet_id, 4) -#define meshtastic_QueueStatus_CALLBACK NULL -#define meshtastic_QueueStatus_DEFAULT NULL +#define QueueStatus_CALLBACK NULL +#define QueueStatus_DEFAULT NULL -#define meshtastic_FromRadio_FIELDLIST(X, a) \ +#define FromRadio_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, id, 1) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,packet,packet), 2) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,my_info,my_info), 3) \ @@ -1076,80 +1076,80 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,moduleConfig,moduleConfig), X(a, STATIC, ONEOF, MESSAGE, (payload_variant,channel,channel), 10) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,queueStatus,queueStatus), 11) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,xmodemPacket,xmodemPacket), 12) -#define meshtastic_FromRadio_CALLBACK NULL -#define meshtastic_FromRadio_DEFAULT NULL -#define meshtastic_FromRadio_payload_variant_packet_MSGTYPE meshtastic_MeshPacket -#define meshtastic_FromRadio_payload_variant_my_info_MSGTYPE meshtastic_MyNodeInfo -#define meshtastic_FromRadio_payload_variant_node_info_MSGTYPE meshtastic_NodeInfo -#define meshtastic_FromRadio_payload_variant_config_MSGTYPE meshtastic_Config -#define meshtastic_FromRadio_payload_variant_log_record_MSGTYPE meshtastic_LogRecord -#define meshtastic_FromRadio_payload_variant_moduleConfig_MSGTYPE meshtastic_ModuleConfig -#define meshtastic_FromRadio_payload_variant_channel_MSGTYPE meshtastic_Channel -#define meshtastic_FromRadio_payload_variant_queueStatus_MSGTYPE meshtastic_QueueStatus -#define meshtastic_FromRadio_payload_variant_xmodemPacket_MSGTYPE meshtastic_XModem +#define FromRadio_CALLBACK NULL +#define FromRadio_DEFAULT NULL +#define FromRadio_payload_variant_packet_MSGTYPE MeshPacket +#define FromRadio_payload_variant_my_info_MSGTYPE MyNodeInfo +#define FromRadio_payload_variant_node_info_MSGTYPE NodeInfo +#define FromRadio_payload_variant_config_MSGTYPE Config +#define FromRadio_payload_variant_log_record_MSGTYPE LogRecord +#define FromRadio_payload_variant_moduleConfig_MSGTYPE ModuleConfig +#define FromRadio_payload_variant_channel_MSGTYPE Channel +#define FromRadio_payload_variant_queueStatus_MSGTYPE QueueStatus +#define FromRadio_payload_variant_xmodemPacket_MSGTYPE XModem -#define meshtastic_ToRadio_FIELDLIST(X, a) \ +#define ToRadio_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,packet,packet), 1) \ X(a, STATIC, ONEOF, UINT32, (payload_variant,want_config_id,want_config_id), 3) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,disconnect,disconnect), 4) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,xmodemPacket,xmodemPacket), 5) -#define meshtastic_ToRadio_CALLBACK NULL -#define meshtastic_ToRadio_DEFAULT NULL -#define meshtastic_ToRadio_payload_variant_packet_MSGTYPE meshtastic_MeshPacket -#define meshtastic_ToRadio_payload_variant_xmodemPacket_MSGTYPE meshtastic_XModem +#define ToRadio_CALLBACK NULL +#define ToRadio_DEFAULT NULL +#define ToRadio_payload_variant_packet_MSGTYPE MeshPacket +#define ToRadio_payload_variant_xmodemPacket_MSGTYPE XModem -#define meshtastic_Compressed_FIELDLIST(X, a) \ +#define Compressed_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, portnum, 1) \ X(a, STATIC, SINGULAR, BYTES, data, 2) -#define meshtastic_Compressed_CALLBACK NULL -#define meshtastic_Compressed_DEFAULT NULL +#define Compressed_CALLBACK NULL +#define Compressed_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_Position_msg; -extern const pb_msgdesc_t meshtastic_User_msg; -extern const pb_msgdesc_t meshtastic_RouteDiscovery_msg; -extern const pb_msgdesc_t meshtastic_Routing_msg; -extern const pb_msgdesc_t meshtastic_Data_msg; -extern const pb_msgdesc_t meshtastic_Waypoint_msg; -extern const pb_msgdesc_t meshtastic_MeshPacket_msg; -extern const pb_msgdesc_t meshtastic_NodeInfo_msg; -extern const pb_msgdesc_t meshtastic_MyNodeInfo_msg; -extern const pb_msgdesc_t meshtastic_LogRecord_msg; -extern const pb_msgdesc_t meshtastic_QueueStatus_msg; -extern const pb_msgdesc_t meshtastic_FromRadio_msg; -extern const pb_msgdesc_t meshtastic_ToRadio_msg; -extern const pb_msgdesc_t meshtastic_Compressed_msg; +extern const pb_msgdesc_t Position_msg; +extern const pb_msgdesc_t User_msg; +extern const pb_msgdesc_t RouteDiscovery_msg; +extern const pb_msgdesc_t Routing_msg; +extern const pb_msgdesc_t Data_msg; +extern const pb_msgdesc_t Waypoint_msg; +extern const pb_msgdesc_t MeshPacket_msg; +extern const pb_msgdesc_t NodeInfo_msg; +extern const pb_msgdesc_t MyNodeInfo_msg; +extern const pb_msgdesc_t LogRecord_msg; +extern const pb_msgdesc_t QueueStatus_msg; +extern const pb_msgdesc_t FromRadio_msg; +extern const pb_msgdesc_t ToRadio_msg; +extern const pb_msgdesc_t Compressed_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_Position_fields &meshtastic_Position_msg -#define meshtastic_User_fields &meshtastic_User_msg -#define meshtastic_RouteDiscovery_fields &meshtastic_RouteDiscovery_msg -#define meshtastic_Routing_fields &meshtastic_Routing_msg -#define meshtastic_Data_fields &meshtastic_Data_msg -#define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg -#define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg -#define meshtastic_NodeInfo_fields &meshtastic_NodeInfo_msg -#define meshtastic_MyNodeInfo_fields &meshtastic_MyNodeInfo_msg -#define meshtastic_LogRecord_fields &meshtastic_LogRecord_msg -#define meshtastic_QueueStatus_fields &meshtastic_QueueStatus_msg -#define meshtastic_FromRadio_fields &meshtastic_FromRadio_msg -#define meshtastic_ToRadio_fields &meshtastic_ToRadio_msg -#define meshtastic_Compressed_fields &meshtastic_Compressed_msg +#define Position_fields &Position_msg +#define User_fields &User_msg +#define RouteDiscovery_fields &RouteDiscovery_msg +#define Routing_fields &Routing_msg +#define Data_fields &Data_msg +#define Waypoint_fields &Waypoint_msg +#define MeshPacket_fields &MeshPacket_msg +#define NodeInfo_fields &NodeInfo_msg +#define MyNodeInfo_fields &MyNodeInfo_msg +#define LogRecord_fields &LogRecord_msg +#define QueueStatus_fields &QueueStatus_msg +#define FromRadio_fields &FromRadio_msg +#define ToRadio_fields &ToRadio_msg +#define Compressed_fields &Compressed_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_Compressed_size 243 -#define meshtastic_Data_size 270 -#define meshtastic_FromRadio_size 330 -#define meshtastic_LogRecord_size 81 -#define meshtastic_MeshPacket_size 321 -#define meshtastic_MyNodeInfo_size 179 -#define meshtastic_NodeInfo_size 258 -#define meshtastic_Position_size 137 -#define meshtastic_QueueStatus_size 23 -#define meshtastic_RouteDiscovery_size 40 -#define meshtastic_Routing_size 42 -#define meshtastic_ToRadio_size 324 -#define meshtastic_User_size 77 -#define meshtastic_Waypoint_size 165 +#define Compressed_size 243 +#define Data_size 270 +#define FromRadio_size 330 +#define LogRecord_size 81 +#define MeshPacket_size 321 +#define MyNodeInfo_size 179 +#define NodeInfo_size 258 +#define Position_size 137 +#define QueueStatus_size 23 +#define RouteDiscovery_size 40 +#define Routing_size 42 +#define ToRadio_size 324 +#define User_size 77 +#define Waypoint_size 165 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/module_config.pb.c b/src/mesh/generated/meshtastic/module_config.pb.c index 56f9b8dd3..a67bcfcc9 100644 --- a/src/mesh/generated/meshtastic/module_config.pb.c +++ b/src/mesh/generated/meshtastic/module_config.pb.c @@ -6,34 +6,34 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_ModuleConfig, meshtastic_ModuleConfig, AUTO) +PB_BIND(ModuleConfig, ModuleConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_MQTTConfig, meshtastic_ModuleConfig_MQTTConfig, AUTO) +PB_BIND(ModuleConfig_MQTTConfig, ModuleConfig_MQTTConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_RemoteHardwareConfig, meshtastic_ModuleConfig_RemoteHardwareConfig, AUTO) +PB_BIND(ModuleConfig_RemoteHardwareConfig, ModuleConfig_RemoteHardwareConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_AudioConfig, meshtastic_ModuleConfig_AudioConfig, AUTO) +PB_BIND(ModuleConfig_AudioConfig, ModuleConfig_AudioConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_SerialConfig, meshtastic_ModuleConfig_SerialConfig, AUTO) +PB_BIND(ModuleConfig_SerialConfig, ModuleConfig_SerialConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_ExternalNotificationConfig, meshtastic_ModuleConfig_ExternalNotificationConfig, AUTO) +PB_BIND(ModuleConfig_ExternalNotificationConfig, ModuleConfig_ExternalNotificationConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_StoreForwardConfig, meshtastic_ModuleConfig_StoreForwardConfig, AUTO) +PB_BIND(ModuleConfig_StoreForwardConfig, ModuleConfig_StoreForwardConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_RangeTestConfig, meshtastic_ModuleConfig_RangeTestConfig, AUTO) +PB_BIND(ModuleConfig_RangeTestConfig, ModuleConfig_RangeTestConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_TelemetryConfig, meshtastic_ModuleConfig_TelemetryConfig, AUTO) +PB_BIND(ModuleConfig_TelemetryConfig, ModuleConfig_TelemetryConfig, AUTO) -PB_BIND(meshtastic_ModuleConfig_CannedMessageConfig, meshtastic_ModuleConfig_CannedMessageConfig, AUTO) +PB_BIND(ModuleConfig_CannedMessageConfig, ModuleConfig_CannedMessageConfig, AUTO) diff --git a/src/mesh/generated/meshtastic/module_config.pb.h b/src/mesh/generated/meshtastic/module_config.pb.h index 50fed5197..84914285f 100644 --- a/src/mesh/generated/meshtastic/module_config.pb.h +++ b/src/mesh/generated/meshtastic/module_config.pb.h @@ -11,70 +11,70 @@ /* Enum definitions */ /* Baudrate for codec2 voice */ -typedef enum _meshtastic_ModuleConfig_AudioConfig_Audio_Baud { - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_3200 = 1, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_2400 = 2, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1600 = 3, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1400 = 4, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1300 = 5, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1200 = 6, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 = 7, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8 -} meshtastic_ModuleConfig_AudioConfig_Audio_Baud; +typedef enum _ModuleConfig_AudioConfig_Audio_Baud { + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_3200 = 1, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_2400 = 2, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1600 = 3, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1400 = 4, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1300 = 5, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1200 = 6, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 = 7, + ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8 +} ModuleConfig_AudioConfig_Audio_Baud; /* TODO: REPLACE */ -typedef enum _meshtastic_ModuleConfig_SerialConfig_Serial_Baud { - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT = 0, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_110 = 1, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_300 = 2, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_600 = 3, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_1200 = 4, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_2400 = 5, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_4800 = 6, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_9600 = 7, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_19200 = 8, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_38400 = 9, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_57600 = 10, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_115200 = 11, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_230400 = 12, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_460800 = 13, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_576000 = 14, - meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 = 15 -} meshtastic_ModuleConfig_SerialConfig_Serial_Baud; +typedef enum _ModuleConfig_SerialConfig_Serial_Baud { + ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT = 0, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_110 = 1, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_300 = 2, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_600 = 3, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_1200 = 4, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_2400 = 5, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_4800 = 6, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_9600 = 7, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_19200 = 8, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_38400 = 9, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_57600 = 10, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_115200 = 11, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_230400 = 12, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_460800 = 13, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_576000 = 14, + ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 = 15 +} ModuleConfig_SerialConfig_Serial_Baud; /* TODO: REPLACE */ -typedef enum _meshtastic_ModuleConfig_SerialConfig_Serial_Mode { - meshtastic_ModuleConfig_SerialConfig_Serial_Mode_DEFAULT = 0, - meshtastic_ModuleConfig_SerialConfig_Serial_Mode_SIMPLE = 1, - meshtastic_ModuleConfig_SerialConfig_Serial_Mode_PROTO = 2, - meshtastic_ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3, - meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA = 4 -} meshtastic_ModuleConfig_SerialConfig_Serial_Mode; +typedef enum _ModuleConfig_SerialConfig_Serial_Mode { + ModuleConfig_SerialConfig_Serial_Mode_DEFAULT = 0, + ModuleConfig_SerialConfig_Serial_Mode_SIMPLE = 1, + ModuleConfig_SerialConfig_Serial_Mode_PROTO = 2, + ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3, + ModuleConfig_SerialConfig_Serial_Mode_NMEA = 4 +} ModuleConfig_SerialConfig_Serial_Mode; /* TODO: REPLACE */ -typedef enum _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar { +typedef enum _ModuleConfig_CannedMessageConfig_InputEventChar { /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE = 0, + ModuleConfig_CannedMessageConfig_InputEventChar_NONE = 0, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP = 17, + ModuleConfig_CannedMessageConfig_InputEventChar_UP = 17, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN = 18, + ModuleConfig_CannedMessageConfig_InputEventChar_DOWN = 18, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT = 19, + ModuleConfig_CannedMessageConfig_InputEventChar_LEFT = 19, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT = 20, + ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT = 20, /* '\n' */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT = 10, + ModuleConfig_CannedMessageConfig_InputEventChar_SELECT = 10, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK = 27, + ModuleConfig_CannedMessageConfig_InputEventChar_BACK = 27, /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL = 24 -} meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar; + ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL = 24 +} ModuleConfig_CannedMessageConfig_InputEventChar; /* Struct definitions */ /* MQTT Client Config */ -typedef struct _meshtastic_ModuleConfig_MQTTConfig { +typedef struct _ModuleConfig_MQTTConfig { /* If a meshtastic node is able to reach the internet it will normally attempt to gateway any channels that are marked as is_uplink_enabled or is_downlink_enabled. */ bool enabled; @@ -96,22 +96,22 @@ typedef struct _meshtastic_ModuleConfig_MQTTConfig { bool encryption_enabled; /* Whether to send / consume json packets on MQTT */ bool json_enabled; -} meshtastic_ModuleConfig_MQTTConfig; +} ModuleConfig_MQTTConfig; /* RemoteHardwareModule Config */ -typedef struct _meshtastic_ModuleConfig_RemoteHardwareConfig { +typedef struct _ModuleConfig_RemoteHardwareConfig { /* Whether the Module is enabled */ bool enabled; -} meshtastic_ModuleConfig_RemoteHardwareConfig; +} ModuleConfig_RemoteHardwareConfig; /* Audio Config for codec2 voice */ -typedef struct _meshtastic_ModuleConfig_AudioConfig { +typedef struct _ModuleConfig_AudioConfig { /* Whether Audio is enabled */ bool codec2_enabled; /* PTT Pin */ uint8_t ptt_pin; /* The audio sample rate to use for codec2 */ - meshtastic_ModuleConfig_AudioConfig_Audio_Baud bitrate; + ModuleConfig_AudioConfig_Audio_Baud bitrate; /* I2S Word Select */ uint8_t i2s_ws; /* I2S Data IN */ @@ -120,10 +120,10 @@ typedef struct _meshtastic_ModuleConfig_AudioConfig { uint8_t i2s_din; /* I2S Clock */ uint8_t i2s_sck; -} meshtastic_ModuleConfig_AudioConfig; +} ModuleConfig_AudioConfig; /* Serial Config */ -typedef struct _meshtastic_ModuleConfig_SerialConfig { +typedef struct _ModuleConfig_SerialConfig { /* Preferences for the SerialModule FIXME - Move this out of UserPreferences and into a section for module configuration. */ bool enabled; @@ -134,15 +134,15 @@ typedef struct _meshtastic_ModuleConfig_SerialConfig { /* TODO: REPLACE */ uint32_t txd; /* TODO: REPLACE */ - meshtastic_ModuleConfig_SerialConfig_Serial_Baud baud; + ModuleConfig_SerialConfig_Serial_Baud baud; /* TODO: REPLACE */ uint32_t timeout; /* TODO: REPLACE */ - meshtastic_ModuleConfig_SerialConfig_Serial_Mode mode; -} meshtastic_ModuleConfig_SerialConfig; + ModuleConfig_SerialConfig_Serial_Mode mode; +} ModuleConfig_SerialConfig; /* External Notifications Config */ -typedef struct _meshtastic_ModuleConfig_ExternalNotificationConfig { +typedef struct _ModuleConfig_ExternalNotificationConfig { /* Enable the ExternalNotificationModule */ bool enabled; /* When using in On/Off mode, keep the output on for this many @@ -181,10 +181,10 @@ typedef struct _meshtastic_ModuleConfig_ExternalNotificationConfig { Default is 0 which means don't repeat at all. 60 would mean blink and/or beep for 60 seconds */ uint16_t nag_timeout; -} meshtastic_ModuleConfig_ExternalNotificationConfig; +} ModuleConfig_ExternalNotificationConfig; /* Store and Forward Module Config */ -typedef struct _meshtastic_ModuleConfig_StoreForwardConfig { +typedef struct _ModuleConfig_StoreForwardConfig { /* Enable the Store and Forward Module */ bool enabled; /* TODO: REPLACE */ @@ -195,10 +195,10 @@ typedef struct _meshtastic_ModuleConfig_StoreForwardConfig { uint32_t history_return_max; /* TODO: REPLACE */ uint32_t history_return_window; -} meshtastic_ModuleConfig_StoreForwardConfig; +} ModuleConfig_StoreForwardConfig; /* Preferences for the RangeTestModule */ -typedef struct _meshtastic_ModuleConfig_RangeTestConfig { +typedef struct _ModuleConfig_RangeTestConfig { /* Enable the Range Test Module */ bool enabled; /* Send out range test messages from this node */ @@ -206,10 +206,10 @@ typedef struct _meshtastic_ModuleConfig_RangeTestConfig { /* Bool value indicating that this node should save a RangeTest.csv file. ESP32 Only */ bool save; -} meshtastic_ModuleConfig_RangeTestConfig; +} ModuleConfig_RangeTestConfig; /* Configuration for both device and environment metrics */ -typedef struct _meshtastic_ModuleConfig_TelemetryConfig { +typedef struct _ModuleConfig_TelemetryConfig { /* Interval in seconds of how often we should try to send our device metrics to the mesh */ uint32_t device_update_interval; @@ -222,10 +222,10 @@ typedef struct _meshtastic_ModuleConfig_TelemetryConfig { /* We'll always read the sensor in Celsius, but sometimes we might want to display the results in Fahrenheit as a "user preference". */ bool environment_display_fahrenheit; -} meshtastic_ModuleConfig_TelemetryConfig; +} ModuleConfig_TelemetryConfig; /* TODO: REPLACE */ -typedef struct _meshtastic_ModuleConfig_CannedMessageConfig { +typedef struct _ModuleConfig_CannedMessageConfig { /* Enable the rotary encoder #1. This is a 'dumb' encoder sending pulses on both A and B pins while rotating. */ bool rotary1_enabled; /* GPIO pin for rotary encoder A port. */ @@ -235,11 +235,11 @@ typedef struct _meshtastic_ModuleConfig_CannedMessageConfig { /* GPIO pin for rotary encoder Press port. */ uint32_t inputbroker_pin_press; /* Generate input event on CW of this kind. */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_cw; + ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_cw; /* Generate input event on CCW of this kind. */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_ccw; + ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_ccw; /* Generate input event on Press of this kind. */ - meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_press; + ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_press; /* Enable the Up/Down/Select input device. Can be RAK rotary encoder or 3 buttons. Uses the a/b/press definitions from inputbroker. */ bool updown1_enabled; /* Enable/disable CannedMessageModule. */ @@ -250,32 +250,32 @@ typedef struct _meshtastic_ModuleConfig_CannedMessageConfig { /* CannedMessageModule also sends a bell character with the messages. ExternalNotificationModule can benefit from this feature. */ bool send_bell; -} meshtastic_ModuleConfig_CannedMessageConfig; +} ModuleConfig_CannedMessageConfig; /* Module Config */ -typedef struct _meshtastic_ModuleConfig { +typedef struct _ModuleConfig { pb_size_t which_payload_variant; union { /* TODO: REPLACE */ - meshtastic_ModuleConfig_MQTTConfig mqtt; + ModuleConfig_MQTTConfig mqtt; /* TODO: REPLACE */ - meshtastic_ModuleConfig_SerialConfig serial; + ModuleConfig_SerialConfig serial; /* TODO: REPLACE */ - meshtastic_ModuleConfig_ExternalNotificationConfig external_notification; + ModuleConfig_ExternalNotificationConfig external_notification; /* TODO: REPLACE */ - meshtastic_ModuleConfig_StoreForwardConfig store_forward; + ModuleConfig_StoreForwardConfig store_forward; /* TODO: REPLACE */ - meshtastic_ModuleConfig_RangeTestConfig range_test; + ModuleConfig_RangeTestConfig range_test; /* TODO: REPLACE */ - meshtastic_ModuleConfig_TelemetryConfig telemetry; + ModuleConfig_TelemetryConfig telemetry; /* TODO: REPLACE */ - meshtastic_ModuleConfig_CannedMessageConfig canned_message; + ModuleConfig_CannedMessageConfig canned_message; /* TODO: REPLACE */ - meshtastic_ModuleConfig_AudioConfig audio; + ModuleConfig_AudioConfig audio; /* TODO: REPLACE */ - meshtastic_ModuleConfig_RemoteHardwareConfig remote_hardware; + ModuleConfig_RemoteHardwareConfig remote_hardware; } payload_variant; -} meshtastic_ModuleConfig; +} ModuleConfig; #ifdef __cplusplus @@ -283,133 +283,133 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT -#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MAX meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B -#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_AudioConfig_Audio_Baud)(meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B+1)) +#define _ModuleConfig_AudioConfig_Audio_Baud_MIN ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT +#define _ModuleConfig_AudioConfig_Audio_Baud_MAX ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B +#define _ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((ModuleConfig_AudioConfig_Audio_Baud)(ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B+1)) -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MAX meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_SerialConfig_Serial_Baud)(meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600+1)) +#define _ModuleConfig_SerialConfig_Serial_Baud_MIN ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT +#define _ModuleConfig_SerialConfig_Serial_Baud_MAX ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 +#define _ModuleConfig_SerialConfig_Serial_Baud_ARRAYSIZE ((ModuleConfig_SerialConfig_Serial_Baud)(ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600+1)) -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN meshtastic_ModuleConfig_SerialConfig_Serial_Mode_DEFAULT -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MAX meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA -#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((meshtastic_ModuleConfig_SerialConfig_Serial_Mode)(meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA+1)) +#define _ModuleConfig_SerialConfig_Serial_Mode_MIN ModuleConfig_SerialConfig_Serial_Mode_DEFAULT +#define _ModuleConfig_SerialConfig_Serial_Mode_MAX ModuleConfig_SerialConfig_Serial_Mode_NMEA +#define _ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((ModuleConfig_SerialConfig_Serial_Mode)(ModuleConfig_SerialConfig_Serial_Mode_NMEA+1)) -#define _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE -#define _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MAX meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK -#define _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_ARRAYSIZE ((meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar)(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK+1)) +#define _ModuleConfig_CannedMessageConfig_InputEventChar_MIN ModuleConfig_CannedMessageConfig_InputEventChar_NONE +#define _ModuleConfig_CannedMessageConfig_InputEventChar_MAX ModuleConfig_CannedMessageConfig_InputEventChar_BACK +#define _ModuleConfig_CannedMessageConfig_InputEventChar_ARRAYSIZE ((ModuleConfig_CannedMessageConfig_InputEventChar)(ModuleConfig_CannedMessageConfig_InputEventChar_BACK+1)) -#define meshtastic_ModuleConfig_AudioConfig_bitrate_ENUMTYPE meshtastic_ModuleConfig_AudioConfig_Audio_Baud +#define ModuleConfig_AudioConfig_bitrate_ENUMTYPE ModuleConfig_AudioConfig_Audio_Baud -#define meshtastic_ModuleConfig_SerialConfig_baud_ENUMTYPE meshtastic_ModuleConfig_SerialConfig_Serial_Baud -#define meshtastic_ModuleConfig_SerialConfig_mode_ENUMTYPE meshtastic_ModuleConfig_SerialConfig_Serial_Mode +#define ModuleConfig_SerialConfig_baud_ENUMTYPE ModuleConfig_SerialConfig_Serial_Baud +#define ModuleConfig_SerialConfig_mode_ENUMTYPE ModuleConfig_SerialConfig_Serial_Mode -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_cw_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_press_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar +#define ModuleConfig_CannedMessageConfig_inputbroker_event_cw_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar +#define ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar +#define ModuleConfig_CannedMessageConfig_inputbroker_event_press_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar /* Initializer values for message structs */ -#define meshtastic_ModuleConfig_init_default {0, {meshtastic_ModuleConfig_MQTTConfig_init_default}} -#define meshtastic_ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0} -#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_default {0} -#define meshtastic_ModuleConfig_AudioConfig_init_default {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN} -#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_RangeTestConfig_init_default {0, 0, 0} -#define meshtastic_ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0} -#define meshtastic_ModuleConfig_init_zero {0, {meshtastic_ModuleConfig_MQTTConfig_init_zero}} -#define meshtastic_ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0} -#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero {0} -#define meshtastic_ModuleConfig_AudioConfig_init_zero {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN} -#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_RangeTestConfig_init_zero {0, 0, 0} -#define meshtastic_ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0} -#define meshtastic_ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0} +#define ModuleConfig_init_default {0, {ModuleConfig_MQTTConfig_init_default}} +#define ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0} +#define ModuleConfig_RemoteHardwareConfig_init_default {0} +#define ModuleConfig_AudioConfig_init_default {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} +#define ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN} +#define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0} +#define ModuleConfig_RangeTestConfig_init_default {0, 0, 0} +#define ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0} +#define ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0} +#define ModuleConfig_init_zero {0, {ModuleConfig_MQTTConfig_init_zero}} +#define ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0} +#define ModuleConfig_RemoteHardwareConfig_init_zero {0} +#define ModuleConfig_AudioConfig_init_zero {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} +#define ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN} +#define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +#define ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0} +#define ModuleConfig_RangeTestConfig_init_zero {0, 0, 0} +#define ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0} +#define ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_ModuleConfig_MQTTConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_MQTTConfig_address_tag 2 -#define meshtastic_ModuleConfig_MQTTConfig_username_tag 3 -#define meshtastic_ModuleConfig_MQTTConfig_password_tag 4 -#define meshtastic_ModuleConfig_MQTTConfig_encryption_enabled_tag 5 -#define meshtastic_ModuleConfig_MQTTConfig_json_enabled_tag 6 -#define meshtastic_ModuleConfig_RemoteHardwareConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_AudioConfig_codec2_enabled_tag 1 -#define meshtastic_ModuleConfig_AudioConfig_ptt_pin_tag 2 -#define meshtastic_ModuleConfig_AudioConfig_bitrate_tag 3 -#define meshtastic_ModuleConfig_AudioConfig_i2s_ws_tag 4 -#define meshtastic_ModuleConfig_AudioConfig_i2s_sd_tag 5 -#define meshtastic_ModuleConfig_AudioConfig_i2s_din_tag 6 -#define meshtastic_ModuleConfig_AudioConfig_i2s_sck_tag 7 -#define meshtastic_ModuleConfig_SerialConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_SerialConfig_echo_tag 2 -#define meshtastic_ModuleConfig_SerialConfig_rxd_tag 3 -#define meshtastic_ModuleConfig_SerialConfig_txd_tag 4 -#define meshtastic_ModuleConfig_SerialConfig_baud_tag 5 -#define meshtastic_ModuleConfig_SerialConfig_timeout_tag 6 -#define meshtastic_ModuleConfig_SerialConfig_mode_tag 7 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_output_ms_tag 2 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_output_tag 3 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_active_tag 4 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_message_tag 5 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_bell_tag 6 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_use_pwm_tag 7 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_output_vibra_tag 8 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_output_buzzer_tag 9 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_message_vibra_tag 10 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_message_buzzer_tag 11 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_bell_vibra_tag 12 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_bell_buzzer_tag 13 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_nag_timeout_tag 14 -#define meshtastic_ModuleConfig_StoreForwardConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_StoreForwardConfig_heartbeat_tag 2 -#define meshtastic_ModuleConfig_StoreForwardConfig_records_tag 3 -#define meshtastic_ModuleConfig_StoreForwardConfig_history_return_max_tag 4 -#define meshtastic_ModuleConfig_StoreForwardConfig_history_return_window_tag 5 -#define meshtastic_ModuleConfig_RangeTestConfig_enabled_tag 1 -#define meshtastic_ModuleConfig_RangeTestConfig_sender_tag 2 -#define meshtastic_ModuleConfig_RangeTestConfig_save_tag 3 -#define meshtastic_ModuleConfig_TelemetryConfig_device_update_interval_tag 1 -#define meshtastic_ModuleConfig_TelemetryConfig_environment_update_interval_tag 2 -#define meshtastic_ModuleConfig_TelemetryConfig_environment_measurement_enabled_tag 3 -#define meshtastic_ModuleConfig_TelemetryConfig_environment_screen_enabled_tag 4 -#define meshtastic_ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 5 -#define meshtastic_ModuleConfig_CannedMessageConfig_rotary1_enabled_tag 1 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_pin_a_tag 2 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_pin_b_tag 3 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_pin_press_tag 4 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_cw_tag 5 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_tag 6 -#define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_press_tag 7 -#define meshtastic_ModuleConfig_CannedMessageConfig_updown1_enabled_tag 8 -#define meshtastic_ModuleConfig_CannedMessageConfig_enabled_tag 9 -#define meshtastic_ModuleConfig_CannedMessageConfig_allow_input_source_tag 10 -#define meshtastic_ModuleConfig_CannedMessageConfig_send_bell_tag 11 -#define meshtastic_ModuleConfig_mqtt_tag 1 -#define meshtastic_ModuleConfig_serial_tag 2 -#define meshtastic_ModuleConfig_external_notification_tag 3 -#define meshtastic_ModuleConfig_store_forward_tag 4 -#define meshtastic_ModuleConfig_range_test_tag 5 -#define meshtastic_ModuleConfig_telemetry_tag 6 -#define meshtastic_ModuleConfig_canned_message_tag 7 -#define meshtastic_ModuleConfig_audio_tag 8 -#define meshtastic_ModuleConfig_remote_hardware_tag 9 +#define ModuleConfig_MQTTConfig_enabled_tag 1 +#define ModuleConfig_MQTTConfig_address_tag 2 +#define ModuleConfig_MQTTConfig_username_tag 3 +#define ModuleConfig_MQTTConfig_password_tag 4 +#define ModuleConfig_MQTTConfig_encryption_enabled_tag 5 +#define ModuleConfig_MQTTConfig_json_enabled_tag 6 +#define ModuleConfig_RemoteHardwareConfig_enabled_tag 1 +#define ModuleConfig_AudioConfig_codec2_enabled_tag 1 +#define ModuleConfig_AudioConfig_ptt_pin_tag 2 +#define ModuleConfig_AudioConfig_bitrate_tag 3 +#define ModuleConfig_AudioConfig_i2s_ws_tag 4 +#define ModuleConfig_AudioConfig_i2s_sd_tag 5 +#define ModuleConfig_AudioConfig_i2s_din_tag 6 +#define ModuleConfig_AudioConfig_i2s_sck_tag 7 +#define ModuleConfig_SerialConfig_enabled_tag 1 +#define ModuleConfig_SerialConfig_echo_tag 2 +#define ModuleConfig_SerialConfig_rxd_tag 3 +#define ModuleConfig_SerialConfig_txd_tag 4 +#define ModuleConfig_SerialConfig_baud_tag 5 +#define ModuleConfig_SerialConfig_timeout_tag 6 +#define ModuleConfig_SerialConfig_mode_tag 7 +#define ModuleConfig_ExternalNotificationConfig_enabled_tag 1 +#define ModuleConfig_ExternalNotificationConfig_output_ms_tag 2 +#define ModuleConfig_ExternalNotificationConfig_output_tag 3 +#define ModuleConfig_ExternalNotificationConfig_active_tag 4 +#define ModuleConfig_ExternalNotificationConfig_alert_message_tag 5 +#define ModuleConfig_ExternalNotificationConfig_alert_bell_tag 6 +#define ModuleConfig_ExternalNotificationConfig_use_pwm_tag 7 +#define ModuleConfig_ExternalNotificationConfig_output_vibra_tag 8 +#define ModuleConfig_ExternalNotificationConfig_output_buzzer_tag 9 +#define ModuleConfig_ExternalNotificationConfig_alert_message_vibra_tag 10 +#define ModuleConfig_ExternalNotificationConfig_alert_message_buzzer_tag 11 +#define ModuleConfig_ExternalNotificationConfig_alert_bell_vibra_tag 12 +#define ModuleConfig_ExternalNotificationConfig_alert_bell_buzzer_tag 13 +#define ModuleConfig_ExternalNotificationConfig_nag_timeout_tag 14 +#define ModuleConfig_StoreForwardConfig_enabled_tag 1 +#define ModuleConfig_StoreForwardConfig_heartbeat_tag 2 +#define ModuleConfig_StoreForwardConfig_records_tag 3 +#define ModuleConfig_StoreForwardConfig_history_return_max_tag 4 +#define ModuleConfig_StoreForwardConfig_history_return_window_tag 5 +#define ModuleConfig_RangeTestConfig_enabled_tag 1 +#define ModuleConfig_RangeTestConfig_sender_tag 2 +#define ModuleConfig_RangeTestConfig_save_tag 3 +#define ModuleConfig_TelemetryConfig_device_update_interval_tag 1 +#define ModuleConfig_TelemetryConfig_environment_update_interval_tag 2 +#define ModuleConfig_TelemetryConfig_environment_measurement_enabled_tag 3 +#define ModuleConfig_TelemetryConfig_environment_screen_enabled_tag 4 +#define ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 5 +#define ModuleConfig_CannedMessageConfig_rotary1_enabled_tag 1 +#define ModuleConfig_CannedMessageConfig_inputbroker_pin_a_tag 2 +#define ModuleConfig_CannedMessageConfig_inputbroker_pin_b_tag 3 +#define ModuleConfig_CannedMessageConfig_inputbroker_pin_press_tag 4 +#define ModuleConfig_CannedMessageConfig_inputbroker_event_cw_tag 5 +#define ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_tag 6 +#define ModuleConfig_CannedMessageConfig_inputbroker_event_press_tag 7 +#define ModuleConfig_CannedMessageConfig_updown1_enabled_tag 8 +#define ModuleConfig_CannedMessageConfig_enabled_tag 9 +#define ModuleConfig_CannedMessageConfig_allow_input_source_tag 10 +#define ModuleConfig_CannedMessageConfig_send_bell_tag 11 +#define ModuleConfig_mqtt_tag 1 +#define ModuleConfig_serial_tag 2 +#define ModuleConfig_external_notification_tag 3 +#define ModuleConfig_store_forward_tag 4 +#define ModuleConfig_range_test_tag 5 +#define ModuleConfig_telemetry_tag 6 +#define ModuleConfig_canned_message_tag 7 +#define ModuleConfig_audio_tag 8 +#define ModuleConfig_remote_hardware_tag 9 /* Struct field encoding specification for nanopb */ -#define meshtastic_ModuleConfig_FIELDLIST(X, a) \ +#define ModuleConfig_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,mqtt,payload_variant.mqtt), 1) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,serial,payload_variant.serial), 2) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,external_notification,payload_variant.external_notification), 3) \ @@ -419,34 +419,34 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,telemetry,payload_variant.te X(a, STATIC, ONEOF, MESSAGE, (payload_variant,canned_message,payload_variant.canned_message), 7) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,audio,payload_variant.audio), 8) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,remote_hardware,payload_variant.remote_hardware), 9) -#define meshtastic_ModuleConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_payload_variant_mqtt_MSGTYPE meshtastic_ModuleConfig_MQTTConfig -#define meshtastic_ModuleConfig_payload_variant_serial_MSGTYPE meshtastic_ModuleConfig_SerialConfig -#define meshtastic_ModuleConfig_payload_variant_external_notification_MSGTYPE meshtastic_ModuleConfig_ExternalNotificationConfig -#define meshtastic_ModuleConfig_payload_variant_store_forward_MSGTYPE meshtastic_ModuleConfig_StoreForwardConfig -#define meshtastic_ModuleConfig_payload_variant_range_test_MSGTYPE meshtastic_ModuleConfig_RangeTestConfig -#define meshtastic_ModuleConfig_payload_variant_telemetry_MSGTYPE meshtastic_ModuleConfig_TelemetryConfig -#define meshtastic_ModuleConfig_payload_variant_canned_message_MSGTYPE meshtastic_ModuleConfig_CannedMessageConfig -#define meshtastic_ModuleConfig_payload_variant_audio_MSGTYPE meshtastic_ModuleConfig_AudioConfig -#define meshtastic_ModuleConfig_payload_variant_remote_hardware_MSGTYPE meshtastic_ModuleConfig_RemoteHardwareConfig +#define ModuleConfig_CALLBACK NULL +#define ModuleConfig_DEFAULT NULL +#define ModuleConfig_payload_variant_mqtt_MSGTYPE ModuleConfig_MQTTConfig +#define ModuleConfig_payload_variant_serial_MSGTYPE ModuleConfig_SerialConfig +#define ModuleConfig_payload_variant_external_notification_MSGTYPE ModuleConfig_ExternalNotificationConfig +#define ModuleConfig_payload_variant_store_forward_MSGTYPE ModuleConfig_StoreForwardConfig +#define ModuleConfig_payload_variant_range_test_MSGTYPE ModuleConfig_RangeTestConfig +#define ModuleConfig_payload_variant_telemetry_MSGTYPE ModuleConfig_TelemetryConfig +#define ModuleConfig_payload_variant_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig +#define ModuleConfig_payload_variant_audio_MSGTYPE ModuleConfig_AudioConfig +#define ModuleConfig_payload_variant_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig -#define meshtastic_ModuleConfig_MQTTConfig_FIELDLIST(X, a) \ +#define ModuleConfig_MQTTConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, STRING, address, 2) \ X(a, STATIC, SINGULAR, STRING, username, 3) \ X(a, STATIC, SINGULAR, STRING, password, 4) \ X(a, STATIC, SINGULAR, BOOL, encryption_enabled, 5) \ X(a, STATIC, SINGULAR, BOOL, json_enabled, 6) -#define meshtastic_ModuleConfig_MQTTConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_MQTTConfig_DEFAULT NULL +#define ModuleConfig_MQTTConfig_CALLBACK NULL +#define ModuleConfig_MQTTConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_RemoteHardwareConfig_FIELDLIST(X, a) \ +#define ModuleConfig_RemoteHardwareConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) -#define meshtastic_ModuleConfig_RemoteHardwareConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_RemoteHardwareConfig_DEFAULT NULL +#define ModuleConfig_RemoteHardwareConfig_CALLBACK NULL +#define ModuleConfig_RemoteHardwareConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_AudioConfig_FIELDLIST(X, a) \ +#define ModuleConfig_AudioConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, codec2_enabled, 1) \ X(a, STATIC, SINGULAR, UINT32, ptt_pin, 2) \ X(a, STATIC, SINGULAR, UENUM, bitrate, 3) \ @@ -454,10 +454,10 @@ X(a, STATIC, SINGULAR, UINT32, i2s_ws, 4) \ X(a, STATIC, SINGULAR, UINT32, i2s_sd, 5) \ X(a, STATIC, SINGULAR, UINT32, i2s_din, 6) \ X(a, STATIC, SINGULAR, UINT32, i2s_sck, 7) -#define meshtastic_ModuleConfig_AudioConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_AudioConfig_DEFAULT NULL +#define ModuleConfig_AudioConfig_CALLBACK NULL +#define ModuleConfig_AudioConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_SerialConfig_FIELDLIST(X, a) \ +#define ModuleConfig_SerialConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, BOOL, echo, 2) \ X(a, STATIC, SINGULAR, UINT32, rxd, 3) \ @@ -465,10 +465,10 @@ X(a, STATIC, SINGULAR, UINT32, txd, 4) \ X(a, STATIC, SINGULAR, UENUM, baud, 5) \ X(a, STATIC, SINGULAR, UINT32, timeout, 6) \ X(a, STATIC, SINGULAR, UENUM, mode, 7) -#define meshtastic_ModuleConfig_SerialConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_SerialConfig_DEFAULT NULL +#define ModuleConfig_SerialConfig_CALLBACK NULL +#define ModuleConfig_SerialConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_ExternalNotificationConfig_FIELDLIST(X, a) \ +#define ModuleConfig_ExternalNotificationConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, UINT32, output_ms, 2) \ X(a, STATIC, SINGULAR, UINT32, output, 3) \ @@ -483,35 +483,35 @@ X(a, STATIC, SINGULAR, BOOL, alert_message_buzzer, 11) \ X(a, STATIC, SINGULAR, BOOL, alert_bell_vibra, 12) \ X(a, STATIC, SINGULAR, BOOL, alert_bell_buzzer, 13) \ X(a, STATIC, SINGULAR, UINT32, nag_timeout, 14) -#define meshtastic_ModuleConfig_ExternalNotificationConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_ExternalNotificationConfig_DEFAULT NULL +#define ModuleConfig_ExternalNotificationConfig_CALLBACK NULL +#define ModuleConfig_ExternalNotificationConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_StoreForwardConfig_FIELDLIST(X, a) \ +#define ModuleConfig_StoreForwardConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, BOOL, heartbeat, 2) \ X(a, STATIC, SINGULAR, UINT32, records, 3) \ X(a, STATIC, SINGULAR, UINT32, history_return_max, 4) \ X(a, STATIC, SINGULAR, UINT32, history_return_window, 5) -#define meshtastic_ModuleConfig_StoreForwardConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_StoreForwardConfig_DEFAULT NULL +#define ModuleConfig_StoreForwardConfig_CALLBACK NULL +#define ModuleConfig_StoreForwardConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_RangeTestConfig_FIELDLIST(X, a) \ +#define ModuleConfig_RangeTestConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ X(a, STATIC, SINGULAR, UINT32, sender, 2) \ X(a, STATIC, SINGULAR, BOOL, save, 3) -#define meshtastic_ModuleConfig_RangeTestConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_RangeTestConfig_DEFAULT NULL +#define ModuleConfig_RangeTestConfig_CALLBACK NULL +#define ModuleConfig_RangeTestConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_TelemetryConfig_FIELDLIST(X, a) \ +#define ModuleConfig_TelemetryConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, device_update_interval, 1) \ X(a, STATIC, SINGULAR, UINT32, environment_update_interval, 2) \ X(a, STATIC, SINGULAR, BOOL, environment_measurement_enabled, 3) \ X(a, STATIC, SINGULAR, BOOL, environment_screen_enabled, 4) \ X(a, STATIC, SINGULAR, BOOL, environment_display_fahrenheit, 5) -#define meshtastic_ModuleConfig_TelemetryConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_TelemetryConfig_DEFAULT NULL +#define ModuleConfig_TelemetryConfig_CALLBACK NULL +#define ModuleConfig_TelemetryConfig_DEFAULT NULL -#define meshtastic_ModuleConfig_CannedMessageConfig_FIELDLIST(X, a) \ +#define ModuleConfig_CannedMessageConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, rotary1_enabled, 1) \ X(a, STATIC, SINGULAR, UINT32, inputbroker_pin_a, 2) \ X(a, STATIC, SINGULAR, UINT32, inputbroker_pin_b, 3) \ @@ -523,43 +523,43 @@ X(a, STATIC, SINGULAR, BOOL, updown1_enabled, 8) \ X(a, STATIC, SINGULAR, BOOL, enabled, 9) \ X(a, STATIC, SINGULAR, STRING, allow_input_source, 10) \ X(a, STATIC, SINGULAR, BOOL, send_bell, 11) -#define meshtastic_ModuleConfig_CannedMessageConfig_CALLBACK NULL -#define meshtastic_ModuleConfig_CannedMessageConfig_DEFAULT NULL +#define ModuleConfig_CannedMessageConfig_CALLBACK NULL +#define ModuleConfig_CannedMessageConfig_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_ModuleConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_MQTTConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_RemoteHardwareConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_AudioConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_SerialConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_ExternalNotificationConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_StoreForwardConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_RangeTestConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_TelemetryConfig_msg; -extern const pb_msgdesc_t meshtastic_ModuleConfig_CannedMessageConfig_msg; +extern const pb_msgdesc_t ModuleConfig_msg; +extern const pb_msgdesc_t ModuleConfig_MQTTConfig_msg; +extern const pb_msgdesc_t ModuleConfig_RemoteHardwareConfig_msg; +extern const pb_msgdesc_t ModuleConfig_AudioConfig_msg; +extern const pb_msgdesc_t ModuleConfig_SerialConfig_msg; +extern const pb_msgdesc_t ModuleConfig_ExternalNotificationConfig_msg; +extern const pb_msgdesc_t ModuleConfig_StoreForwardConfig_msg; +extern const pb_msgdesc_t ModuleConfig_RangeTestConfig_msg; +extern const pb_msgdesc_t ModuleConfig_TelemetryConfig_msg; +extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_ModuleConfig_fields &meshtastic_ModuleConfig_msg -#define meshtastic_ModuleConfig_MQTTConfig_fields &meshtastic_ModuleConfig_MQTTConfig_msg -#define meshtastic_ModuleConfig_RemoteHardwareConfig_fields &meshtastic_ModuleConfig_RemoteHardwareConfig_msg -#define meshtastic_ModuleConfig_AudioConfig_fields &meshtastic_ModuleConfig_AudioConfig_msg -#define meshtastic_ModuleConfig_SerialConfig_fields &meshtastic_ModuleConfig_SerialConfig_msg -#define meshtastic_ModuleConfig_ExternalNotificationConfig_fields &meshtastic_ModuleConfig_ExternalNotificationConfig_msg -#define meshtastic_ModuleConfig_StoreForwardConfig_fields &meshtastic_ModuleConfig_StoreForwardConfig_msg -#define meshtastic_ModuleConfig_RangeTestConfig_fields &meshtastic_ModuleConfig_RangeTestConfig_msg -#define meshtastic_ModuleConfig_TelemetryConfig_fields &meshtastic_ModuleConfig_TelemetryConfig_msg -#define meshtastic_ModuleConfig_CannedMessageConfig_fields &meshtastic_ModuleConfig_CannedMessageConfig_msg +#define ModuleConfig_fields &ModuleConfig_msg +#define ModuleConfig_MQTTConfig_fields &ModuleConfig_MQTTConfig_msg +#define ModuleConfig_RemoteHardwareConfig_fields &ModuleConfig_RemoteHardwareConfig_msg +#define ModuleConfig_AudioConfig_fields &ModuleConfig_AudioConfig_msg +#define ModuleConfig_SerialConfig_fields &ModuleConfig_SerialConfig_msg +#define ModuleConfig_ExternalNotificationConfig_fields &ModuleConfig_ExternalNotificationConfig_msg +#define ModuleConfig_StoreForwardConfig_fields &ModuleConfig_StoreForwardConfig_msg +#define ModuleConfig_RangeTestConfig_fields &ModuleConfig_RangeTestConfig_msg +#define ModuleConfig_TelemetryConfig_fields &ModuleConfig_TelemetryConfig_msg +#define ModuleConfig_CannedMessageConfig_fields &ModuleConfig_CannedMessageConfig_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_ModuleConfig_AudioConfig_size 19 -#define meshtastic_ModuleConfig_CannedMessageConfig_size 49 -#define meshtastic_ModuleConfig_ExternalNotificationConfig_size 40 -#define meshtastic_ModuleConfig_MQTTConfig_size 201 -#define meshtastic_ModuleConfig_RangeTestConfig_size 10 -#define meshtastic_ModuleConfig_RemoteHardwareConfig_size 2 -#define meshtastic_ModuleConfig_SerialConfig_size 26 -#define meshtastic_ModuleConfig_StoreForwardConfig_size 22 -#define meshtastic_ModuleConfig_TelemetryConfig_size 18 -#define meshtastic_ModuleConfig_size 204 +#define ModuleConfig_AudioConfig_size 19 +#define ModuleConfig_CannedMessageConfig_size 49 +#define ModuleConfig_ExternalNotificationConfig_size 40 +#define ModuleConfig_MQTTConfig_size 201 +#define ModuleConfig_RangeTestConfig_size 10 +#define ModuleConfig_RemoteHardwareConfig_size 2 +#define ModuleConfig_SerialConfig_size 26 +#define ModuleConfig_StoreForwardConfig_size 22 +#define ModuleConfig_TelemetryConfig_size 18 +#define ModuleConfig_size 204 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/mqtt.pb.c b/src/mesh/generated/meshtastic/mqtt.pb.c index 18f35f587..86a1e0075 100644 --- a/src/mesh/generated/meshtastic/mqtt.pb.c +++ b/src/mesh/generated/meshtastic/mqtt.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_ServiceEnvelope, meshtastic_ServiceEnvelope, AUTO) +PB_BIND(ServiceEnvelope, ServiceEnvelope, AUTO) diff --git a/src/mesh/generated/meshtastic/mqtt.pb.h b/src/mesh/generated/meshtastic/mqtt.pb.h index cf753a061..644a771bb 100644 --- a/src/mesh/generated/meshtastic/mqtt.pb.h +++ b/src/mesh/generated/meshtastic/mqtt.pb.h @@ -12,16 +12,16 @@ /* Struct definitions */ /* This message wraps a MeshPacket with extra metadata about the sender and how it arrived. */ -typedef struct _meshtastic_ServiceEnvelope { +typedef struct _ServiceEnvelope { /* The (probably encrypted) packet */ - struct _meshtastic_MeshPacket *packet; + struct _MeshPacket *packet; /* The global channel ID it was sent on */ char *channel_id; /* The sending gateway node ID. Can we use this to authenticate/prevent fake nodeid impersonation for senders? - i.e. use gateway/mesh id (which is authenticated) + local node id as the globally trusted nodenum */ char *gateway_id; -} meshtastic_ServiceEnvelope; +} ServiceEnvelope; #ifdef __cplusplus @@ -29,30 +29,30 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_ServiceEnvelope_init_default {NULL, NULL, NULL} -#define meshtastic_ServiceEnvelope_init_zero {NULL, NULL, NULL} +#define ServiceEnvelope_init_default {NULL, NULL, NULL} +#define ServiceEnvelope_init_zero {NULL, NULL, NULL} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_ServiceEnvelope_packet_tag 1 -#define meshtastic_ServiceEnvelope_channel_id_tag 2 -#define meshtastic_ServiceEnvelope_gateway_id_tag 3 +#define ServiceEnvelope_packet_tag 1 +#define ServiceEnvelope_channel_id_tag 2 +#define ServiceEnvelope_gateway_id_tag 3 /* Struct field encoding specification for nanopb */ -#define meshtastic_ServiceEnvelope_FIELDLIST(X, a) \ +#define ServiceEnvelope_FIELDLIST(X, a) \ X(a, POINTER, OPTIONAL, MESSAGE, packet, 1) \ X(a, POINTER, SINGULAR, STRING, channel_id, 2) \ X(a, POINTER, SINGULAR, STRING, gateway_id, 3) -#define meshtastic_ServiceEnvelope_CALLBACK NULL -#define meshtastic_ServiceEnvelope_DEFAULT NULL -#define meshtastic_ServiceEnvelope_packet_MSGTYPE meshtastic_MeshPacket +#define ServiceEnvelope_CALLBACK NULL +#define ServiceEnvelope_DEFAULT NULL +#define ServiceEnvelope_packet_MSGTYPE MeshPacket -extern const pb_msgdesc_t meshtastic_ServiceEnvelope_msg; +extern const pb_msgdesc_t ServiceEnvelope_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_ServiceEnvelope_fields &meshtastic_ServiceEnvelope_msg +#define ServiceEnvelope_fields &ServiceEnvelope_msg /* Maximum encoded size of messages (where known) */ -/* meshtastic_ServiceEnvelope_size depends on runtime parameters */ +/* ServiceEnvelope_size depends on runtime parameters */ #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/portnums.pb.h b/src/mesh/generated/meshtastic/portnums.pb.h index 59cf0ebe5..27d2ab498 100644 --- a/src/mesh/generated/meshtastic/portnums.pb.h +++ b/src/mesh/generated/meshtastic/portnums.pb.h @@ -22,87 +22,87 @@ Note: This was formerly a Type enum named 'typ' with the same id # We have change to this 'portnum' based scheme for specifying app handlers for particular payloads. This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically. */ -typedef enum _meshtastic_PortNum { +typedef enum _PortNum { /* Deprecated: do not use in new code (formerly called OPAQUE) A message sent from a device outside of the mesh, in a form the mesh does not understand NOTE: This must be 0, because it is documented in IMeshService.aidl to be so */ - meshtastic_PortNum_UNKNOWN_APP = 0, + PortNum_UNKNOWN_APP = 0, /* A simple UTF-8 text message, which even the little micros in the mesh can understand and show on their screen eventually in some circumstances even signal might send messages in this form (see below) */ - meshtastic_PortNum_TEXT_MESSAGE_APP = 1, + PortNum_TEXT_MESSAGE_APP = 1, /* Reserved for built-in GPIO/example app. See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number */ - meshtastic_PortNum_REMOTE_HARDWARE_APP = 2, + PortNum_REMOTE_HARDWARE_APP = 2, /* The built-in position messaging app. Payload is a [Position](/docs/developers/protobufs/api#position) message */ - meshtastic_PortNum_POSITION_APP = 3, + PortNum_POSITION_APP = 3, /* The built-in user info app. Payload is a [User](/docs/developers/protobufs/api#user) message */ - meshtastic_PortNum_NODEINFO_APP = 4, + PortNum_NODEINFO_APP = 4, /* Protocol control packets for mesh protocol use. Payload is a [Routing](/docs/developers/protobufs/api#routing) message */ - meshtastic_PortNum_ROUTING_APP = 5, + PortNum_ROUTING_APP = 5, /* Admin control packets. Payload is a [AdminMessage](/docs/developers/protobufs/api#adminmessage) message */ - meshtastic_PortNum_ADMIN_APP = 6, + PortNum_ADMIN_APP = 6, /* Compressed TEXT_MESSAGE payloads. */ - meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7, + PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7, /* Waypoint payloads. Payload is a [Waypoint](/docs/developers/protobufs/api#waypoint) message */ - meshtastic_PortNum_WAYPOINT_APP = 8, + PortNum_WAYPOINT_APP = 8, /* Audio Payloads. Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now */ - meshtastic_PortNum_AUDIO_APP = 9, + PortNum_AUDIO_APP = 9, /* Provides a 'ping' service that replies to any packet it receives. Also serves as a small example module. */ - meshtastic_PortNum_REPLY_APP = 32, + PortNum_REPLY_APP = 32, /* Used for the python IP tunnel feature */ - meshtastic_PortNum_IP_TUNNEL_APP = 33, + PortNum_IP_TUNNEL_APP = 33, /* Provides a hardware serial interface to send and receive from the Meshtastic network. Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network. Maximum packet size of 240 bytes. Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp. */ - meshtastic_PortNum_SERIAL_APP = 64, + PortNum_SERIAL_APP = 64, /* STORE_FORWARD_APP (Work in Progress) Maintained by Jm Casler (MC Hamster) : jm@casler.org */ - meshtastic_PortNum_STORE_FORWARD_APP = 65, + PortNum_STORE_FORWARD_APP = 65, /* Optional port for messages for the range test module. */ - meshtastic_PortNum_RANGE_TEST_APP = 66, + PortNum_RANGE_TEST_APP = 66, /* Provides a format to send and receive telemetry data from the Meshtastic network. Maintained by Charles Crossan (crossan007) : crossan007@gmail.com */ - meshtastic_PortNum_TELEMETRY_APP = 67, + PortNum_TELEMETRY_APP = 67, /* Experimental tools for estimating node position without a GPS Maintained by Github user a-f-G-U-C (a Meshtastic contributor) Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS */ - meshtastic_PortNum_ZPS_APP = 68, + PortNum_ZPS_APP = 68, /* Used to let multiple instances of Linux native applications communicate as if they did using their LoRa chip. Maintained by GitHub user GUVWAF. Project files at https://github.com/GUVWAF/Meshtasticator */ - meshtastic_PortNum_SIMULATOR_APP = 69, + PortNum_SIMULATOR_APP = 69, /* Provides a traceroute functionality to show the route a packet towards a certain destination would take on the mesh. */ - meshtastic_PortNum_TRACEROUTE_APP = 70, + PortNum_TRACEROUTE_APP = 70, /* Private applications should use portnums >= 256. To simplify initial development and testing you can use "PRIVATE_APP" in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */ - meshtastic_PortNum_PRIVATE_APP = 256, + PortNum_PRIVATE_APP = 256, /* ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */ - meshtastic_PortNum_ATAK_FORWARDER = 257, + PortNum_ATAK_FORWARDER = 257, /* Currently we limit port nums to no higher than this value */ - meshtastic_PortNum_MAX = 511 -} meshtastic_PortNum; + PortNum_MAX = 511 +} PortNum; #ifdef __cplusplus extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_PortNum_MIN meshtastic_PortNum_UNKNOWN_APP -#define _meshtastic_PortNum_MAX meshtastic_PortNum_MAX -#define _meshtastic_PortNum_ARRAYSIZE ((meshtastic_PortNum)(meshtastic_PortNum_MAX+1)) +#define _PortNum_MIN PortNum_UNKNOWN_APP +#define _PortNum_MAX PortNum_MAX +#define _PortNum_ARRAYSIZE ((PortNum)(PortNum_MAX+1)) #ifdef __cplusplus diff --git a/src/mesh/generated/meshtastic/remote_hardware.pb.c b/src/mesh/generated/meshtastic/remote_hardware.pb.c index cdea45550..e33884659 100644 --- a/src/mesh/generated/meshtastic/remote_hardware.pb.c +++ b/src/mesh/generated/meshtastic/remote_hardware.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_HardwareMessage, meshtastic_HardwareMessage, AUTO) +PB_BIND(HardwareMessage, HardwareMessage, AUTO) diff --git a/src/mesh/generated/meshtastic/remote_hardware.pb.h b/src/mesh/generated/meshtastic/remote_hardware.pb.h index 26df97616..b76dbe0bc 100644 --- a/src/mesh/generated/meshtastic/remote_hardware.pb.h +++ b/src/mesh/generated/meshtastic/remote_hardware.pb.h @@ -11,22 +11,22 @@ /* Enum definitions */ /* TODO: REPLACE */ -typedef enum _meshtastic_HardwareMessage_Type { +typedef enum _HardwareMessage_Type { /* Unset/unused */ - meshtastic_HardwareMessage_Type_UNSET = 0, + HardwareMessage_Type_UNSET = 0, /* Set gpio gpios based on gpio_mask/gpio_value */ - meshtastic_HardwareMessage_Type_WRITE_GPIOS = 1, + HardwareMessage_Type_WRITE_GPIOS = 1, /* We are now interested in watching the gpio_mask gpios. If the selected gpios change, please broadcast GPIOS_CHANGED. Will implicitly change the gpios requested to be INPUT gpios. */ - meshtastic_HardwareMessage_Type_WATCH_GPIOS = 2, + HardwareMessage_Type_WATCH_GPIOS = 2, /* The gpios listed in gpio_mask have changed, the new values are listed in gpio_value */ - meshtastic_HardwareMessage_Type_GPIOS_CHANGED = 3, + HardwareMessage_Type_GPIOS_CHANGED = 3, /* Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated */ - meshtastic_HardwareMessage_Type_READ_GPIOS = 4, + HardwareMessage_Type_READ_GPIOS = 4, /* A reply to READ_GPIOS. gpio_mask and gpio_value will be populated */ - meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY = 5 -} meshtastic_HardwareMessage_Type; + HardwareMessage_Type_READ_GPIOS_REPLY = 5 +} HardwareMessage_Type; /* Struct definitions */ /* An example app to show off the module system. This message is used for @@ -38,15 +38,15 @@ typedef enum _meshtastic_HardwareMessage_Type { because no security yet (beyond the channel mechanism). It should be off by default and then protected based on some TBD mechanism (a special channel once multichannel support is included?) */ -typedef struct _meshtastic_HardwareMessage { +typedef struct _HardwareMessage { /* What type of HardwareMessage is this? */ - meshtastic_HardwareMessage_Type type; + HardwareMessage_Type type; /* What gpios are we changing. Not used for all MessageTypes, see MessageType for details */ uint64_t gpio_mask; /* For gpios that were listed in gpio_mask as valid, what are the signal levels for those gpios. Not used for all MessageTypes, see MessageType for details */ uint64_t gpio_value; -} meshtastic_HardwareMessage; +} HardwareMessage; #ifdef __cplusplus @@ -54,37 +54,37 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_HardwareMessage_Type_MIN meshtastic_HardwareMessage_Type_UNSET -#define _meshtastic_HardwareMessage_Type_MAX meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY -#define _meshtastic_HardwareMessage_Type_ARRAYSIZE ((meshtastic_HardwareMessage_Type)(meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY+1)) +#define _HardwareMessage_Type_MIN HardwareMessage_Type_UNSET +#define _HardwareMessage_Type_MAX HardwareMessage_Type_READ_GPIOS_REPLY +#define _HardwareMessage_Type_ARRAYSIZE ((HardwareMessage_Type)(HardwareMessage_Type_READ_GPIOS_REPLY+1)) -#define meshtastic_HardwareMessage_type_ENUMTYPE meshtastic_HardwareMessage_Type +#define HardwareMessage_type_ENUMTYPE HardwareMessage_Type /* Initializer values for message structs */ -#define meshtastic_HardwareMessage_init_default {_meshtastic_HardwareMessage_Type_MIN, 0, 0} -#define meshtastic_HardwareMessage_init_zero {_meshtastic_HardwareMessage_Type_MIN, 0, 0} +#define HardwareMessage_init_default {_HardwareMessage_Type_MIN, 0, 0} +#define HardwareMessage_init_zero {_HardwareMessage_Type_MIN, 0, 0} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_HardwareMessage_type_tag 1 -#define meshtastic_HardwareMessage_gpio_mask_tag 2 -#define meshtastic_HardwareMessage_gpio_value_tag 3 +#define HardwareMessage_type_tag 1 +#define HardwareMessage_gpio_mask_tag 2 +#define HardwareMessage_gpio_value_tag 3 /* Struct field encoding specification for nanopb */ -#define meshtastic_HardwareMessage_FIELDLIST(X, a) \ +#define HardwareMessage_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, type, 1) \ X(a, STATIC, SINGULAR, UINT64, gpio_mask, 2) \ X(a, STATIC, SINGULAR, UINT64, gpio_value, 3) -#define meshtastic_HardwareMessage_CALLBACK NULL -#define meshtastic_HardwareMessage_DEFAULT NULL +#define HardwareMessage_CALLBACK NULL +#define HardwareMessage_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_HardwareMessage_msg; +extern const pb_msgdesc_t HardwareMessage_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_HardwareMessage_fields &meshtastic_HardwareMessage_msg +#define HardwareMessage_fields &HardwareMessage_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_HardwareMessage_size 24 +#define HardwareMessage_size 24 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/rtttl.pb.c b/src/mesh/generated/meshtastic/rtttl.pb.c index 62586a11b..5980cacf2 100644 --- a/src/mesh/generated/meshtastic/rtttl.pb.c +++ b/src/mesh/generated/meshtastic/rtttl.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_RTTTLConfig, meshtastic_RTTTLConfig, AUTO) +PB_BIND(RTTTLConfig, RTTTLConfig, AUTO) diff --git a/src/mesh/generated/meshtastic/rtttl.pb.h b/src/mesh/generated/meshtastic/rtttl.pb.h index aa55d0b7d..8cca21f59 100644 --- a/src/mesh/generated/meshtastic/rtttl.pb.h +++ b/src/mesh/generated/meshtastic/rtttl.pb.h @@ -11,10 +11,10 @@ /* Struct definitions */ /* Canned message module configuration. */ -typedef struct _meshtastic_RTTTLConfig { +typedef struct _RTTTLConfig { /* Ringtone for PWM Buzzer in RTTTL Format. */ char ringtone[230]; -} meshtastic_RTTTLConfig; +} RTTTLConfig; #ifdef __cplusplus @@ -22,25 +22,25 @@ extern "C" { #endif /* Initializer values for message structs */ -#define meshtastic_RTTTLConfig_init_default {""} -#define meshtastic_RTTTLConfig_init_zero {""} +#define RTTTLConfig_init_default {""} +#define RTTTLConfig_init_zero {""} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_RTTTLConfig_ringtone_tag 1 +#define RTTTLConfig_ringtone_tag 1 /* Struct field encoding specification for nanopb */ -#define meshtastic_RTTTLConfig_FIELDLIST(X, a) \ +#define RTTTLConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, ringtone, 1) -#define meshtastic_RTTTLConfig_CALLBACK NULL -#define meshtastic_RTTTLConfig_DEFAULT NULL +#define RTTTLConfig_CALLBACK NULL +#define RTTTLConfig_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_RTTTLConfig_msg; +extern const pb_msgdesc_t RTTTLConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_RTTTLConfig_fields &meshtastic_RTTTLConfig_msg +#define RTTTLConfig_fields &RTTTLConfig_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_RTTTLConfig_size 232 +#define RTTTLConfig_size 232 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/storeforward.pb.c b/src/mesh/generated/meshtastic/storeforward.pb.c index 6d4b78754..154e01db5 100644 --- a/src/mesh/generated/meshtastic/storeforward.pb.c +++ b/src/mesh/generated/meshtastic/storeforward.pb.c @@ -6,16 +6,16 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_StoreAndForward, meshtastic_StoreAndForward, AUTO) +PB_BIND(StoreAndForward, StoreAndForward, AUTO) -PB_BIND(meshtastic_StoreAndForward_Statistics, meshtastic_StoreAndForward_Statistics, AUTO) +PB_BIND(StoreAndForward_Statistics, StoreAndForward_Statistics, AUTO) -PB_BIND(meshtastic_StoreAndForward_History, meshtastic_StoreAndForward_History, AUTO) +PB_BIND(StoreAndForward_History, StoreAndForward_History, AUTO) -PB_BIND(meshtastic_StoreAndForward_Heartbeat, meshtastic_StoreAndForward_Heartbeat, AUTO) +PB_BIND(StoreAndForward_Heartbeat, StoreAndForward_Heartbeat, AUTO) diff --git a/src/mesh/generated/meshtastic/storeforward.pb.h b/src/mesh/generated/meshtastic/storeforward.pb.h index e6cb51f61..75b06fc4a 100644 --- a/src/mesh/generated/meshtastic/storeforward.pb.h +++ b/src/mesh/generated/meshtastic/storeforward.pb.h @@ -12,42 +12,42 @@ /* Enum definitions */ /* 001 - 063 = From Router 064 - 127 = From Client */ -typedef enum _meshtastic_StoreAndForward_RequestResponse { +typedef enum _StoreAndForward_RequestResponse { /* Unset/unused */ - meshtastic_StoreAndForward_RequestResponse_UNSET = 0, + StoreAndForward_RequestResponse_UNSET = 0, /* Router is an in error state. */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_ERROR = 1, + StoreAndForward_RequestResponse_ROUTER_ERROR = 1, /* Router heartbeat */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_HEARTBEAT = 2, + StoreAndForward_RequestResponse_ROUTER_HEARTBEAT = 2, /* Router has requested the client respond. This can work as a "are you there" message. */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_PING = 3, + StoreAndForward_RequestResponse_ROUTER_PING = 3, /* The response to a "Ping" */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_PONG = 4, + StoreAndForward_RequestResponse_ROUTER_PONG = 4, /* Router is currently busy. Please try again later. */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_BUSY = 5, + StoreAndForward_RequestResponse_ROUTER_BUSY = 5, /* Router is responding to a request for history. */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_HISTORY = 6, + StoreAndForward_RequestResponse_ROUTER_HISTORY = 6, /* Router is responding to a request for stats. */ - meshtastic_StoreAndForward_RequestResponse_ROUTER_STATS = 7, + StoreAndForward_RequestResponse_ROUTER_STATS = 7, /* Client is an in error state. */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_ERROR = 64, + StoreAndForward_RequestResponse_CLIENT_ERROR = 64, /* Client has requested a replay from the router. */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_HISTORY = 65, + StoreAndForward_RequestResponse_CLIENT_HISTORY = 65, /* Client has requested stats from the router. */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_STATS = 66, + StoreAndForward_RequestResponse_CLIENT_STATS = 66, /* Client has requested the router respond. This can work as a "are you there" message. */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_PING = 67, + StoreAndForward_RequestResponse_CLIENT_PING = 67, /* The response to a "Ping" */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_PONG = 68, + StoreAndForward_RequestResponse_CLIENT_PONG = 68, /* Client has requested that the router abort processing the client's request */ - meshtastic_StoreAndForward_RequestResponse_CLIENT_ABORT = 106 -} meshtastic_StoreAndForward_RequestResponse; + StoreAndForward_RequestResponse_CLIENT_ABORT = 106 +} StoreAndForward_RequestResponse; /* Struct definitions */ /* TODO: REPLACE */ -typedef struct _meshtastic_StoreAndForward_Statistics { +typedef struct _StoreAndForward_Statistics { /* Number of messages we have ever seen */ uint32_t messages_total; /* Number of messages we have currently saved our history. */ @@ -66,42 +66,42 @@ typedef struct _meshtastic_StoreAndForward_Statistics { uint32_t return_max; /* Is the heartbeat enabled on the server? */ uint32_t return_window; -} meshtastic_StoreAndForward_Statistics; +} StoreAndForward_Statistics; /* TODO: REPLACE */ -typedef struct _meshtastic_StoreAndForward_History { +typedef struct _StoreAndForward_History { /* Number of that will be sent to the client */ uint32_t history_messages; /* The window of messages that was used to filter the history client requested */ uint32_t window; /* The window of messages that was used to filter the history client requested */ uint32_t last_request; -} meshtastic_StoreAndForward_History; +} StoreAndForward_History; /* TODO: REPLACE */ -typedef struct _meshtastic_StoreAndForward_Heartbeat { +typedef struct _StoreAndForward_Heartbeat { /* Number of that will be sent to the client */ uint32_t period; /* If set, this is not the primary Store & Forward router on the mesh */ uint32_t secondary; -} meshtastic_StoreAndForward_Heartbeat; +} StoreAndForward_Heartbeat; /* TODO: REPLACE */ -typedef struct _meshtastic_StoreAndForward { +typedef struct _StoreAndForward { /* TODO: REPLACE */ - meshtastic_StoreAndForward_RequestResponse rr; + StoreAndForward_RequestResponse rr; pb_size_t which_variant; union { /* TODO: REPLACE */ - meshtastic_StoreAndForward_Statistics stats; + StoreAndForward_Statistics stats; /* TODO: REPLACE */ - meshtastic_StoreAndForward_History history; + StoreAndForward_History history; /* TODO: REPLACE */ - meshtastic_StoreAndForward_Heartbeat heartbeat; + StoreAndForward_Heartbeat heartbeat; /* Empty Payload */ bool empty; } variant; -} meshtastic_StoreAndForward; +} StoreAndForward; #ifdef __cplusplus @@ -109,61 +109,61 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_StoreAndForward_RequestResponse_MIN meshtastic_StoreAndForward_RequestResponse_UNSET -#define _meshtastic_StoreAndForward_RequestResponse_MAX meshtastic_StoreAndForward_RequestResponse_CLIENT_ABORT -#define _meshtastic_StoreAndForward_RequestResponse_ARRAYSIZE ((meshtastic_StoreAndForward_RequestResponse)(meshtastic_StoreAndForward_RequestResponse_CLIENT_ABORT+1)) +#define _StoreAndForward_RequestResponse_MIN StoreAndForward_RequestResponse_UNSET +#define _StoreAndForward_RequestResponse_MAX StoreAndForward_RequestResponse_CLIENT_ABORT +#define _StoreAndForward_RequestResponse_ARRAYSIZE ((StoreAndForward_RequestResponse)(StoreAndForward_RequestResponse_CLIENT_ABORT+1)) -#define meshtastic_StoreAndForward_rr_ENUMTYPE meshtastic_StoreAndForward_RequestResponse +#define StoreAndForward_rr_ENUMTYPE StoreAndForward_RequestResponse /* Initializer values for message structs */ -#define meshtastic_StoreAndForward_init_default {_meshtastic_StoreAndForward_RequestResponse_MIN, 0, {meshtastic_StoreAndForward_Statistics_init_default}} -#define meshtastic_StoreAndForward_Statistics_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_StoreAndForward_History_init_default {0, 0, 0} -#define meshtastic_StoreAndForward_Heartbeat_init_default {0, 0} -#define meshtastic_StoreAndForward_init_zero {_meshtastic_StoreAndForward_RequestResponse_MIN, 0, {meshtastic_StoreAndForward_Statistics_init_zero}} -#define meshtastic_StoreAndForward_Statistics_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0} -#define meshtastic_StoreAndForward_History_init_zero {0, 0, 0} -#define meshtastic_StoreAndForward_Heartbeat_init_zero {0, 0} +#define StoreAndForward_init_default {_StoreAndForward_RequestResponse_MIN, 0, {StoreAndForward_Statistics_init_default}} +#define StoreAndForward_Statistics_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0} +#define StoreAndForward_History_init_default {0, 0, 0} +#define StoreAndForward_Heartbeat_init_default {0, 0} +#define StoreAndForward_init_zero {_StoreAndForward_RequestResponse_MIN, 0, {StoreAndForward_Statistics_init_zero}} +#define StoreAndForward_Statistics_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0} +#define StoreAndForward_History_init_zero {0, 0, 0} +#define StoreAndForward_Heartbeat_init_zero {0, 0} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_StoreAndForward_Statistics_messages_total_tag 1 -#define meshtastic_StoreAndForward_Statistics_messages_saved_tag 2 -#define meshtastic_StoreAndForward_Statistics_messages_max_tag 3 -#define meshtastic_StoreAndForward_Statistics_up_time_tag 4 -#define meshtastic_StoreAndForward_Statistics_requests_tag 5 -#define meshtastic_StoreAndForward_Statistics_requests_history_tag 6 -#define meshtastic_StoreAndForward_Statistics_heartbeat_tag 7 -#define meshtastic_StoreAndForward_Statistics_return_max_tag 8 -#define meshtastic_StoreAndForward_Statistics_return_window_tag 9 -#define meshtastic_StoreAndForward_History_history_messages_tag 1 -#define meshtastic_StoreAndForward_History_window_tag 2 -#define meshtastic_StoreAndForward_History_last_request_tag 3 -#define meshtastic_StoreAndForward_Heartbeat_period_tag 1 -#define meshtastic_StoreAndForward_Heartbeat_secondary_tag 2 -#define meshtastic_StoreAndForward_rr_tag 1 -#define meshtastic_StoreAndForward_stats_tag 2 -#define meshtastic_StoreAndForward_history_tag 3 -#define meshtastic_StoreAndForward_heartbeat_tag 4 -#define meshtastic_StoreAndForward_empty_tag 5 +#define StoreAndForward_Statistics_messages_total_tag 1 +#define StoreAndForward_Statistics_messages_saved_tag 2 +#define StoreAndForward_Statistics_messages_max_tag 3 +#define StoreAndForward_Statistics_up_time_tag 4 +#define StoreAndForward_Statistics_requests_tag 5 +#define StoreAndForward_Statistics_requests_history_tag 6 +#define StoreAndForward_Statistics_heartbeat_tag 7 +#define StoreAndForward_Statistics_return_max_tag 8 +#define StoreAndForward_Statistics_return_window_tag 9 +#define StoreAndForward_History_history_messages_tag 1 +#define StoreAndForward_History_window_tag 2 +#define StoreAndForward_History_last_request_tag 3 +#define StoreAndForward_Heartbeat_period_tag 1 +#define StoreAndForward_Heartbeat_secondary_tag 2 +#define StoreAndForward_rr_tag 1 +#define StoreAndForward_stats_tag 2 +#define StoreAndForward_history_tag 3 +#define StoreAndForward_heartbeat_tag 4 +#define StoreAndForward_empty_tag 5 /* Struct field encoding specification for nanopb */ -#define meshtastic_StoreAndForward_FIELDLIST(X, a) \ +#define StoreAndForward_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, rr, 1) \ X(a, STATIC, ONEOF, MESSAGE, (variant,stats,variant.stats), 2) \ X(a, STATIC, ONEOF, MESSAGE, (variant,history,variant.history), 3) \ X(a, STATIC, ONEOF, MESSAGE, (variant,heartbeat,variant.heartbeat), 4) \ X(a, STATIC, ONEOF, BOOL, (variant,empty,variant.empty), 5) -#define meshtastic_StoreAndForward_CALLBACK NULL -#define meshtastic_StoreAndForward_DEFAULT NULL -#define meshtastic_StoreAndForward_variant_stats_MSGTYPE meshtastic_StoreAndForward_Statistics -#define meshtastic_StoreAndForward_variant_history_MSGTYPE meshtastic_StoreAndForward_History -#define meshtastic_StoreAndForward_variant_heartbeat_MSGTYPE meshtastic_StoreAndForward_Heartbeat +#define StoreAndForward_CALLBACK NULL +#define StoreAndForward_DEFAULT NULL +#define StoreAndForward_variant_stats_MSGTYPE StoreAndForward_Statistics +#define StoreAndForward_variant_history_MSGTYPE StoreAndForward_History +#define StoreAndForward_variant_heartbeat_MSGTYPE StoreAndForward_Heartbeat -#define meshtastic_StoreAndForward_Statistics_FIELDLIST(X, a) \ +#define StoreAndForward_Statistics_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, messages_total, 1) \ X(a, STATIC, SINGULAR, UINT32, messages_saved, 2) \ X(a, STATIC, SINGULAR, UINT32, messages_max, 3) \ @@ -173,38 +173,38 @@ X(a, STATIC, SINGULAR, UINT32, requests_history, 6) \ X(a, STATIC, SINGULAR, BOOL, heartbeat, 7) \ X(a, STATIC, SINGULAR, UINT32, return_max, 8) \ X(a, STATIC, SINGULAR, UINT32, return_window, 9) -#define meshtastic_StoreAndForward_Statistics_CALLBACK NULL -#define meshtastic_StoreAndForward_Statistics_DEFAULT NULL +#define StoreAndForward_Statistics_CALLBACK NULL +#define StoreAndForward_Statistics_DEFAULT NULL -#define meshtastic_StoreAndForward_History_FIELDLIST(X, a) \ +#define StoreAndForward_History_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, history_messages, 1) \ X(a, STATIC, SINGULAR, UINT32, window, 2) \ X(a, STATIC, SINGULAR, UINT32, last_request, 3) -#define meshtastic_StoreAndForward_History_CALLBACK NULL -#define meshtastic_StoreAndForward_History_DEFAULT NULL +#define StoreAndForward_History_CALLBACK NULL +#define StoreAndForward_History_DEFAULT NULL -#define meshtastic_StoreAndForward_Heartbeat_FIELDLIST(X, a) \ +#define StoreAndForward_Heartbeat_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, period, 1) \ X(a, STATIC, SINGULAR, UINT32, secondary, 2) -#define meshtastic_StoreAndForward_Heartbeat_CALLBACK NULL -#define meshtastic_StoreAndForward_Heartbeat_DEFAULT NULL +#define StoreAndForward_Heartbeat_CALLBACK NULL +#define StoreAndForward_Heartbeat_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_StoreAndForward_msg; -extern const pb_msgdesc_t meshtastic_StoreAndForward_Statistics_msg; -extern const pb_msgdesc_t meshtastic_StoreAndForward_History_msg; -extern const pb_msgdesc_t meshtastic_StoreAndForward_Heartbeat_msg; +extern const pb_msgdesc_t StoreAndForward_msg; +extern const pb_msgdesc_t StoreAndForward_Statistics_msg; +extern const pb_msgdesc_t StoreAndForward_History_msg; +extern const pb_msgdesc_t StoreAndForward_Heartbeat_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_StoreAndForward_fields &meshtastic_StoreAndForward_msg -#define meshtastic_StoreAndForward_Statistics_fields &meshtastic_StoreAndForward_Statistics_msg -#define meshtastic_StoreAndForward_History_fields &meshtastic_StoreAndForward_History_msg -#define meshtastic_StoreAndForward_Heartbeat_fields &meshtastic_StoreAndForward_Heartbeat_msg +#define StoreAndForward_fields &StoreAndForward_msg +#define StoreAndForward_Statistics_fields &StoreAndForward_Statistics_msg +#define StoreAndForward_History_fields &StoreAndForward_History_msg +#define StoreAndForward_Heartbeat_fields &StoreAndForward_Heartbeat_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_StoreAndForward_Heartbeat_size 12 -#define meshtastic_StoreAndForward_History_size 18 -#define meshtastic_StoreAndForward_Statistics_size 50 -#define meshtastic_StoreAndForward_size 54 +#define StoreAndForward_Heartbeat_size 12 +#define StoreAndForward_History_size 18 +#define StoreAndForward_Statistics_size 50 +#define StoreAndForward_size 54 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/telemetry.pb.c b/src/mesh/generated/meshtastic/telemetry.pb.c index 3b664cd22..1446be188 100644 --- a/src/mesh/generated/meshtastic/telemetry.pb.c +++ b/src/mesh/generated/meshtastic/telemetry.pb.c @@ -6,13 +6,13 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_DeviceMetrics, meshtastic_DeviceMetrics, AUTO) +PB_BIND(DeviceMetrics, DeviceMetrics, AUTO) -PB_BIND(meshtastic_EnvironmentMetrics, meshtastic_EnvironmentMetrics, AUTO) +PB_BIND(EnvironmentMetrics, EnvironmentMetrics, AUTO) -PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, AUTO) +PB_BIND(Telemetry, Telemetry, AUTO) diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h index 511ae1229..7d4bb02eb 100644 --- a/src/mesh/generated/meshtastic/telemetry.pb.h +++ b/src/mesh/generated/meshtastic/telemetry.pb.h @@ -11,38 +11,38 @@ /* Enum definitions */ /* TODO: REPLACE */ -typedef enum _meshtastic_TelemetrySensorType { +typedef enum _TelemetrySensorType { /* No external telemetry sensor explicitly set */ - meshtastic_TelemetrySensorType_SENSOR_UNSET = 0, + TelemetrySensorType_SENSOR_UNSET = 0, /* High accuracy temperature, pressure, humidity */ - meshtastic_TelemetrySensorType_BME280 = 1, + TelemetrySensorType_BME280 = 1, /* High accuracy temperature, pressure, humidity, and air resistance */ - meshtastic_TelemetrySensorType_BME680 = 2, + TelemetrySensorType_BME680 = 2, /* Very high accuracy temperature */ - meshtastic_TelemetrySensorType_MCP9808 = 3, + TelemetrySensorType_MCP9808 = 3, /* Moderate accuracy current and voltage */ - meshtastic_TelemetrySensorType_INA260 = 4, + TelemetrySensorType_INA260 = 4, /* Moderate accuracy current and voltage */ - meshtastic_TelemetrySensorType_INA219 = 5, + TelemetrySensorType_INA219 = 5, /* High accuracy temperature and pressure */ - meshtastic_TelemetrySensorType_BMP280 = 6, + TelemetrySensorType_BMP280 = 6, /* High accuracy temperature and humidity */ - meshtastic_TelemetrySensorType_SHTC3 = 7, + TelemetrySensorType_SHTC3 = 7, /* High accuracy pressure */ - meshtastic_TelemetrySensorType_LPS22 = 8, + TelemetrySensorType_LPS22 = 8, /* 3-Axis magnetic sensor */ - meshtastic_TelemetrySensorType_QMC6310 = 9, + TelemetrySensorType_QMC6310 = 9, /* 6-Axis inertial measurement sensor */ - meshtastic_TelemetrySensorType_QMI8658 = 10, + TelemetrySensorType_QMI8658 = 10, /* 3-Axis magnetic sensor */ - meshtastic_TelemetrySensorType_QMC5883L = 11, + TelemetrySensorType_QMC5883L = 11, /* High accuracy temperature and humidity */ - meshtastic_TelemetrySensorType_SHT31 = 12 -} meshtastic_TelemetrySensorType; + TelemetrySensorType_SHT31 = 12 +} TelemetrySensorType; /* Struct definitions */ /* Key native device metrics such as battery level */ -typedef struct _meshtastic_DeviceMetrics { +typedef struct _DeviceMetrics { /* 1-100 (0 means powered) */ uint32_t battery_level; /* Voltage measured */ @@ -51,10 +51,10 @@ typedef struct _meshtastic_DeviceMetrics { float channel_utilization; /* Percent of airtime for transmission used within the last hour. */ float air_util_tx; -} meshtastic_DeviceMetrics; +} DeviceMetrics; /* Weather station or other environmental metrics */ -typedef struct _meshtastic_EnvironmentMetrics { +typedef struct _EnvironmentMetrics { /* Temperature measured */ float temperature; /* Relative humidity percent measured */ @@ -67,10 +67,10 @@ typedef struct _meshtastic_EnvironmentMetrics { float voltage; /* Current measured */ float current; -} meshtastic_EnvironmentMetrics; +} EnvironmentMetrics; /* Types of Measurements the telemetry module is equipped to handle */ -typedef struct _meshtastic_Telemetry { +typedef struct _Telemetry { /* This is usually not sent over the mesh (to save space), but it is sent from the phone so that the local device can set its RTC If it is sent over the mesh (because there are devices on the mesh without GPS), it will only @@ -80,11 +80,11 @@ typedef struct _meshtastic_Telemetry { pb_size_t which_variant; union { /* Key native device metrics such as battery level */ - meshtastic_DeviceMetrics device_metrics; + DeviceMetrics device_metrics; /* Weather station or other environmental metrics */ - meshtastic_EnvironmentMetrics environment_metrics; + EnvironmentMetrics environment_metrics; } variant; -} meshtastic_Telemetry; +} Telemetry; #ifdef __cplusplus @@ -92,78 +92,78 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET -#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SHT31 -#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SHT31+1)) +#define _TelemetrySensorType_MIN TelemetrySensorType_SENSOR_UNSET +#define _TelemetrySensorType_MAX TelemetrySensorType_SHT31 +#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_SHT31+1)) /* Initializer values for message structs */ -#define meshtastic_DeviceMetrics_init_default {0, 0, 0, 0} -#define meshtastic_EnvironmentMetrics_init_default {0, 0, 0, 0, 0, 0} -#define meshtastic_Telemetry_init_default {0, 0, {meshtastic_DeviceMetrics_init_default}} -#define meshtastic_DeviceMetrics_init_zero {0, 0, 0, 0} -#define meshtastic_EnvironmentMetrics_init_zero {0, 0, 0, 0, 0, 0} -#define meshtastic_Telemetry_init_zero {0, 0, {meshtastic_DeviceMetrics_init_zero}} +#define DeviceMetrics_init_default {0, 0, 0, 0} +#define EnvironmentMetrics_init_default {0, 0, 0, 0, 0, 0} +#define Telemetry_init_default {0, 0, {DeviceMetrics_init_default}} +#define DeviceMetrics_init_zero {0, 0, 0, 0} +#define EnvironmentMetrics_init_zero {0, 0, 0, 0, 0, 0} +#define Telemetry_init_zero {0, 0, {DeviceMetrics_init_zero}} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_DeviceMetrics_battery_level_tag 1 -#define meshtastic_DeviceMetrics_voltage_tag 2 -#define meshtastic_DeviceMetrics_channel_utilization_tag 3 -#define meshtastic_DeviceMetrics_air_util_tx_tag 4 -#define meshtastic_EnvironmentMetrics_temperature_tag 1 -#define meshtastic_EnvironmentMetrics_relative_humidity_tag 2 -#define meshtastic_EnvironmentMetrics_barometric_pressure_tag 3 -#define meshtastic_EnvironmentMetrics_gas_resistance_tag 4 -#define meshtastic_EnvironmentMetrics_voltage_tag 5 -#define meshtastic_EnvironmentMetrics_current_tag 6 -#define meshtastic_Telemetry_time_tag 1 -#define meshtastic_Telemetry_device_metrics_tag 2 -#define meshtastic_Telemetry_environment_metrics_tag 3 +#define DeviceMetrics_battery_level_tag 1 +#define DeviceMetrics_voltage_tag 2 +#define DeviceMetrics_channel_utilization_tag 3 +#define DeviceMetrics_air_util_tx_tag 4 +#define EnvironmentMetrics_temperature_tag 1 +#define EnvironmentMetrics_relative_humidity_tag 2 +#define EnvironmentMetrics_barometric_pressure_tag 3 +#define EnvironmentMetrics_gas_resistance_tag 4 +#define EnvironmentMetrics_voltage_tag 5 +#define EnvironmentMetrics_current_tag 6 +#define Telemetry_time_tag 1 +#define Telemetry_device_metrics_tag 2 +#define Telemetry_environment_metrics_tag 3 /* Struct field encoding specification for nanopb */ -#define meshtastic_DeviceMetrics_FIELDLIST(X, a) \ +#define DeviceMetrics_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, battery_level, 1) \ X(a, STATIC, SINGULAR, FLOAT, voltage, 2) \ X(a, STATIC, SINGULAR, FLOAT, channel_utilization, 3) \ X(a, STATIC, SINGULAR, FLOAT, air_util_tx, 4) -#define meshtastic_DeviceMetrics_CALLBACK NULL -#define meshtastic_DeviceMetrics_DEFAULT NULL +#define DeviceMetrics_CALLBACK NULL +#define DeviceMetrics_DEFAULT NULL -#define meshtastic_EnvironmentMetrics_FIELDLIST(X, a) \ +#define EnvironmentMetrics_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, FLOAT, temperature, 1) \ X(a, STATIC, SINGULAR, FLOAT, relative_humidity, 2) \ X(a, STATIC, SINGULAR, FLOAT, barometric_pressure, 3) \ X(a, STATIC, SINGULAR, FLOAT, gas_resistance, 4) \ X(a, STATIC, SINGULAR, FLOAT, voltage, 5) \ X(a, STATIC, SINGULAR, FLOAT, current, 6) -#define meshtastic_EnvironmentMetrics_CALLBACK NULL -#define meshtastic_EnvironmentMetrics_DEFAULT NULL +#define EnvironmentMetrics_CALLBACK NULL +#define EnvironmentMetrics_DEFAULT NULL -#define meshtastic_Telemetry_FIELDLIST(X, a) \ +#define Telemetry_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, FIXED32, time, 1) \ X(a, STATIC, ONEOF, MESSAGE, (variant,device_metrics,variant.device_metrics), 2) \ X(a, STATIC, ONEOF, MESSAGE, (variant,environment_metrics,variant.environment_metrics), 3) -#define meshtastic_Telemetry_CALLBACK NULL -#define meshtastic_Telemetry_DEFAULT NULL -#define meshtastic_Telemetry_variant_device_metrics_MSGTYPE meshtastic_DeviceMetrics -#define meshtastic_Telemetry_variant_environment_metrics_MSGTYPE meshtastic_EnvironmentMetrics +#define Telemetry_CALLBACK NULL +#define Telemetry_DEFAULT NULL +#define Telemetry_variant_device_metrics_MSGTYPE DeviceMetrics +#define Telemetry_variant_environment_metrics_MSGTYPE EnvironmentMetrics -extern const pb_msgdesc_t meshtastic_DeviceMetrics_msg; -extern const pb_msgdesc_t meshtastic_EnvironmentMetrics_msg; -extern const pb_msgdesc_t meshtastic_Telemetry_msg; +extern const pb_msgdesc_t DeviceMetrics_msg; +extern const pb_msgdesc_t EnvironmentMetrics_msg; +extern const pb_msgdesc_t Telemetry_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_DeviceMetrics_fields &meshtastic_DeviceMetrics_msg -#define meshtastic_EnvironmentMetrics_fields &meshtastic_EnvironmentMetrics_msg -#define meshtastic_Telemetry_fields &meshtastic_Telemetry_msg +#define DeviceMetrics_fields &DeviceMetrics_msg +#define EnvironmentMetrics_fields &EnvironmentMetrics_msg +#define Telemetry_fields &Telemetry_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_DeviceMetrics_size 21 -#define meshtastic_EnvironmentMetrics_size 30 -#define meshtastic_Telemetry_size 37 +#define DeviceMetrics_size 21 +#define EnvironmentMetrics_size 30 +#define Telemetry_size 37 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/meshtastic/xmodem.pb.c b/src/mesh/generated/meshtastic/xmodem.pb.c index 83bb6e51a..f2b00401d 100644 --- a/src/mesh/generated/meshtastic/xmodem.pb.c +++ b/src/mesh/generated/meshtastic/xmodem.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(meshtastic_XModem, meshtastic_XModem, AUTO) +PB_BIND(XModem, XModem, AUTO) diff --git a/src/mesh/generated/meshtastic/xmodem.pb.h b/src/mesh/generated/meshtastic/xmodem.pb.h index 48d5aa5cd..4994fa97b 100644 --- a/src/mesh/generated/meshtastic/xmodem.pb.h +++ b/src/mesh/generated/meshtastic/xmodem.pb.h @@ -10,25 +10,25 @@ #endif /* Enum definitions */ -typedef enum _meshtastic_XModem_Control { - meshtastic_XModem_Control_NUL = 0, - meshtastic_XModem_Control_SOH = 1, - meshtastic_XModem_Control_STX = 2, - meshtastic_XModem_Control_EOT = 4, - meshtastic_XModem_Control_ACK = 6, - meshtastic_XModem_Control_NAK = 21, - meshtastic_XModem_Control_CAN = 24, - meshtastic_XModem_Control_CTRLZ = 26 -} meshtastic_XModem_Control; +typedef enum _XModem_Control { + XModem_Control_NUL = 0, + XModem_Control_SOH = 1, + XModem_Control_STX = 2, + XModem_Control_EOT = 4, + XModem_Control_ACK = 6, + XModem_Control_NAK = 21, + XModem_Control_CAN = 24, + XModem_Control_CTRLZ = 26 +} XModem_Control; /* Struct definitions */ -typedef PB_BYTES_ARRAY_T(128) meshtastic_XModem_buffer_t; -typedef struct _meshtastic_XModem { - meshtastic_XModem_Control control; +typedef PB_BYTES_ARRAY_T(128) XModem_buffer_t; +typedef struct _XModem { + XModem_Control control; uint16_t seq; uint16_t crc16; - meshtastic_XModem_buffer_t buffer; -} meshtastic_XModem; + XModem_buffer_t buffer; +} XModem; #ifdef __cplusplus @@ -36,39 +36,39 @@ extern "C" { #endif /* Helper constants for enums */ -#define _meshtastic_XModem_Control_MIN meshtastic_XModem_Control_NUL -#define _meshtastic_XModem_Control_MAX meshtastic_XModem_Control_CTRLZ -#define _meshtastic_XModem_Control_ARRAYSIZE ((meshtastic_XModem_Control)(meshtastic_XModem_Control_CTRLZ+1)) +#define _XModem_Control_MIN XModem_Control_NUL +#define _XModem_Control_MAX XModem_Control_CTRLZ +#define _XModem_Control_ARRAYSIZE ((XModem_Control)(XModem_Control_CTRLZ+1)) -#define meshtastic_XModem_control_ENUMTYPE meshtastic_XModem_Control +#define XModem_control_ENUMTYPE XModem_Control /* Initializer values for message structs */ -#define meshtastic_XModem_init_default {_meshtastic_XModem_Control_MIN, 0, 0, {0, {0}}} -#define meshtastic_XModem_init_zero {_meshtastic_XModem_Control_MIN, 0, 0, {0, {0}}} +#define XModem_init_default {_XModem_Control_MIN, 0, 0, {0, {0}}} +#define XModem_init_zero {_XModem_Control_MIN, 0, 0, {0, {0}}} /* Field tags (for use in manual encoding/decoding) */ -#define meshtastic_XModem_control_tag 1 -#define meshtastic_XModem_seq_tag 2 -#define meshtastic_XModem_crc16_tag 3 -#define meshtastic_XModem_buffer_tag 4 +#define XModem_control_tag 1 +#define XModem_seq_tag 2 +#define XModem_crc16_tag 3 +#define XModem_buffer_tag 4 /* Struct field encoding specification for nanopb */ -#define meshtastic_XModem_FIELDLIST(X, a) \ +#define XModem_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, control, 1) \ X(a, STATIC, SINGULAR, UINT32, seq, 2) \ X(a, STATIC, SINGULAR, UINT32, crc16, 3) \ X(a, STATIC, SINGULAR, BYTES, buffer, 4) -#define meshtastic_XModem_CALLBACK NULL -#define meshtastic_XModem_DEFAULT NULL +#define XModem_CALLBACK NULL +#define XModem_DEFAULT NULL -extern const pb_msgdesc_t meshtastic_XModem_msg; +extern const pb_msgdesc_t XModem_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define meshtastic_XModem_fields &meshtastic_XModem_msg +#define XModem_fields &XModem_msg /* Maximum encoded size of messages (where known) */ -#define meshtastic_XModem_size 141 +#define XModem_size 141 #ifdef __cplusplus } /* extern "C" */