From 279ccb8bfb4c6e0aca566d5cdd3e1fedff551b69 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Fri, 10 May 2024 09:11:43 +0700 Subject: [PATCH 1/3] update configuration filename, log mesage and add configuration default value --- src/AgConfigure.cpp | 89 ++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/src/AgConfigure.cpp b/src/AgConfigure.cpp index a78f147..c76e964 100644 --- a/src/AgConfigure.cpp +++ b/src/AgConfigure.cpp @@ -9,7 +9,7 @@ #include #define EEPROM_CONFIG_SIZE 1024 -#define CONFIG_FILE_NAME "/cfg.json" +#define CONFIG_FILE_NAME "/AgConfigure_Configuration.json" const char *CONFIGURATION_CONTROL_NAME[] = { [ConfigurationControlLocal] = "local", @@ -42,6 +42,23 @@ JSON_PROP_DEF(displayBrightness); JSON_PROP_DEF(co2CalibrationRequested); JSON_PROP_DEF(ledBarTestRequested); JSON_PROP_DEF(lastOta); + +#define jprop_model_default "" +#define jprop_country_default "" +#define jprop_pmStandard_default getPMStandardString(false) +#define jprop_ledBarMode_default getLedBarModeName(LedBarMode::LedBarModeCO2) +#define jprop_displayMode_default getDisplayModeString(true) +#define jprop_abcDays_default 8 +#define jprop_tvocLearningOffset_default 12 +#define jprop_noxLearningOffset_default 12 +#define jprop_mqttBrokerUrl_default "" +#define jprop_temperatureUnit_default "c" +#define jprop_configurationControl_default String(CONFIGURATION_CONTROL_NAME[ConfigurationControl::ConfigurationControlBoth]) +#define jprop_postDataToAirGradient_default true +#define jprop_ledbarBrightness_default 100 +#define jprop_displayBrightness_default 100 +#define jprop_lastOta_default 0 + JSONVar jconfig; static bool jsonTypeInvalid(JSONVar root, String validType) { @@ -97,7 +114,6 @@ void Configuration::saveConfig(void) { } void Configuration::loadConfig(void) { - bool readSuccess = false; char *buf = (char *)malloc(EEPROM_CONFIG_SIZE); if (buf == NULL) { logError("Malloc read file buffer failed"); @@ -112,9 +128,12 @@ void Configuration::loadConfig(void) { #else File file = SPIFFS.open(CONFIG_FILE_NAME); if (file && !file.isDirectory()) { - logInfo("Read file"); - file.readBytes(buf, file.size()); - readSuccess = true; + logInfo("Reading file..."); + if(file.readBytes(buf, file.size()) != file.size()) { + logError("Reading file: failed - size not match"); + } else { + logInfo("Reading file: success"); + } file.close(); } else { SPIFFS.format(); @@ -130,23 +149,21 @@ void Configuration::loadConfig(void) { */ void Configuration::defaultConfig(void) { jconfig = JSON.parse("{}"); - jconfig[jprop_country] = ""; - jconfig[jprop_mqttBrokerUrl] = ""; - jconfig[jprop_configurationControl] = - String(CONFIGURATION_CONTROL_NAME - [ConfigurationControl::ConfigurationControlBoth]); - jconfig[jprop_pmStandard] = getPMStandardString(false); - jconfig[jprop_temperatureUnit] = "c"; - jconfig[jprop_postDataToAirGradient] = true; - jconfig[jprop_displayMode] = getDisplayModeString(true); - jconfig[jprop_ledbarBrightness] = 100; - jconfig[jprop_displayBrightness] = 100; - jconfig[jprop_ledBarMode] = getLedBarModeName(LedBarMode::LedBarModeCO2); - jconfig[jprop_tvocLearningOffset] = 12; - jconfig[jprop_noxLearningOffset] = 12; - jconfig[jprop_abcDays] = 8; - jconfig[jprop_model] = ""; + jconfig[jprop_country] = jprop_country_default; + jconfig[jprop_mqttBrokerUrl] = jprop_mqttBrokerUrl_default; + jconfig[jprop_configurationControl] = jprop_configurationControl_default; + jconfig[jprop_pmStandard] = jprop_pmStandard_default; + jconfig[jprop_temperatureUnit] = jprop_temperatureUnit_default; + jconfig[jprop_postDataToAirGradient] = jprop_postDataToAirGradient_default; + jconfig[jprop_displayMode] = getDisplayModeString(true); + jconfig[jprop_ledbarBrightness] = jprop_ledbarBrightness_default; + jconfig[jprop_displayBrightness] = jprop_displayBrightness_default; + jconfig[jprop_ledBarMode] = jprop_ledbarBrightness_default; + jconfig[jprop_tvocLearningOffset] = jprop_tvocLearningOffset_default; + jconfig[jprop_noxLearningOffset] = jprop_noxLearningOffset_default; + jconfig[jprop_abcDays] = jprop_abcDays_default; + jconfig[jprop_model] = jprop_model_default; saveConfig(); } @@ -886,7 +903,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_country] = ""; + jconfig[jprop_country] = jprop_country_default; changed = true; logInfo("toConfig: country changed"); } @@ -904,7 +921,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_pmStandard] = getPMStandardString(false); + jconfig[jprop_pmStandard] = jprop_pmStandard_default; changed = true; logInfo("toConfig: pmStandard changed"); } @@ -923,7 +940,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_ledBarMode] = getLedBarModeName(LedBarMode::LedBarModeCO2); + jconfig[jprop_ledBarMode] = jprop_ledBarMode_default; changed = true; logInfo("toConfig: ledBarMode changed"); } @@ -941,7 +958,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_displayMode] = getDisplayModeString(true); + jconfig[jprop_displayMode] = jprop_displayMode_default; changed = true; logInfo("toConfig: displayMode changed"); } @@ -953,7 +970,7 @@ void Configuration::toConfig(const char *buf) { isInvalid = false; } if (isInvalid) { - jconfig[jprop_abcDays] = 8; + jconfig[jprop_abcDays] = jprop_abcDays_default; changed = true; logInfo("toConfig: abcDays changed"); } @@ -970,7 +987,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_tvocLearningOffset] = 12; + jconfig[jprop_tvocLearningOffset] = jprop_tvocLearningOffset_default; changed = true; logInfo("toConfig: tvocLearningOffset changed"); } @@ -987,7 +1004,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_noxLearningOffset] = 12; + jconfig[jprop_noxLearningOffset] = jprop_noxLearningOffset_default; changed = true; logInfo("toConfig: noxLearningOffset changed"); } @@ -1000,7 +1017,7 @@ void Configuration::toConfig(const char *buf) { } if (isInvalid) { changed = true; - jconfig[jprop_mqttBrokerUrl] = ""; + jconfig[jprop_mqttBrokerUrl] = jprop_mqttBrokerUrl_default; logInfo("toConfig: mqttBroker changed"); } @@ -1016,7 +1033,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_temperatureUnit] = "c"; + jconfig[jprop_temperatureUnit] = jprop_temperatureUnit_default; changed = true; logInfo("toConfig: temperatureUnit changed"); } @@ -1038,9 +1055,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_configurationControl] = - String(CONFIGURATION_CONTROL_NAME - [ConfigurationControl::ConfigurationControlBoth]); + jconfig[jprop_configurationControl] =jprop_configurationControl_default; changed = true; logInfo("toConfig: configurationControl changed"); } @@ -1052,7 +1067,7 @@ void Configuration::toConfig(const char *buf) { isInvalid = false; } if (isInvalid) { - jconfig[jprop_postDataToAirGradient] = true; + jconfig[jprop_postDataToAirGradient] = jprop_postDataToAirGradient_default; changed = true; logInfo("toConfig: postToAirGradient changed"); } @@ -1069,7 +1084,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_ledbarBrightness] = 100; + jconfig[jprop_ledbarBrightness] = jprop_ledbarBrightness_default; changed = true; logInfo("toConfig: ledBarBrightness changed"); } @@ -1086,7 +1101,7 @@ void Configuration::toConfig(const char *buf) { } } if (isInvalid) { - jconfig[jprop_displayBrightness] = 100; + jconfig[jprop_displayBrightness] = jprop_displayBrightness_default; changed = true; logInfo("toConfig: displayBrightness changed"); } @@ -1098,7 +1113,7 @@ void Configuration::toConfig(const char *buf) { isInvalid = false; } if(isInvalid) { - jconfig[jprop_lastOta] = 0; + jconfig[jprop_lastOta] = jprop_lastOta_default; changed = true; } From e3dee42b4ba35759dfbd5fea4178adabec47e4fd Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Fri, 10 May 2024 09:16:22 +0700 Subject: [PATCH 2/3] fix esp8266 build fail --- src/AgConfigure.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/AgConfigure.cpp b/src/AgConfigure.cpp index c76e964..609f800 100644 --- a/src/AgConfigure.cpp +++ b/src/AgConfigure.cpp @@ -124,7 +124,6 @@ void Configuration::loadConfig(void) { for (int i = 0; i < EEPROM_CONFIG_SIZE; i++) { buf[i] = EEPROM.read(i); } - readSuccess = true; #else File file = SPIFFS.open(CONFIG_FILE_NAME); if (file && !file.isDirectory()) { From 31c60dcbece0b5dd68073f520d6d8906bd15f3cf Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Sun, 12 May 2024 11:48:03 +0700 Subject: [PATCH 3/3] fix build failed --- src/AgConfigure.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AgConfigure.cpp b/src/AgConfigure.cpp index f110698..dfccdc6 100644 --- a/src/AgConfigure.cpp +++ b/src/AgConfigure.cpp @@ -165,7 +165,7 @@ void Configuration::defaultConfig(void) { jconfig[jprop_noxLearningOffset] = jprop_noxLearningOffset_default; jconfig[jprop_abcDays] = jprop_abcDays_default; jconfig[jprop_model] = jprop_model_default; - jconfig[lastOta] = jprop_lastOta_default; + jconfig[jprop_lastOta] = jprop_lastOta_default; jconfig[jprop_offlineMode] = jprop_offlineMode_default; saveConfig();