pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-24 01:16:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Migrate to new defaults (#4294)

Browse Source 
* Upgrade module config state version but don't blow everything away

* ModuleConfig version intervals roll forward

* Be specific about version migration criteria

* initModuleConfigIntervals fix

* Don't forget power!
This commit is contained in:
Ben Meadors 2024-07-16 09:37:50 -05:00 committed by GitHub
parent 9db3552e5a
commit 46d7b82ac1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mesh/NodeDB.cpp
View File

@ -425,10 +425,14 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
void NodeDB::initModuleConfigIntervals() void NodeDB::initModuleConfigIntervals()
{ {
moduleConfig.telemetry.device_update_interval = default_broadcast_interval_secs; // Zero out telemetry intervals so that they coalesce to defaults in Default.h
moduleConfig.telemetry.environment_update_interval = default_broadcast_interval_secs; moduleConfig.telemetry.device_update_interval = 0;
moduleConfig.telemetry.air_quality_interval = default_broadcast_interval_secs; moduleConfig.telemetry.environment_update_interval = 0;
moduleConfig.neighbor_info.update_interval = default_broadcast_interval_secs; moduleConfig.telemetry.air_quality_interval = 0;
moduleConfig.telemetry.power_update_interval = 0;
moduleConfig.neighbor_info.update_interval = 0;
moduleConfig.paxcounter.paxcounter_update_interval = 0;
moduleConfig.neighbor_info.update_interval = 0;
} }
void NodeDB::installDefaultChannels() void NodeDB::installDefaultChannels()
@ -648,6 +652,26 @@ void NodeDB::loadFromDisk()
if (state == LoadFileResult::SUCCESS) { if (state == LoadFileResult::SUCCESS) {
LOG_INFO("Loaded OEMStore\n"); LOG_INFO("Loaded OEMStore\n");
} }
// 2.4.X - configuration migration to update new default intervals
if (moduleConfig.version < 23) {
LOG_DEBUG("ModuleConfig version %d is stale, upgrading to new default intervals\n", moduleConfig.version);
moduleConfig.version = DEVICESTATE_CUR_VER;
if (moduleConfig.telemetry.device_update_interval == 900)
moduleConfig.telemetry.device_update_interval = 0;
if (moduleConfig.telemetry.environment_update_interval == 900)
moduleConfig.telemetry.environment_update_interval = 0;
if (moduleConfig.telemetry.air_quality_interval == 900)
moduleConfig.telemetry.air_quality_interval = 0;
if (moduleConfig.telemetry.power_update_interval == 900)
moduleConfig.telemetry.power_update_interval = 0;
if (moduleConfig.neighbor_info.update_interval == 900)
moduleConfig.neighbor_info.update_interval = 0;
if (moduleConfig.paxcounter.paxcounter_update_interval == 900)
moduleConfig.paxcounter.paxcounter_update_interval = 0;
saveToDisk(SEGMENT_MODULECONFIG);
}
} }
/** Save a protobuf from a file, return true for success */ /** Save a protobuf from a file, return true for success */

4
src/mesh/NodeDB.h
View File

@ -20,8 +20,8 @@ DeviceState versions used to be defined in the .proto file but really only this
#define SEGMENT_DEVICESTATE 4 #define SEGMENT_DEVICESTATE 4
#define SEGMENT_CHANNELS 8 #define SEGMENT_CHANNELS 8
#define DEVICESTATE_CUR_VER 22 #define DEVICESTATE_CUR_VER 23
#define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER #define DEVICESTATE_MIN_VER 22
extern meshtastic_DeviceState devicestate; extern meshtastic_DeviceState devicestate;
extern meshtastic_ChannelFile channelFile; extern meshtastic_ChannelFile channelFile;