mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-18 02:52:05 +00:00
Merge branch 'master' into tft-gui-work
This commit is contained in:
commit
78af6d04c1
@ -649,6 +649,7 @@ void NodeDB::saveDeviceStateToDisk()
|
|||||||
#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)
|
||||||
|
@ -213,4 +213,6 @@ extern uint32_t error_address;
|
|||||||
#define Module_Config_size \
|
#define Module_Config_size \
|
||||||
(ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size + \
|
(ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size + \
|
||||||
ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size + \
|
ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size + \
|
||||||
ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
|
ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
|
||||||
|
|
||||||
|
// Please do not remove this comment, it makes trunk and compiler happy at the same time.
|
||||||
|
Loading…
Reference in New Issue
Block a user