diff --git a/FeatureRequest.md b/FeatureRequest.md index c28745b5..f1e66bce 100644 --- a/FeatureRequest.md +++ b/FeatureRequest.md @@ -11,6 +11,12 @@ ____ +#### #9 Basic auth for the UI + +* https://github.com/jomjol/AI-on-the-edge-device/issues/283 + +* Implementation of an authentication mechanism. + #### #8 MQTT configurable readout intervall Make the readout intervall configurable via MQTT. @@ -27,13 +33,13 @@ To do: * Implement a checking algo * Extend the firmware and html page for the error handling -#### #6 Check for double ROI names +#### ~~#6 Check for double ROI names~~ - implemented v8.0.0 -Check during configuration, that ROI names are unique. +~~Check during configuration, that ROI names are unique.~~ -To do: +~~To do:~~ -* Implementation of ROI name checking in html code before saving analog or digital ROIs +* ~~Implementation of ROI name checking in html code before saving analog or digital ROIs~~ @@ -49,31 +55,31 @@ To do: -#### #4 Initial Shifting and Rotation +#### ~~#4 Initial Shifting and Rotation~~ - implemented v7.0.0 -* https://github.com/jomjol/AI-on-the-edge-device/issues/123 +* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/123~~ -Implementation of a shifting additional to the initial rotation of the raw camera input +~~Implementation of a shifting additional to the initial rotation of the raw camera input~~ -To do: +~~To do:~~ -* Implementation of shifting -* Extension of configuration -* Adaption of the html configuration to implement shifting +* ~~Implementation of shifting~~ +* ~~Extension of configuration~~ +* ~~Adaption of the html configuration to implement shifting~~ -#### #3 Allow grouping of digits to multiple reading values +#### ~~#3 Allow grouping of digits to multiple reading values~~ - implemented v8.0.0 -* https://github.com/jomjol/AI-on-the-edge-device/issues/123 +* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/123~~ -Implementation of two different independent readouts in one setup +~~Implementation of two different independent readouts in one setup~~ -To do: +~~To do:~~ + +* ~~Extend the configuration, setting and processing flow for two independend readouts~~ -* Extend the configuration, setting and processing flow for two independend readouts -https://github.com/jomjol/AI-on-the-edge-device/issues/123 @@ -96,15 +102,16 @@ To do: ____ -#### #1 Optional GPIO for external flash/lighting +#### ~~#1 Optional GPIO for external flash/lighting~~ - implemented (v8.0.0) -* https://github.com/jomjol/AI-on-the-edge-device/issues/133 +* ~~https://github.com/jomjol/AI-on-the-edge-device/issues/133~~ -Implementation of an an extrnal flash / lightning through GPIOs. -* available GPIOs: 12 & 13 (currently in use for html switching) +~~Implementation of an an extrnal flash / lightning through GPIOs.~~ -To do: +* ~~available GPIOs: 12 & 13 (currently in use for html switching)~~ -* Implementation of a software module for external light source (e.g. WS8132 LED controller, ...) -* Update of the camera module to use the external light instead of the internal flash light -* Adopt the configuration algorithm with a configurable light source \ No newline at end of file +~~To do:~~ + +* ~~Implementation of a software module for external light source (e.g. WS8132 LED controller, ...)~~ +* ~~Update of the camera module to use the external light instead of the internal flash light~~ +* ~~Adopt the configuration algorithm with a configurable light source~~ \ No newline at end of file diff --git a/README.md b/README.md index 17eb360b..96b63c9d 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,9 @@ In other cases you can contact the developer via email: timeStamp = std::string(buffer); - _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + to_string(NUMBERS[j]->PreValue) + "\n"; + _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + "\n"; printf("Write PreValue Zeile: %s\n", _zw.c_str()); fputs(_zw.c_str(), pFile); @@ -594,7 +594,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue)) { - NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + std::to_string(NUMBERS[j]->Value) + " "; + NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; NUMBERS[j]->Value = NUMBERS[j]->PreValue; zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); } diff --git a/code/main/version.cpp b/code/main/version.cpp index e9fcd1f0..fe5184b4 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="03b5e36"; +const char* GIT_REV="a6d39af"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-14 19:54"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-23 20:43"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index ed812495..04ef1f0f 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 - v8.0.0 - 2021-07-14"; +const char* GIT_BASE_BRANCH = "master - v8.0.2 - 2021-07-23"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 934e3147..fe5184b4 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="03b5e36"; +const char* GIT_REV="a6d39af"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-14 19:53"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-23 20:43"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index f73c470c..ece04d94 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 93aab4f0..11337a62 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