diff --git a/README.md b/README.md
index d8bb3194..e64f5575 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,10 @@ In other cases you can contact the developer via email:
= 9.5 --> noch kein Nulldurchgang = " + std::to_string(result) +
+ " zahl: " + std::to_string(zahl) + " ziffer_vorgaenger = " + std::to_string(ziffer_vorgaenger) + " DigitalUnschaerfe = " + std::to_string(DigitalUnschaerfe));
+ return result;
+}
+
int ClassFlowCNNGeneral::ZeigerEvalAnalogNeu(float zahl, int ziffer_vorgaenger)
{
float zahl_min, zahl_max;
@@ -287,10 +320,13 @@ int ClassFlowCNNGeneral::ZeigerEvalAnalogNeu(float zahl, int ziffer_vorgaenger)
" zahl: " + std::to_string(zahl) + " ziffer_vorgaenger = " + std::to_string(ziffer_vorgaenger) + " AnalogFehler = " + std::to_string(AnalogFehler));
return result;
}
- result = ((int) floor(zahl_min) + 10) % 10;
- if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::ZeigerEvalAnalogNeu - Zahl uneindeutig, Korrektur nach unten - Ergebnis = " + std::to_string(result) +
- " zahl: " + std::to_string(zahl) + " ziffer_vorgaenger = " + std::to_string(ziffer_vorgaenger) + " AnalogFehler = " + std::to_string(AnalogFehler));
- return result;
+ if (ziffer_vorgaenger >= 10 - AnalogFehler)
+ {
+ result = ((int) floor(zahl_min) + 10) % 10;
+ if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::ZeigerEvalAnalogNeu - Zahl uneindeutig, Korrektur nach unten - Ergebnis = " + std::to_string(result) +
+ " zahl: " + std::to_string(zahl) + " ziffer_vorgaenger = " + std::to_string(ziffer_vorgaenger) + " AnalogFehler = " + std::to_string(AnalogFehler));
+ return result;
+ }
}
@@ -302,7 +338,7 @@ int ClassFlowCNNGeneral::ZeigerEvalAnalogNeu(float zahl, int ziffer_vorgaenger)
}
-
+/*
int ClassFlowCNNGeneral::ZeigerEval(float zahl, int ziffer_vorgaenger)
{
int ergebnis_nachkomma = ((int) floor(zahl * 10) + 10) % 10;
@@ -333,6 +369,7 @@ int ClassFlowCNNGeneral::ZeigerEval(float zahl, int ziffer_vorgaenger)
ergebnis = (ergebnis + 10) % 10;
return ergebnis;
}
+*/
bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph)
{
diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
index 2424ef5f..249aa544 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
@@ -25,8 +25,10 @@ protected:
std::vector GENERAL;
float CNNGoodThreshold;
float AnalogFehler = 3.0;
+ float AnalogToDigtalFehler = 0.8;
float DigitalUnschaerfe = 0.2;
float DigitalAnalogerVorgaengerUebergangsbereich = 2;
+ float DigitalUebergangsbereichVorgaengerAnalogToDigit = 2;
float DigitalUebergangsbereichVorgaenger = 0.7;
string cnnmodelfile;
@@ -38,9 +40,10 @@ protected:
bool SaveAllFiles;
// bool extendedResolution;
- int ZeigerEval(float zahl, int ziffer_vorgaenger);
- int ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int eval_vorgaenger);
+// int ZeigerEval(float zahl, int ziffer_vorgaenger);
+// int ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int eval_vorgaenger);
int ZeigerEvalAnalogNeu(float zahl, int ziffer_vorgaenger);
+ int ZeigerEvalAnalogToDigitNeu(float zahl, float ziffer_vorgaenger);
int ZeigerEvalHybridNeu(float zahl, float zahl_vorgaenger, int eval_vorgaenger, bool AnalogerVorgaenger = false);
diff --git a/code/components/jomjol_logfile/ClassLogFile.cpp b/code/components/jomjol_logfile/ClassLogFile.cpp
index 04a4df4d..f9a790fe 100644
--- a/code/components/jomjol_logfile/ClassLogFile.cpp
+++ b/code/components/jomjol_logfile/ClassLogFile.cpp
@@ -73,7 +73,7 @@ void ClassLogFile::WriteToDedicatedFile(std::string _fn, std::string info, bool
// pFile = OpenFileAndWait(_fn.c_str(), "a");
pFile = fopen(_fn.c_str(), "a+");
- printf("Logfile opened: %s\n", _fn.c_str());
+// printf("Logfile opened: %s\n", _fn.c_str());
if (pFile!=NULL) {
if (_time)
diff --git a/code/main/version.cpp b/code/main/version.cpp
index 173fb840..1907172b 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="ae302d4";
+const char* GIT_REV="2b60e81";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-08-23 17:55";
\ No newline at end of file
+const char* BUILD_TIME="2022-08-26 21:09";
\ No newline at end of file
diff --git a/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp b/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
index 5b9f1fca..9d7c9b09 100644
--- a/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
@@ -3,8 +3,8 @@
class UnderTestCNN : public ClassFlowCNNGeneral {
public:
- using ClassFlowCNNGeneral::ZeigerEval;
- using ClassFlowCNNGeneral::ZeigerEvalHybrid;
+ using ClassFlowCNNGeneral::ZeigerEvalAnalogNeu;
+ using ClassFlowCNNGeneral::ZeigerEvalHybridNeu;
using ClassFlowCNNGeneral::ClassFlowCNNGeneral;
};
@@ -19,18 +19,22 @@ void test_ZeigerEval()
UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
// the 5.2 is already above 5.0 and the previous digit too (3)
- int result = undertest.ZeigerEval(5.2, 3);
+ printf("Test 5.2, 3\n");
+ int result = undertest.ZeigerEvalAnalogNeu(5.2, 3);
TEST_ASSERT_EQUAL(5, result);
// the 5.2 is already above 5.0 and the previous digit not (9)
// so the current digit shoult be reduced (4.9)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEval(5.2, 9));
+ printf("Test 5.2, 9\n");
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalAnalogNeu(5.2, 9));
+ printf("Test 4.4, 9\n");
// the 4.4 (digital100) is not above 5 and the previous digit (analog) too (9.3)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEval(4.4, 9));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalAnalogNeu(4.4, 9));
+ printf("Test 4.5, 0\n");
// the 4.5 (digital100) is not above 5 and the previous digit (analog) too (9.6)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEval(4.5, 0));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalAnalogNeu(4.5, 0));
}
@@ -42,53 +46,57 @@ void test_ZeigerEvalHybrid() {
UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
// the 5.2 and no previous should round down
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.2, 0, -1));
+ printf("ZeigerEvalHybridNeu(5.2, 0, -1)\n");
+ TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybridNeu(5.2, 0, -1));
// the 5.3 and no previous should trunc to 5
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.3, 0, -1));
+ printf("ZeigerEvalHybridNeu(5.3, 0, -1)\n");
+ TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybridNeu(5.3, 0, -1));
+ printf("ZeigerEvalHybridNeu(5.7, 0, -1)\n");
// the 5.7 and no previous should trunc to 5
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.7, 0, -1));
+ TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybridNeu(5.7, 0, -1));
// the 5.8 and no previous should round up to 6
- TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybrid(5.8, 0, -1));
+ printf("ZeigerEvalHybridNeu(5.8, 0, -1)\n");
+ TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybridNeu(5.8, 0, -1));
// the 5.7 with previous and the previous between 0.3-0.5 should round up to 6
- TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybrid(5.7, 0.4, 1));
+ TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybridNeu(5.7, 0.4, 1));
// the 5.3 with previous and the previous between 0.3-0.7 should round down to 5
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.3, 0.7, 1));
+ TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybridNeu(5.3, 0.7, 1));
// the 5.3 with previous and the previous <=0.5 should trunc to 5
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.3, 0.1, 1));
+ TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybridNeu(5.3, 0.1, 1));
// the 5.3 with previous and the previous >=9.5 should reduce to 4
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(5.3, 9.6, 9));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybridNeu(5.3, 9.6, 9));
// the 5.7 with previous and the previous >=9.5 should trunc to 5
- TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.7, 9.6, 9));
+ TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybridNeu(5.7, 9.6, 9));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.6)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.6, 0));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybridNeu(4.5, 9.6, 0));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.6)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.6, 9));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybridNeu(4.5, 9.6, 9));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.5, 9));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybridNeu(4.5, 9.5, 9));
// 59.96889 - Pre: 58.94888
// 8.6 : 9.8 : 6.7
// the 4.4 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
- TEST_ASSERT_EQUAL(8, undertest.ZeigerEvalHybrid(8.6, 9.8, 9));
+ TEST_ASSERT_EQUAL(8, undertest.ZeigerEvalHybridNeu(8.6, 9.8, 9));
// pre = 9.9 (0.0 raw)
// zahl = 1.8
- TEST_ASSERT_EQUAL(2, undertest.ZeigerEvalHybrid(1.8, 9.0, 9));
+ TEST_ASSERT_EQUAL(2, undertest.ZeigerEvalHybridNeu(1.8, 9.0, 9));
// if a digit have an early transition and the pointer is < 9.0
// prev (pointer) = 6.2, but on digital readout = 6.0 (prev is int parameter)
// zahl = 4.6
- TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.6, 6.0, 6));
+ TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybridNeu(4.6, 6.0, 6));
// issue #879 vorgaenger is -1, zahl = 6.7
diff --git a/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp b/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
index 591c1c2b..41159d06 100644
--- a/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
@@ -90,6 +90,24 @@ void test_doFlow() {
result = process_doFlow(analogs, digits);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
+
+ digits = { 1.1, 9.0, 4.0};
+ analogs = { 6.1, 2.6, 6.25, 9.7};
+ expected = "194.6259";
+ result = process_doFlow(analogs, digits);
+ TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
+
+ digits = { 1.1, 9.0, 4.0};
+ analogs = { 8.1, 2.6, 6.25, 9.7};
+ expected = "194.8259";
+ result = process_doFlow(analogs, digits);
+ TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
+
+ digits = { 1.1, 9.0, 4.0};
+ analogs = { 9.1, 2.6, 6.25, 9.7};
+ expected = "193.9259";
+ result = process_doFlow(analogs, digits);
+ TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
}
diff --git a/code/test/test_suite_flowcontroll.cpp b/code/test/test_suite_flowcontroll.cpp
index a981ec39..62c9fea1 100644
--- a/code/test/test_suite_flowcontroll.cpp
+++ b/code/test/test_suite_flowcontroll.cpp
@@ -83,8 +83,8 @@ extern "C" void app_main()
Init_NVS_SDCard();
UNITY_BEGIN();
- RUN_TEST(test_ZeigerEval);
- RUN_TEST(test_ZeigerEvalHybrid);
+// RUN_TEST(test_ZeigerEval);
+// RUN_TEST(test_ZeigerEvalHybrid);
RUN_TEST(test_doFlow);
UNITY_END();
diff --git a/code/version.cpp b/code/version.cpp
index 173fb840..1907172b 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="ae302d4";
+const char* GIT_REV="2b60e81";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-08-23 17:55";
\ No newline at end of file
+const char* BUILD_TIME="2022-08-26 21:09";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index 0962e5ff..14bf0d2d 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 88cedc19..d2d57c4a 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