diff --git a/Cargo.lock b/Cargo.lock
index 8a32830..e56f985 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1542,8 +1542,10 @@ dependencies = [
  "embedded-graphics",
  "log",
  "num",
+ "portable-atomic",
  "rgb",
  "ringbuf",
+ "spin",
 ]
 
 [[package]]
@@ -2430,6 +2432,9 @@ name = "portable-atomic"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+dependencies = [
+ "critical-section",
+]
 
 [[package]]
 name = "portable-atomic-util"
@@ -2760,6 +2765,7 @@ dependencies = [
  "mpu6050-dmp",
  "nalgebra 0.33.2",
  "nmea",
+ "portable-atomic",
  "reqwless",
  "rgb",
  "rmp",
@@ -2806,6 +2812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe47b720588c8702e34b5979cb3271a8b1842c7cb6f57408efa70c779363488c"
 dependencies = [
  "crossbeam-utils",
+ "portable-atomic",
  "portable-atomic-util",
 ]
 
@@ -3098,6 +3105,16 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c"
 
+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+dependencies = [
+ "lock_api",
+ "portable-atomic",
+]
+
 [[package]]
 name = "ssd1306"
 version = "0.10.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3e87e9b..e4fdfe3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,6 +72,7 @@ futures = { version = "0.3.31", default-features = false, features = ["async-awa
 micromath = "2.1.0"
 enumset = "1.1.10"
 enum-map = "2.7.3"
+portable-atomic = { version = "1.11", features = ["critical-section"] }
 
 # Telemetry outputs
 esp-radio = { version = "*", optional = true, features = [
@@ -104,7 +105,7 @@ mpu6050-dmp = { version = "0.6.1", features = ["async"], optional = true }
 rtt-target = { version = "0.6.2", optional = true }
 
 # Simulation
-esp-storage = { version = "0.7.0", features = ["esp32s3"] }
+esp-storage = { version = "0.7.0", features = ["esp32s3", "critical-section"] }
 embedded-storage = "0.3.1"
 rmp = { path = "../msgpack-rust/rmp/", optional = true, default-features = false }
 display-interface = "0.5.0"