Merge branch 'rolling' into master

README.md

@@ -41,8 +41,9 @@ If you would like to support the developer with a cup of coffee you can do that
 
 
 
-##### 6.3.0 Image Processing in Memory - (2021-03-14)
+##### 6.3.1 Image Processing in Memory - (2021-03-16)
 
+* NEW: 6.3.1: bug fixing in initial edit reference image and `config.ini` (Spelling error in `InitialRotate`)
 * Initial setup mode: bug fixing, error correction
 * Bug-fixing
 

code/main/version.cpp

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 const char* GIT_REV="5f0f180";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-14 12:56";
+const char* BUILD_TIME="2021-03-14 12:56";
+=======
+const char* GIT_REV="5be56d9";
+const char* GIT_TAG="";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-16 20:48";
+>>>>>>> rolling

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v6.3.0 - 2020-03-14";
+const char* GIT_BASE_BRANCH = "master - v6.3.1 - 2020-03-16";
 
 
 const char* git_base_branch(void)

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
@@ -657,8 +660,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
@@ -682,8 +687,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
@@ -698,6 +705,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
 
 #
@@ -713,6 +721,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
@@ -996,6 +1006,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
 
 #

sd-card/config/config.ini

@@ -8,7 +8,7 @@ ImageSize = VGA
 FixedExposure = false
 
 [Alignment]
-InitalRotate=180
+InitialRotate=180
 /config/ref0.jpg 119 273
 /config/ref1.jpg 456 138
 SearchFieldX = 20

sd-card/html/edit_reference.html

@@ -164,7 +164,7 @@ table {
 //            document.getElementById("MakeImage_Saturation_value1").disabled = true;
 //            document.getElementById("MakeImage_Contrast_value1").disabled = true;
             document.getElementById("mirror").disabled = false;
-            if (!(param["Alignment"]["InitialMirror"].found))
+            if (!(param["MakeImage"]["Brightness"].found))
             {
                 document.getElementById("MakeImage_Brightness_value1").type = "hidden";
                 document.getElementById("MakeImage_Brightness_text").style.visibility = "hidden";
@@ -200,13 +200,15 @@ table {
                     ReadParameter(param, "MakeImage", "Brightness", false);		
     //            	ReadParameter(param, "MakeImage", "Contrast", false);
     //                ReadParameter(param, "MakeImage", "Saturation", false);
-                    var textToSave = setConfigParameters(param);
-                    FileDeleteOnServer("/config/config.ini", basepath);
-                    FileSendContent(textToSave, "/config/config.ini", basepath);
                 }
 
                 var canvas = document.getElementById("canvas");
                 drawRotated(false);
+
+                var textToSave = setConfigParameters(param);
+                FileDeleteOnServer("/config/config.ini", basepath);
+                FileSendContent(textToSave, "/config/config.ini", basepath);
+
                 SaveCanvasToImage(canvas, "/config/reference.jpg", true, basepath);
                 showReference();
                 UpdatePage();

sd-card/html/version.txt

@@ -1 +1 @@
-6.0.0
+6.3.1