rolling 20210520

README.md

@@ -43,8 +43,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
-##### Rolling - (2021-05-17)
+##### Rolling - (2021-05-20)
 
+* Bug fix: WLan reconnect after connection lost
+
+Rolling - (2021-05-17)
 * Update wlan handling to esp-idf 4.1
 * Set mqtt error message with retain flag
 * based on v7.0.1

code/components/jomjol_controlcamera/CMakeLists.txt

@@ -4,6 +4,6 @@ list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/proto
 
 idf_component_register(SRCS ${app_sources}
                     INCLUDE_DIRS "."
-                    REQUIRES esp32-camera-master esp_http_server jomjol_logfile jomjol_image_proc nvs_flash)
+                    REQUIRES esp32-camera-master esp_http_server jomjol_logfile jomjol_image_proc nvs_flash jomjol_fileserver_ota)
 
 

code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -9,6 +9,8 @@
 #include "Helper.h"
 #include "CImageBasis.h"
 
+#include "server_ota.h"
+
 
 #define BOARD_ESP32CAM_AITHINKER
 
@@ -227,6 +229,7 @@ void CCamera::EnableAutoExposure(int flashdauer)
     camera_fb_t * fb = esp_camera_fb_get();
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
+        doReboot();
     }
     esp_camera_fb_return(fb);        
 
@@ -271,6 +274,8 @@ esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
         LEDOnOff(false);
+        doReboot();
+
         return ESP_FAIL;
     }
 
@@ -354,7 +359,11 @@ esp_err_t CCamera::CaptureToFile(std::string nm, int delay)
     camera_fb_t * fb = esp_camera_fb_get();
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
+        ESP_LOGE(TAGCAMERACLASS, "Reboot ?????");
         LEDOnOff(false);
+        LightOnOff(false);
+        doReboot();
+
         return ESP_FAIL;
     }
     LEDOnOff(false);    
@@ -443,7 +452,10 @@ esp_err_t CCamera::CaptureToHTTP(httpd_req_t *req, int delay)
     fb = esp_camera_fb_get();
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera capture failed");
+        LightOnOff(false);
         httpd_resp_send_500(req);
+//        doReboot();
+
         return ESP_FAIL;
     }
 

code/components/jomjol_wlan/connect_wlan.cpp

@@ -262,11 +262,11 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
 ////////////////////////// ENDE esp-idf 4.2 ///////////////////////////
 */
 
+/* Deaktiveren, damit bei einen Verbindungsabbruch neu aufgebaut wird
     ESP_ERROR_CHECK(esp_event_handler_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler));
     ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler));
-
-
     vEventGroupDelete(s_wifi_event_group);
+*/ 
 
 /*
     while (BlinkIsRunning)

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="39eda4a";
+const char* GIT_REV="58eb0b1";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-17 19:21";
+const char* BUILD_TIME="2021-05-20 06:55";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="39eda4a";
+const char* GIT_REV="58eb0b1";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-17 19:21";
+const char* BUILD_TIME="2021-05-20 06:55";

sd-card/config/config.ini

@@ -18,7 +18,7 @@ InitialMirror= false
 AlignmentAlgo = Default
 
 [Digits]
-Model = /config/dig0850s1q.tflite
+Model = /config/dig0860s1q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32