nightly

code/lib/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -74,7 +74,7 @@ bool ClassFlowAlignment::doFlow(string time)
 
     CRotate *rt;
 
-    if (this->initalrotate != 0)
+    if (initalrotate != 0)
     {
         rt = new CRotate(input);
         rt->Rotate(this->initalrotate);

code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -271,13 +271,13 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
     if ((!AllowNegativeRates) && (Value < PreValue))
     {
-        error = "Negative Rate - Return old value - " + zwvalue;
+        error = "Negative Rate - Returned old value - read value: " + zwvalue;
         Value = PreValue;
     }
 
-    if (useMaxRateValue && ((Value - PreValue) > MaxRateValue))
+    if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue))
     {
-        error = "Negative Rate - Return old value - " + zwvalue;
+        error = "Rate too high - Returned old value - read value: " + zwvalue;
         Value = PreValue;
     }
 

code/lib/jomjol_image_proc/CFindTemplate.cpp

@@ -2,6 +2,8 @@
 #include "Helper.h"
 #include "ClassLogFile.h"
 
+#include "esp_system.h"
+
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include <algorithm>
@@ -360,13 +362,13 @@ CImageBasis::CImageBasis()
 
 CImageBasis::CImageBasis(std::string _image)
 {
-    //    printf("Start CImageBasis\n");
+    channels = 3;
-    this->channels = 3;
+    externalImage = false;
-    this->externalImage = false;
+    filename = _image;
-    this->filename = _image;
+
-    //    printf("CImageBasis before load\n");
+    rgb_image = stbi_load(_image.c_str(), &width, &height, &bpp, channels);
-    //    printf(_image.c_str()); printf("\n");
+    if (rgb_image == NULL)
-    this->rgb_image = stbi_load(_image.c_str(), &(this->width), &(this->height), &(this->bpp), this->channels);
+        LogFile.WriteToFile("Image Load failed:" + _image + " FreeHeapSize: " + to_string(esp_get_free_heap_size()));
     //    printf("CImageBasis after load\n");
     //    printf("w %d, h %d, b %d, c %d", this->width, this->height, this->bpp, this->channels);
 }