Update 20201119

code/build/config.env

@@ -0,0 +1,10 @@
+{
+    "COMPONENT_KCONFIGS": "C:/Users/Muell/esp-idf/components/app_trace/Kconfig C:/Users/Muell/esp-idf/components/bt/Kconfig C:/Users/Muell/esp-idf/components/coap/Kconfig C:/Users/Muell/esp-idf/components/driver/Kconfig C:/Users/Muell/esp-idf/components/efuse/Kconfig C:/Users/Muell/esp-idf/components/esp-tls/Kconfig C:/Users/Muell/esp-idf/components/esp32/Kconfig C:/Users/Muell/esp-idf/components/esp_adc_cal/Kconfig C:/Users/Muell/esp-idf/components/esp_common/Kconfig C:/Users/Muell/esp-idf/components/esp_eth/Kconfig C:/Users/Muell/esp-idf/components/esp_event/Kconfig C:/Users/Muell/esp-idf/components/esp_gdbstub/Kconfig C:/Users/Muell/esp-idf/components/esp_http_client/Kconfig C:/Users/Muell/esp-idf/components/esp_http_server/Kconfig C:/Users/Muell/esp-idf/components/esp_https_ota/Kconfig C:/Users/Muell/esp-idf/components/esp_https_server/Kconfig C:/Users/Muell/esp-idf/components/esp_netif/Kconfig C:/Users/Muell/esp-idf/components/esp_wifi/Kconfig C:/Users/Muell/esp-idf/components/espcoredump/Kconfig C:/Users/Muell/esp-idf/components/fatfs/Kconfig C:/Users/Muell/esp-idf/components/freemodbus/Kconfig C:/Users/Muell/esp-idf/components/freertos/Kconfig C:/Users/Muell/esp-idf/components/heap/Kconfig C:/Users/Muell/esp-idf/components/jsmn/Kconfig C:/Users/Muell/esp-idf/components/libsodium/Kconfig C:/Users/Muell/esp-idf/components/log/Kconfig C:/Users/Muell/esp-idf/components/lwip/Kconfig C:/Users/Muell/esp-idf/components/mbedtls/Kconfig C:/Users/Muell/esp-idf/components/mdns/Kconfig C:/Users/Muell/esp-idf/components/mqtt/Kconfig C:/Users/Muell/esp-idf/components/newlib/Kconfig C:/Users/Muell/esp-idf/components/nvs_flash/Kconfig C:/Users/Muell/esp-idf/components/openssl/Kconfig C:/Users/Muell/esp-idf/components/pthread/Kconfig C:/Users/Muell/esp-idf/components/spi_flash/Kconfig C:/Users/Muell/esp-idf/components/spiffs/Kconfig C:/Users/Muell/esp-idf/components/unity/Kconfig C:/Users/Muell/esp-idf/components/vfs/Kconfig C:/Users/Muell/esp-idf/components/wear_levelling/Kconfig C:/Users/Muell/esp-idf/components/wifi_provisioning/Kconfig C:/Users/Muell/esp-idf/components/wpa_supplicant/Kconfig C:/Users/Muell/Documents/Programmieren/GitHub/AI-on-the-edge-device/code/components/esp32-camera-master/Kconfig",
+    "COMPONENT_KCONFIGS_PROJBUILD": "C:/Users/Muell/esp-idf/components/app_update/Kconfig.projbuild C:/Users/Muell/esp-idf/components/bootloader/Kconfig.projbuild C:/Users/Muell/esp-idf/components/esptool_py/Kconfig.projbuild C:/Users/Muell/esp-idf/components/partition_table/Kconfig.projbuild C:/Users/Muell/esp-idf/examples/common_components/protocol_examples_common/Kconfig.projbuild",
+    "COMPONENT_SDKCONFIG_RENAMES": "C:/Users/Muell/esp-idf/components/app_trace/sdkconfig.rename C:/Users/Muell/esp-idf/components/bootloader/sdkconfig.rename C:/Users/Muell/esp-idf/components/bt/sdkconfig.rename C:/Users/Muell/esp-idf/components/driver/sdkconfig.rename C:/Users/Muell/esp-idf/components/esp32/sdkconfig.rename C:/Users/Muell/esp-idf/components/esp_common/sdkconfig.rename C:/Users/Muell/esp-idf/components/esp_event/sdkconfig.rename C:/Users/Muell/esp-idf/components/esp_wifi/sdkconfig.rename C:/Users/Muell/esp-idf/components/esptool_py/sdkconfig.rename C:/Users/Muell/esp-idf/components/freemodbus/sdkconfig.rename C:/Users/Muell/esp-idf/components/freertos/sdkconfig.rename C:/Users/Muell/esp-idf/components/lwip/sdkconfig.rename C:/Users/Muell/esp-idf/components/pthread/sdkconfig.rename C:/Users/Muell/esp-idf/components/spi_flash/sdkconfig.rename C:/Users/Muell/esp-idf/components/vfs/sdkconfig.rename",
+    "IDF_CMAKE": "y",
+    "IDF_TARGET": "esp32",
+    "IDF_PATH": "C:/Users/Muell/esp-idf",
+    "COMPONENT_KCONFIGS_SOURCE_FILE": "C:/Users/Muell/Documents/Programmieren/GitHub/AI-on-the-edge-device/code/build/kconfigs.in",
+    "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE": "C:/Users/Muell/Documents/Programmieren/GitHub/AI-on-the-edge-device/code/build/kconfigs_projbuild.in"
+}

code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -90,7 +90,6 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
 void ClassFlowPostProcessing::SavePreValue(float value, string zwtime)
 {
     FILE* pFile;
-    PreValue = value;
 
     pFile = fopen(FilePreValue.c_str(), "w");
 
@@ -323,6 +322,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
             }
             Value = std::stof(ReturnValue);
             ReturnValueNoError = ReturnValue;
+
+            PreValueOkay = true;
+            PreValue = Value;
             
             SavePreValue(Value, zwtime);
         }
@@ -360,7 +362,11 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         ReturnValue = ReturnValue + "\t" + error;
 
     if (error.length() == 0)
+    {
+        PreValue = Value;
         SavePreValue(Value, zwtime);
+    }
+
 
     return true;
 }

code/src/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="c292ecd";
+const char* GIT_REV="dbbc5ea";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
+const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-15 18:27";
+const char* BUILD_TIME="2020-11-19 18:57";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="c292ecd";
+const char* GIT_REV="dbbc5ea";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
+const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-15 18:27";
+const char* BUILD_TIME="2020-11-19 18:57";

sd-card/config/config.ini

@@ -14,7 +14,7 @@ SearchFieldY = 20
 
 
 [Digits]
-Model=/config/dig0650s3.tflite
+Model=/config/dig0710s3.tflite
 LogImageLocation = /log/digit
 LogfileRetentionInDays = 15
 ModelInputSize 20, 32
@@ -35,7 +35,7 @@ analog4, 168, 326, 92, 92
 [PostProcessing]
 DecimalShift = 0
 PreValueUse = True
-PreValueAgeStartup = 30
+PreValueAgeStartup = 720
 AllowNegativeRates = False
 MaxRateValue = 0.1
 ErrorMessage = True