Fix ESP-IDF environment activation

.devcontainer/Dockerfile

@@ -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"

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" }
 

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" }
 

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"
 

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"

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"

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"

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"
 

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"
 

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"
 

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"
 

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"

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"

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));