[create-pull-request] automated change (#6181)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>

protobufs

@@ -1 +1 @@
-Subproject commit e2790151f058c0e885863a15eea0b4e4edf4aaaa
+Subproject commit 2a3a67f0431926dc3f32a8b216d264daab09b9bf

src/mesh/generated/meshtastic/admin.pb.cpp

@@ -20,3 +20,5 @@ PB_BIND(meshtastic_NodeRemoteHardwarePinsResponse, meshtastic_NodeRemoteHardware
 
 
 
+
+

src/mesh/generated/meshtastic/admin.pb.h

@@ -70,6 +70,13 @@ typedef enum _meshtastic_AdminMessage_ModuleConfigType {
     meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG = 12
 } meshtastic_AdminMessage_ModuleConfigType;
 
+typedef enum _meshtastic_AdminMessage_BackupLocation {
+    /* Backup to the internal flash */
+    meshtastic_AdminMessage_BackupLocation_FLASH = 0,
+    /* Backup to the SD card */
+    meshtastic_AdminMessage_BackupLocation_SD = 1
+} meshtastic_AdminMessage_BackupLocation;
+
 /* Struct definitions */
 /* Parameters for setting up Meshtastic for ameteur radio usage */
 typedef struct _meshtastic_HamParameters {
@@ -145,6 +152,12 @@ typedef struct _meshtastic_AdminMessage {
         char delete_file_request[201];
         /* Set zero and offset for scale chips */
         uint32_t set_scale;
+        /* Backup the node's preferences */
+        meshtastic_AdminMessage_BackupLocation backup_preferences;
+        /* Restore the node's preferences */
+        meshtastic_AdminMessage_BackupLocation restore_preferences;
+        /* Remove backups of the node's preferences */
+        meshtastic_AdminMessage_BackupLocation remove_backup_preferences;
         /* Set the owner for this node */
         meshtastic_User set_owner;
         /* Set channels (using the new API).
@@ -226,8 +239,15 @@ extern "C" {
 #define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG
 #define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG+1))
 
+#define _meshtastic_AdminMessage_BackupLocation_MIN meshtastic_AdminMessage_BackupLocation_FLASH
+#define _meshtastic_AdminMessage_BackupLocation_MAX meshtastic_AdminMessage_BackupLocation_SD
+#define _meshtastic_AdminMessage_BackupLocation_ARRAYSIZE ((meshtastic_AdminMessage_BackupLocation)(meshtastic_AdminMessage_BackupLocation_SD+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 meshtastic_AdminMessage_payload_variant_backup_preferences_ENUMTYPE meshtastic_AdminMessage_BackupLocation
+#define meshtastic_AdminMessage_payload_variant_restore_preferences_ENUMTYPE meshtastic_AdminMessage_BackupLocation
+#define meshtastic_AdminMessage_payload_variant_remove_backup_preferences_ENUMTYPE meshtastic_AdminMessage_BackupLocation
 
 
 
@@ -268,6 +288,9 @@ extern "C" {
 #define meshtastic_AdminMessage_enter_dfu_mode_request_tag 21
 #define meshtastic_AdminMessage_delete_file_request_tag 22
 #define meshtastic_AdminMessage_set_scale_tag    23
+#define meshtastic_AdminMessage_backup_preferences_tag 24
+#define meshtastic_AdminMessage_restore_preferences_tag 25
+#define meshtastic_AdminMessage_remove_backup_preferences_tag 26
 #define meshtastic_AdminMessage_set_owner_tag    32
 #define meshtastic_AdminMessage_set_channel_tag  33
 #define meshtastic_AdminMessage_set_config_tag   34
@@ -320,6 +343,9 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_node_remote_hardware_pin
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,enter_dfu_mode_request,enter_dfu_mode_request),  21) \
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,delete_file_request,delete_file_request),  22) \
 X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,set_scale,set_scale),  23) \
+X(a, STATIC,   ONEOF,    UENUM,    (payload_variant,backup_preferences,backup_preferences),  24) \
+X(a, STATIC,   ONEOF,    UENUM,    (payload_variant,restore_preferences,restore_preferences),  25) \
+X(a, STATIC,   ONEOF,    UENUM,    (payload_variant,remove_backup_preferences,remove_backup_preferences),  26) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_owner,set_owner),  32) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_channel,set_channel),  33) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_config,set_config),  34) \

src/mesh/generated/meshtastic/device_ui.pb.cpp

@@ -15,6 +15,12 @@ PB_BIND(meshtastic_NodeFilter, meshtastic_NodeFilter, AUTO)
 PB_BIND(meshtastic_NodeHighlight, meshtastic_NodeHighlight, AUTO)
 
 
+PB_BIND(meshtastic_GeoPoint, meshtastic_GeoPoint, AUTO)
+
+
+PB_BIND(meshtastic_Map, meshtastic_Map, AUTO)
+
+
 
 
 

src/mesh/generated/meshtastic/device_ui.pb.h

@@ -90,6 +90,25 @@ typedef struct _meshtastic_NodeHighlight {
     char node_name[16];
 } meshtastic_NodeHighlight;
 
+typedef struct _meshtastic_GeoPoint {
+    /* Zoom level */
+    int8_t zoom;
+    /* Coordinate: latitude */
+    int32_t latitude;
+    /* Coordinate: longitude */
+    int32_t longitude;
+} meshtastic_GeoPoint;
+
+typedef struct _meshtastic_Map {
+    /* Home coordinates */
+    bool has_home;
+    meshtastic_GeoPoint home;
+    /* Map tile style */
+    char style[20];
+    /* Map scroll follows GPS */
+    bool follow_gps;
+} meshtastic_Map;
+
 typedef PB_BYTES_ARRAY_T(16) meshtastic_DeviceUIConfig_calibration_data_t;
 typedef struct _meshtastic_DeviceUIConfig {
     /* A version integer used to invalidate saved files when we make incompatible changes. */
@@ -118,6 +137,9 @@ typedef struct _meshtastic_DeviceUIConfig {
     meshtastic_NodeHighlight node_highlight;
     /* 8 integers for screen calibration data */
     meshtastic_DeviceUIConfig_calibration_data_t calibration_data;
+    /* Map related data */
+    bool has_map_data;
+    meshtastic_Map map_data;
 } meshtastic_DeviceUIConfig;
 
 
@@ -140,13 +162,19 @@ extern "C" {
 
 
 
+
+
 /* Initializer values for message structs */
-#define meshtastic_DeviceUIConfig_init_default   {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_default, false, meshtastic_NodeHighlight_init_default, {0, {0}}}
+#define meshtastic_DeviceUIConfig_init_default   {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_default, false, meshtastic_NodeHighlight_init_default, {0, {0}}, false, meshtastic_Map_init_default}
 #define meshtastic_NodeFilter_init_default       {0, 0, 0, 0, 0, "", 0}
 #define meshtastic_NodeHighlight_init_default    {0, 0, 0, 0, ""}
-#define meshtastic_DeviceUIConfig_init_zero      {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_zero, false, meshtastic_NodeHighlight_init_zero, {0, {0}}}
+#define meshtastic_GeoPoint_init_default         {0, 0, 0}
+#define meshtastic_Map_init_default              {false, meshtastic_GeoPoint_init_default, "", 0}
+#define meshtastic_DeviceUIConfig_init_zero      {0, 0, 0, 0, 0, 0, _meshtastic_Theme_MIN, 0, 0, 0, _meshtastic_Language_MIN, false, meshtastic_NodeFilter_init_zero, false, meshtastic_NodeHighlight_init_zero, {0, {0}}, false, meshtastic_Map_init_zero}
 #define meshtastic_NodeFilter_init_zero          {0, 0, 0, 0, 0, "", 0}
 #define meshtastic_NodeHighlight_init_zero       {0, 0, 0, 0, ""}
+#define meshtastic_GeoPoint_init_zero            {0, 0, 0}
+#define meshtastic_Map_init_zero                 {false, meshtastic_GeoPoint_init_zero, "", 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_NodeFilter_unknown_switch_tag 1
@@ -161,6 +189,12 @@ extern "C" {
 #define meshtastic_NodeHighlight_telemetry_switch_tag 3
 #define meshtastic_NodeHighlight_iaq_switch_tag  4
 #define meshtastic_NodeHighlight_node_name_tag   5
+#define meshtastic_GeoPoint_zoom_tag             1
+#define meshtastic_GeoPoint_latitude_tag         2
+#define meshtastic_GeoPoint_longitude_tag        3
+#define meshtastic_Map_home_tag                  1
+#define meshtastic_Map_style_tag                 2
+#define meshtastic_Map_follow_gps_tag            3
 #define meshtastic_DeviceUIConfig_version_tag    1
 #define meshtastic_DeviceUIConfig_screen_brightness_tag 2
 #define meshtastic_DeviceUIConfig_screen_timeout_tag 3
@@ -175,6 +209,7 @@ extern "C" {
 #define meshtastic_DeviceUIConfig_node_filter_tag 12
 #define meshtastic_DeviceUIConfig_node_highlight_tag 13
 #define meshtastic_DeviceUIConfig_calibration_data_tag 14
+#define meshtastic_DeviceUIConfig_map_data_tag   15
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceUIConfig_FIELDLIST(X, a) \
@@ -191,11 +226,13 @@ X(a, STATIC,   SINGULAR, UINT32,   ring_tone_id,     10) \
 X(a, STATIC,   SINGULAR, UENUM,    language,         11) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  node_filter,      12) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  node_highlight,   13) \
-X(a, STATIC,   SINGULAR, BYTES,    calibration_data,  14)
+X(a, STATIC,   SINGULAR, BYTES,    calibration_data,  14) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  map_data,         15)
 #define meshtastic_DeviceUIConfig_CALLBACK NULL
 #define meshtastic_DeviceUIConfig_DEFAULT NULL
 #define meshtastic_DeviceUIConfig_node_filter_MSGTYPE meshtastic_NodeFilter
 #define meshtastic_DeviceUIConfig_node_highlight_MSGTYPE meshtastic_NodeHighlight
+#define meshtastic_DeviceUIConfig_map_data_MSGTYPE meshtastic_Map
 
 #define meshtastic_NodeFilter_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     unknown_switch,    1) \
@@ -217,18 +254,39 @@ X(a, STATIC,   SINGULAR, STRING,   node_name,         5)
 #define meshtastic_NodeHighlight_CALLBACK NULL
 #define meshtastic_NodeHighlight_DEFAULT NULL
 
+#define meshtastic_GeoPoint_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, INT32,    zoom,              1) \
+X(a, STATIC,   SINGULAR, INT32,    latitude,          2) \
+X(a, STATIC,   SINGULAR, INT32,    longitude,         3)
+#define meshtastic_GeoPoint_CALLBACK NULL
+#define meshtastic_GeoPoint_DEFAULT NULL
+
+#define meshtastic_Map_FIELDLIST(X, a) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  home,              1) \
+X(a, STATIC,   SINGULAR, STRING,   style,             2) \
+X(a, STATIC,   SINGULAR, BOOL,     follow_gps,        3)
+#define meshtastic_Map_CALLBACK NULL
+#define meshtastic_Map_DEFAULT NULL
+#define meshtastic_Map_home_MSGTYPE meshtastic_GeoPoint
+
 extern const pb_msgdesc_t meshtastic_DeviceUIConfig_msg;
 extern const pb_msgdesc_t meshtastic_NodeFilter_msg;
 extern const pb_msgdesc_t meshtastic_NodeHighlight_msg;
+extern const pb_msgdesc_t meshtastic_GeoPoint_msg;
+extern const pb_msgdesc_t meshtastic_Map_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_DeviceUIConfig_fields &meshtastic_DeviceUIConfig_msg
 #define meshtastic_NodeFilter_fields &meshtastic_NodeFilter_msg
 #define meshtastic_NodeHighlight_fields &meshtastic_NodeHighlight_msg
+#define meshtastic_GeoPoint_fields &meshtastic_GeoPoint_msg
+#define meshtastic_Map_fields &meshtastic_Map_msg
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_DEVICE_UI_PB_H_MAX_SIZE meshtastic_DeviceUIConfig_size
-#define meshtastic_DeviceUIConfig_size           128
+#define meshtastic_DeviceUIConfig_size           188
+#define meshtastic_GeoPoint_size                 33
+#define meshtastic_Map_size                      58
 #define meshtastic_NodeFilter_size               47
 #define meshtastic_NodeHighlight_size            25
 

src/mesh/generated/meshtastic/deviceonly.pb.cpp

@@ -18,7 +18,13 @@ PB_BIND(meshtastic_NodeInfoLite, meshtastic_NodeInfoLite, AUTO)
 PB_BIND(meshtastic_DeviceState, meshtastic_DeviceState, 2)
 
 
+PB_BIND(meshtastic_NodeDatabase, meshtastic_NodeDatabase, AUTO)
+
+
 PB_BIND(meshtastic_ChannelFile, meshtastic_ChannelFile, 2)
 
 
+PB_BIND(meshtastic_BackupPreferences, meshtastic_BackupPreferences, 2)
+
+
 

src/mesh/generated/meshtastic/deviceonly.pb.h

@@ -9,6 +9,7 @@
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/telemetry.pb.h"
 #include "meshtastic/config.pb.h"
+#include "meshtastic/localonly.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -133,10 +134,17 @@ typedef struct _meshtastic_DeviceState {
     /* The mesh's nodes with their available gpio pins for RemoteHardware module */
     pb_size_t node_remote_hardware_pins_count;
     meshtastic_NodeRemoteHardwarePin node_remote_hardware_pins[12];
-    /* New lite version of NodeDB to decrease memory footprint */
-    std::vector<meshtastic_NodeInfoLite> node_db_lite;
 } meshtastic_DeviceState;
 
+typedef struct _meshtastic_NodeDatabase {
+    /* 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;
+    /* New lite version of NodeDB to decrease memory footprint */
+    std::vector<meshtastic_NodeInfoLite> nodes;
+} meshtastic_NodeDatabase;
+
 /* The on-disk saved channels */
 typedef struct _meshtastic_ChannelFile {
     /* The channels our node knows about */
@@ -148,6 +156,26 @@ typedef struct _meshtastic_ChannelFile {
     uint32_t version;
 } meshtastic_ChannelFile;
 
+/* The on-disk backup of the node's preferences */
+typedef struct _meshtastic_BackupPreferences {
+    /* The version of the backup */
+    uint32_t version;
+    /* The timestamp of the backup (if node has time) */
+    uint32_t timestamp;
+    /* The node's configuration */
+    bool has_config;
+    meshtastic_LocalConfig config;
+    /* The node's module configuration */
+    bool has_module_config;
+    meshtastic_LocalModuleConfig module_config;
+    /* The node's channels */
+    bool has_channels;
+    meshtastic_ChannelFile channels;
+    /* The node's user (owner) information */
+    bool has_owner;
+    meshtastic_User owner;
+} meshtastic_BackupPreferences;
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -157,13 +185,17 @@ extern "C" {
 #define meshtastic_PositionLite_init_default     {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0}
-#define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, {0}}
+#define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
+#define meshtastic_NodeDatabase_init_default     {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_BackupPreferences_init_default {0, 0, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default, false, meshtastic_ChannelFile_init_default, false, meshtastic_User_init_default}
 #define meshtastic_PositionLite_init_zero        {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0}
-#define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, {0}}
+#define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
+#define meshtastic_NodeDatabase_init_zero        {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_BackupPreferences_init_zero   {0, 0, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero, false, meshtastic_ChannelFile_init_zero, false, meshtastic_User_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_PositionLite_latitude_i_tag   1
@@ -199,9 +231,16 @@ extern "C" {
 #define meshtastic_DeviceState_did_gps_reset_tag 11
 #define meshtastic_DeviceState_rx_waypoint_tag   12
 #define meshtastic_DeviceState_node_remote_hardware_pins_tag 13
-#define meshtastic_DeviceState_node_db_lite_tag  14
+#define meshtastic_NodeDatabase_version_tag      1
+#define meshtastic_NodeDatabase_nodes_tag        2
 #define meshtastic_ChannelFile_channels_tag      1
 #define meshtastic_ChannelFile_version_tag       2
+#define meshtastic_BackupPreferences_version_tag 1
+#define meshtastic_BackupPreferences_timestamp_tag 2
+#define meshtastic_BackupPreferences_config_tag  3
+#define meshtastic_BackupPreferences_module_config_tag 4
+#define meshtastic_BackupPreferences_channels_tag 5
+#define meshtastic_BackupPreferences_owner_tag   6
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_PositionLite_FIELDLIST(X, a) \
@@ -252,10 +291,8 @@ X(a, STATIC,   SINGULAR, UINT32,   version,           8) \
 X(a, STATIC,   SINGULAR, BOOL,     no_save,           9) \
 X(a, STATIC,   SINGULAR, BOOL,     did_gps_reset,    11) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  rx_waypoint,      12) \
-X(a, STATIC,   REPEATED, MESSAGE,  node_remote_hardware_pins,  13) \
+X(a, STATIC,   REPEATED, MESSAGE,  node_remote_hardware_pins,  13)
-X(a, CALLBACK, REPEATED, MESSAGE,  node_db_lite,     14)
+#define meshtastic_DeviceState_CALLBACK NULL
-extern bool meshtastic_DeviceState_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field);
-#define meshtastic_DeviceState_CALLBACK meshtastic_DeviceState_callback
 #define meshtastic_DeviceState_DEFAULT NULL
 #define meshtastic_DeviceState_my_node_MSGTYPE meshtastic_MyNodeInfo
 #define meshtastic_DeviceState_owner_MSGTYPE meshtastic_User
@@ -263,7 +300,14 @@ extern bool meshtastic_DeviceState_callback(pb_istream_t *istream, pb_ostream_t
 #define meshtastic_DeviceState_rx_text_message_MSGTYPE meshtastic_MeshPacket
 #define meshtastic_DeviceState_rx_waypoint_MSGTYPE meshtastic_MeshPacket
 #define meshtastic_DeviceState_node_remote_hardware_pins_MSGTYPE meshtastic_NodeRemoteHardwarePin
-#define meshtastic_DeviceState_node_db_lite_MSGTYPE meshtastic_NodeInfoLite
+
+#define meshtastic_NodeDatabase_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           1) \
+X(a, CALLBACK, REPEATED, MESSAGE,  nodes,             2)
+extern bool meshtastic_NodeDatabase_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field);
+#define meshtastic_NodeDatabase_CALLBACK meshtastic_NodeDatabase_callback
+#define meshtastic_NodeDatabase_DEFAULT NULL
+#define meshtastic_NodeDatabase_nodes_MSGTYPE meshtastic_NodeInfoLite
 
 #define meshtastic_ChannelFile_FIELDLIST(X, a) \
 X(a, STATIC,   REPEATED, MESSAGE,  channels,          1) \
@@ -272,23 +316,43 @@ X(a, STATIC,   SINGULAR, UINT32,   version,           2)
 #define meshtastic_ChannelFile_DEFAULT NULL
 #define meshtastic_ChannelFile_channels_MSGTYPE meshtastic_Channel
 
+#define meshtastic_BackupPreferences_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           1) \
+X(a, STATIC,   SINGULAR, FIXED32,  timestamp,         2) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  config,            3) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  module_config,     4) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  channels,          5) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  owner,             6)
+#define meshtastic_BackupPreferences_CALLBACK NULL
+#define meshtastic_BackupPreferences_DEFAULT NULL
+#define meshtastic_BackupPreferences_config_MSGTYPE meshtastic_LocalConfig
+#define meshtastic_BackupPreferences_module_config_MSGTYPE meshtastic_LocalModuleConfig
+#define meshtastic_BackupPreferences_channels_MSGTYPE meshtastic_ChannelFile
+#define meshtastic_BackupPreferences_owner_MSGTYPE meshtastic_User
+
 extern const pb_msgdesc_t meshtastic_PositionLite_msg;
 extern const pb_msgdesc_t meshtastic_UserLite_msg;
 extern const pb_msgdesc_t meshtastic_NodeInfoLite_msg;
 extern const pb_msgdesc_t meshtastic_DeviceState_msg;
