Compiler update and TAITs

card-io-ecg · Dec 21, 2024 · b61cd59 · b61cd59
1 parent 1c7d301
commit b61cd59
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 31 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -28,8 +28,6 @@ monitor = "xtask monitor"
 [env]
 DEFMT_LOG = "card_io_fw=debug,info"
 
-ESP_HAL_EMBASSY_TIMER_QUEUE = "multiple-integrated"
-
 ESP_WIFI_RX_QUEUE_SIZE = "16"
 ESP_WIFI_STATIC_RX_BUF_NUM = "32"
 ESP_WIFI_DYNAMIC_RX_BUF_NUM = "16"

diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,7 @@ rtt-target = { version = "0.6.0", optional = true }
 panic-rtt-target = { version = "0.2.0", optional = true }
 
 esp-hal = { version = "0.22.0", features = ["unstable"] }
-esp-hal-embassy = { version = "0.5.0" }
+esp-hal-embassy = { version = "0.5.0", features = ["integrated-timers"] }
 esp-backtrace = { version = "0.14.2", optional = true, features = [
     "panic-handler",
     "exception-handler"
@@ -122,14 +122,14 @@ smoltcp.workspace = true
 crc = "3.0.1"
 enumset = "1.1.3"
 
-# [patch.crates-io]
-# esp-hal = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# esp-hal-embassy = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# esp-wifi = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# esp-backtrace = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# esp-println = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# esp-alloc = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
-# xtensa-lx-rt = { git = "https://github.com/jessebraham/esp-hal.git", rev = "a80385a20a85592a0466311da24f4d5ec8c7ea71" }
+[patch.crates-io]
+esp-hal = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+esp-hal-embassy = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+esp-wifi = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+esp-backtrace = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+esp-println = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+esp-alloc = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
+xtensa-lx-rt = { git = "https://github.com/bugadani/esp-hal.git", branch = "gpio" }
 
 [features]
 default = ["defmt", "rtt"]
@@ -220,17 +220,3 @@ lto = "fat"
 [profile.lto]
 inherits = "release"
 lto = "fat"
-
-[patch.crates-io]
-esp-alloc = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-esp-hal = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-esp-hal-embassy = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-esp-hal-procmacros = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-esp-wifi = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-xtensa-lx-rt = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-xtensa-lx = { git = "https://github.com/bugadani/esp-hal", branch = "time-driver-redo" }
-
-embassy-executor    = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
-embassy-time        = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
-embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
-embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
diff --git a/src/states/menu/about.rs b/src/states/menu/about.rs
@@ -1,7 +1,7 @@
 use crate::{
     board::initialized::Context,
     human_readable::LeftPadAny,
-    states::menu::{AppMenu, AppMenuBuilder, MenuScreen},
+    states::menu::{AppMenu, MenuScreen},
     uformat, AppState, SerialNumber,
 };
 

diff --git a/src/states/menu/battery_info.rs b/src/states/menu/battery_info.rs
@@ -1,7 +1,7 @@
 use crate::{
     board::initialized::Context,
     human_readable::LeftPad,
-    states::menu::{AppMenu, AppMenuBuilder, MenuScreen},
+    states::menu::{AppMenu, MenuScreen},
     uformat, AppState,
 };
 use embassy_time::Duration;

diff --git a/src/states/menu/display.rs b/src/states/menu/display.rs
@@ -3,7 +3,7 @@ use crate::{
         config::types::{DisplayBrightness, FilterStrength},
         initialized::Context,
     },
-    states::menu::{AppMenu, AppMenuBuilder, MenuScreen},
+    states::menu::{AppMenu, MenuScreen},
     AppState,
 };
 use embedded_graphics::pixelcolor::BinaryColor;

diff --git a/src/states/menu/storage.rs b/src/states/menu/storage.rs
@@ -18,8 +18,6 @@ use embedded_menu::{
 };
 use gui::{embedded_layout::object_chain, screens::create_menu};
 
-use super::AppMenuBuilder;
-
 #[derive(Clone, Copy)]
 pub enum StorageMenuEvents {
     ChangeMeasurementAction(MeasurementAction),

diff --git a/src/states/upload_or_store_measurement.rs b/src/states/upload_or_store_measurement.rs
@@ -33,7 +33,7 @@ use crate::{
         initialized::{Context, InnerContext, StaMode},
     },
     human_readable::BinarySize,
-    states::menu::{AppMenuBuilder, MenuScreen},
+    states::menu::MenuScreen,
     uformat, AppState, SerialNumber,
 };