From da6169f84204dc57b186d4b7427b9df6e4a615cd Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sat, 7 May 2022 22:16:29 +0000 Subject: [PATCH 01/13] Update esp-idf-sys, esp-idf-svc and embedded-svc versions --- advanced/button-interrupt/exercise/Cargo.toml | 2 +- advanced/button-interrupt/solution/Cargo.toml | 2 +- advanced/i2c-driver/solution/Cargo.toml | 4 ++-- advanced/i2c-sensor-reading/solution/Cargo.toml | 4 ++-- common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml | 4 ++-- common/lib/esp32-c3-dkc02-bsc/Cargo.toml | 8 ++++---- intro/hardware-check/Cargo.toml | 2 +- intro/http-client/exercise/Cargo.toml | 6 +++--- intro/http-client/solution/Cargo.toml | 6 +++--- intro/http-server/exercise/Cargo.toml | 6 +++--- intro/http-server/solution/Cargo.toml | 6 +++--- intro/mqtt/exercise/Cargo.toml | 6 +++--- intro/mqtt/solution/Cargo.toml | 6 +++--- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/advanced/button-interrupt/exercise/Cargo.toml b/advanced/button-interrupt/exercise/Cargo.toml index 7446982c..9735f215 100644 --- a/advanced/button-interrupt/exercise/Cargo.toml +++ b/advanced/button-interrupt/exercise/Cargo.toml @@ -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" } diff --git a/advanced/button-interrupt/solution/Cargo.toml b/advanced/button-interrupt/solution/Cargo.toml index cc49e0a6..9735f215 100644 --- a/advanced/button-interrupt/solution/Cargo.toml +++ b/advanced/button-interrupt/solution/Cargo.toml @@ -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" } diff --git a/advanced/i2c-driver/solution/Cargo.toml b/advanced/i2c-driver/solution/Cargo.toml index 67c0085c..272af831 100644 --- a/advanced/i2c-driver/solution/Cargo.toml +++ b/advanced/i2c-driver/solution/Cargo.toml @@ -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" diff --git a/advanced/i2c-sensor-reading/solution/Cargo.toml b/advanced/i2c-sensor-reading/solution/Cargo.toml index d2cb259f..997c04c4 100644 --- a/advanced/i2c-sensor-reading/solution/Cargo.toml +++ b/advanced/i2c-sensor-reading/solution/Cargo.toml @@ -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" diff --git a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml index 3da2f15b..1da20845 100644 --- a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml +++ b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml @@ -28,9 +28,9 @@ 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 = "branch:release/v4.4" } # 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" } +ESP_IDF_VERSION = { value = "master" } # These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files # that you might put in the root of the project diff --git a/common/lib/esp32-c3-dkc02-bsc/Cargo.toml b/common/lib/esp32-c3-dkc02-bsc/Cargo.toml index fb410ab8..dbd01543 100644 --- a/common/lib/esp32-c3-dkc02-bsc/Cargo.toml +++ b/common/lib/esp32-c3-dkc02-bsc/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dependencies] esp32c3 = "=0.3.0" -esp-idf-sys = { version = "=0.30.4" } -esp-idf-svc = { version="=0.36.7", features = ["experimental", "alloc"] } -esp-idf-hal = "=0.32.5" -embedded-svc = "=0.16.5" +esp-idf-sys = { version = "=0.31.5" } +esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] } +esp-idf-hal = "=0.35.1" +embedded-svc = "=0.19" rgb = "0.8" log = "0.4" anyhow = "1" diff --git a/intro/hardware-check/Cargo.toml b/intro/hardware-check/Cargo.toml index 41dc2caa..d5cc4087 100644 --- a/intro/hardware-check/Cargo.toml +++ b/intro/hardware-check/Cargo.toml @@ -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"] } esp32-c3-dkc02-bsc = { path = "../../common/lib/esp32-c3-dkc02-bsc" } log = "0.4" anyhow = "1" diff --git a/intro/http-client/exercise/Cargo.toml b/intro/http-client/exercise/Cargo.toml index bf2a4d58..0b71666c 100644 --- a/intro/http-client/exercise/Cargo.toml +++ b/intro/http-client/exercise/Cargo.toml @@ -17,10 +17,10 @@ default = ["native"] native = ["esp-idf-sys/native"] [dependencies] -esp-idf-svc="=0.36.7" -esp-idf-sys = { version = "=0.30.4", features = ["binstart"] } +esp-idf-svc="=0.39.1" +esp-idf-sys = { version = "=0.31.5", features = ["binstart"] } esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } -embedded-svc = "=0.16.5" +embedded-svc = "=0.19" anyhow = "1.0" toml-cfg = "0.1" diff --git a/intro/http-client/solution/Cargo.toml b/intro/http-client/solution/Cargo.toml index 63b124dd..d87d0d75 100644 --- a/intro/http-client/solution/Cargo.toml +++ b/intro/http-client/solution/Cargo.toml @@ -17,10 +17,10 @@ default = ["native"] native = ["esp-idf-sys/native"] [dependencies] -esp-idf-svc = { version="=0.36.7", features = ["experimental", "alloc"] } -esp-idf-sys = { version = "=0.30.4", features = ["binstart"] } +esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] } +esp-idf-sys = { version = "=0.31.5", features = ["binstart"] } esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } -embedded-svc = "=0.16.5" +embedded-svc = "=0.19" anyhow = "1.0" toml-cfg = "0.1" diff --git a/intro/http-server/exercise/Cargo.toml b/intro/http-server/exercise/Cargo.toml index 7fa4a268..288c7d09 100644 --- a/intro/http-server/exercise/Cargo.toml +++ b/intro/http-server/exercise/Cargo.toml @@ -17,11 +17,11 @@ default = ["native"] native = ["esp-idf-sys/native"] [dependencies] -esp-idf-sys = { version = "=0.30.4", features = ["binstart"] } -esp-idf-svc = "=0.36.7" +esp-idf-sys = { version = "=0.31.5", features = ["binstart"] } +esp-idf-svc = "=0.39.1" esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } esp32c3 = "=0.3.0" -embedded-svc = "=0.16.5" +embedded-svc = "=0.19" anyhow = "1.0" toml-cfg = "0.1" diff --git a/intro/http-server/solution/Cargo.toml b/intro/http-server/solution/Cargo.toml index 7fa4a268..288c7d09 100644 --- a/intro/http-server/solution/Cargo.toml +++ b/intro/http-server/solution/Cargo.toml @@ -17,11 +17,11 @@ default = ["native"] native = ["esp-idf-sys/native"] [dependencies] -esp-idf-sys = { version = "=0.30.4", features = ["binstart"] } -esp-idf-svc = "=0.36.7" +esp-idf-sys = { version = "=0.31.5", features = ["binstart"] } +esp-idf-svc = "=0.39.1" esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } esp32c3 = "=0.3.0" -embedded-svc = "=0.16.5" +embedded-svc = "=0.19" anyhow = "1.0" toml-cfg = "0.1" diff --git a/intro/mqtt/exercise/Cargo.toml b/intro/mqtt/exercise/Cargo.toml index 56d3828c..819d432d 100644 --- a/intro/mqtt/exercise/Cargo.toml +++ b/intro/mqtt/exercise/Cargo.toml @@ -17,10 +17,10 @@ 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"] } #esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git", features = ["experimental", "alloc"], rev="d7313416" } -esp-idf-svc = { version="=0.36.7", features = ["experimental", "alloc"] } -embedded-svc = "=0.16.5" +esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] } +embedded-svc = "=0.19" esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } log = "0.4" anyhow = "1" diff --git a/intro/mqtt/solution/Cargo.toml b/intro/mqtt/solution/Cargo.toml index 56d3828c..819d432d 100644 --- a/intro/mqtt/solution/Cargo.toml +++ b/intro/mqtt/solution/Cargo.toml @@ -17,10 +17,10 @@ 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"] } #esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git", features = ["experimental", "alloc"], rev="d7313416" } -esp-idf-svc = { version="=0.36.7", features = ["experimental", "alloc"] } -embedded-svc = "=0.16.5" +esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] } +embedded-svc = "=0.19" esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" } log = "0.4" anyhow = "1" From b33b4d59f46a023f249c725653dbf960eb13853f Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sat, 7 May 2022 22:16:52 +0000 Subject: [PATCH 02/13] Activate ESP-IDF environment --- .devcontainer/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 172b851b..9e98b489 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ ARG CONTAINER_USER=esp ARG CONTAINER_GROUP=esp ARG NIGHTLY_VERSION=nightly-2022-03-10 RUN apt-get update \ - && apt-get install -y vim nano git curl gcc ninja-build cmake libudev-dev \ + && apt-get install -y vim nano git curl gcc libudev-dev \ python3 python3-pip libusb-1.0-0 libssl-dev pkg-config libtinfo5 clang \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts RUN adduser --disabled-password --gecos "" ${CONTAINER_USER} @@ -20,11 +20,15 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ && $HOME/.cargo/bin/cargo install cargo-generate cargo-espflash espmonitor bindgen ldproxy ENV ESP_BOARD=esp32c3 ENV ESP_IDF_VERSION=release/v4.4 +ENV ESP_IDF_TOOLS_INSTALL_DIR=global RUN mkdir -p .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 ninja \ && .espressif/frameworks/esp-idf-v4.4/install.sh ${ESP_BOARD} \ && rm -rf .espressif/dist \ && rm -rf .espressif/frameworks/esp-idf-v4.4/docs +ENV IDF_TOOLS_PATH=/home/${CONTAINER_USER}/.espressif +RUN echo "source /home/${CONTAINER_USER}/.espressif/frameworks/esp-idf-v4.4/export.sh" >> ~/.bashrc CMD "/bin/bash" \ No newline at end of file From f24a2a824075fd61e9e0dc78d890edf23992515b Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sat, 7 May 2022 22:18:01 +0000 Subject: [PATCH 03/13] Fix process_message() --- intro/mqtt/solution/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intro/mqtt/solution/src/main.rs b/intro/mqtt/solution/src/main.rs index 4f78135a..1f4736c8 100644 --- a/intro/mqtt/solution/src/main.rs +++ b/intro/mqtt/solution/src/main.rs @@ -86,7 +86,7 @@ fn main() -> anyhow::Result<()> { } } -fn process_message(message: EspMqttMessage, led: &mut WS2812RMT) { +fn process_message(message: &EspMqttMessage, led: &mut WS2812RMT) { match message.details() { Complete(token) => { info!("{}", message.topic(token)); From 3118e5c0a8d395f8107a55581f65119fb07651b3 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sun, 8 May 2022 08:42:18 +0000 Subject: [PATCH 04/13] Avoid printing the source output Install ninja with apt Use arg instead of env for ESP_IDF_VERSION --- .devcontainer/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9e98b489..8df7c7b9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,8 +5,9 @@ ENV LANG=C.UTF-8 ARG CONTAINER_USER=esp ARG CONTAINER_GROUP=esp ARG NIGHTLY_VERSION=nightly-2022-03-10 +ARG ESP_IDF_VERSION=release/v4.4 RUN apt-get update \ - && apt-get install -y vim nano git curl gcc libudev-dev \ + && apt-get install -y vim nano git curl gcc ninja-build libudev-dev \ python3 python3-pip libusb-1.0-0 libssl-dev pkg-config libtinfo5 clang \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts RUN adduser --disabled-password --gecos "" ${CONTAINER_USER} @@ -19,16 +20,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ && $HOME/.cargo/bin/rustup target add riscv32i-unknown-none-elf \ && $HOME/.cargo/bin/cargo install cargo-generate cargo-espflash espmonitor bindgen ldproxy ENV ESP_BOARD=esp32c3 -ENV ESP_IDF_VERSION=release/v4.4 -ENV ESP_IDF_TOOLS_INSTALL_DIR=global RUN mkdir -p .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 ninja \ + && python3 .espressif/frameworks/esp-idf-v4.4/tools/idf_tools.py install cmake \ && .espressif/frameworks/esp-idf-v4.4/install.sh ${ESP_BOARD} \ && rm -rf .espressif/dist \ && rm -rf .espressif/frameworks/esp-idf-v4.4/docs ENV IDF_TOOLS_PATH=/home/${CONTAINER_USER}/.espressif -RUN echo "source /home/${CONTAINER_USER}/.espressif/frameworks/esp-idf-v4.4/export.sh" >> ~/.bashrc +RUN echo "source /home/${CONTAINER_USER}/.espressif/frameworks/esp-idf-v4.4/export.sh > /dev/null 2>&1" >> ~/.bashrc CMD "/bin/bash" \ No newline at end of file From c2edecc0f8308a4628b94d61d4f70c0a4d89ac58 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Sun, 8 May 2022 09:13:27 +0000 Subject: [PATCH 05/13] Fix ESP_IDF_VERSION --- common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml index 1da20845..3da2f15b 100644 --- a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml +++ b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml @@ -28,9 +28,9 @@ 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 = "branch:release/v4.4" } # 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" } +#ESP_IDF_VERSION = { value = "master" } # These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files # that you might put in the root of the project From 2b3d8c66696d13fe6939ea7396434c6ce6f822f0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 9 May 2022 10:47:50 +0000 Subject: [PATCH 06/13] Further esp-idf cleanup Use ESP_BOARD as ARG --- .devcontainer/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8df7c7b9..bd5fdbca 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,6 +6,7 @@ ARG CONTAINER_USER=esp ARG CONTAINER_GROUP=esp ARG NIGHTLY_VERSION=nightly-2022-03-10 ARG ESP_IDF_VERSION=release/v4.4 +ARG ESP_BOARD=esp32c3 RUN apt-get update \ && apt-get install -y vim nano git curl gcc ninja-build libudev-dev \ python3 python3-pip libusb-1.0-0 libssl-dev pkg-config libtinfo5 clang \ @@ -19,7 +20,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ && $HOME/.cargo/bin/rustup component add rust-src --toolchain ${NIGHTLY_VERSION} \ && $HOME/.cargo/bin/rustup target add riscv32i-unknown-none-elf \ && $HOME/.cargo/bin/cargo install cargo-generate cargo-espflash espmonitor bindgen ldproxy -ENV ESP_BOARD=esp32c3 RUN mkdir -p .espressif/frameworks/ \ && git clone --branch ${ESP_IDF_VERSION} -q --depth 1 --shallow-submodules \ --recursive https://github.com/espressif/esp-idf.git \ @@ -27,7 +27,10 @@ RUN mkdir -p .espressif/frameworks/ \ && python3 .espressif/frameworks/esp-idf-v4.4/tools/idf_tools.py install cmake \ && .espressif/frameworks/esp-idf-v4.4/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/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=/home/${CONTAINER_USER}/.espressif RUN echo "source /home/${CONTAINER_USER}/.espressif/frameworks/esp-idf-v4.4/export.sh > /dev/null 2>&1" >> ~/.bashrc CMD "/bin/bash" \ No newline at end of file From e76a02f0b9488c6a32a567008599405f8ca72f4a Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 10 May 2022 10:47:48 +0200 Subject: [PATCH 07/13] Remove bindgen and cargo-generate --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index bd5fdbca..ecc37e07 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -19,7 +19,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ --default-toolchain ${NIGHTLY_VERSION} -y \ && $HOME/.cargo/bin/rustup component add rust-src --toolchain ${NIGHTLY_VERSION} \ && $HOME/.cargo/bin/rustup target add riscv32i-unknown-none-elf \ - && $HOME/.cargo/bin/cargo install cargo-generate cargo-espflash espmonitor bindgen ldproxy + && $HOME/.cargo/bin/cargo install cargo-espflash espmonitor ldproxy RUN mkdir -p .espressif/frameworks/ \ && git clone --branch ${ESP_IDF_VERSION} -q --depth 1 --shallow-submodules \ --recursive https://github.com/espressif/esp-idf.git \ From fb5e0b0985a7d6cf5e06fa851893009277b7f1b0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Wed, 18 May 2022 10:45:09 +0000 Subject: [PATCH 08/13] Update esp-idf folder name and install path --- .devcontainer/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fc7feb13..84fb5c45 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -24,17 +24,17 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ RUN $HOME/.cargo/bin/cargo install cargo-espflash espmonitor 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 + && 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-v4.4/export.sh > /dev/null 2>&1" >> ~/.bashrc +RUN echo "source ${HOME}/.espressif/frameworks/esp-idf/export.sh > /dev/null 2>&1" >> ~/.bashrc CMD "/bin/bash" From 2c3fe653e57783f895fcf876e3cf53bc50e1efcb Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 18 Jul 2022 15:23:19 +0000 Subject: [PATCH 09/13] Remove `espmonitor` --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 84fb5c45..aa45a4f1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,7 +22,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ && $HOME/.cargo/bin/rustup component add rust-src --toolchain ${NIGHTLY_VERSION} \ && $HOME/.cargo/bin/rustup target add riscv32i-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 ${HOME}/.espressif/frameworks/ \ && git clone --branch ${ESP_IDF_VERSION} -q --depth 1 --shallow-submodules \ From 4c7f946338957220f8c9a3d6f6c49e9b94c94fc8 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 18 Jul 2022 15:23:59 +0000 Subject: [PATCH 10/13] Update rustup target --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index aa45a4f1..22b57493 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -20,7 +20,7 @@ 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 ldproxy From 6aeeb8d63b82cd513b9c36b8e6ff352d47d69f94 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Mon, 18 Jul 2022 12:18:36 +0100 Subject: [PATCH 11/13] Use tag instead of release branch, as release branch can be updated causing inconsistencies among different users --- advanced/button-interrupt/exercise/.cargo/config.toml | 2 +- advanced/button-interrupt/solution/.cargo/config.toml | 2 +- advanced/i2c-driver/solution/.cargo/config.toml | 2 +- advanced/i2c-sensor-reading/solution/.cargo/config.toml | 2 +- common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml | 2 +- intro/hardware-check/.cargo/config.toml | 2 +- intro/http-client/exercise/.cargo/config.toml | 2 +- intro/http-client/solution/.cargo/config.toml | 2 +- intro/http-server/exercise/.cargo/config.toml | 2 +- intro/http-server/solution/.cargo/config.toml | 2 +- intro/mqtt/exercise/.cargo/config.toml | 2 +- intro/mqtt/solution/.cargo/config.toml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/advanced/button-interrupt/exercise/.cargo/config.toml b/advanced/button-interrupt/exercise/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/advanced/button-interrupt/exercise/.cargo/config.toml +++ b/advanced/button-interrupt/exercise/.cargo/config.toml @@ -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" } diff --git a/advanced/button-interrupt/solution/.cargo/config.toml b/advanced/button-interrupt/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/advanced/button-interrupt/solution/.cargo/config.toml +++ b/advanced/button-interrupt/solution/.cargo/config.toml @@ -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" } diff --git a/advanced/i2c-driver/solution/.cargo/config.toml b/advanced/i2c-driver/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/advanced/i2c-driver/solution/.cargo/config.toml +++ b/advanced/i2c-driver/solution/.cargo/config.toml @@ -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" } diff --git a/advanced/i2c-sensor-reading/solution/.cargo/config.toml b/advanced/i2c-sensor-reading/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/advanced/i2c-sensor-reading/solution/.cargo/config.toml +++ b/advanced/i2c-sensor-reading/solution/.cargo/config.toml @@ -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" } diff --git a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml index 3da2f15b..ed557a46 100644 --- a/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml +++ b/common/lib/esp32-c3-dkc02-bsc/.cargo/config.toml @@ -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" } diff --git a/intro/hardware-check/.cargo/config.toml b/intro/hardware-check/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/hardware-check/.cargo/config.toml +++ b/intro/hardware-check/.cargo/config.toml @@ -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" } diff --git a/intro/http-client/exercise/.cargo/config.toml b/intro/http-client/exercise/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/http-client/exercise/.cargo/config.toml +++ b/intro/http-client/exercise/.cargo/config.toml @@ -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" } diff --git a/intro/http-client/solution/.cargo/config.toml b/intro/http-client/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/http-client/solution/.cargo/config.toml +++ b/intro/http-client/solution/.cargo/config.toml @@ -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" } diff --git a/intro/http-server/exercise/.cargo/config.toml b/intro/http-server/exercise/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/http-server/exercise/.cargo/config.toml +++ b/intro/http-server/exercise/.cargo/config.toml @@ -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" } diff --git a/intro/http-server/solution/.cargo/config.toml b/intro/http-server/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/http-server/solution/.cargo/config.toml +++ b/intro/http-server/solution/.cargo/config.toml @@ -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" } diff --git a/intro/mqtt/exercise/.cargo/config.toml b/intro/mqtt/exercise/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/mqtt/exercise/.cargo/config.toml +++ b/intro/mqtt/exercise/.cargo/config.toml @@ -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" } diff --git a/intro/mqtt/solution/.cargo/config.toml b/intro/mqtt/solution/.cargo/config.toml index cf8f4550..721c42cd 100644 --- a/intro/mqtt/solution/.cargo/config.toml +++ b/intro/mqtt/solution/.cargo/config.toml @@ -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" } From ce48de1ade9f48da6042c800d40fb50fd73679df Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 19 Jul 2022 07:51:50 +0000 Subject: [PATCH 12/13] Use tag `v4.4.1` --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 22b57493..03e856d6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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 \ From 556947816eca576377508cc161dc10750390c2a1 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Tue, 19 Jul 2022 07:51:59 +0000 Subject: [PATCH 13/13] Update Cargo.lock --- common/lib/esp32-c3-dkc02-bsc/Cargo.lock | 596 +++++++++++------------ 1 file changed, 281 insertions(+), 315 deletions(-) diff --git a/common/lib/esp32-c3-dkc02-bsc/Cargo.lock b/common/lib/esp32-c3-dkc02-bsc/Cargo.lock index 9cb2fb15..226588ab 100644 --- a/common/lib/esp32-c3-dkc02-bsc/Cargo.lock +++ b/common/lib/esp32-c3-dkc02-bsc/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "aho-corasick" version = "0.7.18" @@ -32,17 +26,6 @@ version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" -[[package]] -name = "async-trait" -version = "0.1.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "atty" version = "0.2.14" @@ -72,12 +55,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - [[package]] name = "bindgen" version = "0.59.2" @@ -122,29 +99,12 @@ dependencies = [ "memchr", ] -[[package]] -name = "bumpalo" -version = "3.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" - [[package]] name = "bytemuck" version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" -[[package]] -name = "cargo_toml" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3596addfb02dcdc06f5252ddda9f3785f9230f5827fb4284645240fa05ad92" -dependencies = [ - "serde", - "serde_derive", - "toml", -] - [[package]] name = "cc" version = "1.0.72" @@ -166,12 +126,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - [[package]] name = "clang-sys" version = "1.3.0" @@ -199,12 +153,47 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.1" +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "once_cell", + "scopeguard", ] [[package]] @@ -296,9 +285,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "embedded-hal" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36cfb62ff156596c892272f3015ef952fe1525e85261fa3a7f327bd6b384ab9" +checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" dependencies = [ "nb 0.1.3", "void", @@ -306,31 +295,30 @@ dependencies = [ [[package]] name = "embedded-hal" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570e765da7319a256dfe1542f14501a53f74e020b68aa666a98b1ad31a614c7e" +checksum = "93cc714edeae73aa1ff259af4498595360b2992e0e9c59801873ed198a7f2216" dependencies = [ "nb 1.0.0", ] [[package]] name = "embedded-svc" -version = "0.16.5" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c008e912fe53fc0ea402dab2e6501048579c803e951b9d30478ada38cbb6c6" +checksum = "aeac0cf436604eced307910b6676bac59f328c07875b8f8d7c65bc5ecee9dbf4" dependencies = [ "anyhow", - "async-trait", "enumset", + "futures", "http-auth-basic", "log", "no-std-net", "num_enum", "serde", "serde_json", - "strum", - "strum_macros", - "url", + "strum 0.23.0", + "strum_macros 0.23.1", ] [[package]] @@ -338,23 +326,43 @@ name = "embuild" version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76f3d7e8ed0354738a5e220441e9866cf6ce0750e446aded4c11315ae279bb8" +dependencies = [ + "anyhow", + "bitflags", + "dirs", + "log", + "serde", + "serde_json", + "shlex", + "strum 0.23.0", + "strum_macros 0.23.1", + "thiserror", + "toml", + "xmas-elf", +] + +[[package]] +name = "embuild" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1dd6c90e28cfc361281a692320fcd820bcae71d327215e87c7d749bf8ddd26" dependencies = [ "anyhow", "bindgen", "bitflags", - "cargo_toml", + "cmake", "dirs", + "filetime", "globwalk", "log", + "remove_dir_all 0.7.0", "serde", "serde_json", "shlex", - "strum", - "strum_macros", + "strum 0.24.1", "tempfile", "thiserror", "toml", - "ureq", "which", "xmas-elf", ] @@ -396,29 +404,29 @@ dependencies = [ [[package]] name = "esp-idf-hal" -version = "0.32.5" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49180be29a292fedc91cf886208ef03d21338f3d9fe7a64a8a8a77048e105ed5" +checksum = "3c9745ec647d871638d95dd5a17e0e9cafade6b64679b3a4399d935b16887173" dependencies = [ "anyhow", - "embedded-hal 0.2.6", - "embedded-hal 1.0.0-alpha.6", + "embedded-hal 0.2.7", + "embedded-hal 1.0.0-alpha.7", "embedded-svc", - "embuild", + "embuild 0.28.4", "esp-idf-sys", "nb 0.1.3", ] [[package]] name = "esp-idf-svc" -version = "0.36.7" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bacd0c33167f6c011831731288c79a6f18641e0e7349908e4fe7682bbe49ac" +checksum = "075259b99be1d75c7274399f11cbcb67415c88f7e3d822c6531fed78fcb8716d" dependencies = [ "anyhow", "cstr_core", "embedded-svc", - "embuild", + "embuild 0.28.4", "enumset", "esp-idf-hal", "esp-idf-sys", @@ -428,15 +436,16 @@ dependencies = [ [[package]] name = "esp-idf-sys" -version = "0.30.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26b804853f557326c55a626d35c6faffaa6d985ee93b1c10547c5f3379cf63b" +checksum = "b239e46fe930f21ed36a25de1b6d29a0e22b65166f3a8e44624095a671f2f56c" dependencies = [ "anyhow", "bindgen", - "embuild", + "embuild 0.29.3", "paste", "regex", + "strum 0.24.1", ] [[package]] @@ -476,15 +485,15 @@ dependencies = [ ] [[package]] -name = "flate2" -version = "1.0.22" +name = "filetime" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ "cfg-if", - "crc32fast", "libc", - "miniz_oxide", + "redox_syscall", + "windows-sys", ] [[package]] @@ -494,13 +503,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.0.1" +name = "futures" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ - "matches", - "percent-encoding", + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-core", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", ] [[package]] @@ -574,7 +634,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df69b6a68474b935f436fb9c84139f32de4f7759810090d1a3a5e592553f7ee0" dependencies = [ - "base64 0.12.3", + "base64", ] [[package]] @@ -589,17 +649,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "ignore" version = "0.4.18" @@ -633,15 +682,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -[[package]] -name = "js-sys" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -679,12 +719,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" version = "2.4.1" @@ -692,21 +726,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" +name = "memoffset" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "adler", "autocfg", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "nb" version = "0.1.3" @@ -742,6 +775,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "num_enum" version = "0.5.6" @@ -782,10 +825,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "percent-encoding" -version = "2.1.0" +name = "pin-project-lite" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "proc-macro-crate" @@ -815,6 +864,30 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + [[package]] name = "redox_syscall" version = "0.2.10" @@ -861,37 +934,35 @@ dependencies = [ ] [[package]] -name = "rgb" -version = "0.8.31" +name = "remove_dir_all" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1" +checksum = "882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40" dependencies = [ - "bytemuck", + "libc", + "log", + "num_cpus", + "rayon", + "winapi", ] [[package]] -name = "ring" -version = "0.16.20" +name = "rgb" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1" dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", + "bytemuck", ] [[package]] name = "riscv" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" +source = "git+https://github.com/rust-embedded/riscv?rev=396fb9b#396fb9b8daeb11e8632e53ccc42590385a1eeb87" dependencies = [ "bare-metal", "bit_field", + "embedded-hal 0.2.7", "riscv-target", ] @@ -911,18 +982,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustls" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustversion" version = "1.0.6" @@ -945,14 +1004,10 @@ dependencies = [ ] [[package]] -name = "sct" -version = "0.7.0" +name = "scopeguard" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" @@ -991,12 +1046,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "strsim" version = "0.8.0" @@ -1015,7 +1064,16 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros", + "strum_macros 0.23.1", +] + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros 0.24.2", ] [[package]] @@ -1031,6 +1089,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "syn" version = "1.0.86" @@ -1052,7 +1123,7 @@ dependencies = [ "fastrand", "libc", "redox_syscall", - "remove_dir_all", + "remove_dir_all 0.5.3", "winapi", ] @@ -1103,21 +1174,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tinyvec" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "toml" version = "0.5.8" @@ -1150,21 +1206,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" version = "1.8.0" @@ -1183,41 +1224,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5" -dependencies = [ - "base64 0.13.0", - "chunked_transfer", - "flate2", - "log", - "once_cell", - "rustls", - "url", - "webpki", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - [[package]] name = "vcell" version = "0.1.3" @@ -1259,89 +1265,6 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -[[package]] -name = "wasm-bindgen" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" - -[[package]] -name = "web-sys" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" -dependencies = [ - "webpki", -] - [[package]] name = "which" version = "4.2.4" @@ -1384,6 +1307,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "xmas-elf" version = "0.8.0"