From a5ff07e7daa94e9345df8d110747fb6506d1778e Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Mon, 3 Dec 2018 17:36:04 +1300 Subject: [PATCH] Reduced hex size by mutualizing print config function --- src/Config.cpp | 19 ++++++++++++------- src/Config.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index f0a2025..040c939 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -14,16 +14,14 @@ namespace config { void read() { #define CURRENT_LOGGER_FUNCTION "read" - VERBOSE; + NOTICE; hardware::i2c::powerOn(); hardware::i2c::eeprom.readBlock(CONFIG_ADDR, value); if (CONFIG_SEED != value.seed) reset(); //todo : reset network if seed for network is not right hardware::i2c::powerOff(); - NOTICE_FORMAT("%d, %s, %d, %d, %d, %d, %d, %B, %s", value.seed, value.version, value.firstEntry, value.lastEntry, value.alertBatteryLevel1, value.alertBatteryLevel2, value.alertBatteryLevelClear, value.activeAlerts, value.contactPhone); #if BACKUP_ENABLE_NETWORK - NOTICE_FORMAT("%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); //networkConfig_t c = { // POSITIONS_CONFIG_NET_DEFAULT_SAVE_THRESHOLD, // 0xFFFF, @@ -42,11 +40,9 @@ namespace config { void write() { #define CURRENT_LOGGER_FUNCTION "write" + NOTICE; - NOTICE_FORMAT("%d, %s, %d, %d, %d, %d, %d, %B, %s", value.seed, value.version, value.firstEntry, value.lastEntry, value.alertBatteryLevel1, value.alertBatteryLevel2, value.alertBatteryLevelClear, value.activeAlerts, value.contactPhone); -#if BACKUP_ENABLE_NETWORK - NOTICE_FORMAT("%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); -#endif + print(); hardware::i2c::powerOn(); int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value); hardware::i2c::powerOff(); @@ -91,5 +87,14 @@ namespace config { save(); } + void print() { + #define CURRENT_LOGGER_FUNCTION "print" + + NOTICE_FORMAT("%d, %s, %d, %d, %d, %d, %d, %B, %s", value.seed, value.version, value.firstEntry, value.lastEntry, value.alertBatteryLevel1, value.alertBatteryLevel2, value.alertBatteryLevelClear, value.activeAlerts, value.contactPhone); +#if BACKUP_ENABLE_NETWORK + NOTICE_FORMAT("%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); +#endif + } + } } \ No newline at end of file diff --git a/src/Config.h b/src/Config.h index e165fc2..85ea75d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,5 +29,7 @@ namespace config { void save(); void reset(); + + void print(); } } \ No newline at end of file