pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-16 18:25:10 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
mverch67 2024-10-15 01:31:26 +02:00
parent fa74645096
commit 56ab052892
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/NodeDB.cpp
View File

@ -791,12 +791,6 @@ void NodeDB::loadFromDisk()
} }
} }
state = loadProto(oemConfigFile, meshtastic_OEMStore_size, sizeof(meshtastic_OEMStore), &meshtastic_OEMStore_msg, &oemStore);
if (state == LoadFileResult::LOAD_SUCCESS) {
LOG_INFO("Loaded OEMStore");
hasOemStore = true;
}
state = loadProto(uiconfigFileName, meshtastic_DeviceUIConfig_size, sizeof(meshtastic_DeviceUIConfig), state = loadProto(uiconfigFileName, meshtastic_DeviceUIConfig_size, sizeof(meshtastic_DeviceUIConfig),
&meshtastic_DeviceUIConfig_msg, &uiconfig); &meshtastic_DeviceUIConfig_msg, &uiconfig);
if (state == LoadFileResult::LOAD_SUCCESS) { if (state == LoadFileResult::LOAD_SUCCESS) {