Compare commits

..

8 Commits

Author SHA1 Message Date
jomjol
01e81d02b5 v8.0.2 2021-07-23 20:57:42 +02:00
jomjol
9ae8d0a512 Merge branch 'rolling' 2021-07-23 20:48:28 +02:00
jomjol
da16322fb8 v8.0.2 2021-07-23 20:47:23 +02:00
jomjol
a6d39afc26 rolling 20210723 2021-07-23 07:44:59 +02:00
jomjol
1b6a124f54 Update FeatureRequest.md 2021-07-21 07:00:12 +02:00
jomjol
8aff6bf8f3 Rolling 20210719 2021-07-19 21:54:14 +02:00
jomjol
21115752aa Merge pull request #280 from jomjol/rolling
v8.0.1
2021-07-18 16:58:23 +02:00
jomjol
025c2b88b9 v8.0.1 2021-07-18 16:57:35 +02:00
12 changed files with 48 additions and 37 deletions

View File

@@ -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 #### #8 MQTT configurable readout intervall
Make the readout intervall configurable via MQTT. Make the readout intervall configurable via MQTT.
@@ -27,13 +33,13 @@ To do:
* Implement a checking algo * Implement a checking algo
* Extend the firmware and html page for the error handling * 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 * ~~Implementation of shifting~~
* Extension of configuration * ~~Extension of configuration~~
* Adaption of the html configuration to implement shifting * ~~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. ~~Implementation of an an extrnal flash / lightning through GPIOs.~~
* available GPIOs: 12 & 13 (currently in use for html switching)
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, ...) ~~To do:~~
* 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 * ~~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~~

View File

@@ -47,8 +47,10 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
##### 8.0.0 - Multi Meter Support (2021-07-14) ##### 8.0.2 - Multi Meter Support (2021-07-23
* NEW 8.0.1: saving roundes prevalue, bug fix html server
* NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`
* Dual / multi meter support (more than 1 number to be recognized) * Dual / multi meter support (more than 1 number to be recognized)
This is implemented with the feature "number" on the ROI definition as well as selected options This is implemented with the feature "number" on the ROI definition as well as selected options
* MQTT: standardization of the naming - including new topics (`json`, `freeMem `, `uptime`)c * MQTT: standardization of the naming - including new topics (`json`, `freeMem `, `uptime`)c

View File

@@ -107,6 +107,8 @@ esp_err_t set_content_type_from_file(httpd_req_t *req, const char *filename)
return httpd_resp_set_type(req, "text/html"); return httpd_resp_set_type(req, "text/html");
} else if (IS_FILE_EXT(filename, ".jpeg")) { } else if (IS_FILE_EXT(filename, ".jpeg")) {
return httpd_resp_set_type(req, "image/jpeg"); return httpd_resp_set_type(req, "image/jpeg");
} else if (IS_FILE_EXT(filename, ".jpg")) {
return httpd_resp_set_type(req, "image/jpeg");
} else if (IS_FILE_EXT(filename, ".ico")) { } else if (IS_FILE_EXT(filename, ".ico")) {
return httpd_resp_set_type(req, "image/x-icon"); return httpd_resp_set_type(req, "image/x-icon");
} }

View File

@@ -208,7 +208,7 @@ void ClassFlowPostProcessing::SavePreValue()
strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo); strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
NUMBERS[j]->timeStamp = std::string(buffer); NUMBERS[j]->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()); printf("Write PreValue Zeile: %s\n", _zw.c_str());
fputs(_zw.c_str(), pFile); fputs(_zw.c_str(), pFile);
@@ -594,7 +594,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue)) 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; NUMBERS[j]->Value = NUMBERS[j]->PreValue;
zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift);
} }

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="03b5e36"; const char* GIT_REV="9ae8d0a";
const char* GIT_TAG=""; const char* GIT_TAG="";
const char* GIT_BRANCH="master"; const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-07-14 19:54"; const char* BUILD_TIME="2021-07-23 20:49";

View File

@@ -13,7 +13,7 @@ extern "C"
#include "Helper.h" #include "Helper.h"
#include <fstream> #include <fstream>
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) const char* git_base_branch(void)

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="03b5e36"; const char* GIT_REV="9ae8d0a";
const char* GIT_TAG=""; const char* GIT_TAG="";
const char* GIT_BRANCH="master"; const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-07-14 19:53"; const char* BUILD_TIME="2021-07-23 20:49";

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1659,12 +1659,12 @@ function UpdateInput() {
WriteParameter(param, category, "MakeImage", "Brightness", false); WriteParameter(param, category, "MakeImage", "Brightness", false);
// WriteParameter(param, category, "MakeImage", "Contrast", false); // WriteParameter(param, category, "MakeImage", "Contrast", false);
// WriteParameter(param, category, "MakeImage", "Saturation", false); // WriteParameter(param, category, "MakeImage", "Saturation", false);
WriteParameter(param, category, "MakeImage", "ImageSize", false, true); WriteParameter(param, category, "MakeImage", "ImageSize", false);
WriteParameter(param, category, "MakeImage", "FixedExposure", false, true); WriteParameter(param, category, "MakeImage", "FixedExposure", false);
WriteParameter(param, category, "Alignment", "SearchFieldX", false); WriteParameter(param, category, "Alignment", "SearchFieldX", false);
WriteParameter(param, category, "Alignment", "SearchFieldY", false); WriteParameter(param, category, "Alignment", "SearchFieldY", false);
WriteParameter(param, category, "Alignment", "AlignmentAlgo", true, true); WriteParameter(param, category, "Alignment", "AlignmentAlgo", true);
WriteParameter(param, category, "Digits", "Model", false); WriteParameter(param, category, "Digits", "Model", false);
WriteParameter(param, category, "Digits", "LogImageLocation", true); WriteParameter(param, category, "Digits", "LogImageLocation", true);

View File

@@ -1 +1 @@
9.5.0 9.5.1