+extern const pb_msgdesc_t meshtastic_NodeDatabase_msg;
 extern const pb_msgdesc_t meshtastic_ChannelFile_msg;
+extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_PositionLite_fields &meshtastic_PositionLite_msg
 #define meshtastic_UserLite_fields &meshtastic_UserLite_msg
 #define meshtastic_NodeInfoLite_fields &meshtastic_NodeInfoLite_msg
 #define meshtastic_DeviceState_fields &meshtastic_DeviceState_msg
+#define meshtastic_NodeDatabase_fields &meshtastic_NodeDatabase_msg
 #define meshtastic_ChannelFile_fields &meshtastic_ChannelFile_msg
+#define meshtastic_BackupPreferences_fields &meshtastic_BackupPreferences_msg
 
 /* Maximum encoded size of messages (where known) */
-/* meshtastic_DeviceState_size depends on runtime parameters */
+/* meshtastic_NodeDatabase_size depends on runtime parameters */
-#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_ChannelFile_size
+#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
+#define meshtastic_BackupPreferences_size        2263
 #define meshtastic_ChannelFile_size              718
+#define meshtastic_DeviceState_size              1720
 #define meshtastic_NodeInfoLite_size             188
 #define meshtastic_PositionLite_size             28
 #define meshtastic_UserLite_size                 96

