Skip to content

Commit 3b2bb53

Browse files
NarukaraNarukara
committed
update to 5831eba
1 parent 54644ae commit 3b2bb53

39 files changed

+107
-169
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// "build": {
77
// "dockerfile": "Dockerfile",
88
// "args": {
9-
// "NIGHTLY_VERSION": "nightly-2024-06-30"
9+
// "NIGHTLY_VERSION": "nightly-2025-01-01"
1010
// }
1111
// },
1212
"customizations": {

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
这里是 https://github.com/esp-rs/std-training 的简体中文翻译
22

3-
目前进度：已经翻译完成，跟踪到 c7325fa
3+
目前进度：已经翻译完成，跟踪到 5831eba
44

55
---
66

‎advanced/button-interrupt/.cargo/config.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ linker = "ldproxy"
66
runner = "espflash flash --monitor"
77
# Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3
88
# See also https://github.com/ivmarkov/embuild/issues/16
9-
rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
9+
rustflags = ["--cfg", "espidf_time64"]
1010

1111
[unstable]
1212
build-std = ["panic_abort", "std"]
1313

1414
[env]
15-
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2)
16-
ESP_IDF_VERSION = { value = "tag:v5.2.2" }
15+
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2)
16+
ESP_IDF_VERSION = { value = "tag:v5.3.2" }
1717

1818
# These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files
1919
# that you might put in the root of the project
@@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" }
2323
#ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true }
2424
ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true }
2525
# ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples.
26-
# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir
26+
# 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
2727
ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" }
28-
# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174
29-
CRATE_CC_NO_DEFAULTS = "1"
28+

‎advanced/button-interrupt/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ debug = true # Symbols are nice and they don't increase the size on Flash
2121
opt-level = "z"
2222

2323
[dependencies]
24-
anyhow = "=1.0.86"
25-
esp-idf-svc = "=0.49.0"
24+
anyhow = "=1.0.95"
25+
esp-idf-svc = "=0.50.1"
2626
rgb-led = { path = "../../common/lib/rgb-led" }
2727

2828
[build-dependencies]
29-
embuild = "=0.32.0"
29+
embuild = "=0.33.0"

‎advanced/button-interrupt/rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2024-06-30"
2+
channel = "nightly-2025-01-01"
33
components = ["rust-src"]

‎advanced/i2c-driver/.cargo/config.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ linker = "ldproxy"
66
runner = "espflash flash --monitor"
77
# Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3
88
# See also https://github.com/ivmarkov/embuild/issues/16
9-
rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
9+
rustflags = ["--cfg", "espidf_time64"]
1010

1111
[unstable]
1212
build-std = ["panic_abort", "std"]
1313

1414
[env]
15-
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2)
16-
ESP_IDF_VERSION = { value = "tag:v5.2.2" }
15+
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2)
16+
ESP_IDF_VERSION = { value = "tag:v5.3.2" }
1717

1818
# These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files
1919
# that you might put in the root of the project
@@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" }
2323
#ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true }
2424
ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true }
2525
# ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples.
26-
# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir
26+
# 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
2727
ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" }
28-
# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174
29-
CRATE_CC_NO_DEFAULTS = "1"
28+

‎advanced/i2c-driver/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ debug = true # Symbols are nice and they don't increase the size on Flash
2020
opt-level = "z"
2121

2222
[dependencies]
23-
anyhow = "=1.0.86"
23+
anyhow = "=1.0.95"
2424
embedded-hal = "=0.2.7"
25-
esp-idf-svc = "=0.49.0"
25+
esp-idf-svc = "=0.50.1"
2626

2727
[build-dependencies]
28-
embuild = "=0.32.0"
28+
embuild = "=0.33.0"

‎advanced/i2c-driver/rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2024-06-30"
2+
channel = "nightly-2025-01-01"
33
components = ["rust-src"]

‎advanced/i2c-sensor-reading/.cargo/config.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ linker = "ldproxy"
66
runner = "espflash flash --monitor"
77
# Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3
88
# See also https://github.com/ivmarkov/embuild/issues/16
9-
rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
9+
rustflags = ["--cfg", "espidf_time64"]
1010

1111
[unstable]
1212
build-std = ["panic_abort", "std"]
1313

1414
[env]
15-
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.2.2)
16-
ESP_IDF_VERSION = { value = "tag:v5.2.2" }
15+
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF (v5.3.2)
16+
ESP_IDF_VERSION = { value = "tag:v5.3.2" }
1717

1818
# These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files
1919
# that you might put in the root of the project
@@ -23,7 +23,6 @@ ESP_IDF_VERSION = { value = "tag:v5.2.2" }
2323
#ESP_IDF_SDKCONFIG = { value = "./sdkconfig.debug", relative = true }
2424
ESP_IDF_SDKCONFIG_DEFAULTS = { value = "./sdkconfig.defaults", relative = true }
2525
# ESP-IDF will be installed in ~/.espressif so it can be reused across the different examples.
26-
# See also https://github.com/esp-rs/esp-idf-sys#esp_idf_tools_install_dir-esp_idf_tools_install_dir
26+
# 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
2727
ESP_IDF_TOOLS_INSTALL_DIR = { value = "global" }
28-
# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174
29-
CRATE_CC_NO_DEFAULTS = "1"
28+

‎advanced/i2c-sensor-reading/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ debug = true # Symbols are nice and they don't increase the size on Flash
2020
opt-level = "z"
2121

2222
[dependencies]
23-
anyhow = "=1.0.86"
23+
anyhow = "=1.0.95"
2424
embedded-hal = "=0.2.7"
25-
esp-idf-svc = "=0.49.0"
25+
esp-idf-svc = "=0.50.1"
2626
icm42670 = "=0.1.1"
2727
lis3dh = "=0.4.2"
2828
shared-bus = "=0.3.1"
2929
shtcx = "=0.11.0"
3030

3131
[build-dependencies]
32-
embuild = "=0.32.0"
32+
embuild = "=0.33.0"

0 commit comments

Comments
 (0)