Skip to content

Fix ESP-IDF environment, update crates versions and use tag v4.4.1 #80

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jul 19, 2022
Merged

Fix ESP-IDF environment, update crates versions and use tag v4.4.1 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
da6169f
Update esp-idf-sys, esp-idf-svc and embedded-svc versions
SergioGasquez May 7, 2022
b33b4d5
Activate ESP-IDF environment
SergioGasquez May 7, 2022
f24a2a8
Fix process_message()
SergioGasquez May 7, 2022
3118e5c
Avoid printing the source output
SergioGasquez May 8, 2022
c2edecc
Fix ESP_IDF_VERSION
SergioGasquez May 8, 2022
2b3d8c6
Further esp-idf cleanup
SergioGasquez May 9, 2022
e76a02f
Remove bindgen and cargo-generate
SergioGasquez May 10, 2022
bb4defa
Merge https://github.com/ferrous-systems/espressif-trainings into fea…
SergioGasquez May 18, 2022
fb5e0b0
Update esp-idf folder name and install path
SergioGasquez May 18, 2022
4700805
Merge remote-tracking branch 'upstream/main' into feature/devcontainer
SergioGasquez Jun 8, 2022
664e6ad
Merge branch 'ferrous-systems:main' into feature/devcontainer
SergioGasquez Jul 18, 2022
2c3fe65
Remove `espmonitor`
SergioGasquez Jul 18, 2022
4c7f946
Update rustup target
SergioGasquez Jul 18, 2022
6aeeb8d
Use tag instead of release branch, as release branch can be updated c…
MabezDev Jul 18, 2022
ce48de1
Use tag `v4.4.1`
SergioGasquez Jul 19, 2022
5569478
Update Cargo.lock
SergioGasquez Jul 19, 2022
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
28 changes: 13 additions & 15 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ARG NIGHTLY_VERSION=nightly-2022-03-10
ARG ESP_IDF_VERSION=release/v4.4
ARG ESP_IDF_VERSION=v4.4.1
ARG ESP_BOARD=esp32c3

RUN apt-get update \
Expand All @@ -20,23 +20,21 @@ ENV PATH=${PATH}:$HOME/.cargo/bin
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
--default-toolchain ${NIGHTLY_VERSION} -y --profile minimal \
&& $HOME/.cargo/bin/rustup component add rust-src --toolchain ${NIGHTLY_VERSION} \
&& $HOME/.cargo/bin/rustup target add riscv32i-unknown-none-elf
&& $HOME/.cargo/bin/rustup target add riscv32imc-unknown-none-elf

RUN $HOME/.cargo/bin/cargo install cargo-espflash espmonitor ldproxy
RUN $HOME/.cargo/bin/cargo install cargo-espflash ldproxy

RUN mkdir -p .espressif/frameworks/ \
RUN mkdir -p ${HOME}/.espressif/frameworks/ \
&& git clone --branch ${ESP_IDF_VERSION} -q --depth 1 --shallow-submodules \
--recursive https://github.com/espressif/esp-idf.git \
.espressif/frameworks/esp-idf-v4.4 \
&& python3 .espressif/frameworks/esp-idf-v4.4/tools/idf_tools.py install cmake \
&& .espressif/frameworks/esp-idf-v4.4/install.sh ${ESP_BOARD} \
${HOME}/.espressif/frameworks/esp-idf \
&& python3 ${HOME}/.espressif/frameworks/esp-idf/tools/idf_tools.py install cmake \
&& ${HOME}/.espressif/frameworks/esp-idf/install.sh ${ESP_BOARD} \
&& rm -rf .espressif/dist \
&& rm -rf .espressif/frameworks/esp-idf-v4.4/docs \
&& rm -rf .espressif/frameworks/esp-idf-v4.4/examples \
&& rm -rf .espressif/frameworks/esp-idf-v4.4/tools/esp_app_trace \
&& rm -rf .espressif/frameworks/esp-idf-v4.4/tools/test_idf_size

ENV IDF_TOOLS_PATH=/root/.espressif
RUN echo "source /root/.espressif/frameworks/esp-idf-v4.4/export.sh > /dev/null 2>&1" >> ~/.bashrc

