Skip to content

Commit b0dbeb2

Browse files
authored
Updates from branch s3 120 (#86)
* Update GH actions * Update python * CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y * Use MacOS ARM * Update push.yml * Update push.yml * add lib Builder branch * add env * add comments * CONFIG_ETH_TRANSMIT_MUTEX * Fix build of build Platformio manifest (fail in second run) * fix manifest script build error * rm outdated code * don't know why it needs to be restored?!? * Build Pio framework manifest (#78) * Update build.sh * Update gen_pio_frmwk_manifest.py * Delete core_version.h * generate core version.h * Update build.sh * Update .gitignore * Update prepare-ci.sh * Update README.md * Update README.md * NO BT in common settings * Fix wrong change * NO BT setting in common * add BT settings * add BT settings * add BT settings * add BT settings * add BT settings * add BT settings * Use exact IDF version * get version from file * CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y * rm every exe from folder tools * add $TARGET to framework name * prepare tokens use for pushing in target repos * rm Arduino chip debug report * rm chip debug report header file * Update build.sh * deprecate warn off * Update defconfig.common * Update defconfig.common * add build date
1 parent cc6e8b9 commit b0dbeb2

12 files changed

+53
-25
lines changed

.github/workflows/push.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
run: |
1919
echo "GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
2020
- name: Build Arduino Libs
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
23+
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
2124
run: bash ./build.sh
2225
- name: Release
2326
uses: jason2866/[email protected]

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ This repository contains the scripts that produce the libraries included with Ta
44

55
### Build on Ubuntu
66
```bash
7-
sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python3 python3-pip python3-setuptools python3-serial python3-click python3-cryptography python3-future python3-pyparsing python3-pyelftools cmake ninja-build ccache jq p7zip-full
8-
sudo pip3 install --upgrade pip3
7+
sudo apt update && sudo apt install -y git wget curl libssl-dev libncurses-dev flex bison gperf python3 cmake ninja-build ccache jq
8+
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && \
9+
pip3 install setuptools pyserial click future wheel cryptography pyparsing pyelftools
910
git clone https://github.com/Jason2866/esp32-arduino-lib-builder
1011
cd esp32-arduino-lib-builder
1112
./build.sh

build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then
1010
exit 1
1111
fi
1212

13-
TARGET="all"
13+
export TARGET="all"
1414
BUILD_TYPE="all"
1515
SKIP_ENV=0
1616
COPY_OUT=0
@@ -246,7 +246,7 @@ fi
246246

247247
# Generate PlatformIO library manifest file
248248
if [ "$BUILD_TYPE" = "all" ]; then
249-
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT"
249+
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
250250
if [ $? -ne 0 ]; then exit 1; fi
251251
fi
252252

configs/defconfig.common

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
CONFIG_AUTOSTART_ARDUINO=y
22
# CONFIG_WS2812_LED_ENABLE is not set
33
CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
4+
CONFIG_APP_REPRODUCIBLE_BUILD=y
45
CONFIG_COMPILER_HIDE_PATHS_MACROS=y
56
CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
67
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
78
# CONFIG_APP_COMPILE_TIME_DATE is not set
89
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
10+
CONFIG_BOOT_ROM_LOG_ALWAYS_OFF=y
911
CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS=y
1012
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
1113
CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
12-
CONFIG_BT_ENABLED=y
13-
CONFIG_BT_STACK_NO_LOG=y
14-
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
15-
# CONFIG_BLE_MESH is not set
14+
CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
15+
CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN=y
1616
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
1717
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
1818
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
@@ -34,12 +34,19 @@ CONFIG_ESP_TASK_WDT_PANIC=y
3434
CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
3535
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
3636
CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
37-
CONFIG_ESP_WIFI_FTM_ENABLE=n
37+
# CONFIG_ESP_WIFI_FTM_ENABLE is not set
3838
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
3939
CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
4040
CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
41-
CONFIG_ESP_WIFI_CSI_ENABLED=n
41+
# CONFIG_ESP_WIFI_CSI_ENABLED is not set
4242
CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
43+
CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
44+
# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set
45+
CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
46+
# CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT is not set
47+
# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
48+
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
49+
# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
4350
# CONFIG_ESP_WIFI_IRAM_OPT is not set
4451
# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
4552
CONFIG_ETH_TRANSMIT_MUTEX=y
@@ -93,13 +100,6 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
93100
CONFIG_NEWLIB_NANO_FORMAT=y
94101
# CONFIG_DAC_DMA_AUTO_16BIT_ALIGN is not set
95102

96-
# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set
97-
# CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT is not set
98-
# CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT is not set
99-
# CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA is not set
100-
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
101-
# CONFIG_ESP_WIFI_MBEDTLS_CRYPTO is not set
102-
103103
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
104104
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
105105
CONFIG_MBEDTLS_TLS_DISABLED=y

configs/defconfig.esp32

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR=y
21
#
32
# Bluetooth
43
#
54
CONFIG_BT_ENABLED=y
5+
CONFIG_BT_STACK_NO_LOG=y
6+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
7+
# CONFIG_BLE_MESH is not set
68
CONFIG_BT_NIMBLE_ENABLED=y
79
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
810
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
@@ -12,6 +14,8 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
1214
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
1315
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
1416

17+
CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR=y
18+
1519
CONFIG_ETH_ENABLED=y
1620
CONFIG_ETH_USE_ESP32_EMAC=y
1721
CONFIG_ETH_PHY_INTERFACE_RMII=y

configs/defconfig.esp32c2

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ CONFIG_XTAL_FREQ=26
55
# Bluetooth
66
#
77
CONFIG_BT_ENABLED=y
8+
CONFIG_BT_STACK_NO_LOG=y
9+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
10+
# CONFIG_BLE_MESH is not set
811
CONFIG_BT_NIMBLE_ENABLED=y
912
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
1013
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1

configs/defconfig.esp32c3

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Bluetooth
33
#
44
CONFIG_BT_ENABLED=y
5+
CONFIG_BT_STACK_NO_LOG=y
6+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
7+
# CONFIG_BLE_MESH is not set
58
CONFIG_BT_NIMBLE_ENABLED=y
69
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
710
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1

configs/defconfig.esp32c6

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ CONFIG_ULP_COPROC_RESERVE_MEM=8192
1010
# Bluetooth
1111
#
1212
CONFIG_BT_ENABLED=y
13+
CONFIG_BT_STACK_NO_LOG=y
14+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
15+
# CONFIG_BLE_MESH is not set
1316
CONFIG_BT_NIMBLE_ENABLED=y
1417
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
1518
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1

configs/defconfig.esp32h2

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Bluetooth
33
#
44
CONFIG_BT_ENABLED=y
5+
CONFIG_BT_STACK_NO_LOG=y
6+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
7+
# CONFIG_BLE_MESH is not set
58
CONFIG_BT_NIMBLE_ENABLED=y
69
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
710
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1

configs/defconfig.esp32s3

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
2222
# Bluetooth
2323
#
2424
CONFIG_BT_ENABLED=y
25+
CONFIG_BT_STACK_NO_LOG=y
26+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
27+
# CONFIG_BLE_MESH is not set
2528
CONFIG_BT_NIMBLE_ENABLED=y
2629
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
2730
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1

tools/archive-build.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
44

5-
archive_path="dist/arduino-esp32-libs-$idf_version_string.tar.gz"
6-
build_archive_path="dist/arduino-esp32-build-$idf_version_string.tar.gz"
7-
pio_archive_path="dist/framework-arduinoespressif32-$idf_version_string.tar.gz"
8-
pio_zip_archive_path="dist/framework-arduinoespressif32-$idf_version_string.zip"
5+
archive_path="dist/arduino-esp32-libs-$TARGET-$idf_version_string.tar.gz"
6+
build_archive_path="dist/arduino-esp32-build-$TARGET-$idf_version_string.tar.gz"
7+
pio_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.tar.gz"
8+
pio_zip_archive_path="dist/framework-arduinoespressif32-$TARGET-$idf_version_string.zip"
99

1010
mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
1111

@@ -38,12 +38,11 @@ rm -rf arduino-esp32/libraries/TFLiteMicro
3838
rm -rf arduino-esp32/libraries/ESP32
3939
rm -rf arduino-esp32/package
4040
rm -rf arduino-esp32/tools/esp32-arduino-libs
41+
rm -rf arduino-esp32/tools/*.exe
4142
rm -rf arduino-esp32/tools/esptool.py
4243
rm -rf arduino-esp32/tools/get.py
43-
rm -rf arduino-esp32/tools/get.exe
4444
rm -rf arduino-esp32/tools/ide-debug
4545
rm -rf arduino-esp32/tools/gen_insights_package.py
46-
rm -rf arduino-esp32/tools/gen_insights_package.exe
4746
rm -rf arduino-esp32/platform.txt
4847
rm -rf arduino-esp32/programmers.txt
4948
rm -rf arduino-esp32/boards.txt

tools/install-esp-idf.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ ! -d "$IDF_PATH" ]; then
3737
idf_was_installed="1"
3838
else
3939
# update existing branch
40-
echo "ESP-IDF is already installed, updating branch '$IDF_BRANCH'"
40+
echo "ESP-IDF is already installed, updating branch $IDF_BRANCH"
4141
cd $IDF_PATH
4242
git pull
4343
git reset --hard $IDF_BRANCH
@@ -68,6 +68,12 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
6868
cd $IDF_PATH
6969
patch -p1 -N -i ../patches/esp32s2_i2c_ll_master_init.diff
7070
cd -
71+
72+
# Get the exact IDF version from file "version.txt"
73+
cd $IDF_PATH
74+
export IDF_VERSION=$(<version.txt)
75+
echo "IDF version: $IDF_VERSION"
76+
cd -
7177
fi
7278

7379
#

0 commit comments

Comments
 (0)