Skip to content

Support ESP-IDF 3.3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .travis/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ HASH_CMD="shasum -a 256"
# Install dependencies
# --------------------------------------------------------------------------------

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

set +x

# --------------------------------------------------------------------------------
# Prepare python
# --------------------------------------------------------------------------------
python -m pip install --user -r ${TRAVIS_BUILD_DIR}/esp-idf/requirements.txt


# --------------------------------------------------------------------------------
# Log build information.
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ COMPONENTS := app_trace \
console \
cxx \
driver \
efuse \
esp32 \
esp_adc_cal \
esp_event \
esp_ringbuf \
espcoredump \
esptool_py \
ethernet \
expat \
Expand All @@ -73,6 +77,7 @@ COMPONENTS := app_trace \
pthread \
QRCode \
sdmmc \
smartconfig_ack \
soc \
spidriver \
spi_flash \
Expand Down
10 changes: 8 additions & 2 deletions sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
CONFIG_APP_OFFSET=0x10000

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

# Default to 921600 baud when flashing and monitoring device
CONFIG_ESPTOOLPY_BAUD_921600B=y
Expand Down Expand Up @@ -46,3 +49,6 @@ CONFIG_LOG_PROVISIONING_HASH=y
# purposes.
CONFIG_DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT=0

# According to partitions.csv, we need 4MB or larger flash
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
2 changes: 1 addition & 1 deletion third_party/lwip
Submodule lwip updated 407 files