diff --git a/README.md b/README.md index ffaa522f..4f2baec4 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,17 @@ In other cases you can contact the developer via email: posy = std::stoi(zerlegt[2]); neuroi->deltax = std::stoi(zerlegt[3]); neuroi->deltay = std::stoi(zerlegt[4]); - neuroi->CCW = toUpper(zerlegt[5]) == "TRUE"; + neuroi->CCW = false; + if (zerlegt.size() >= 6) + { + neuroi->CCW = toUpper(zerlegt[5]) == "TRUE"; + } neuroi->result_float = -1; neuroi->image = NULL; neuroi->image_org = NULL; diff --git a/code/main/version.cpp b/code/main/version.cpp index fa056109..e3644f43 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6db01e6"; +const char* GIT_REV="5a31543"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-08-31 19:38"; \ No newline at end of file +const char* BUILD_TIME="2022-08-31 21:56"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index fa056109..e3644f43 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6db01e6"; +const char* GIT_REV="5a31543"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-08-31 19:38"; \ No newline at end of file +const char* BUILD_TIME="2022-08-31 21:56"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 3d7242e3..8a56fa2a 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 1ad988d9..e3e3ac58 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 2a373d5b..b816ee0d 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html index 1c7665c8..0d8eed40 100644 --- a/sd-card/html/edit_analog.html +++ b/sd-card/html/edit_analog.html @@ -254,7 +254,10 @@ function changeCCW(){ ROIInfo = getROIInfo("analog", _number); aktindex = parseInt(document.getElementById("index").value); - ROIInfo[aktindex]["CCW"] = document.getElementById("CCW").checked; + if (document.getElementById("CCW").checked) + ROIInfo[aktindex]["CCW"] = "true"; + else + ROIInfo[aktindex]["CCW"] = "false"; UpdateROIs(); } diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js index 349a6bec..751e4b11 100644 --- a/sd-card/html/gethost.js +++ b/sd-card/html/gethost.js @@ -13,7 +13,7 @@ function getbasepath(){ { // host = "http://192.168.2.219"; // jomjol interner test // host = "http://192.168.178.46"; // jomjol interner test - host = "http://192.168.178.44"; // jomjol interner Real + host = "http://192.168.178.62"; // jomjol interner Real // host = "http://192.168.43.191"; // host = "."; // jomjol interner localhost diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js index 90604727..afbedc5d 100644 --- a/sd-card/html/readconfigparam.js +++ b/sd-card/html/readconfigparam.js @@ -86,8 +86,6 @@ function ParseConfig() { ParamAddValue(param, catname, "CNNGoodThreshold", 1); ParamAddValue(param, catname, "LogImageLocation"); ParamAddValue(param, catname, "LogfileRetentionInDays"); -// ParamAddValue(param, catname, "ModelInputSize", 2); - var catname = "Analog"; category[catname] = new Object(); @@ -97,7 +95,6 @@ function ParseConfig() { ParamAddValue(param, catname, "Model"); ParamAddValue(param, catname, "LogImageLocation"); ParamAddValue(param, catname, "LogfileRetentionInDays"); -// ParamAddValue(param, catname, "ModelInputSize", 2); var catname = "PostProcessing"; category[catname] = new Object(); @@ -236,9 +233,9 @@ function ParseConfigParamAll(_aktline, _catname){ let [isCom, input] = isCommented(_input); var linesplit = ZerlegeZeile(input); ParamExtractValueAll(param, linesplit, _catname, _aktline, isCom); - if (!isCom && (linesplit.length == 6) && (_catname == 'Digits')) + if (!isCom && (linesplit.length >= 5) && (_catname == 'Digits')) ExtractROIs(input, "digit"); - if (!isCom && (linesplit.length == 6) && (_catname == 'Analog')) + if (!isCom && (linesplit.length >= 5) && (_catname == 'Analog')) ExtractROIs(input, "analog"); if (!isCom && (linesplit.length == 3) && (_catname == 'Alignment')) { @@ -486,7 +483,9 @@ function ExtractROIs(_aktline, _type){ abc["dx"] = linesplit[3]; abc["dy"] = linesplit[4]; abc["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]); - abc["CCW"] = linesplit[5]; + abc["CCW"] = "false"; + if (linesplit.length >= 6) + abc["CCW"] = linesplit[5]; } diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 1c2b4334..f15237f6 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -16.2.0 \ No newline at end of file +16.3.1 \ No newline at end of file