From 5831eba5c7735400580a2e35116b87834f714a13 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 10 Jan 2025 11:45:23 +0100 Subject: [PATCH] feat: Update training --- .devcontainer/devcontainer.json | 2 +- advanced/button-interrupt/.cargo/config.toml | 11 +++++------ advanced/button-interrupt/Cargo.toml | 6 +++--- advanced/button-interrupt/rust-toolchain.toml | 2 +- advanced/i2c-driver/.cargo/config.toml | 11 +++++------ advanced/i2c-driver/Cargo.toml | 6 +++--- advanced/i2c-driver/rust-toolchain.toml | 2 +- advanced/i2c-sensor-reading/.cargo/config.toml | 11 +++++------ advanced/i2c-sensor-reading/Cargo.toml | 6 +++--- advanced/i2c-sensor-reading/rust-toolchain.toml | 2 +- book/src/03_2_cargo_generate.md | 2 +- common/lib/get-uuid/Cargo.toml | 4 ++-- common/lib/mqtt-messages/Cargo.toml | 2 +- common/lib/rgb-led/.cargo/config.toml | 11 +++++------ common/lib/rgb-led/Cargo.toml | 7 ++++--- common/lib/rgb-led/rust-toolchain.toml | 2 +- common/lib/rgb-led/src/lib.rs | 2 +- common/lib/wifi/.cargo/config.toml | 11 +++++------ common/lib/wifi/Cargo.toml | 6 +++--- common/lib/wifi/rust-toolchain.toml | 2 +- intro/hardware-check/.cargo/config.toml | 11 +++++------ intro/hardware-check/Cargo.toml | 6 +++--- intro/hardware-check/rust-toolchain.toml | 2 +- intro/http-client/.cargo/config.toml | 11 +++++------ intro/http-client/Cargo.toml | 8 ++++---- intro/http-client/rust-toolchain.toml | 2 +- intro/http-server/.cargo/config.toml | 11 +++++------ intro/http-server/Cargo.toml | 8 ++++---- intro/http-server/rust-toolchain.toml | 2 +- intro/mqtt/exercise/.cargo/config.toml | 11 +++++------ intro/mqtt/exercise/Cargo.toml | 8 ++++---- intro/mqtt/exercise/rust-toolchain.toml | 2 +- 32 files changed, 91 insertions(+), 99 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e861e6b5..622f2602 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ // "build": { // "dockerfile": "Dockerfile", // "args": { - // "NIGHTLY_VERSION": "nightly-2024-06-30" + // "NIGHTLY_VERSION": "nightly-2025-01-01" // } // }, "customizations": { diff --git a/advanced/button-interrupt/.cargo/config.toml b/advanced/button-interrupt/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/advanced/button-interrupt/.cargo/config.toml +++ b/advanced/button-interrupt/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/advanced/button-interrupt/Cargo.toml b/advanced/button-interrupt/Cargo.toml index 889d87ad..7a00b829 100644 --- a/advanced/button-interrupt/Cargo.toml +++ b/advanced/button-interrupt/Cargo.toml @@ -21,9 +21,9 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +esp-idf-svc = "=0.50.1" rgb-led = { path = "../../common/lib/rgb-led" } [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" diff --git a/advanced/button-interrupt/rust-toolchain.toml b/advanced/button-interrupt/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/advanced/button-interrupt/rust-toolchain.toml +++ b/advanced/button-interrupt/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/advanced/i2c-driver/.cargo/config.toml b/advanced/i2c-driver/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/advanced/i2c-driver/.cargo/config.toml +++ b/advanced/i2c-driver/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/advanced/i2c-driver/Cargo.toml b/advanced/i2c-driver/Cargo.toml index dff3f056..d6a52c4d 100644 --- a/advanced/i2c-driver/Cargo.toml +++ b/advanced/i2c-driver/Cargo.toml @@ -20,9 +20,9 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" +anyhow = "=1.0.95" embedded-hal = "=0.2.7" -esp-idf-svc = "=0.49.0" +esp-idf-svc = "=0.50.1" [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" diff --git a/advanced/i2c-driver/rust-toolchain.toml b/advanced/i2c-driver/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/advanced/i2c-driver/rust-toolchain.toml +++ b/advanced/i2c-driver/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/advanced/i2c-sensor-reading/.cargo/config.toml b/advanced/i2c-sensor-reading/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/advanced/i2c-sensor-reading/.cargo/config.toml +++ b/advanced/i2c-sensor-reading/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/advanced/i2c-sensor-reading/Cargo.toml b/advanced/i2c-sensor-reading/Cargo.toml index f719e5ba..5480dc00 100644 --- a/advanced/i2c-sensor-reading/Cargo.toml +++ b/advanced/i2c-sensor-reading/Cargo.toml @@ -20,13 +20,13 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" +anyhow = "=1.0.95" embedded-hal = "=0.2.7" -esp-idf-svc = "=0.49.0" +esp-idf-svc = "=0.50.1" icm42670 = "=0.1.1" lis3dh = "=0.4.2" shared-bus = "=0.3.1" shtcx = "=0.11.0" [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" diff --git a/advanced/i2c-sensor-reading/rust-toolchain.toml b/advanced/i2c-sensor-reading/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/advanced/i2c-sensor-reading/rust-toolchain.toml +++ b/advanced/i2c-sensor-reading/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/book/src/03_2_cargo_generate.md b/book/src/03_2_cargo_generate.md index ed29ec2c..174cce10 100644 --- a/book/src/03_2_cargo_generate.md +++ b/book/src/03_2_cargo_generate.md @@ -54,7 +54,7 @@ ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } # add this line ```toml [toolchain] -channel = "nightly-2024-06-30" # change this line +channel = "nightly-2025-01-01" # change this line ``` ✅ Run your project by using the following command out of the `hello-world` directory. diff --git a/common/lib/get-uuid/Cargo.toml b/common/lib/get-uuid/Cargo.toml index 69e08c8f..f5ed861b 100644 --- a/common/lib/get-uuid/Cargo.toml +++ b/common/lib/get-uuid/Cargo.toml @@ -8,8 +8,8 @@ authors = [ edition = "2021" [dependencies] -anyhow = "=1.0.86" +anyhow = "=1.0.95" [build-dependencies] -anyhow = "=1.0.86" +anyhow = "=1.0.95" uuid = { version = "=1.9.1", features = ["v4"] } diff --git a/common/lib/mqtt-messages/Cargo.toml b/common/lib/mqtt-messages/Cargo.toml index 24816fa8..c6537c2f 100644 --- a/common/lib/mqtt-messages/Cargo.toml +++ b/common/lib/mqtt-messages/Cargo.toml @@ -8,4 +8,4 @@ authors = [ edition = "2021" [dependencies] -rgb = "=0.8.40" +rgb = "=0.8.50" diff --git a/common/lib/rgb-led/.cargo/config.toml b/common/lib/rgb-led/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/common/lib/rgb-led/.cargo/config.toml +++ b/common/lib/rgb-led/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/common/lib/rgb-led/Cargo.toml b/common/lib/rgb-led/Cargo.toml index fb49a441..69d19146 100644 --- a/common/lib/rgb-led/Cargo.toml +++ b/common/lib/rgb-led/Cargo.toml @@ -5,10 +5,11 @@ edition = "2021" authors = ["Sergio Gasquez "] [dependencies] -anyhow = "=1.0.86" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +esp-idf-svc = "=0.50.1" +esp-idf-hal ={ version = "=0.45.0", features = ["rmt-legacy"] } log = "=0.4.22" rgb = "0.8.29" [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" diff --git a/common/lib/rgb-led/rust-toolchain.toml b/common/lib/rgb-led/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/common/lib/rgb-led/rust-toolchain.toml +++ b/common/lib/rgb-led/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/common/lib/rgb-led/src/lib.rs b/common/lib/rgb-led/src/lib.rs index c98ad5aa..34ed1c3d 100644 --- a/common/lib/rgb-led/src/lib.rs +++ b/common/lib/rgb-led/src/lib.rs @@ -1,6 +1,6 @@ use anyhow::Result; use core::time::Duration; -use esp_idf_svc::hal::{ +use esp_idf_hal::{ gpio::OutputPin, peripheral::Peripheral, rmt::{config::TransmitConfig, FixedLengthSignal, PinState, Pulse, RmtChannel, TxRmtDriver}, diff --git a/common/lib/wifi/.cargo/config.toml b/common/lib/wifi/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/common/lib/wifi/.cargo/config.toml +++ b/common/lib/wifi/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/common/lib/wifi/Cargo.toml b/common/lib/wifi/Cargo.toml index 8aa5c86c..30d81dc2 100644 --- a/common/lib/wifi/Cargo.toml +++ b/common/lib/wifi/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" authors = ["Sergio Gasquez "] [dependencies] -anyhow = "=1.0.86" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +esp-idf-svc = "=0.50.1" log = "=0.4.22" [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" [dev-dependencies] toml-cfg = "=0.1.3" diff --git a/common/lib/wifi/rust-toolchain.toml b/common/lib/wifi/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/common/lib/wifi/rust-toolchain.toml +++ b/common/lib/wifi/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/intro/hardware-check/.cargo/config.toml b/intro/hardware-check/.cargo/config.toml index 708d2571..16d902e9 100644 --- a/intro/hardware-check/.cargo/config.toml +++ b/intro/hardware-check/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["std", "panic_abort"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/intro/hardware-check/Cargo.toml b/intro/hardware-check/Cargo.toml index 1bb6d958..a1c078b3 100644 --- a/intro/hardware-check/Cargo.toml +++ b/intro/hardware-check/Cargo.toml @@ -20,13 +20,13 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +esp-idf-svc = "=0.50.1" log = "=0.4.22" rgb-led = { path = "../../common/lib/rgb-led" } toml-cfg = "=0.1.3" wifi = { path = "../../common/lib/wifi" } [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" toml-cfg = "=0.1.3" diff --git a/intro/hardware-check/rust-toolchain.toml b/intro/hardware-check/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/intro/hardware-check/rust-toolchain.toml +++ b/intro/hardware-check/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/intro/http-client/.cargo/config.toml b/intro/http-client/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/intro/http-client/.cargo/config.toml +++ b/intro/http-client/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/intro/http-client/Cargo.toml b/intro/http-client/Cargo.toml index cff92ff5..6596da3d 100644 --- a/intro/http-client/Cargo.toml +++ b/intro/http-client/Cargo.toml @@ -20,12 +20,12 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" -embedded-svc = "=0.28.0" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +embedded-svc = "=0.28.1" +esp-idf-svc = "=0.50.1" toml-cfg = "=0.1.3" wifi = { path = "../../common/lib/wifi" } [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" toml-cfg = "=0.1.3" diff --git a/intro/http-client/rust-toolchain.toml b/intro/http-client/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/intro/http-client/rust-toolchain.toml +++ b/intro/http-client/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/intro/http-server/.cargo/config.toml b/intro/http-server/.cargo/config.toml index ca3f7442..3fafebc0 100644 --- a/intro/http-server/.cargo/config.toml +++ b/intro/http-server/.cargo/config.toml @@ -6,14 +6,14 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/intro/http-server/Cargo.toml b/intro/http-server/Cargo.toml index c26440ac..18f938e5 100644 --- a/intro/http-server/Cargo.toml +++ b/intro/http-server/Cargo.toml @@ -20,13 +20,13 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" -embedded-svc = "=0.28.0" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +embedded-svc = "=0.28.1" +esp-idf-svc = "=0.50.1" shtcx = "=1.0.0" toml-cfg = "=0.1.3" wifi = { path = "../../common/lib/wifi" } [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" toml-cfg = "=0.1.3" diff --git a/intro/http-server/rust-toolchain.toml b/intro/http-server/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/intro/http-server/rust-toolchain.toml +++ b/intro/http-server/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"] diff --git a/intro/mqtt/exercise/.cargo/config.toml b/intro/mqtt/exercise/.cargo/config.toml index 1ca93d68..428440ed 100644 --- a/intro/mqtt/exercise/.cargo/config.toml +++ b/intro/mqtt/exercise/.cargo/config.toml @@ -6,15 +6,15 @@ linker = "ldproxy" runner = "espflash flash --monitor" # Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3 # See also https://github.com/ivmarkov/embuild/issues/16 -rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"] +rustflags = ["--cfg", "espidf_time64"] [unstable] build-std = ["panic_abort", "std"] [env] -# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2) -ESP_IDF_VERSION = { value = "tag:v5.2.2" } +# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2) +ESP_IDF_VERSION = { value = "tag:v5.3.2" } # 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 @@ -24,7 +24,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" } #ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true } ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true } # ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples. -# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir +# See also https://github.com/esp-rs/esp-idf-sys/blob/master/BUILD-OPTIONS.md#esp_idf_tools_install_dir-esp_idf_tools_install_dir ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" } -# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 -CRATE_CC_NO_DEFAULTS = "1" + diff --git a/intro/mqtt/exercise/Cargo.toml b/intro/mqtt/exercise/Cargo.toml index d59b9624..b9c06e95 100644 --- a/intro/mqtt/exercise/Cargo.toml +++ b/intro/mqtt/exercise/Cargo.toml @@ -20,9 +20,9 @@ debug = true # Symbols are nice and they don't increase the size on Flash opt-level = "z" [dependencies] -anyhow = "=1.0.86" -embedded-svc = "=0.28.0" -esp-idf-svc = "=0.49.0" +anyhow = "=1.0.95" +embedded-svc = "=0.28.1" +esp-idf-svc = "=0.50.1" get-uuid = { path = "../../../common/lib/get-uuid" } log = "=0.4.22" mqtt-messages = { path = "../../../common/lib/mqtt-messages" } @@ -32,5 +32,5 @@ toml-cfg = "=0.1.3" wifi = { path = "../../../common/lib/wifi" } [build-dependencies] -embuild = "=0.32.0" +embuild = "=0.33.0" toml-cfg = "=0.1.3" diff --git a/intro/mqtt/exercise/rust-toolchain.toml b/intro/mqtt/exercise/rust-toolchain.toml index 6518c18d..31169716 100644 --- a/intro/mqtt/exercise/rust-toolchain.toml +++ b/intro/mqtt/exercise/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-06-30" +channel = "nightly-2025-01-01" components = ["rust-src"]