src/mesh/generated/meshtastic/localonly.pb.h

@@ -188,7 +188,7 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalConfig_size
 #define meshtastic_LocalConfig_size              743
-#define meshtastic_LocalModuleConfig_size        699
+#define meshtastic_LocalModuleConfig_size        667
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/meshtastic/module_config.pb.cpp

@@ -6,10 +6,10 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(meshtastic_ModuleConfig, meshtastic_ModuleConfig, 2)
+PB_BIND(meshtastic_ModuleConfig, meshtastic_ModuleConfig, AUTO)
 
 
-PB_BIND(meshtastic_ModuleConfig_MQTTConfig, meshtastic_ModuleConfig_MQTTConfig, 2)
+PB_BIND(meshtastic_ModuleConfig_MQTTConfig, meshtastic_ModuleConfig_MQTTConfig, AUTO)
 
 
 PB_BIND(meshtastic_ModuleConfig_MapReportSettings, meshtastic_ModuleConfig_MapReportSettings, AUTO)

src/mesh/generated/meshtastic/module_config.pb.h

@@ -126,7 +126,7 @@ typedef struct _meshtastic_ModuleConfig_MQTTConfig {
     /* MQTT password to use (most useful for a custom MQTT server).
  If using a custom server, this will be honoured even if empty.
  If using the default server, this will only be honoured if set, otherwise the device will use the default password */
-    char password[64];
+    char password[32];
     /* Whether to send encrypted or decrypted packets to MQTT.
  This parameter is only honoured if you also set server
  (the default official mqtt.meshtastic.org server can handle encrypted packets)
@@ -887,7 +887,7 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_CannedMessageConfig_size 49
 #define meshtastic_ModuleConfig_DetectionSensorConfig_size 44
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_size 42
-#define meshtastic_ModuleConfig_MQTTConfig_size  254
+#define meshtastic_ModuleConfig_MQTTConfig_size  222
 #define meshtastic_ModuleConfig_MapReportSettings_size 12
 #define meshtastic_ModuleConfig_NeighborInfoConfig_size 10
 #define meshtastic_ModuleConfig_PaxcounterConfig_size 30
@@ -896,7 +896,7 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_SerialConfig_size 28
 #define meshtastic_ModuleConfig_StoreForwardConfig_size 24
 #define meshtastic_ModuleConfig_TelemetryConfig_size 46
-#define meshtastic_ModuleConfig_size             257
+#define meshtastic_ModuleConfig_size             225
 #define meshtastic_RemoteHardwarePin_size        21
 
 #ifdef __cplusplus