Przeglądaj źródła

rolling 2021-03-06

jomjol 4 lat temu
rodzic
commit
871d3b537d

+ 7 - 1
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!
 **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
 * 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
   With the update to v3.0.0 code can be compiled, but is not functional - major checks (and chances?) needed

+ 2 - 2
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -361,14 +361,14 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
 
     if ((!AllowNegativeRates) && (Value < PreValue))
     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;
         Value = PreValue;
         zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift);
         zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift);
     }
     }
 
 
     if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue))
     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;
         Value = PreValue;
         zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift);
         zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift);
     }
     }

+ 4 - 1
code/components/jomjol_tfliteclass/CTfLiteClass.cpp

@@ -140,7 +140,10 @@ bool CTfLiteClass::LoadInputImageBasis(CImageBasis *rs)
 void CTfLiteClass::MakeAllocate()
 void CTfLiteClass::MakeAllocate()
 {
 {
     static tflite::AllOpsResolver resolver;
     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);
     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();
     TfLiteStatus allocate_status = this->interpreter->AllocateTensors();
     if (allocate_status != kTfLiteOk) {
     if (allocate_status != kTfLiteOk) {
@@ -229,7 +232,7 @@ CTfLiteClass::CTfLiteClass()
     this->interpreter = nullptr;
     this->interpreter = nullptr;
     this->input = nullptr;
     this->input = nullptr;
     this->output = 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]; 
     this->tensor_arena = new uint8_t[kTensorArenaSize]; 
 }
 }
 
 

+ 2 - 2
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_TAG="";
 const char* GIT_BRANCH="rolling";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-03-01 07:17";
+const char* BUILD_TIME="2021-03-06 19:58";

+ 1 - 0
code/platformio.ini

@@ -15,6 +15,7 @@ src_dir = main
 
 
 [env:esp32cam]
 [env:esp32cam]
 platform = espressif32@2.1.0
 platform = espressif32@2.1.0
+;platform = espressif32
 board = esp32cam
 board = esp32cam
 framework = espidf
 framework = espidf
 
 

+ 2 - 2
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="7dbd77d";
+const char* GIT_REV="01f8a51";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-03-01 07:17";
+const char* BUILD_TIME="2021-03-06 19:58";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin