diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index d6d0de28..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index e0ca791d..b06bb529 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ compile_commands.json CTestTestfile.cmake _deps code/edgeAI.code-workspace +.DS_Store diff --git a/FeatureRequest.md b/FeatureRequest.md index a0c478e1..c862a4de 100644 --- a/FeatureRequest.md +++ b/FeatureRequest.md @@ -11,6 +11,15 @@ ____ +#### #29 Add favicon and use the hostname for the website + +* https://github.com/jomjol/AI-on-the-edge-device/issues/927 + +#### #28 Improved error handling for ROIs + +* In case a ROI is out of the image, there is no error message, but a non sense image is used +* Implement a error message for wrong configuratioin of ROI + #### #27 Use Homie Spec for Mqtt binding * Use the standardized Home Protocol for the Mqtt binding @@ -55,7 +64,8 @@ ____ #### #20 Deep sleep and push mode * Let the device be normally in deep sleep state, and wake it up periodically to collect data and push it via MQTT or HTTP post. - +* Support ESP-NOW to reduce the overhead of connecting to wifi and mqtt +* the above should enable battery powered applications #### #19 Extended log informations diff --git a/README.md b/README.md index 6377554a..abac3df1 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,10 @@ In other cases you can contact the developer via email: = 0.5 ) && (zahl_vorgaenger < 9.5)) + // 9.0, da bei getReadout() prev als int übergeben wird (9 statt 9.5) + // tritt bei der ersten ziffer von digit auf, wenn analog davor (2. Aufruf von getReadout) + if ((zahl_vorgaenger >= 0.5 ) && (zahl_vorgaenger < 9.0)) { // kein Ziffernwechsel, da Vorkomma weit genug weg ist (0+/-0.5) --> zahl wird gerundet - return ((int) round(zahl) + 10) % 10; + if ((ergebnis_nachkomma <= 2) || (ergebnis_nachkomma >= 8)) // Band um die Ziffer --> Runden, da Ziffer im Rahmen Ungenauigkeit erreicht + return ((int) round(zahl) + 10) % 10; + else + return ((int) trunc(zahl) + 10) % 10; } else { diff --git a/code/main/version.cpp b/code/main/version.cpp index 49b8a186..41d77c99 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="bfe8d3b"; +const char* GIT_REV="ea69b1b"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-08-13 14:22"; \ No newline at end of file +const char* BUILD_TIME="2022-08-21 17:46"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index cc20446e..ec46f07a 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 - v11.0.0 - 2022-08-13"; +const char* GIT_BASE_BRANCH = "master - v11.1.0 - 2022-08-21"; const char* git_base_branch(void) diff --git a/code/platformio.ini b/code/platformio.ini index abf5731f..987e58e5 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -15,6 +15,7 @@ src_dir = main [env:esp32cam] platform = espressif32@4.4.0 +;platform = espressif32@5.1.0 ;platform = espressif32 board = esp32cam framework = espidf diff --git a/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp b/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp index 89725fb4..79332eea 100644 --- a/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp +++ b/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp @@ -65,8 +65,8 @@ void test_ZeigerEvalHybrid() { // the 5.8 and no previous should round up to 6 TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybrid(5.8, 0, -1)); - // the 5.7 with previous and the previous between 0.3-0.7 should round up to 6 - TEST_ASSERT_EQUAL(6, undertest.ZeigerEvalHybrid(5.7, 0.7, 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)); // 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)); @@ -85,7 +85,7 @@ void test_ZeigerEvalHybrid() { // 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)); - // the 4.4 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5) + // 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)); // 59.96889 - Pre: 58.94888 @@ -93,6 +93,16 @@ void test_ZeigerEvalHybrid() { // 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)); + // pre = 9.9 (0.0 raw) + // zahl = 1.8 + TEST_ASSERT_EQUAL(1, undertest.ZeigerEvalHybrid(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)); + + // issue #879 vorgaenger is -1, zahl = 6.7 //TEST_ASSERT_EQUAL(7, undertest.ZeigerEvalHybrid(6.7, -1.0, -1)); diff --git a/code/version.cpp b/code/version.cpp index 49b8a186..41d77c99 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="bfe8d3b"; +const char* GIT_REV="ea69b1b"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-08-13 14:22"; \ No newline at end of file +const char* BUILD_TIME="2022-08-21 17:46"; \ No newline at end of file diff --git a/firmware/.DS_Store b/firmware/.DS_Store deleted file mode 100644 index 9ace466e..00000000 Binary files a/firmware/.DS_Store and /dev/null differ diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 72391919..66d686a7 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index e1906ebb..d423fcd5 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/sd-card/.DS_Store b/sd-card/.DS_Store deleted file mode 100644 index 03cb74a1..00000000 Binary files a/sd-card/.DS_Store and /dev/null differ