Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 3f5d36d

Browse files
author
imarkov
committed
Upgrade to latest dependencies
1 parent 6611e76 commit 3f5d36d

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

.cargo/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ rustflags = ["-C", "default-linker-libraries"]
2323

2424
[unstable]
2525
build-std = ["std", "panic_abort"]
26-
#build-std-features = ["panic_immediate_abort"] # Temporarily comment this out, because of https://github.com/rust-lang/cargo/issues/10019
26+
build-std-features = ["panic_immediate_abort"] # Temporarily comment this out, because of https://github.com/rust-lang/cargo/issues/10019
2727
configurable-env = true # No longer necessary since 1.56, as it was stabilized: https://github.com/rust-lang/cargo/blob/master/src/cargo/core/features.rs#L698
2828
extra-link-arg = true # No longer necessary since 1.56, as it was stabilized: https://github.com/rust-lang/cargo/blob/master/src/cargo/core/features.rs#L695
2929

3030
[env]
3131
ESP_IDF_SYS_GLOB_BASE = { value = ".", relative = true }
3232
#ESP_IDF_VERSION = { value = "master" } # Uncomment this and enable the esp-idf-sys "native" build feature to build against ESP-IDF master
33+
#ESP_IDF_VERSION = { value = "release/v4.4" } # Uncomment this and enable the esp-idf-sys "native" build feature to build against ESP-IDF v4.4
3334

3435
# These configurations will pick up your custom "sdkconfig.release", "sdkconfig.debug" or "sdkconfig.defaults[.*]" files
3536
# that you might put in the root of the project

Cargo.toml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust-esp32-std-demo"
3-
version = "0.20.0"
3+
version = "0.20.1"
44
authors = ["ivmarkov"]
55
edition = "2018"
66
categories = ["embedded", "hardware-support"]
@@ -18,8 +18,7 @@ getrandom = { version = "0.2", git = "https://github.com/esp-rs-compat/getrandom
1818
getrandom1 = { version = "0.1", git = "https://github.com/esp-rs-compat/getrandom.git", package = "getrandom", branch = "0.1" }
1919

2020
[profile.release]
21-
# symbols are nice and they don't increase the size on Flash
22-
debug = true
21+
debug = true # Symbols are nice and they don't increase the size on Flash
2322
opt-level = "z"
2423

2524
[profile.dev]
@@ -55,10 +54,10 @@ experimental = ["esp-idf-svc/experimental", "embedded-svc/experimental"]
5554
anyhow = {version = "1", features = ["backtrace"]}
5655
log = "0.4"
5756
url = "2"
58-
esp-idf-sys = { version = "0.21.1", features = ["binstart"] }
59-
embedded-svc = "0.11"
60-
esp-idf-svc = "0.27.1"
61-
esp-idf-hal = "0.21"
57+
esp-idf-sys = { version = "0.24.3", features = ["binstart"] }
58+
embedded-svc = "0.12"
59+
esp-idf-svc = "0.28.1"
60+
esp-idf-hal = "0.23.2"
6261
embedded-hal = "0.2"
6362
embedded-graphics = "0.7"
6463
display-interface = "0.4"
@@ -69,7 +68,7 @@ ssd1306 = "0.7"
6968
smol = "1.2"
7069

7170
[build-dependencies]
72-
embuild = "0.24.5"
71+
embuild = "0.25"
7372
anyhow = "1"
7473

7574
# Future; might be possible once https://github.com/rust-lang/cargo/issues/9096 hits Cargo nightly:

src/main.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -971,18 +971,3 @@ impl ili9341::Mode for KalugaOrientation {
971971
matches!(self, Self::Landscape | Self::LandscapeFlipped)
972972
}
973973
}
974-
975-
// TODO: This is coming from the panic_abort crate (but only when panic_immediate_abort is NOT enabled),
976-
// because it calls fs::canonicalize() here: https://github.com/rust-lang/backtrace-rs/blob/master/src/symbolize/gimli/elf.rs#L353
977-
// The "standard" Unix implementation of fs::canonicalize() just calls libc::realpath, which is nort implemented for the ESP-IDF
978-
//
979-
// It is unclear what the long-term fix would be:
980-
// - Option A: Implement `realpath` for the ESP-IDF similarly to this implementation: https://sourceware.org/legacy-ml/newlib/2016/msg00498.html
981-
// and assuming that the current directory is `/`
982-
// - Option B1: Implement `realpath` for the ESP-IDF with a stub that always fails with ENOSYS
983-
// - Option B2: Implement a special version of fs::canonicalize() in Rust STD which fails with ENOSYS
984-
// - Option C: Implement a special version of fs::canonicalize() in Rust STD which panics <- this is what OS-es like Hermit & others do
985-
#[no_mangle]
986-
extern "C" fn realpath(path: *const std::os::raw::c_void, wat: *const std::os::raw::c_void) {
987-
panic!("Not implemented");
988-
}

0 commit comments

Comments
 (0)