Skip to content

Commit 48067b1

Browse files
committed
v7.1.2
1 parent 21a59fb commit 48067b1

File tree

9 files changed

+28
-11
lines changed

9 files changed

+28
-11
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
4646

4747

4848

49-
##### 7.1.1 MQTT-Update - (2021-05-30)
49+
##### 7.1.2 MQTT-Update - (2021-06-17)
5050

51+
* NEW: 7.1.2: bug fix setting hostname, Flash-LED not off during reboot
5152
* NEW: 7.1.1: bug fix wlan password with "=" (again)
5253
* MQTT error message: changes "no error", send retain flag
5354
* Update wlan handling to esp-idf 4.1

code/components/jomjol_controlcamera/ClassControllCamera.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ void CCamera::EnableAutoExposure(int flashdauer)
230230
camera_fb_t * fb = esp_camera_fb_get();
231231
if (!fb) {
232232
ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
233+
LEDOnOff(false);
234+
LightOnOff(false);
233235
doReboot();
234236
}
235237
esp_camera_fb_return(fb);
@@ -275,6 +277,7 @@ esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
275277
if (!fb) {
276278
ESP_LOGE(TAGCAMERACLASS, "Camera Capture Failed");
277279
LEDOnOff(false);
280+
LightOnOff(false);
278281
doReboot();
279282

280283
return ESP_FAIL;
@@ -453,6 +456,7 @@ esp_err_t CCamera::CaptureToHTTP(httpd_req_t *req, int delay)
453456
fb = esp_camera_fb_get();
454457
if (!fb) {
455458
ESP_LOGE(TAGCAMERACLASS, "Camera capture failed");
459+
LEDOnOff(false);
456460
LightOnOff(false);
457461
httpd_resp_send_500(req);
458462
// doReboot();

code/components/jomjol_wlan/read_wlanini.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_ho
135135
fclose(pFile);
136136

137137
// Check if Hostname was empty in .ini if yes set to std_hostname
138-
if(hostname.length() >= 0){
138+
if(hostname.length() == 0){
139139
hostname = std_hostname;
140140
}
141141

code/main/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="6cefc44";
2-
const char* GIT_TAG="v7.1.0";
1+
const char* GIT_REV="21a59fb";
2+
const char* GIT_TAG="v7.1.1";
33
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-05-30 21:47";
4+
const char* BUILD_TIME="2021-06-17 19:59";

code/main/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C"
1313
#include "Helper.h"
1414
#include <fstream>
1515

16-
const char* GIT_BASE_BRANCH = "master - v7.1.1 - 2020-05-30";
16+
const char* GIT_BASE_BRANCH = "master - v7.1.2 - 2020-06-17";
1717

1818

1919
const char* git_base_branch(void)

code/sdkconfig

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
165165
#
166166
# CONFIG_BT_ENABLED is not set
167167
CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
168+
CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
169+
CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
168170
CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
169171
CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
170172
CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -239,6 +241,7 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
239241
#
240242
# ESP32-specific
241243
#
244+
CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
242245
CONFIG_ESP32_REV_MIN_0=y
243246
# CONFIG_ESP32_REV_MIN_1 is not set
244247
# CONFIG_ESP32_REV_MIN_2 is not set
@@ -656,8 +659,10 @@ CONFIG_LWIP_SO_REUSE=y
656659
CONFIG_LWIP_SO_REUSE_RXTOALL=y
657660
# CONFIG_LWIP_SO_RCVBUF is not set
658661
# CONFIG_LWIP_NETBUF_RECVINFO is not set
659-
CONFIG_LWIP_IP_FRAG=y
660-
# CONFIG_LWIP_IP_REASSEMBLY is not set
662+
CONFIG_LWIP_IP4_FRAG=y
663+
CONFIG_LWIP_IP6_FRAG=y
664+
# CONFIG_LWIP_IP4_REASSEMBLY is not set
665+
# CONFIG_LWIP_IP6_REASSEMBLY is not set
661666
# CONFIG_LWIP_STATS is not set
662667
# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
663668
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
@@ -681,8 +686,10 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
681686
#
682687
# TCP
683688
#
689+
CONFIG_LWIP_TCP_ISN_HOOK=y
684690
CONFIG_LWIP_MAX_ACTIVE_TCP=16
685691
CONFIG_LWIP_MAX_LISTENING_TCP=16
692+
CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
686693
CONFIG_LWIP_TCP_MAXRTX=12
687694
CONFIG_LWIP_TCP_SYNMAXRTX=6
688695
CONFIG_LWIP_TCP_MSS=1440
@@ -697,6 +704,7 @@ CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
697704
CONFIG_LWIP_TCP_OVERSIZE_MSS=y
698705
# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
699706
# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
707+
CONFIG_LWIP_TCP_RTO_TIME=1500
700708
# end of TCP
701709

702710
#
@@ -712,6 +720,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
712720
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
713721
CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
714722
# CONFIG_LWIP_PPP_SUPPORT is not set
723+
CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
724+
CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
715725

716726
#
717727
# ICMP
@@ -995,6 +1005,8 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
9951005
#
9961006
CONFIG_WPA_MBEDTLS_CRYPTO=y
9971007
# CONFIG_WPA_TLS_V12 is not set
1008+
# CONFIG_WPA_WPS_WARS is not set
1009+
# CONFIG_WPA_DEBUG_PRINT is not set
9981010
# end of Supplicant
9991011

10001012
#

code/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="6cefc44";
2-
const char* GIT_TAG="v7.1.0";
1+
const char* GIT_REV="21a59fb";
2+
const char* GIT_TAG="v7.1.1";
33
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-05-30 21:47";
4+
const char* BUILD_TIME="2021-06-17 19:47";

firmware/bootloader.bin

0 Bytes
Binary file not shown.

firmware/firmware.bin

48 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)