Merge branch 'master' into patch-1

me-no-dev · web-flow · commit e6975b1a037e · 2023-07-18T14:24:34.000+03:00
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -20,7 +20,7 @@ jobs:
     
     strategy:
       matrix:
-        idf_branch: [release/v4.4] #, release/v3.3]
+        idf_branch: [release/v5.1, release/v4.4] #, release/v3.3]
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,15 @@
 .DS_Store
 .vscode
+managed_components/
 components/arduino/
 components/esp-dl/
 components/esp-sr/
 components/esp32-camera/
 components/esp_littlefs/
 components/esp-rainmaker/
-components/esp-dsp/
+components/espressif__esp-dsp/
+components/esp-insights/
+components/arduino_tinyusb/tinyusb/
 esp-idf/
 out/
 build/
@@ -15,6 +18,4 @@ env.sh
 sdkconfig
 sdkconfig.old
 version.txt
-components/arduino_tinyusb/tinyusb/
 dependencies.lock
-tools/esptool/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,8 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
+set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
+set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# 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)
+# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)
 
 This repository contains the scripts that produce the libraries included with esp32-arduino.
 
diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ! [ -x "$(command -v python)" ]; then
+if ! [ -x "$(command -v python3)" ]; then
     echo "ERROR: python is not installed! Please install python first."
     exit 1
 fi
@@ -124,15 +124,15 @@ rm -rf build sdkconfig out
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
-component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
+component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
 echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
 for component in `ls "$AR_COMPS"`; do
     if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
-        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
+        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD || git -C "$AR_COMPS/$component" tag --points-at HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
         echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
     fi
 done
-component_version="tinyusb: "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" rev-parse --short HEAD)
+component_version="tinyusb: "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" symbolic-ref --short HEAD || git -C "$AR_COMPS/arduino_tinyusb/tinyusb" tag --points-at HEAD)" "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" rev-parse --short HEAD)
 echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
 
 #targets_count=`jq -c '.targets[] | length' configs/builds.json`
@@ -187,6 +187,12 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     done
 done
 
+# update package_esp32_index.template.json
+if [ "$BUILD_TYPE" = "all" ]; then
+    python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
+
 # archive the build
 if [ "$BUILD_TYPE" = "all" ]; then
     ./tools/archive-build.sh
diff --git a/configs/defconfig.common b/configs/defconfig.common
@@ -32,11 +32,12 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
+# CONFIG_FATFS_API_ENCODING_ANSI_OEM is not set
+CONFIG_FATFS_API_ENCODING_UTF_8=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
 CONFIG_HEAP_POISONING_LIGHT=y
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
@@ -71,3 +72,23 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
+CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
+CONFIG_ESP_RMAKER_USER_ID_CHECK=y
+CONFIG_ESP_INSIGHTS_ENABLED=y
+CONFIG_ESP_INSIGHTS_COREDUMP_ENABLE=y
+CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
+CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
+CONFIG_DIAG_ENABLE_METRICS=y
+CONFIG_DIAG_ENABLE_HEAP_METRICS=y
+CONFIG_DIAG_ENABLE_WIFI_METRICS=y
+CONFIG_DIAG_ENABLE_VARIABLES=y
+CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
+CONFIG_ESP_COREDUMP_ENABLE=y
+CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
+CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
+CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
+CONFIG_ESP_COREDUMP_STACK_SIZE=1024
+CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
@@ -9,9 +9,15 @@ CONFIG_BT_HFP_ENABLE=y
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
 CONFIG_ESP32_XTAL_FREQ_AUTO=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_FREERTOS_FPU_IN_ISR=y
 # CONFIG_USE_WAKENET is not set
-# CONFIG_USE_MULTINET is not set
+# CONFIG_USE_MULTINET is not set
+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
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
@@ -4,4 +4,5 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 CONFIG_ESP32S2_KEEP_USB_ALIVE=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 # CONFIG_USE_WAKENET is not set
-# CONFIG_USE_MULTINET is not set
+# CONFIG_USE_MULTINET is not set
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
@@ -8,4 +8,6 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
 CONFIG_SR_WN_MODEL_WN8_QUANT=y
 CONFIG_SR_WN_WN8_HIESP=y
 CONFIG_SR_MN_ENGLISH=y
-CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
+CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
@@ -13,3 +13,7 @@ config LIB_BUILDER_FLASHFREQ
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
+
+config LIB_BUILDER_COMPILE
+    bool
+    default y
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD)
+IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
+IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD || echo "")
 
 idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
 archive_path="dist/arduino-esp32-libs-$idf_version_string.tar.gz"
diff --git a/tools/config.sh b/tools/config.sh
@@ -10,7 +10,7 @@ if [ -z $IDF_BRANCH ]; then
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-	AR_PR_TARGET_BRANCH="master"
+	AR_PR_TARGET_BRANCH="release/v2.x"
 fi
 
 if [ -z $IDF_TARGET ]; then
@@ -43,7 +43,6 @@ AR_COMPS="$AR_ROOT/components"
 AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
-AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 
@@ -77,6 +76,14 @@ export SED="sed"
 export SSTAT="stat -c %s"
 
 if [[ "$AR_OS" == "macos" ]]; then
