From e902dd1fa22f4e6c5f6b16734d8156d0241664eb Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Wed, 19 Dec 2018 20:53:58 +1300 Subject: [PATCH 1/2] Using PROGMEM to store default configuration --- src/Config.cpp | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index dfac240..2d63a50 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,11 +1,31 @@ #include "Config.h" #include "Hardware.h" #include "Logging.h" - +#include "Flash.h" + +const char VERSION_STRING[] PROGMEM = VERSION; +const config_t DEFAULT_CONFIG PROGMEM = { + CONFIG_SEED, + VERSION, + 0xFFFF, + 0xFFFF, +#if BACKUP_ENABLE_NETWORK + { + POSITIONS_CONFIG_NET_DEFAULT_SAVE_THRESHOLD, + 0xFFFF, + POSITIONS_CONFIG_NET_DEFAULT_APN, + POSITIONS_CONFIG_NET_DEFAULT_URL + }, +#endif + CONFIG_DEFAULT_BATTERY_ALERT_LEVEL1, + CONFIG_DEFAULT_BATTERY_ALERT_LEVEL2, + CONFIG_DEFAULT_BATTERY_ALERT_CLEAR, + CONFIG_DEFAULT_ACTIVE_ALERTS, + CONFIG_DEFAULT_CONTACT_PHONE +}; namespace config { #define CURRENT_LOGGER "config" - const char VERSION_STRING[] PROGMEM = VERSION; namespace main { @@ -68,24 +88,7 @@ namespace config { #define CURRENT_LOGGER_FUNCTION "reset" NOTICE; - config_t config = {}; - config.seed = CONFIG_SEED; - strcpy_P(config.version, VERSION_STRING); - config.firstEntry = config.lastEntry = 0xFFFF; - config.alertBatteryLevel1 = CONFIG_DEFAULT_BATTERY_ALERT_LEVEL1; - config.alertBatteryLevel2 = CONFIG_DEFAULT_BATTERY_ALERT_LEVEL2; - config.alertBatteryLevelClear = CONFIG_DEFAULT_BATTERY_ALERT_CLEAR; - config.activeAlerts = CONFIG_DEFAULT_ACTIVE_ALERTS; - strcpy_P(config.contactPhone, PSTR(CONFIG_DEFAULT_CONTACT_PHONE)); - -#if BACKUP_ENABLE_NETWORK - config.network.saveThreshold = POSITIONS_CONFIG_NET_DEFAULT_SAVE_THRESHOLD; - config.network.lastSavedEntry = 0xFFFF; - strcpy_P(config.network.apn, PSTR(POSITIONS_CONFIG_NET_DEFAULT_APN)); - strcpy_P(config.network.url, PSTR(POSITIONS_CONFIG_NET_DEFAULT_URL)); -#endif - - value = config; + utils::flash::read(&DEFAULT_CONFIG, value); save(); } From 819a81965c2c159701170c08be0e7ceb98e49e60 Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Wed, 19 Dec 2018 21:39:24 +1300 Subject: [PATCH 2/2] Version bump --- src/config/System.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/System.h b/src/config/System.h index c82e618..8538e08 100644 --- a/src/config/System.h +++ b/src/config/System.h @@ -20,7 +20,7 @@ \def VERSION Version string, only used for indicative purpose */ -#define VERSION "1.40" +#define VERSION "1.41" /**