diff --git a/code/main/main.cpp b/code/main/main.cpp index 0340e50f..36e40d20 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -528,30 +528,44 @@ extern "C" void app_main(void) } } -// FIXME: needs to be revised or removed!!! void migrateConfiguration(void) { + std::vector splitted; bool migrated = false; + bool CamZoom_found = false; + int CamZoom_lines = 0; + bool CamZoom_value = false; + int CamZoomSize_lines = 0; + int CamZoomSize_value = 0; + int CamZoomOffsetX_lines = 0; + int CamZoomOffsetX_value = 0; + int CamZoomOffsetY_lines = 0; + int CamZoomOffsetY_value = 0; + if (!FileExists(CONFIG_FILE)) { LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Config file seems to be missing!"); - return; + return; } std::string section = ""; - std::ifstream ifs(CONFIG_FILE); - std::string content((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); - + std::ifstream ifs(CONFIG_FILE); + std::string content((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); + /* Split config file it array of lines */ std::vector configLines = splitString(content); /* Process each line */ for (int i = 0; i < configLines.size(); i++) { - //ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str()); + // ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str()); - if (configLines[i].find("[") != std::string::npos) { // Start of new section + if (configLines[i].find("[") != std::string::npos) { + // Start of new section section = configLines[i]; replaceString(section, ";", "", false); // Remove possible semicolon (just for the string comparison) - //ESP_LOGI(TAG, "New section: %s", section.c_str()); + // ESP_LOGI(TAG, "New section: %s", section.c_str()); + } + else { + splitted = ZerlegeZeile(configLines[i]); } /* Migrate parameters as needed @@ -569,119 +583,154 @@ void migrateConfiguration(void) { } if (section == "[MakeImage]" || section == "[TakeImage]") { - migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation"); - migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention"); + if ((isInString(configLines[i], "Brightness")) && (!isInString(configLines[i], "CamBrightness"))) { + migrated = migrated | replaceString(configLines[i], "Brightness", "CamBrightness"); + } + else if ((isInString(configLines[i], "Contrast")) && (!isInString(configLines[i], "CamContrast"))) { + migrated = migrated | replaceString(configLines[i], "Contrast", "CamContrast"); + } + else if ((isInString(configLines[i], "Saturation")) && (!isInString(configLines[i], "CamSaturation"))) { + migrated = migrated | replaceString(configLines[i], "Saturation", "CamSaturation"); + } + else if ((isInString(configLines[i], "Sharpness")) && (!isInString(configLines[i], "CamSharpness")) && (!isInString(configLines[i], "CamAutoSharpness"))) { + migrated = migrated | replaceString(configLines[i], "Sharpness", "CamSharpness"); + } + else if ((isInString(configLines[i], "Aec2")) && (!isInString(configLines[i], "CamAec")) && (!isInString(configLines[i], "CamAec2"))) { + migrated = migrated | replaceString(configLines[i], "Aec2", "CamAec2"); + } + else if ((isInString(configLines[i], "Zoom")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "ZoomOffsetY"))) { + CamZoom_lines = i; + CamZoom_value = alphanumericToBoolean(splitted[1]); + CamZoom_found = true; + } + else if ((isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "CamZoom"))) { + CamZoomSize_lines = i; + if (isStringNumeric(splitted[1])) { + CamZoomSize_value = std::stof(splitted[1]); + } + CamZoom_found = true; + } + else if ((isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetY"))) { + CamZoomOffsetX_lines = i; + if (isStringNumeric(splitted[1])) { + CamZoomOffsetX_value = std::stof(splitted[1]); + } + CamZoom_found = true; + } + else if ((isInString(configLines[i], "ZoomOffsetY")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetX"))) { + CamZoomOffsetY_lines = i; + if (isStringNumeric(splitted[1])) { + CamZoomOffsetY_value = std::stof(splitted[1]); + } + CamZoom_found = true; + } + else { + migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation"); + migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention"); - migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";Demo", "Demo"); // Enable it + migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value + migrated = migrated | replaceString(configLines[i], ";Demo", "Demo"); // Enable it - // Parameter is no longer used - // migrated = migrated | replaceString(configLines[i], ";FixedExposure = true", ";FixedExposure = false"); // Set it to its default value - // migrated = migrated | replaceString(configLines[i], ";FixedExposure", "FixedExposure"); // Enable it + migrated = migrated | replaceString(configLines[i], "ImageQuality", "CamQuality"); + migrated = migrated | replaceString(configLines[i], "AutoExposureLevel", "CamAeLevel"); + migrated = migrated | replaceString(configLines[i], "FixedExposure", "CamAec"); + + migrated = migrated | replaceString(configLines[i], "ImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used + migrated = migrated | replaceString(configLines[i], "Grayscale", ";UNUSED_PARAMETER"); // This parameter is no longer used + migrated = migrated | replaceString(configLines[i], "Negative", ";UNUSED_PARAMETER"); // This parameter is no longer used + } } - - if (section == "[Alignment]") { - // Parameter is no longer used - // migrated = migrated | replaceString(configLines[i], ";InitialMirror = true", ";InitialMirror = false"); // Set it to its default value - // migrated = migrated | replaceString(configLines[i], ";InitialMirror", "InitialMirror"); // Enable it - - // Parameter is no longer used - // migrated = migrated | replaceString(configLines[i], ";FlipImageSize = true", ";FlipImageSize = false"); // Set it to its default value - // migrated = migrated | replaceString(configLines[i], ";FlipImageSize", "FlipImageSize"); // Enable it + else if (section == "[Alignment]") { + migrated = migrated | replaceString(configLines[i], "InitialMirror", ";UNUSED_PARAMETER"); // This parameter is no longer used + migrated = migrated | replaceString(configLines[i], ";InitialMirror", ";UNUSED_PARAMETER"); // This parameter is no longer used + migrated = migrated | replaceString(configLines[i], "FlipImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used + migrated = migrated | replaceString(configLines[i], ";FlipImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used } - - if (section == "[Digits]") { + else if (section == "[Digits]") { migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation"); migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention"); } - - if (section == "[Analog]") { + else if (section == "[Analog]") { migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation"); migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention"); migrated = migrated | replaceString(configLines[i], "ExtendedResolution", ";UNUSED_PARAMETER"); // This parameter is no longer used } - - if (section == "[PostProcessing]") { - migrated = migrated | replaceString(configLines[i], "AnalogDigitalTransitionStart", "AnalogToDigitTransitionStart"); // Rename it - migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse"); // Enable it - + else if (section == "[PostProcessing]") { /* AllowNegativeRates has a as prefix! */ - if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) { // It is the parameter "AllowNegativeRates" and it is commented out + if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) { + // It is the parameter "AllowNegativeRates" and it is commented out migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it + migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it } - /* IgnoreLeadingNaN has a as prefix! */ - if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) { // It is the parameter "IgnoreLeadingNaN" and it is commented out + else if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) { + // It is the parameter "IgnoreLeadingNaN" and it is commented out migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it + migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it } - /* ExtendedResolution has a as prefix! */ - if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) { // It is the parameter "ExtendedResolution" and it is commented out + else if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) { + // It is the parameter "ExtendedResolution" and it is commented out migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it + migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it } + else { + migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value + migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse"); // Enable it - migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage"); // Enable it + migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value + migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage"); // Enable it - migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency"); // Enable it + migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value + migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency"); // Enable it + } } - - if (section == "[MQTT]") { - migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages"); // First rename it, enable it with its default value + else if (section == "[MQTT]") { + migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages"); // First rename it, enable it with its default value migrated = migrated | replaceString(configLines[i], ";RetainMessages = true", ";RetainMessages = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages"); // Enable it + migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages"); // Enable it migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery = true", ";HomeassistantDiscovery = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery"); // Enable it + migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery"); // Enable it - if (configLines[i].rfind("Topic", 0) != std::string::npos) // only if string starts with "Topic" (Was the naming in very old version) - { + // only if string starts with "Topic" (Was the naming in very old version) + if (configLines[i].rfind("Topic", 0) != std::string::npos) { migrated = migrated | replaceString(configLines[i], "Topic", "MainTopic"); } } - - if (section == "[InfluxDB]") { + else if (section == "[InfluxDB]") { /* Fieldname has a as prefix! */ - if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname" + if (isInString(configLines[i], "Fieldname")) { + // It is the parameter "Fieldname" migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field } } - - if (section == "[InfluxDBv2]") { + else if (section == "[InfluxDBv2]") { /* Fieldname has a as prefix! */ - if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname" + if (isInString(configLines[i], "Fieldname")) { + // It is the parameter "Fieldname" migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field } /* Database got renamed to Bucket! */ - if (isInString(configLines[i], "Database")) { // It is the parameter "Database" + else if (isInString(configLines[i], "Database")) { + // It is the parameter "Database" migrated = migrated | replaceString(configLines[i], "Database", "Bucket"); // Rename it to Bucket } } - - if (section == "[GPIO]") { - + else if (section == "[GPIO]") { } - - if (section == "[DataLogging]") { + else if (section == "[DataLogging]") { migrated = migrated | replaceString(configLines[i], "DataLogRetentionInDays", "DataFilesRetention"); /* DataLogActive is true by default! */ migrated = migrated | replaceString(configLines[i], ";DataLogActive = false", ";DataLogActive = true"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive"); // Enable it + migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive"); // Enable it } - - if (section == "[AutoTimer]") { + else if (section == "[AutoTimer]") { migrated = migrated | replaceString(configLines[i], "Intervall", "Interval"); migrated = migrated | replaceString(configLines[i], ";AutoStart = true", ";AutoStart = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart"); // Enable it - + migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart"); // Enable it } - - if (section == "[Debug]") { + else if (section == "[Debug]") { migrated = migrated | replaceString(configLines[i], "Logfile ", "LogLevel "); // Whitespace needed so it does not match `LogfileRetentionInDays` /* LogLevel (resp. LogFile) was originally a boolean, but we switched it to an int * For both cases (true/false), we set it to level 2 (WARNING) */ @@ -689,27 +738,102 @@ void migrateConfiguration(void) { migrated = migrated | replaceString(configLines[i], "LogLevel = false", "LogLevel = 2"); migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "LogfilesRetention"); } - - if (section == "[System]") { + else if (section == "[System]") { migrated = migrated | replaceString(configLines[i], "RSSIThreashold", "RSSIThreshold"); migrated = migrated | replaceString(configLines[i], "AutoAdjustSummertime", ";UNUSED_PARAMETER"); // This parameter is no longer used migrated = migrated | replaceString(configLines[i], ";SetupMode = true", ";SetupMode = false"); // Set it to its default value - migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode"); // Enable it + migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode"); // Enable it } } - if (migrated) { // At least one replacement happened - if (! RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) { + if (CamZoom_found == true) { + if (CamZoomSize_value == 0) { + // mode0 + // 1600 - 640 = 960 / 2 = max-Offset (+/-) 480 + // 1200 - 480 = 720 / 2 = max-Offset (+/-) 360 + + if (CamZoomOffsetX_value > 960) { + CamZoomOffsetX_value = 960; + } + else { + CamZoomOffsetX_value = (floor((CamZoomOffsetX_value - 480) / 8) * 8); + } + + if (CamZoomOffsetY_value > 720) { + CamZoomOffsetY_value = 720; + } + else { + CamZoomOffsetY_value = (floor((CamZoomOffsetY_value - 360) / 8) * 8); + } + + CamZoomSize_value = 29; + } + else { + // mode1 + // 800 - 640 = 160 / 2 = max-Offset (+/-) 80 + // 600 - 480 = 120 / 2 = max-Offset (+/-) 60 + + if (CamZoomOffsetX_value > 160) { + CamZoomOffsetX_value = 160; + } + else { + CamZoomOffsetX_value = (floor(((CamZoomOffsetX_value - 80) * 2) / 8) * 8); + } + + if (CamZoomOffsetY_value > 120) { + CamZoomOffsetY_value = 120; + } + else { + CamZoomOffsetY_value = (floor(((CamZoomOffsetY_value - 60) * 2) / 8) * 8); + } + + CamZoomSize_value = 9; + } + + if (CamZoom_lines > 0) { + if (CamZoom_value) { + configLines[CamZoom_lines] = ("CamZoom = true"); + } + else { + configLines[CamZoom_lines] = ("CamZoom = false"); + } + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'Zoom' to 'CamZoom'"); + migrated = true; + } + if (CamZoomSize_lines > 0) { + configLines[CamZoomSize_lines] = ("CamZoomSize = " + std::to_string(CamZoomSize_value)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomMode' to 'CamZoomSize'"); + migrated = true; + } + if (CamZoomOffsetX_lines > 0) { + configLines[CamZoomOffsetX_lines] = ("CamZoomOffsetX = " + std::to_string(CamZoomOffsetX_value)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetX' to 'CamZoomOffsetX'"); + migrated = true; + } + if (CamZoomOffsetY_lines > 0) { + configLines[CamZoomOffsetY_lines] = ("CamZoomOffsetY = " + std::to_string(CamZoomOffsetY_value)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetY' to 'CamZoomOffsetY'"); + migrated = true; + } + } + + if (migrated) { + // At least one replacement happened + if (!RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) { LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to create backup of Config file!"); return; } - FILE* pfile = fopen(CONFIG_FILE, "w"); + FILE *pfile = fopen(CONFIG_FILE, "w"); + for (int i = 0; i < configLines.size(); i++) { - fwrite(configLines[i].c_str() , configLines[i].length(), 1, pfile); - fwrite("\n" , 1, 1, pfile); + if (!isInString(configLines[i], ";UNUSED_PARAMETER")) { + fwrite(configLines[i].c_str(), configLines[i].length(), 1, pfile); + fwrite("\n", 1, 1, pfile); + } } + fclose(pfile); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Config file migrated. Saved backup to " + string(CONFIG_FILE_BACKUP)); }