diff --git a/README.md b/README.md index d5788fff..16b7ae7e 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,12 @@ If you would like to support the developer with a cup of coffee you can do that +##### 6.5.0 Image Processing in Memory - (2021-03-25) + +* Upgrade digital CNN to v8.2.0 (added new type of digits) +* Supporting alignment structures in ROI definition +* Bug fixing: definition of hostname in `config.ini` + ##### 6.4.0 Image Processing in Memory - (2021-03-20) * Additional alignment marks for settings the ROIs (analog and digit) diff --git a/code/components/connect_wlan/connect_wlan.cpp b/code/components/connect_wlan/connect_wlan.cpp index aa2ea5d9..e01b6bcf 100644 --- a/code/components/connect_wlan/connect_wlan.cpp +++ b/code/components/connect_wlan/connect_wlan.cpp @@ -292,11 +292,14 @@ bool ChangeHostName(std::string fn, std::string _newhostname) for (int i = 0; i < neuesfile.size(); ++i) { + printf(neuesfile[i].c_str()); fputs(neuesfile[i].c_str(), pFile); } fclose(pFile); + printf("*** Update hostname done ***\n"); + return true; } diff --git a/code/components/jomjol_fileserver_ota/server_ota.h b/code/components/jomjol_fileserver_ota/server_ota.h index 622fd0a8..e227d146 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.h +++ b/code/components/jomjol_fileserver_ota/server_ota.h @@ -9,4 +9,5 @@ static const char *TAGPARTOTA = "server_ota"; void register_server_ota_sdcard_uri(httpd_handle_t server); void CheckOTAUpdate(); void doReboot(); +void hard_restart(); diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index 3d846f6c..4bf307e2 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -382,6 +382,9 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph) { // reboot notwendig damit die neue wlan.ini auch benutzt wird !!! fclose(pfile); + printf("do reboot\n"); + esp_restart(); + hard_restart(); doReboot(); } } diff --git a/code/main/version.cpp b/code/main/version.cpp index fb45468b..74503ddb 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="3b3d924"; +const char* GIT_REV="c6ae989"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-17 22:46"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-03-25 20:40"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index a03713f9..4d015fb5 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v6.3.1 - 2020-03-16"; +const char* GIT_BASE_BRANCH = "master - v6.5.0 - 2020-03-25"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index fb45468b..74503ddb 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="3b3d924"; +const char* GIT_REV="c6ae989"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-17 22:46"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-03-25 20:40"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index b344a09a..607b2bbd 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 13919ed3..f733edfb 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 571419e4..33a00339 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini index 9c2b9850..5546a843 100644 --- a/sd-card/config/config.ini +++ b/sd-card/config/config.ini @@ -17,7 +17,7 @@ InitialMirror= false AlignmentAlgo = Default [Digits] -Model = /config/dig0811s1.tflite +Model = /config/dig0820s2q.tflite ;LogImageLocation = /log/digit ;LogfileRetentionInDays = 3 ModelInputSize = 20 32 diff --git a/sd-card/config/dig0820s2q.tflite b/sd-card/config/dig0820s2q.tflite new file mode 100644 index 00000000..1ad67dd0 Binary files /dev/null and b/sd-card/config/dig0820s2q.tflite differ diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index c9d2c43c..4a501ca0 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -61,7 +61,7 @@ textarea { - + LogImageLocation @@ -75,7 +75,7 @@ textarea { - + LogfileRetentionInDays @@ -223,7 +223,7 @@ textarea { - + AlignmentAlgo @@ -260,7 +260,7 @@ textarea { - + LogImageLocation @@ -274,7 +274,7 @@ textarea { - + LogfileRetentionInDays @@ -313,7 +313,7 @@ textarea { - + LogImageLocation @@ -321,7 +321,7 @@ textarea { - + LogfileRetentionInDays @@ -330,7 +330,7 @@ textarea { - + ExtendedResolution @@ -364,7 +364,7 @@ textarea { - + DecimalShift @@ -378,7 +378,7 @@ textarea { - + PreValueUse @@ -395,7 +395,7 @@ textarea { - + PreValueAgeStartup @@ -409,7 +409,7 @@ textarea { - + AllowNegativeRates @@ -426,7 +426,7 @@ textarea { - + MaxRateValue @@ -440,7 +440,7 @@ textarea { - + ErrorMessage @@ -457,7 +457,7 @@ textarea { - + CheckDigitIncreaseConsistency @@ -478,7 +478,7 @@ textarea { - + Uri @@ -492,7 +492,7 @@ textarea { - + Topic @@ -506,7 +506,7 @@ textarea { - + TopicError @@ -520,7 +520,7 @@ textarea { - + ClientID @@ -534,7 +534,7 @@ textarea { - + user @@ -548,7 +548,7 @@ textarea { - + password @@ -566,7 +566,6 @@ textarea { - AutoStart @@ -583,7 +582,6 @@ textarea { - Intervall @@ -601,7 +599,7 @@ textarea { - + Logfile @@ -618,7 +616,7 @@ textarea { - + LogfileRetentionInDays @@ -636,7 +634,7 @@ textarea { - + TimeZone @@ -650,7 +648,7 @@ textarea { - + TimeServer @@ -664,7 +662,7 @@ textarea { - + Hostname @@ -768,6 +766,33 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _select = fal EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional); } +function InvertEnableItem(_cat, _param) +{ + _zw = _cat + "_" + _param + "_enabled"; + _isOn = document.getElementById(_zw).checked; + + _color = "color:lightgrey;"; + if (_isOn) { + _color = "color:black;"; + } + + _zw = _cat + "_" + _param + "_text"; + document.getElementById(_zw).disabled = !_isOn; + document.getElementById(_zw).style = _color; + + if (param[_cat][_param]["anzParam"] == 2) { + _color = "width: 30px;" + _color; + } + + for (var j = 1; j <= param[_cat][_param]["anzParam"]; ++j) { + document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn; + document.getElementById(_cat+"_"+_param+"_value"+j).style=_color; + } + + + +} + function EnDisableItem(_status, _param, _category, _cat, _name, _optional) { _status = _param[_cat][_name]["found"] && _category[_cat]["enabled"]; @@ -864,8 +889,8 @@ function UpdateInput() { WriteParameter(param, category, "MQTT", "user", true); WriteParameter(param, category, "MQTT", "password", true); - WriteParameter(param, category, "AutoTimer", "AutoStart", true, true); - WriteParameter(param, category, "AutoTimer", "Intervall", true); + WriteParameter(param, category, "AutoTimer", "AutoStart", false, true); + WriteParameter(param, category, "AutoTimer", "Intervall", false); WriteParameter(param, category, "Debug", "Logfile", true, true); WriteParameter(param, category, "Debug", "LogfileRetentionInDays", true); @@ -921,8 +946,8 @@ function ReadParameterAll() ReadParameter(param, "MQTT", "user", true); ReadParameter(param, "MQTT", "password", true); - ReadParameter(param, "AutoTimer", "AutoStart", true, true); - ReadParameter(param, "AutoTimer", "Intervall", true); + ReadParameter(param, "AutoTimer", "AutoStart", false, true); + ReadParameter(param, "AutoTimer", "Intervall", false); ReadParameter(param, "Debug", "Logfile", true, true); ReadParameter(param, "Debug", "LogfileRetentionInDays", true); diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js index 40a7c87a..a3e80ee6 100644 --- a/sd-card/html/gethost.js +++ b/sd-card/html/gethost.js @@ -9,7 +9,7 @@ function getbasepath(){ { // host = "http://192.168.2.118"; // jomjol interner test // host = "http://192.168.178.26"; // jomjol interner test - host = "http://192.168.178.22"; // jomjol interner Real + host = "http://192.168.178.26"; // jomjol interner Real // host = "."; // jomjol interner localhost } diff --git a/sd-card/html/readconfigcommon.js b/sd-card/html/readconfigcommon.js index d1706880..f2165dc8 100644 --- a/sd-card/html/readconfigcommon.js +++ b/sd-card/html/readconfigcommon.js @@ -172,6 +172,7 @@ function loadConfig(_basepath) { xhttp.open("GET", url, false); xhttp.send(); config_gesamt = xhttp.responseText; + config_gesamt = config_gesamt.replace("InitalRotate", "InitialRotate"); // Korrigiere Schreibfehler in config.ini !!!!! } catch (error) { diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 19b860c1..4c77920f 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -6.4.0 +6.4.1