diff --git a/README.md b/README.md index d5788fffd..16b7ae7e5 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 aa2ea5d95..e01b6bcfc 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 622fd0a88..e227d146b 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 3d846f6c0..4bf307e29 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 fb45468bb..74503ddb3 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 a03713f94..4d015fb55 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 fb45468bb..74503ddb3 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 b344a09ae..607b2bbd3 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 13919ed3a..f733edfb3 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 571419e48..33a003395 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 9c2b9850f..5546a843a 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 000000000..1ad67dd02 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 c9d2c43ca..4a501ca01 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -61,7 +61,7 @@

Config.ini:

- + LogImageLocation @@ -75,7 +75,7 @@

Config.ini:

- + LogfileRetentionInDays @@ -223,7 +223,7 @@

Config.ini:

- + AlignmentAlgo @@ -260,7 +260,7 @@

+ LogImageLocation @@ -274,7 +274,7 @@

+ LogfileRetentionInDays @@ -313,7 +313,7 @@

+ LogImageLocation @@ -321,7 +321,7 @@

+ LogfileRetentionInDays @@ -330,7 +330,7 @@

+ ExtendedResolution @@ -364,7 +364,7 @@

+ DecimalShift @@ -378,7 +378,7 @@

+ PreValueUse @@ -395,7 +395,7 @@

+ PreValueAgeStartup @@ -409,7 +409,7 @@

+ AllowNegativeRates @@ -426,7 +426,7 @@

+ MaxRateValue @@ -440,7 +440,7 @@

+ ErrorMessage @@ -457,7 +457,7 @@

+ CheckDigitIncreaseConsistency @@ -478,7 +478,7 @@

+ Uri @@ -492,7 +492,7 @@

+ Topic @@ -506,7 +506,7 @@

+ TopicError @@ -520,7 +520,7 @@

+ ClientID @@ -534,7 +534,7 @@

+ user @@ -548,7 +548,7 @@

+ password @@ -566,7 +566,6 @@

AutoStart @@ -583,7 +582,6 @@

Intervall @@ -601,7 +599,7 @@

+ Logfile @@ -618,7 +616,7 @@

+ LogfileRetentionInDays @@ -636,7 +634,7 @@

+ TimeZone @@ -650,7 +648,7 @@

+ TimeServer @@ -664,7 +662,7 @@

+ Hostname @@ -768,6 +766,33 @@