+	if ! [ -x "$(command -v gsed)" ]; then
+		echo "ERROR: gsed is not installed! Please install gsed first. ex. brew install gsed"
+		exit 1
+	fi
+	if ! [ -x "$(command -v gawk)" ]; then
+		echo "ERROR: gawk is not installed! Please install gawk first. ex. brew install gawk"
+		exit 1
+	fi
 	export SED="gsed"
 	export SSTAT="stat -f %z"
 fi
@@ -105,14 +112,15 @@ function git_create_pr(){ # git_create_pr <branch> <title>
 	local pr_title="$2"
 	local pr_target="$3"
 	local pr_body=""
+	pr_body+="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)"\r\n"
 	for component in `ls "$AR_COMPS"`; do
 		if [ ! $component == "arduino" ]; then
 			if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
-				pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n"
+				pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD || git -C "$AR_COMPS/$component" tag --points-at HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n"
 			fi
 		fi
 	done
-	pr_body+="tinyusb: "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" rev-parse --short HEAD)"\r\n"
+	pr_body+="tinyusb: "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" symbolic-ref --short HEAD || git -C "$AR_COMPS/arduino_tinyusb/tinyusb" tag --points-at HEAD)" "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" rev-parse --short HEAD)"\r\n"
 	local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"$pr_target\"}"
 	git_create_pr_res=`echo "$pr_data" | curl -k -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" --data @- "https://api.github.com/repos/$AR_REPO/pulls"`
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh
@@ -7,14 +7,8 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 
 source ./tools/config.sh
 
-echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
+echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
 
 mkdir -p "$AR_SDK/bin"
 
-# Workaround for getting the bootloaders to be flashable with esptool v4.x
-# It might still be needed for IDF5, but using the included esptool instead
-#cp "build/bootloader/bootloader.bin" "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
-if [ ! -e "tools/esptool" ]; then
-	git clone https://github.com/espressif/esptool tools/esptool
-fi
-./tools/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
+cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
@@ -78,7 +78,7 @@ for item in "${@:2:${#@}-5}"; do
 			item=`get_actual_path $item`
 			INCLUDES+="$item "
 		elif [ "${item:0:2}" = ".." ]; then
-			if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]]; then
+			if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]] || [[ "${item:0:22}" = "../managed_components/" ]]; then
 				item="$PWD${item:2}"
 				item=`get_actual_path $item`
 				INCLUDES+="$item "
@@ -92,6 +92,8 @@ for item in "${@:2:${#@}-5}"; do
 		if [[ "${item:2:7}" != "ARDUINO" ]] && [[ "$item" != "-DESP32" ]]; then #skip ARDUINO defines
 			DEFINES+="$item "
 		fi
+	elif [ "$prefix" = "-O" ]; then
+		PIO_CC_FLAGS+="$item "
 	elif [[ "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			C_FLAGS+="$item "
@@ -106,7 +108,7 @@ str=`printf '%b' "$str"` #unescape the string
 set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
-	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
+	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			AS_FLAGS+="$item "
 			if [[ $C_FLAGS == *"$item"* ]]; then
@@ -125,7 +127,7 @@ str=`printf '%b' "$str"` #unescape the string
 set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
-	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
+	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			CPP_FLAGS+="$item "
 			if [[ $PIO_CC_FLAGS != *"$item"* ]]; then
@@ -360,7 +362,7 @@ for item; do
 		if [[ "$fname" == "main" && "$dname" == $(basename "$PWD") ]]; then
 			continue
 		fi
-		while [[ "$dname" != "components" && "$dname" != "build" ]]; do
+		while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do
 			ipath=`dirname "$ipath"`
 			fname=`basename "$ipath"`
 			dname=`basename $(dirname "$ipath")`
@@ -479,9 +481,6 @@ rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
-# esptool.py
-cp "$IDF_COMPS/esptool_py/esptool/esptool.py" "$AR_ESPTOOL_PY"
-
 # gen_esp32part.py
 cp "$IDF_COMPS/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
@@ -16,10 +16,10 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/esptool.py $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
+rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
 
 cp -f $AR_OUT/platform.txt $ESP32_ARDUINO/
+cp -f $AR_OUT/package_esp32_index.template.json $ESP32_ARDUINO/package/package_esp32_index.template.json
 cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
-cp -f $AR_TOOLS/esptool.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/gen_esp32part.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/platformio-build-*.py $ESP32_ARDUINO/tools/
diff --git a/tools/cron.sh b/tools/cron.sh
@@ -6,5 +6,6 @@ if [ ! "$GITHUB_EVENT_NAME" == "schedule" ]; then
 fi
 
 git checkout "$IDF_BRANCH" #local branches should match what the matrix wants to build
+DEPLOY_OUT=1
 source ./build.sh
-bash ./tools/push-to-arduino.sh
+# bash ./tools/push-to-arduino.sh
diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh
diff --git a/tools/update-components.sh b/tools/update-components.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 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)`
	`1`	`+# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)`
`2`	`2`
`3`	`3`	`This repository contains the scripts that produce the libraries included with esp32-arduino.`
`4`	`4`