v1.00

Loucotolo · Loucotolo · commit efa0790bf4d5 · 2022-05-19T16:57:34.000+01:00
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: ESP32 Arduino ITEAD
+name: ESP32 Arduino V1.00
 
 on:
   workflow_dispatch:  # Manually start a workflow
diff --git a/README.md b/README.md
@@ -1,12 +1,14 @@
-# Tasmota ESP32 Arduino Lib Builder [![ESP32 builder](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml)
+# Tasmota ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder)
 
-This repository contains the scripts that produce the libraries included with Tasmota esp32-arduino.
+This repository contains the scripts that produce the libraries included with esp32-arduino.
 
-### Build on Ubuntu
+Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
+
+### Build on Ubuntu and Raspberry Pi
 ```bash
 sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
 sudo pip install --upgrade pip
-git clone https://github.com/Jason2866/esp32-arduino-lib-builder
+git clone https://github.com/tv4you2016/esp32-arduino-lib-builder
 cd esp32-arduino-lib-builder
 ./build.sh
 ```
diff --git a/components/fb_gfx/fb_gfx.c b/components/fb_gfx/fb_gfx.c
@@ -38,24 +38,17 @@ typedef struct { // Data stored for FONT AS A WHOLE:
 
 void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
 {
-    int32_t line_step = (fb->width - w) * fb->bytes_per_pixel;
-    uint8_t *data = fb->data + ((x + (y * fb->width)) * fb->bytes_per_pixel);
+    int32_t line_step = (fb->width - w) * 3;
+    uint8_t *data = fb->data + ((x + (y * fb->width)) * 3);
     uint8_t c0 = color >> 16;
     uint8_t c1 = color >> 8;
     uint8_t c2 = color;
     for (int i=0; i<h; i++){
         for (int j=0; j<w; j++){
-            if(fb->bytes_per_pixel == 2){
-                data[0] = c1;
-                data[1] = c2;
-            } else if(fb->bytes_per_pixel == 1){
-                data[0] = c2;
-            } else {
-                data[0] = c0;
-                data[1] = c1;
-                data[2] = c2;
-            }
-            data+=fb->bytes_per_pixel;
+            data[0] = c0;
+            data[1] = c1;
+            data[2] = c2;
+            data+=3;
         }
         data += line_step;
     }
diff --git a/components/fb_gfx/include/fb_gfx.h b/components/fb_gfx/include/fb_gfx.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
     typedef enum {
-        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY
+        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565
     } fb_format_t;
 
     typedef struct {
diff --git a/configs/builds.json b/configs/builds.json
@@ -83,7 +83,7 @@
 		{
 			"target": "esp32",
 			"features":["qio_ram"],
-			"idf_libs":["dout","40m"],
+			"idf_libs":["dout","80m"],
 			"bootloaders":[
 				["qio","80m"],
 				["qout","80m"],
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
@@ -27,24 +27,27 @@ CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_MEMTEST is not set
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
-CONFIG_D0WD_PSRAM_CLK_IO=5
-CONFIG_D0WD_PSRAM_CS_IO=18
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
 CONFIG_ESP32_XTAL_FREQ_AUTO=y
-CONFIG_ETH_SPI_ETHERNET_DM9051=y
-CONFIG_ETH_SPI_ETHERNET_W5500=y
-CONFIG_HTTPD_WS_SUPPORT=y
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
+#CONFIG_ETH_SPI_ETHERNET_DM9051=y
+#CONFIG_ETH_SPI_ETHERNET_W5500=y
+# CONFIG_HTTPD_WS_SUPPORT is not set
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
-# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_TX_BA_WIN=32
+CONFIG_ESP32_WIFI_RX_BA_WIN=32
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
@@ -59,16 +62,16 @@ CONFIG_HEAP_POISONING_LIGHT=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # CONFIG_LOG_COLORS is not set
 CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
-CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_MAX_SOCKETS=10
 CONFIG_LWIP_SO_RCVBUF=y
 CONFIG_LWIP_IP_FORWARD=y
 CONFIG_LWIP_IPV4_NAPT=y
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
-CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
-CONFIG_LWIP_DHCP_OPTIONS_LEN=128
-CONFIG_LWIP_TCP_SYNMAXRTX=6
-CONFIG_LWIP_TCP_MSS=1436
-CONFIG_LWIP_TCP_RTO_TIME=3000
+# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
+CONFIG_LWIP_TCP_SYNMAXRTX=12
+CONFIG_LWIP_TCP_MSS=1440
+CONFIG_LWIP_TCP_RTO_TIME=1500
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
@@ -79,6 +82,7 @@ CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
+CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
@@ -90,3 +94,28 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
 # CONFIG_VFS_SUPPORT_SELECT is not set
 # CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
 # CONFIG_VFS_SUPPORT_TERMIOS is not set
+CONFIG_ESP_TLS_INSECURE=y
+CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
+# CONFIG_LWIP_L2_TO_L3_COPY is not set
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
+CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=3072
+CONFIG_MAIN_TASK_STACK_SIZE=3584
+CONFIG_INT_WDT_TIMEOUT_MS=1000
+CONFIG_TIMER_TASK_STACK_SIZE=3584
+CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_TCP_SYNMAXRTX=12
+CONFIG_TCP_MSS=1440
+CONFIG_TCP_SND_BUF_DEFAULT=65534
+CONFIG_TCP_WND_DEFAULT=65534
+CONFIG_TCP_RECVMBOX_SIZE=64
+CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
+# CONFIG_SPIRAM_MEMTEST is not set
+# CONFIG_SPIRAM_OCCUPY_VSPI_HOST is not set
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
+# CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
+# CONFIG_BT_SSP_ENABLED is not set 
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
@@ -61,6 +61,7 @@ CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 # CONFIG_UNITY_ENABLE_FLOAT is not set
 # CONFIG_UNITY_ENABLE_DOUBLE is not set
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
@@ -71,6 +71,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
@@ -97,6 +97,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
diff --git a/configs/defconfig.qio_ram b/configs/defconfig.qio_ram
@@ -1,2 +1,2 @@
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-# CONFIG_SPIRAM_MEMTEST is not set
+CONFIG_SPIRAM_MEMTEST=y
diff --git a/tools/config.sh b/tools/config.sh
@@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then
 fi
 
 if [ -z $IDF_BRANCH ]; then
-	IDF_BRANCH="v4.4.1"
+	IDF_BRANCH="v4.4_dev"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -34,7 +34,7 @@ AR_USER="tasmota"
 AR_REPO="$AR_USER/arduino-esp32"
 
 # Arduino branch to use
-AR_BRANCH="release_203"
+AR_BRANCH="work"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then
@@ -118,3 +118,4 @@ function git_create_pr(){ # git_create_pr <branch> <title>
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
 	if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi
 }
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: ESP32 Arduino ITEAD`
	`1`	`+name: ESP32 Arduino V1.00`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch: # Manually start a workflow`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@`
`83`	`83`	`{`
`84`	`84`	`"target": "esp32",`
`85`	`85`	`"features":["qio_ram"],`
`86`		`- "idf_libs":["dout","40m"],`
	`86`	`+ "idf_libs":["dout","80m"],`
`87`	`87`	`"bootloaders":[`
`88`	`88`	`["qio","80m"],`
`89`	`89`	`["qout","80m"],`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`CONFIG_SPIRAM_IGNORE_NOTFOUND=y`
`2`		`-# CONFIG_SPIRAM_MEMTEST is not set`
	`2`	`+CONFIG_SPIRAM_MEMTEST=y`