jomjol 4 years ago
parent
commit
45154cb55c

+ 7 - 3
README.md

@@ -45,7 +45,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling - (2021-06-11)
+##### Rolling - (2021-06-17)
+
+* bug fix setting hostname, Flash-LED not off during reboot
+
+Rolling - (2021-06-11)
 
 * Restructuring for multi number counters
   * Major internal and html changes 
@@ -54,9 +58,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 7.1.1 MQTT-Update - (2021-05-30)
+##### 7.1.2 MQTT-Update - (2021-06-17)
 
-* NEW: 7.1.1: bug fix wlan password with "="  (again)
+* NEW: 7.1.2: bug fix setting hostname, Flash-LED not off during rebootNEW: 7.1.1: bug fix wlan password with "="  (again)
 * MQTT error message: changes "no error", send retain flag
 * Update wlan handling to esp-idf 4.1
 * Upgrade digital CNN to v8.7.0  (added new images)

+ 4 - 0
code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -230,6 +230,8 @@ void CCamera::EnableAutoExposure(int flashdauer)
     camera_fb_t * fb = esp_camera_fb_get();
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
+        LEDOnOff(false);
+        LightOnOff(false);
         doReboot();
     }
     esp_camera_fb_return(fb);        
@@ -275,6 +277,7 @@ esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
         LEDOnOff(false);
+        LightOnOff(false);
         doReboot();
 
         return ESP_FAIL;
@@ -453,6 +456,7 @@ esp_err_t CCamera::CaptureToHTTP(httpd_req_t *req, int delay)
     fb = esp_camera_fb_get();
     if (!fb) {
         ESP_LOGE(TAGCAMERACLASS, "Camera capture failed");
+        LEDOnOff(false);
         LightOnOff(false);
         httpd_resp_send_500(req);
 //        doReboot();

+ 1 - 1
code/components/jomjol_wlan/read_wlanini.cpp

@@ -135,7 +135,7 @@ void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_ho
     fclose(pFile);
 
     // Check if Hostname was empty in .ini if yes set to std_hostname
-    if(hostname.length() >= 0){
+    if(hostname.length() == 0){
         hostname = std_hostname;
     }
 

+ 2 - 2
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="8308f15";
+const char* GIT_REV="f4edd36";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-06-05 09:51";
+const char* BUILD_TIME="2021-06-17 20:14";

+ 2 - 2
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="8308f15";
+const char* GIT_REV="f4edd36";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-06-05 09:51";
+const char* BUILD_TIME="2021-06-17 20:14";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin