diff --git a/README.md b/README.md index 384fc9b1..7bbe0c29 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,11 @@ In other cases you can contact the developer via email: 1)) -// { -// if (toUpper(zerlegt[1]) == "DIGITHYPRID") -// CNNType = DigitalHyprid; -// } if ((toUpper(zerlegt[0]) == "MODEL") && (zerlegt.size() > 1)) { @@ -664,10 +627,11 @@ bool ClassFlowCNNGeneral::getNetworkParameter() CNNType = Digital; printf("TFlite-Type set to Digital\n"); break; - case 20: +/* case 20: CNNType = DigitalHyprid10; printf("TFlite-Type set to DigitalHyprid10\n"); break; +*/ // case 22: // CNNType = DigitalHyprid; // printf("TFlite-Type set to DigitalHyprid\n"); @@ -801,6 +765,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) } } break; */ +/* case DigitalHyprid10: { int _num, _nachkomma; @@ -836,6 +801,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) } } } break; +*/ case DoubleHyprid10: { @@ -869,7 +835,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) _fit = _val + _valminus; } - if (result > 10) + if (result >= 10) result = result - 10; if (result < 0) result = result + 10; diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h index 6b24c237..81556f01 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h +++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h @@ -37,12 +37,9 @@ protected: bool isLogImageSelect; string LogImageSelect; ClassFlowAlignment* flowpostalignment; -// ClassFlowPostProcessing *flowpostprocessing = NULL; - bool SaveAllFiles; -// bool extendedResolution; -// int ZeigerEval(float zahl, int ziffer_vorgaenger); -// int ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int eval_vorgaenger); + bool SaveAllFiles; + int ZeigerEvalAnalogNeu(float zahl, int ziffer_vorgaenger); int ZeigerEvalAnalogToDigitNeu(float zahl, float ziffer_vorgaenger, int eval_vorgaenger); int ZeigerEvalHybridNeu(float zahl, float zahl_vorgaenger, int eval_vorgaenger, bool AnalogerVorgaenger = false); diff --git a/code/components/jomjol_flowcontroll/ClassFlowImage.cpp b/code/components/jomjol_flowcontroll/ClassFlowImage.cpp index c50b8cda..4053b5dc 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowImage.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowImage.cpp @@ -63,7 +63,12 @@ void ClassFlowImage::LogImage(string logPath, string name, float *resultFloat, i if (*resultFloat < 0) sprintf(buf, "N.N_"); else + { sprintf(buf, "%.1f_", *resultFloat); + if (strcmp(buf, "10.0_")) + sprintf(buf, "0.0_"); + } + } else if (resultInt != NULL) { sprintf(buf, "%d_", *resultInt); } else { diff --git a/code/main/version.cpp b/code/main/version.cpp index 1a8026e4..6eefe87b 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="77427a8"; +const char* GIT_REV="47da2d6"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-09-03 08:15"; \ No newline at end of file +const char* BUILD_TIME="2022-09-04 18:01"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 1a8026e4..6eefe87b 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="77427a8"; +const char* GIT_REV="47da2d6"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-09-03 08:15"; \ No newline at end of file +const char* BUILD_TIME="2022-09-04 18:01"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index b102867d..e7019eb1 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 52ee6550..7542cf6c 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index f0c2e663..57cddbaa 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 9cc45924..f0cc64aa 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -16.3.2 \ No newline at end of file +16.3.4 \ No newline at end of file