v10.5.1

README.md

@@ -53,10 +53,10 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 10.5.0 - Stability Increase (2022-02-18)
+##### 10.5.1 - Stability Increase (2022-02-20)
 
+- **NEW 10.5.1:** Bug Fix: wrong return value & PreValue status, HTML: SSID & IP were not displayed 
 - MQTT: changed wifi naming to "wifiRSSI"
-
 - HTML: check select able values for consistency
 - Refactoring of check postprocessing consistency (e.g. max rate, negative rate, ...)
 - Bug Fix: corrected error in "Check Consistency Increase"

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -74,10 +74,10 @@ using namespace std;
 
 esp_err_t get_tflite_file_handler(httpd_req_t *req)
 {
-    DIR *verzeichnis;
-    struct dirent *files;
+//    DIR *verzeichnis;
+//    struct dirent *files;
     struct dirent *entry;
-    struct stat entry_stat;
+//    struct stat entry_stat;
 
 
     std::string _filename, _fileext;

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -647,11 +647,14 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         while ((NUMBERS[j]->ReturnValue.length() > 1) && (NUMBERS[j]->ReturnValue[0] == '0'))
             NUMBERS[j]->ReturnValue.erase(0, 1);
 
-
         NUMBERS[j]->Value = std::stof(NUMBERS[j]->ReturnValue);
 
         if (NUMBERS[j]->checkDigitIncreaseConsistency)
+        {
             NUMBERS[j]->Value = checkDigitConsistency(NUMBERS[j]->Value, NUMBERS[j]->DecimalShift, NUMBERS[j]->analog_roi != NULL, NUMBERS[j]->PreValue);
+        }
+
+
 
         if (!NUMBERS[j]->AllowNegativeRates)
         {
@@ -687,8 +690,12 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 
         NUMBERS[j]->lastvalue = imagetime;
         NUMBERS[j]->PreValue = NUMBERS[j]->Value;
+        NUMBERS[j]->PreValueOkay = true;
+
 
+        NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
         NUMBERS[j]->ReturnPreValue = RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
+
         NUMBERS[j]->ErrorMessageText = "no error";
         UpdatePreValueINI = true;
 

code/components/jomjol_wlan/connect_wlan.cpp

@@ -122,28 +122,6 @@ static void event_handler(void* arg, esp_event_base_t event_base,
 //            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
 //        }
         ESP_LOGI(TAG,"connect to the AP fail");
-    } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
-        ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
-        ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
-        s_retry_num = 0;
-        xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
-        LEDBlinkTask(1000, 5, true);
-    }
-}
-
-/*
-static void event_handler(void* arg, esp_event_base_t event_base,
-                                int32_t event_id, void* event_data)
-{
-    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
-        LEDBlinkTask(200, 1, true);
-        esp_wifi_connect();
-    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
-//        if (s_retry_num < EXAMPLE_ESP_MAXIMUM_RETRY){ 
-            esp_wifi_connect();
-            s_retry_num++;
-            ESP_LOGI(TAG, "retry to connect to the AP");
-        ESP_LOGI(TAG,"connect to the AP fail");
     } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
         ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
         ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
@@ -153,7 +131,6 @@ static void event_handler(void* arg, esp_event_base_t event_base,
         LEDBlinkTask(1000, 5, true);
     }
 }
-*/
 
 void strinttoip4(const char *ip, int &a, int &b, int &c, int &d) {
     std::string zw = std::string(ip);
@@ -246,101 +223,13 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
     } else {
         ESP_LOGE(TAG, "UNEXPECTED EVENT");
     }
+    ssid = std::string(_ssid);
+
 
     /* The event will not be processed after unregister */
 //    ESP_ERROR_CHECK(esp_event_handler_instance_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, instance_got_ip));
 //    ESP_ERROR_CHECK(esp_event_handler_instance_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, instance_any_id));
 //    vEventGroupDelete(s_wifi_event_group);
-
-/*
-    ssid = std::string(_ssid);
-
-    s_wifi_event_group = xEventGroupCreate();
-
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-/////////////////////////////////////////////////////////////////
-
-
-    esp_netif_t *my_sta = esp_netif_create_default_wifi_sta();
-
-    if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
-    {
-        ESP_LOGI(TAG, "set IP %s, GW %s, Netmask %s manual", _ipadr, _gw, _netmask);
-        esp_netif_dhcpc_stop(my_sta);
-
-        esp_netif_ip_info_t ip_info;
-        int a, b, c, d;
-        strinttoip4(_ipadr, a, b, c, d);
-        IP4_ADDR(&ip_info.ip, a, b, c, d);
-        strinttoip4(_gw, a, b, c, d);
-        IP4_ADDR(&ip_info.gw, a, b, c, d);
-        strinttoip4(_netmask, a, b, c, d);
-        IP4_ADDR(&ip_info.netmask, a, b, c, d);
-
-        esp_netif_set_ip_info(my_sta, &ip_info);
-    }
-
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
-
-    if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
-    {
-        if (_dns == NULL)
-            _dns = _gw;
-            
-        ESP_LOGI(TAG, "set DNS manual");
-        esp_netif_dns_info_t dns_info;
-        ip4_addr_t ip;
-        ip.addr = esp_ip4addr_aton(_dns);
-        ip_addr_set_ip4_u32(&dns_info.ip, ip.addr);
-        ESP_ERROR_CHECK(esp_netif_set_dns_info(my_sta, ESP_NETIF_DNS_MAIN, &dns_info));
-    }
-
-    ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
-    ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL));
-
-    wifi_config_t wifi_config = { };
-
-    strcpy((char*)wifi_config.sta.ssid, (const char*)_ssid);
-    strcpy((char*)wifi_config.sta.password, (const char*)_password);
-
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
-    ESP_ERROR_CHECK(esp_wifi_start() );
-
-    if (_hostname != NULL)
-    {
-        esp_err_t ret = tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA , _hostname);
-        hostname = std::string(_hostname);
-        if(ret != ESP_OK ){
-            ESP_LOGE(TAG,"failed to set hostname:%d",ret);  
-        }
-    }
-
-    ESP_LOGI(TAG, "wifi_init_sta finished.");
-
-    // Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
-    // number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) 
-    EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
-            WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
-            pdFALSE,
-            pdFALSE,
-            portMAX_DELAY);
-
-    // xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
-    // happened. 
-    if (bits & WIFI_CONNECTED_BIT) {
-        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
-                 _ssid, _password);
-    } else if (bits & WIFI_FAIL_BIT) {
-        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
-                 _ssid, _password);
-    } else {
-        ESP_LOGE(TAG, "UNEXPECTED EVENT");
-    }
-*/
 }
 
 int get_WIFI_RSSI()

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1dd703b";
-const char* GIT_TAG="";
+const char* GIT_REV="cbe884a";
+const char* GIT_TAG="v10.5.0";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2022-02-18 21:15";
+const char* BUILD_TIME="2022-02-20 16:02";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v10.5.0 - 2022-02-18";
+const char* GIT_BASE_BRANCH = "master - v10.5.1 - 2022-02-20";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1dd703b";
-const char* GIT_TAG="";
+const char* GIT_REV="cbe884a";
+const char* GIT_TAG="v10.5.0";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2022-02-18 21:15";
+const char* BUILD_TIME="2022-02-20 16:01";