First working compile; FIXME httpd needs revising

Cargo.toml

@@ -14,7 +14,6 @@ crossbeam-utils = { git = "https://github.com/crossbeam-rs/crossbeam" }
 # esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal" }
 # esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc" }
 # edge-frame = { git = "https://github.com/ivmarkov/edge-frame" }
-# shared-bus = { git = "https://github.com/taks/shared-bus", branch = "embedded-hal-1.0.0-alpha.10" }
 # shared-bus = { git = "https://github.com/taks/shared-bus" }
 
 #socket2 = { git = "https://github.com/esp-rs-compat/socket2" }

rued-esp32/Cargo.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 rust-version = "1.71"
 
 [features]
-default = ["edge-executor", "system", "experimental"] # Note that edge-executor requires alloc
+default = ["system", "experimental"]
 # system = ["display-i2c"]
 system = ["display-spi", "nvs", "external-rtc", "board"]
 
@@ -36,21 +36,21 @@ log = { version = "0.4", features = [
  "release_max_level_debug",
 ] }
 futures = {version = "0.3", features = ["async-await"] }
-serde = { version = "1", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"]}
 postcard = "0.7"
-heapless = "0.8"
+heapless = { version = "0.7", features = ["serde"] }
 critical-section = "1.1"
 embedded-hal = { version = "1.0.0-rc.1" }
 embedded-hal-async = "1.0.0-rc.1"
 embedded-hal-0-2 = { package = "embedded-hal", version = "0.2", features = ["unproven"] }
-embedded-svc = { version = "0.26", features = ["nightly", "experimental"] }
-esp-idf-svc = { version = "0.47", features = ["nightly", "experimental", "critical-section", "embassy-time-driver"] }
+embedded-svc = { version = "0.26", features = ["nightly"] }
+esp-idf-svc = { version = "0.47", features = ["nightly", "critical-section", "embassy-time-driver", "embassy-time-isr-queue", "wake-from-isr"] }
 embassy-futures = { version = "0.1" }
 embassy-sync = { version = "0.3", features = ["std"] }
 embassy-time = { version = "0.1" }
 static_cell = { version = "2" }
 edge-frame = { version = "0.7", default-features = false, features = ["dto"] }
-edge-executor = { version = "0.4", optional = true }
+edge-executor = { version = "0.4" }
 channel-bridge = { version = "0.6", default-features = false, features = ["nightly", "embedded-svc"] }
 http = "0.2"
 
@@ -72,7 +72,7 @@ embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sd
 profont = { version = "0.5", optional = true }
 ssd1306 = { version = "0.7", optional = true }
 ssd1351 = { version = "0.4", optional = true }
-mipidsi = { git = "https://github.com/almindor/mipidsi", optional = true }
+mipidsi = { version = "0.5", optional = true }
 
 [build-dependencies]
 embuild = { version = "0.31", features = ["espidf", "elf"] }

rued-esp32/src/core/internal/battery.rs

@@ -1,8 +1,8 @@
+use core::fmt::Debug;
+
 use embassy_time::{Duration, Timer};
 
-use core::fmt::Debug;
-use embedded_hal_0_2::adc;
-use embedded_hal_0_2::digital::v2::InputPin;
+use embedded_hal::digital::InputPin;
 
 use super::state::State;