Skip to content

Commit 5959d7a

Browse files
committed
Support ESP-IDF 3.3
- A few more components is required for esp-idf 3.3 - Need 6144B stack to avoid stackoverflow - The partition table requires 2.1M flash - Update travis CI to use ESP-IDF 3.3.2 Change-Id: Icc8e84d08f05996bbb309373f373e7540f833959
1 parent 1f887ed commit 5959d7a

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

.travis/prepare.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ HASH_CMD="shasum -a 256"
4747
# Install dependencies
4848
# --------------------------------------------------------------------------------
4949

50-
ESP_IDF_VERSION=v3.0.4
50+
ESP_IDF_VERSION=release/v3.3
5151
if test "${TRAVIS_OS_NAME}" = "linux"; then
5252
XTENSA_TOOL_CHAIN_URL=https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
5353
XTENSA_TOOL_CHAIN_HASH=3fe96c151d46c1d4e5edc6ed690851b8e53634041114bad04729bc16b0445156
@@ -97,6 +97,11 @@ git -C ${TRAVIS_BUILD_DIR} submodule update || exit 1
9797

9898
set +x
9999

100+
# --------------------------------------------------------------------------------
101+
# Prepare python
102+
# --------------------------------------------------------------------------------
103+
python -m pip install --user -r ${TRAVIS_BUILD_DIR}/esp-idf/requirements.txt
104+
100105

101106
# --------------------------------------------------------------------------------
102107
# Log build information.

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ COMPONENTS := app_trace \
5353
console \
5454
cxx \
5555
driver \
56+
efuse \
5657
esp32 \
5758
esp_adc_cal \
59+
esp_event \
60+
esp_ringbuf \
61+
espcoredump \
5862
esptool_py \
5963
ethernet \
6064
expat \
@@ -73,6 +77,7 @@ COMPONENTS := app_trace \
7377
pthread \
7478
QRCode \
7579
sdmmc \
80+
smartconfig_ack \
7681
soc \
7782
spidriver \
7883
spi_flash \

sdkconfig.defaults

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
1717
CONFIG_APP_OFFSET=0x10000
1818

1919
# Bump the stack size of the Weave task to accommodate extra stack useage due to
20-
# debugging.
21-
CONFIG_WEAVE_TASK_STACK_SIZE=5120
20+
# debugging. When using ESP-IDF3.3, there exists a callpath that when reached
21+
# DataManagement_Current::PrettyPrintWDM, ~4400B stack space is used (default
22+
# stack size is 4608B). And then vsnprintf called by PerttyPrintWDM will cost
23+
# another 1KB, a 5120B stack space in previous versions will overflow.
24+
CONFIG_WEAVE_TASK_STACK_SIZE=6144
2225

2326
# Default to 921600 baud when flashing and monitoring device
2427
CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -46,3 +49,6 @@ CONFIG_LOG_PROVISIONING_HASH=y
4649
# purposes.
4750
CONFIG_DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT=0
4851

52+
# According to partitions.csv, we need 4MB or larger flash
53+
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
54+
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"

third_party/lwip

Submodule lwip updated 407 files

0 commit comments

Comments
 (0)