pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-13 08:01:24 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove devicestate no_save (#3424)

Browse Source
This commit is contained in:
Ben Meadors 2024-03-17 08:16:22 -05:00 committed by GitHub
parent e27f029d09
commit bb57ccfc9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/mesh/NodeDB.cpp
View File

@ -97,13 +97,6 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
channels.onConfigChanged(); channels.onConfigChanged();
// temp hack for quicker testing
// devicestate.no_save = true;
if (devicestate.no_save) {
LOG_DEBUG("***** DEVELOPMENT MODE - DO NOT RELEASE *****\n");
// Put your development config changes here
}
// Update the global myRegion // Update the global myRegion
initRegion(); initRegion();
@ -644,61 +637,52 @@ bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_
void NodeDB::saveChannelsToDisk() void NodeDB::saveChannelsToDisk()
{ {
if (!devicestate.no_save) {
#ifdef FSCom #ifdef FSCom
FSCom.mkdir("/prefs"); FSCom.mkdir("/prefs");
#endif #endif
saveProto(channelFileName, meshtastic_ChannelFile_size, &meshtastic_ChannelFile_msg, &channelFile); saveProto(channelFileName, meshtastic_ChannelFile_size, &meshtastic_ChannelFile_msg, &channelFile);
}
} }
void NodeDB::saveDeviceStateToDisk() void NodeDB::saveDeviceStateToDisk()
{ {
if (!devicestate.no_save) {
#ifdef FSCom #ifdef FSCom
FSCom.mkdir("/prefs"); FSCom.mkdir("/prefs");
#endif #endif
saveProto(prefFileName, meshtastic_DeviceState_size, &meshtastic_DeviceState_msg, &devicestate);
}
} }
void NodeDB::saveToDisk(int saveWhat) void NodeDB::saveToDisk(int saveWhat)
{ {
if (!devicestate.no_save) {
#ifdef FSCom #ifdef FSCom
FSCom.mkdir("/prefs"); FSCom.mkdir("/prefs");
#endif #endif
if (saveWhat & SEGMENT_DEVICESTATE) { if (saveWhat & SEGMENT_DEVICESTATE) {
saveDeviceStateToDisk(); saveDeviceStateToDisk();
} }
if (saveWhat & SEGMENT_CONFIG) { if (saveWhat & SEGMENT_CONFIG) {
config.has_device = true; config.has_device = true;
config.has_display = true; config.has_display = true;
config.has_lora = true; config.has_lora = true;
config.has_position = true; config.has_position = true;
config.has_power = true; config.has_power = true;
config.has_network = true; config.has_network = true;
config.has_bluetooth = true; config.has_bluetooth = true;
saveProto(configFileName, meshtastic_LocalConfig_size, &meshtastic_LocalConfig_msg, &config); saveProto(configFileName, meshtastic_LocalConfig_size, &meshtastic_LocalConfig_msg, &config);
} }
if (saveWhat & SEGMENT_MODULECONFIG) { if (saveWhat & SEGMENT_MODULECONFIG) {
moduleConfig.has_canned_message = true; moduleConfig.has_canned_message = true;
moduleConfig.has_external_notification = true; moduleConfig.has_external_notification = true;
moduleConfig.has_mqtt = true; moduleConfig.has_mqtt = true;
moduleConfig.has_range_test = true; moduleConfig.has_range_test = true;
moduleConfig.has_serial = true; moduleConfig.has_serial = true;
moduleConfig.has_store_forward = true; moduleConfig.has_store_forward = true;
moduleConfig.has_telemetry = true; moduleConfig.has_telemetry = true;
saveProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, &meshtastic_LocalModuleConfig_msg, &moduleConfig); saveProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, &meshtastic_LocalModuleConfig_msg, &moduleConfig);
} }
if (saveWhat & SEGMENT_CHANNELS) { if (saveWhat & SEGMENT_CHANNELS) {
saveChannelsToDisk(); saveChannelsToDisk();
}
} else {
LOG_DEBUG("***** DEVELOPMENT MODE - DO NOT RELEASE - not saving to flash *****\n");
} }
} }