From 058b5ceddd98099145c7f9d88fc361bb932e466e Mon Sep 17 00:00:00 2001 From: caveman99 Date: Wed, 15 Jun 2022 14:44:33 +0000 Subject: [PATCH] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/deviceonly.pb.h | 14 +++++-- src/mesh/generated/localonly.pb.h | 54 ++++++++++++++++----------- src/mesh/generated/module_config.pb.h | 2 +- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/protobufs b/protobufs index 8f616d3ee..9b0148e86 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 8f616d3eefd4edc86b915f3d7fae827847bdcd95 +Subproject commit 9b0148e86b28d995c56e3aca209f5e2af6360c5b diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h index 6da17270e..dc7a305db 100644 --- a/src/mesh/generated/deviceonly.pb.h +++ b/src/mesh/generated/deviceonly.pb.h @@ -28,6 +28,10 @@ typedef struct _ChannelFile { /* The channels our node knows about */ pb_size_t channels_count; 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; } ChannelFile; /* This message is never sent over the wire, but it is used for serializing DB @@ -93,14 +97,15 @@ extern "C" { /* Initializer values for message structs */ #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}} +#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, ""} #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}} +#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, ""} /* Field tags (for use in manual encoding/decoding) */ #define ChannelFile_channels_tag 1 +#define ChannelFile_version_tag 2 #define DeviceState_my_node_tag 2 #define DeviceState_owner_tag 3 #define DeviceState_node_db_tag 4 @@ -134,7 +139,8 @@ X(a, STATIC, SINGULAR, BOOL, did_gps_reset, 11) #define DeviceState_rx_text_message_MSGTYPE MeshPacket #define ChannelFile_FIELDLIST(X, a) \ -X(a, STATIC, REPEATED, MESSAGE, channels, 1) +X(a, STATIC, REPEATED, MESSAGE, channels, 1) \ +X(a, STATIC, SINGULAR, UINT32, version, 2) #define ChannelFile_CALLBACK NULL #define ChannelFile_DEFAULT NULL #define ChannelFile_channels_MSGTYPE Channel @@ -158,7 +164,7 @@ extern const pb_msgdesc_t OEMStore_msg; #define OEMStore_fields &OEMStore_msg /* Maximum encoded size of messages (where known) */ -#define ChannelFile_size 624 +#define ChannelFile_size 630 #define DeviceState_size 23728 #define OEMStore_size 2106 diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index 06922a88d..60c8ed2d5 100644 --- a/src/mesh/generated/localonly.pb.h +++ b/src/mesh/generated/localonly.pb.h @@ -13,48 +13,56 @@ /* Struct definitions */ typedef struct _LocalConfig { - /* TODO: REPLACE */ + /* The part of the config that is specific to the Device */ bool has_device; Config_DeviceConfig device; - /* TODO: REPLACE */ + /* The part of the config that is specific to the GPS Position */ bool has_position; Config_PositionConfig position; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Power settings */ bool has_power; Config_PowerConfig power; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Wifi Settings */ bool has_wifi; Config_WiFiConfig wifi; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Display */ bool has_display; Config_DisplayConfig display; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Lora Radio */ bool has_lora; Config_LoRaConfig lora; + /* 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; } LocalConfig; typedef struct _LocalModuleConfig { - /* TODO: REPLACE */ + /* The part of the config that is specific to the MQTT module */ bool has_mqtt; ModuleConfig_MQTTConfig mqtt; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Serial module */ bool has_serial; ModuleConfig_SerialConfig serial; - /* TODO: REPLACE */ + /* The part of the config that is specific to the ExternalNotification module */ bool has_external_notification; ModuleConfig_ExternalNotificationConfig external_notification; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Store & Forward module */ bool has_store_forward; ModuleConfig_StoreForwardConfig store_forward; - /* TODO: REPLACE */ + /* The part of the config that is specific to the RangeTest module */ bool has_range_test; ModuleConfig_RangeTestConfig range_test; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Telemetry module */ bool has_telemetry; ModuleConfig_TelemetryConfig telemetry; - /* TODO: REPLACE */ + /* The part of the config that is specific to the Canned Message module */ bool has_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; } LocalModuleConfig; @@ -63,10 +71,10 @@ extern "C" { #endif /* Initializer values for message structs */ -#define LocalConfig_init_default {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_WiFiConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_init_default} -#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} -#define LocalConfig_init_zero {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_WiFiConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_init_zero} -#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} +#define LocalConfig_init_default {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_WiFiConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_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} +#define LocalConfig_init_zero {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_WiFiConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_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} /* Field tags (for use in manual encoding/decoding) */ #define LocalConfig_device_tag 1 @@ -75,6 +83,7 @@ extern "C" { #define LocalConfig_wifi_tag 4 #define LocalConfig_display_tag 5 #define LocalConfig_lora_tag 6 +#define LocalConfig_version_tag 7 #define LocalModuleConfig_mqtt_tag 1 #define LocalModuleConfig_serial_tag 2 #define LocalModuleConfig_external_notification_tag 3 @@ -82,6 +91,7 @@ extern "C" { #define LocalModuleConfig_range_test_tag 5 #define LocalModuleConfig_telemetry_tag 6 #define LocalModuleConfig_canned_message_tag 7 +#define LocalModuleConfig_version_tag 8 /* Struct field encoding specification for nanopb */ #define LocalConfig_FIELDLIST(X, a) \ @@ -90,7 +100,8 @@ X(a, STATIC, OPTIONAL, MESSAGE, position, 2) \ X(a, STATIC, OPTIONAL, MESSAGE, power, 3) \ X(a, STATIC, OPTIONAL, MESSAGE, wifi, 4) \ X(a, STATIC, OPTIONAL, MESSAGE, display, 5) \ -X(a, STATIC, OPTIONAL, MESSAGE, lora, 6) +X(a, STATIC, OPTIONAL, MESSAGE, lora, 6) \ +X(a, STATIC, SINGULAR, UINT32, version, 7) #define LocalConfig_CALLBACK NULL #define LocalConfig_DEFAULT NULL #define LocalConfig_device_MSGTYPE Config_DeviceConfig @@ -107,7 +118,8 @@ X(a, STATIC, OPTIONAL, MESSAGE, external_notification, 3) \ X(a, STATIC, OPTIONAL, MESSAGE, store_forward, 4) \ X(a, STATIC, OPTIONAL, MESSAGE, range_test, 5) \ X(a, STATIC, OPTIONAL, MESSAGE, telemetry, 6) \ -X(a, STATIC, OPTIONAL, MESSAGE, canned_message, 7) +X(a, STATIC, OPTIONAL, MESSAGE, canned_message, 7) \ +X(a, STATIC, SINGULAR, UINT32, version, 8) #define LocalModuleConfig_CALLBACK NULL #define LocalModuleConfig_DEFAULT NULL #define LocalModuleConfig_mqtt_MSGTYPE ModuleConfig_MQTTConfig @@ -126,8 +138,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg; #define LocalModuleConfig_fields &LocalModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define LocalConfig_size 315 -#define LocalModuleConfig_size 282 +#define LocalConfig_size 321 +#define LocalModuleConfig_size 288 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h index f68b1655c..56d1b3b26 100644 --- a/src/mesh/generated/module_config.pb.h +++ b/src/mesh/generated/module_config.pb.h @@ -115,7 +115,7 @@ typedef struct _ModuleConfig_TelemetryConfig { uint32_t environment_sensor_pin; } ModuleConfig_TelemetryConfig; -/* TODO: REPLACE */ +/* Module Config */ typedef struct _ModuleConfig { /* TODO: REPLACE */ pb_size_t which_payloadVariant;