diff --git a/README.md b/README.md index e8d0e833d..5f22a630a 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,9 @@ In other cases you can contact the developer via email: = 0){ + if(hostname.length() == 0){ hostname = std_hostname; } diff --git a/code/main/version.cpp b/code/main/version.cpp index 7c89f2786..c13cc7d6e 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6cefc44"; -const char* GIT_TAG="v7.1.0"; +const char* GIT_REV="21a59fb"; +const char* GIT_TAG="v7.1.1"; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-05-30 21:47"; \ No newline at end of file +const char* BUILD_TIME="2021-06-17 19:59"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index d470870a6..5a6a9e78b 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v7.1.1 - 2020-05-30"; +const char* GIT_BASE_BRANCH = "master - v7.1.2 - 2020-06-17"; const char* git_base_branch(void) diff --git a/code/sdkconfig b/code/sdkconfig index ecb9959f2..d27a104c6 100644 --- a/code/sdkconfig +++ b/code/sdkconfig @@ -165,6 +165,8 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # CONFIG_BT_ENABLED is not set CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 +CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 +CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 @@ -239,6 +241,7 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y # # ESP32-specific # +CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y CONFIG_ESP32_REV_MIN_0=y # CONFIG_ESP32_REV_MIN_1 is not set # CONFIG_ESP32_REV_MIN_2 is not set @@ -656,8 +659,10 @@ CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE_RXTOALL=y # CONFIG_LWIP_SO_RCVBUF is not set # CONFIG_LWIP_NETBUF_RECVINFO is not set -CONFIG_LWIP_IP_FRAG=y -# CONFIG_LWIP_IP_REASSEMBLY is not set +CONFIG_LWIP_IP4_FRAG=y +CONFIG_LWIP_IP6_FRAG=y +# CONFIG_LWIP_IP4_REASSEMBLY is not set +# CONFIG_LWIP_IP6_REASSEMBLY is not set # CONFIG_LWIP_STATS is not set # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y @@ -681,8 +686,10 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 # # TCP # +CONFIG_LWIP_TCP_ISN_HOOK=y CONFIG_LWIP_MAX_ACTIVE_TCP=16 CONFIG_LWIP_MAX_LISTENING_TCP=16 +CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y CONFIG_LWIP_TCP_MAXRTX=12 CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1440 @@ -697,6 +704,7 @@ CONFIG_LWIP_TCP_QUEUE_OOSEQ=y CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set +CONFIG_LWIP_TCP_RTO_TIME=1500 # end of TCP # @@ -712,6 +720,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF # CONFIG_LWIP_PPP_SUPPORT is not set +CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3 +CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5 # # ICMP @@ -995,6 +1005,8 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 # CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_TLS_V12 is not set +# CONFIG_WPA_WPS_WARS is not set +# CONFIG_WPA_DEBUG_PRINT is not set # end of Supplicant # diff --git a/code/version.cpp b/code/version.cpp index 7c89f2786..e3848299c 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6cefc44"; -const char* GIT_TAG="v7.1.0"; +const char* GIT_REV="21a59fb"; +const char* GIT_TAG="v7.1.1"; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-05-30 21:47"; \ No newline at end of file +const char* BUILD_TIME="2021-06-17 19:47"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 6f6427d84..239752633 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 0de202307..9aa136769 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