Declare all folder names in a single source file (#2039)

This commit is contained in:
Mark Thompson
2024-03-25 02:44:49 -05:00
committed by GitHub
parent d9bbd1b9ff
commit d5c8525afc
56 changed files with 224 additions and 105 deletions

View File

@@ -37,6 +37,7 @@
#include "ui_flash_utility.hpp"
#include "utility.hpp"
#include "rtc_time.hpp"
#include "file_path.hpp"
#include <algorithm>
#include <string>
@@ -1105,14 +1106,14 @@ void set_menu_color(Color v) {
// PMem to sdcard settings
bool should_use_sdcard_for_pmem() {
return std::filesystem::file_exists(PMEM_FILEFLAG);
return std::filesystem::file_exists(settings_dir / PMEM_FILEFLAG);
}
int save_persistent_settings_to_file() {
File outfile;
ensure_directory(SETTINGS_DIR);
auto error = outfile.create(PMEM_SETTING_FILE);
ensure_directory(settings_dir);
auto error = outfile.create(settings_dir / PMEM_SETTING_FILE);
if (error)
return false;
@@ -1122,7 +1123,7 @@ int save_persistent_settings_to_file() {
int load_persistent_settings_from_file() {
File infile;
auto error = infile.open(PMEM_SETTING_FILE);
auto error = infile.open(settings_dir / PMEM_SETTING_FILE);
if (error)
return false;

View File

@@ -37,10 +37,10 @@
#include "ui.hpp"
// persistent memory from/to sdcard flag file
#define PMEM_FILEFLAG u"/SETTINGS/PMEM_FILEFLAG"
#define PMEM_FILEFLAG u"PMEM_FILEFLAG"
// persistent memory from/to sdcard flag file
#define PMEM_SETTING_FILE u"/SETTINGS/pmem_settings"
#define PMEM_SETTING_FILE u"pmem_settings"
#define PMEM_SIZE_BYTES 256 // total amount of pmem space in bytes, including checksum
#define PMEM_SIZE_WORDS (PMEM_SIZE_BYTES / 4)