From fe61fc98495a731204d2dba61023a5e5c98249aa Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 21:53:10 +0200 Subject: [PATCH 01/13] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cfca956f8..762ca9034 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: Arduino IDF 4.4.4 +name: Arduino IDF 4.4.4 more optimize on: workflow_dispatch: # Manually start a workflow From e8d957074db8820b7daf0906f0afae70be8a24cc Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 21:55:36 +0200 Subject: [PATCH 02/13] CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n --- configs/defconfig.esp32 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index ddbb04d21..ab258a260 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -55,6 +55,7 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 # CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y +CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y CONFIG_LOG_DEFAULT_LEVEL_NONE=y From 9e5eef2a2fa79492c7ec48ecaf1b6a69a1ababd0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 22:14:07 +0200 Subject: [PATCH 03/13] no SPIRAM bank switch --- configs/defconfig.esp32 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index ab258a260..a0a654e77 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -28,6 +28,8 @@ CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=1024 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +CONFIG_SPIRAM_BANKSWITCH_ENABLE=n +#CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y # CONFIG_ETH_SPI_ETHERNET_W5500 is not set From 49cc01c95baae7fff98fa4ab79b49cc4cd03534d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 22:28:15 +0200 Subject: [PATCH 04/13] CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT --- configs/defconfig.esp32 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index a0a654e77..b0e6737d4 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -22,6 +22,7 @@ CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y +CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y CONFIG_ESP32_SPIRAM_SUPPORT=y CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y CONFIG_ESP32_ULP_COPROC_ENABLED=y From d21d36bf57eeca4e49a974c16a22051d549f813d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 22:33:01 +0200 Subject: [PATCH 05/13] # CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set --- configs/defconfig.esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index b0e6737d4..830bd6e3a 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -22,7 +22,6 @@ CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y -CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y CONFIG_ESP32_SPIRAM_SUPPORT=y CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y CONFIG_ESP32_ULP_COPROC_ENABLED=y @@ -34,6 +33,7 @@ CONFIG_SPIRAM_BANKSWITCH_ENABLE=n CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y # CONFIG_ETH_SPI_ETHERNET_W5500 is not set +# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set CONFIG_HTTPD_WS_SUPPORT=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 From 8770c5519b150733cb49ae75e1c203442e3f2b8e Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 14 May 2023 22:34:11 +0200 Subject: [PATCH 06/13] only esp32 (for testing) --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4217e714c..54d731c75 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then exit 1 fi -TARGET="all" +TARGET="esp32" BUILD_TYPE="all" SKIP_ENV=0 COPY_OUT=0 From 43216553e644a0ce7ca9fe677ae45fdbe40ae559 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 17:50:06 +0200 Subject: [PATCH 07/13] Disable not used cameras and others --- configs/defconfig.esp32 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 830bd6e3a..449c66e20 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -28,8 +28,8 @@ CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=1024 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 -CONFIG_SPIRAM_BANKSWITCH_ENABLE=n -#CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set +# CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set +# CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y # CONFIG_ETH_SPI_ETHERNET_W5500 is not set @@ -56,6 +56,7 @@ CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 # CONFIG_FREERTOS_FPU_IN_ISR is not set +# CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT is not set CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n @@ -104,3 +105,17 @@ CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y +# +# Disable Cameras not used +# +# CONFIG_OV7670_SUPPORT is not set +# CONFIG_OV7725_SUPPORT is not set +# CONFIG_NT99141_SUPPORT is not set +# CONFIG_OV3660_SUPPORT is not set +# CONFIG_OV5640_SUPPORT is not set +# CONFIG_GC2145_SUPPORT is not set +# CONFIG_GC032A_SUPPORT is not set +# CONFIG_GC0308_SUPPORT is not set +# CONFIG_BF3005_SUPPORT is not set +# CONFIG_BF20A6_SUPPORT is not set +# CONFIG_SC030IOT_SUPPORT is not set From 775014e83a6a2439a563bdac6fd966fa6ed696c9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 18:12:03 +0200 Subject: [PATCH 08/13] rm redundant --- configs/defconfig.esp32 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 449c66e20..3beb393d9 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -29,7 +29,6 @@ CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=1024 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 # CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set -# CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y # CONFIG_ETH_SPI_ETHERNET_W5500 is not set From b5d4537b75ac009c7a594aded143dd581900d337 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 18:18:42 +0200 Subject: [PATCH 09/13] Update defconfig.esp32c3 --- configs/defconfig.esp32c3 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 3aba6600a..345d85c5c 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -43,7 +43,8 @@ CONFIG_ESP32C3_REV_MIN_0=y CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 -CONFIG_ESP_HTTPS_SERVER_ENABLE=y +# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set +# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 @@ -85,3 +86,17 @@ CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y # CONFIG_VFS_SUPPORT_SELECT is not set # CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set # CONFIG_VFS_SUPPORT_TERMIOS is not set +# +# Disable Cameras not used 107 +# +# CONFIG_OV7670_SUPPORT is not set +# CONFIG_OV7725_SUPPORT is not set +# CONFIG_NT99141_SUPPORT is not set +# CONFIG_OV3660_SUPPORT is not set +# CONFIG_OV5640_SUPPORT is not set +# CONFIG_GC2145_SUPPORT is not set +# CONFIG_GC032A_SUPPORT is not set +# CONFIG_GC0308_SUPPORT is not set +# CONFIG_BF3005_SUPPORT is not set +# CONFIG_BF20A6_SUPPORT is not set +# CONFIG_SC030IOT_SUPPORT is not set From 400ab4397c375ae3357f2e5fdd1351700cee09be Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 18:21:58 +0200 Subject: [PATCH 10/13] Disable more --- configs/defconfig.esp32s2 | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index b28cd33dc..82b63c8cf 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -25,12 +25,14 @@ CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=4096 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +# CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_ESP32S2_KEEP_USB_ALIVE=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_HTTPD_WS_SUPPORT=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 -CONFIG_ESP_HTTPS_SERVER_ENABLE=y +# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set +# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 @@ -56,6 +58,8 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 # CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y +# CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT is not set +CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y CONFIG_LOG_DEFAULT_LEVEL_NONE=y @@ -97,3 +101,17 @@ 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 +# +# Disable Cameras not used +# +# CONFIG_OV7670_SUPPORT is not set +# CONFIG_OV7725_SUPPORT is not set +# CONFIG_NT99141_SUPPORT is not set +# CONFIG_OV3660_SUPPORT is not set +# CONFIG_OV5640_SUPPORT is not set +# CONFIG_GC2145_SUPPORT is not set +# CONFIG_GC032A_SUPPORT is not set +# CONFIG_GC0308_SUPPORT is not set +# CONFIG_BF3005_SUPPORT is not set +# CONFIG_BF20A6_SUPPORT is not set +# CONFIG_SC030IOT_SUPPORT is not set From d08427382e611522116a59d3099f7a2080aa489a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 18:24:55 +0200 Subject: [PATCH 11/13] Disable stuff --- configs/defconfig.esp32s3 | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index af519b444..824e571ed 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -49,11 +49,13 @@ CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=4096 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +# CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=576 CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_HTTPD_WS_SUPPORT=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 -CONFIG_ESP_HTTPS_SERVER_ENABLE=y +# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set +# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 @@ -82,6 +84,8 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 # CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y +# CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT is not set +CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y CONFIG_LOG_DEFAULT_LEVEL_NONE=y @@ -120,3 +124,17 @@ 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 +# +# Disable Cameras not used +# +# CONFIG_OV7670_SUPPORT is not set +# CONFIG_OV7725_SUPPORT is not set +# CONFIG_NT99141_SUPPORT is not set +# CONFIG_OV3660_SUPPORT is not set +# CONFIG_OV5640_SUPPORT is not set +# CONFIG_GC2145_SUPPORT is not set +# CONFIG_GC032A_SUPPORT is not set +# CONFIG_GC0308_SUPPORT is not set +# CONFIG_BF3005_SUPPORT is not set +# CONFIG_BF20A6_SUPPORT is not set +# CONFIG_SC030IOT_SUPPORT is not set From df89f665a765a68b721b8bbfd3f01765e175ccad Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 15 May 2023 18:25:20 +0200 Subject: [PATCH 12/13] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 54d731c75..4217e714c 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then exit 1 fi -TARGET="esp32" +TARGET="all" BUILD_TYPE="all" SKIP_ENV=0 COPY_OUT=0 From efcd8bb3d4879014abf21e698ce3faf8c81ab0eb Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 16 May 2023 12:59:10 +0200 Subject: [PATCH 13/13] AR branch "lwip_fs" Updated LittleFS to v1.5.4 and Camera to v2.0.4 --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index b0e50b2dd..60077a107 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -10,7 +10,7 @@ IDF_REPO_URL="https://github.com/tasmota/esp-idf.git" # The IDF branch to use if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="lwip_timeout" + IDF_BRANCH="lwip_fs" fi if [ -z $AR_PR_TARGET_BRANCH ]; then