diff --git a/README.md b/README.md index 0e8b82d8..2397335a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,13 @@ If you would like to support the developer with a cup of coffee you can do that **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated! -##### Rolling (2021-02-03) +##### Rolling (2021-02-06) + +* added checked value information to MQTT error message + + +2021-02-03 + * Pinned espressif32 to version 2.1.0 With the update to v3.0.0 code can be compiled, but is not functional - major checks (and chances?) needed diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index ced38fef..817126cf 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -361,14 +361,14 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) if ((!AllowNegativeRates) && (Value < PreValue)) { - ErrorMessageText = ErrorMessageText + "Negative Rate - Returned old value - read value: " + zwvalue + " - raw value: " + ReturnRawValue; + ErrorMessageText = ErrorMessageText + "Negative Rate - Returned old value - read value: " + zwvalue + " - raw value: " + ReturnRawValue + " - checked value: " + std::to_string(Value) + " "; Value = PreValue; zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); } if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue)) { - ErrorMessageText = ErrorMessageText + "Rate too high - Returned old value - read value: " + zwvalue + " "; + ErrorMessageText = ErrorMessageText + "Rate too high - Returned old value - read value: " + zwvalue + " - checked value: " + std::to_string(Value) + " "; Value = PreValue; zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); } diff --git a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp index fc0043d3..d0a529f5 100644 --- a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp +++ b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp @@ -140,7 +140,10 @@ bool CTfLiteClass::LoadInputImageBasis(CImageBasis *rs) void CTfLiteClass::MakeAllocate() { static tflite::AllOpsResolver resolver; + +// printf(LogFile.getESPHeapInfo().c_str()); printf("\n"); this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter); +// printf(LogFile.getESPHeapInfo().c_str()); printf("\n"); TfLiteStatus allocate_status = this->interpreter->AllocateTensors(); if (allocate_status != kTfLiteOk) { @@ -229,7 +232,7 @@ CTfLiteClass::CTfLiteClass() this->interpreter = nullptr; this->input = nullptr; this->output = nullptr; - this->kTensorArenaSize = 150 * 1024; /// laut testfile: 108000 - bisher 600 + this->kTensorArenaSize = 200 * 1024; /// laut testfile: 108000 - bisher 600 this->tensor_arena = new uint8_t[kTensorArenaSize]; } diff --git a/code/main/version.cpp b/code/main/version.cpp index ee764d7f..33fd5ef7 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="7dbd77d"; +const char* GIT_REV="01f8a51"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-03-01 07:17"; \ No newline at end of file +const char* BUILD_TIME="2021-03-06 19:58"; \ No newline at end of file diff --git a/code/platformio.ini b/code/platformio.ini index 4af22de5..117cc0e8 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -15,6 +15,7 @@ src_dir = main [env:esp32cam] platform = espressif32@2.1.0 +;platform = espressif32 board = esp32cam framework = espidf diff --git a/code/version.cpp b/code/version.cpp index ee764d7f..33fd5ef7 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="7dbd77d"; +const char* GIT_REV="01f8a51"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-03-01 07:17"; \ No newline at end of file +const char* BUILD_TIME="2021-03-06 19:58"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index ef718238..a493f186 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 6a360eaa..f400dc17 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