&& rm -rf .espressif/frameworks/esp-idf/docs \
&& rm -rf .espressif/frameworks/esp-idf/examples \
&& rm -rf .espressif/frameworks/esp-idf/tools/esp_app_trace \
&& rm -rf .espressif/frameworks/esp-idf/tools/test_idf_size
ENV IDF_TOOLS_PATH=${HOME}/.espressif
RUN echo "source ${HOME}/.espressif/frameworks/esp-idf/export.sh > /dev/null 2>&1" >> ~/.bashrc
CMD "/bin/bash"
2 changes: 1 addition & 1 deletion advanced/button-interrupt/exercise/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-std-features = ["panic_immediate_abort"]

[env]
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF upcoming (v4.4)
ESP_IDF_VERSION = { value = "branch:release/v4.4" }
ESP_IDF_VERSION = { value = "tag:v4.4.1" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
#ESP_IDF_VERSION = { value = "master" }

Expand Down
2 changes: 1 addition & 1 deletion advanced/button-interrupt/exercise/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = ["native"]
native = ["esp-idf-sys/native"]

[dependencies]
esp-idf-sys = { version = "0.30", features = ["binstart"] }
esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
anyhow = "1"
esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }

Expand Down
2 changes: 1 addition & 1 deletion advanced/button-interrupt/solution/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-std-features = ["panic_immediate_abort"]

[env]
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF upcoming (v4.4)
ESP_IDF_VERSION = { value = "branch:release/v4.4" }
ESP_IDF_VERSION = { value = "tag:v4.4.1" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
#ESP_IDF_VERSION = { value = "master" }

Expand Down
2 changes: 1 addition & 1 deletion advanced/button-interrupt/solution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = ["native"]
native = ["esp-idf-sys/native"]

[dependencies]
esp-idf-sys = { version = "=0.30.4", features = ["binstart"] }
esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
anyhow = "1"
esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }

Expand Down
2 changes: 1 addition & 1 deletion advanced/i2c-driver/solution/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-std-features = ["panic_immediate_abort"]

[env]
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF upcoming (v4.4)
ESP_IDF_VERSION = { value = "branch:release/v4.4" }
ESP_IDF_VERSION = { value = "tag:v4.4.1" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
#ESP_IDF_VERSION = { value = "master" }

Expand Down
4 changes: 2 additions & 2 deletions advanced/i2c-driver/solution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ default = ["native"]
native = ["esp-idf-sys/native"]

[dependencies]
esp-idf-sys = { version = "0.30", features = ["binstart"] }
esp-idf-hal = "0.32.10"
esp-idf-sys = { version = "0.31", features = ["binstart"] }
esp-idf-hal = "0.35.1"
anyhow = "1"
embedded-hal = "0.2.7"

Expand Down
2 changes: 1 addition & 1 deletion advanced/i2c-sensor-reading/solution/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-std-features = ["panic_immediate_abort"]

[env]
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF upcoming (v4.4)
ESP_IDF_VERSION = { value = "branch:release/v4.4" }
ESP_IDF_VERSION = { value = "tag:v4.4.1" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
#ESP_IDF_VERSION = { value = "master" }

Expand Down
4 changes: 2 additions & 2 deletions advanced/i2c-sensor-reading/solution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ default = ["native"]
native = ["esp-idf-sys/native"]

[dependencies]
esp-idf-sys = { version = "0.30", features = ["binstart"] }
esp-idf-hal = "0.32.10"
esp-idf-sys = { version = "0.31", features = ["binstart"] }
esp-idf-hal = "0.35.1"
anyhow = "1"
embedded-hal = "0.2.7"
shtcx = "0.10.0"
Expand Down
2 changes: 1 addition & 1 deletion common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-std-features = ["panic_immediate_abort"]

[env]
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF upcoming (v4.4)
ESP_IDF_VERSION = { value = "branch:release/v4.4" }
ESP_IDF_VERSION = { value = "tag:v4.4.1" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
#ESP_IDF_VERSION = { value = "master" }

Expand Down
Loading