diff --git a/protobufs b/protobufs index a1b8c3d17..9adb17d94 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit a1b8c3d171445b2eebfd4b5bd1e4876f3bbed605 +Subproject commit 9adb17d940c236625ab0bcf6fb3c4c6ddfc695e9 diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 7f0e9b9c6..4362a67a0 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -983,7 +983,7 @@ void NodeDB::resetNodes() if (!config.position.fixed_position) clearLocalPosition(); numMeshNodes = 1; - if (config.device.preserve_favourites) { + if (config.device.preserve_favorites) { for (size_t i = 0; i < nodeDatabase.nodes.size(); i++) { meshtastic_NodeInfoLite &node = nodeDatabase.nodes[i]; if (i > 0 && !node.is_favorite) { diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h index f74863536..4d6b3ca9d 100644 --- a/src/mesh/generated/meshtastic/config.pb.h +++ b/src/mesh/generated/meshtastic/config.pb.h @@ -357,8 +357,8 @@ typedef struct _meshtastic_Config_DeviceConfig { /* Controls buzzer behavior for audio feedback Defaults to ENABLED */ meshtastic_Config_DeviceConfig_BuzzerMode buzzer_mode; - /* Tell the node to persist favourited nodes following a NodeDB reset. */ - bool preserve_favourites; + /* When true, favourited nodes are persisted through NodeDB resets. */ + bool preserve_favorites; } meshtastic_Config_DeviceConfig; /* Position Config */ @@ -760,7 +760,7 @@ extern "C" { #define meshtastic_Config_DeviceConfig_tzdef_tag 11 #define meshtastic_Config_DeviceConfig_led_heartbeat_disabled_tag 12 #define meshtastic_Config_DeviceConfig_buzzer_mode_tag 13 -#define meshtastic_Config_DeviceConfig_preserve_favourites_tag 14 +#define meshtastic_Config_DeviceConfig_preserve_favorites_tag 14 #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 @@ -887,7 +887,7 @@ X(a, STATIC, SINGULAR, BOOL, disable_triple_click, 10) \ X(a, STATIC, SINGULAR, STRING, tzdef, 11) \ X(a, STATIC, SINGULAR, BOOL, led_heartbeat_disabled, 12) \ X(a, STATIC, SINGULAR, UENUM, buzzer_mode, 13) \ -X(a, STATIC, SINGULAR, BOOL, preserve_favourites, 14) +X(a, STATIC, SINGULAR, BOOL, preserve_favorites, 14) #define meshtastic_Config_DeviceConfig_CALLBACK NULL #define meshtastic_Config_DeviceConfig_DEFAULT NULL diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index e5670f98a..cd24bbafe 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -639,7 +639,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c) // https://github.com/meshtastic/firmware/pull/7992 if (IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_CLIENT_BASE, meshtastic_Config_DeviceConfig_Role_ROUTER, meshtastic_Config_DeviceConfig_Role_ROUTER_LATE)) { - config.device.preserve_favourites = true; + config.device.preserve_favorites = true; }; #if USERPREFS_EVENT_MODE // If we're in event mode, nobody is a Router or Router Late