Skip to content

Commit e6975b1

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into patch-1
2 parents d8e8eea + ace36a9 commit e6975b1

20 files changed

+273
-67
lines changed

‎.github/workflows/cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
idf_branch: [release/v4.4] #, release/v3.3]
23+
idf_branch: [release/v5.1, release/v4.4] #, release/v3.3]
2424
steps:
2525
- uses: actions/checkout@v1
2626
- name: Install dependencies

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
.DS_Store
22
.vscode
3+
managed_components/
34
components/arduino/
45
components/esp-dl/
56
components/esp-sr/
67
components/esp32-camera/
78
components/esp_littlefs/
89
components/esp-rainmaker/
9-
components/esp-dsp/
10+
components/espressif__esp-dsp/
11+
components/esp-insights/
12+
components/arduino_tinyusb/tinyusb/
1013
esp-idf/
1114
out/
1215
build/
@@ -15,6 +18,4 @@ env.sh
1518
sdkconfig
1619
sdkconfig.old
1720
version.txt
18-
components/arduino_tinyusb/tinyusb/
1921
dependencies.lock
20-
tools/esptool/

‎CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# CMakeLists in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
5+
set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
6+
set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
67

78
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
89
project(arduino-lib-builder)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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)
22

33
This repository contains the scripts that produce the libraries included with esp32-arduino.
44

‎build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if ! [ -x "$(command -v python)" ]; then
3+
if ! [ -x "$(command -v python3)" ]; then
44
echo "ERROR: python is not installed! Please install python first."
55
exit 1
66
fi
@@ -124,15 +124,15 @@ rm -rf build sdkconfig out
124124

125125
# Add components version info
126126
mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
127-
component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
127+
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)
128128
echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
129129
for component in `ls "$AR_COMPS"`; do
130130
if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
131-
component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
131+
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)
132132
echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
133133
fi
134134
done
135-
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)
135+
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)
136136
echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
137137

138138
#targets_count=`jq -c '.targets[] | length' configs/builds.json`
@@ -187,6 +187,12 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
187187
done
188188
done
189189

190+
# update package_esp32_index.template.json
191+
if [ "$BUILD_TYPE" = "all" ]; then
192+
python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
193+
if [ $? -ne 0 ]; then exit 1; fi
194+
fi
195+
190196
# archive the build
191197
if [ "$BUILD_TYPE" = "all" ]; then
192198
./tools/archive-build.sh

‎configs/defconfig.common

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y
3232
CONFIG_ETH_SPI_ETHERNET_W5500=y
3333
CONFIG_FATFS_CODEPAGE_850=y
3434
CONFIG_FATFS_LFN_STACK=y
35+
# CONFIG_FATFS_API_ENCODING_ANSI_OEM is not set
36+
CONFIG_FATFS_API_ENCODING_UTF_8=y
3537
# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
3638
CONFIG_FMB_TIMER_PORT_ENABLED=y
3739
CONFIG_FREERTOS_HZ=1000
3840
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
39-
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
4041
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
4142
CONFIG_HEAP_POISONING_LIGHT=y
4243
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
@@ -71,3 +72,23 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
7172
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
7273
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
7374
CONFIG_LWIP_IPV6_AUTOCONFIG=y
75+
CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
76+
CONFIG_ESP_RMAKER_USER_ID_CHECK=y
77+
CONFIG_ESP_INSIGHTS_ENABLED=y
78+
CONFIG_ESP_INSIGHTS_COREDUMP_ENABLE=y
79+
CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
80+
CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
81+
CONFIG_DIAG_ENABLE_METRICS=y
82+
CONFIG_DIAG_ENABLE_HEAP_METRICS=y
83+
CONFIG_DIAG_ENABLE_WIFI_METRICS=y
84+
CONFIG_DIAG_ENABLE_VARIABLES=y
85+
CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
86+
CONFIG_ESP_COREDUMP_ENABLE=y
87+
CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
88+
CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
89+
CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
90+
CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
91+
CONFIG_ESP_COREDUMP_STACK_SIZE=1024
92+
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
93+
CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
94+
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y

‎configs/defconfig.esp32

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ CONFIG_BT_HFP_ENABLE=y
99
CONFIG_BT_STACK_NO_LOG=y
1010
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
1111
CONFIG_ESP32_SPIRAM_SUPPORT=y
12+
CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
1213
CONFIG_ESP32_ULP_COPROC_ENABLED=y
1314
CONFIG_ESP32_XTAL_FREQ_AUTO=y
1415
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
1516
CONFIG_FREERTOS_FPU_IN_ISR=y
1617
# CONFIG_USE_WAKENET is not set
17-
# CONFIG_USE_MULTINET is not set
18+
# CONFIG_USE_MULTINET is not set
19+
CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
20+
CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
21+
CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
22+
CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
23+
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y

‎configs/defconfig.esp32s2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y
44
CONFIG_ESP32S2_KEEP_USB_ALIVE=y
55
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
66
# CONFIG_USE_WAKENET is not set
7-
# CONFIG_USE_MULTINET is not set
7+
# CONFIG_USE_MULTINET is not set
8+
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y

‎configs/defconfig.esp32s3

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
88
CONFIG_SR_WN_MODEL_WN8_QUANT=y
99
CONFIG_SR_WN_WN8_HIESP=y
1010
CONFIG_SR_MN_ENGLISH=y
11-
CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
11+
CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
12+
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
13+
CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120

‎main/Kconfig.projbuild

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ config LIB_BUILDER_FLASHFREQ
1313
default "40m" if ESPTOOLPY_FLASHFREQ_40M
1414
default "26m" if ESPTOOLPY_FLASHFREQ_26M
1515
default "20m" if ESPTOOLPY_FLASHFREQ_20M
16+
17+
config LIB_BUILDER_COMPILE
18+
bool
19+
default y

0 commit comments

Comments
 (0)