simplify display use

probe

fix feat

fix

.cargo/config.toml

@@ -4,7 +4,7 @@ runner = "probe-rs run --chip RP2350"
 
 [build]
 # target = "thumbv6m-none-eabi" # rp2040: Cortex-M0 and Cortex-M0+
-target = "thumbv8m.main-none-eabihf" # rp235x: Cortex-M33
+target = "thumbv8m.main-none-eabihf" # rp235xa: Cortex-M33
 
 [env]
 DEFMT_LOG = "info"

README.md

@@ -32,4 +32,4 @@ just userapps
 # copy the build applications from target/thumbv8m.main-none-eabihf/release-binary/application to the sdcard and rename them to app.bin
 
 # has builds for the official rp2350 board and the pimoroni2w board
-just kernel-release rp235x # keep in mind that https://github.com/StripedMonkey/elf2uf2-rs version is required until https://github.com/JoNil/elf2uf2-rs/pull/41 is merged
+just kernel-release rp235xa # keep in mind that https://github.com/StripedMonkey/elf2uf2-rs version is required until https://github.com/JoNil/elf2uf2-rs/pull/41 is merged

kernel/Cargo.toml

@@ -10,11 +10,14 @@ test = false
 doctest = false
 bench = false
 
+[profile.release]
+debug = true
+
 [features]
-default = ["rp235x"]
+default = ["rp235xa"]
-pimoroni2w = ["rp235x", "psram"]
+pimoroni2w = ["rp235xa", "psram"]
 # rp2040 = ["embassy-rp/rp2040"] # unsupported, ram too small for fb
-rp235x = ["embassy-rp/rp235xb"]
+rp235xa = ["embassy-rp/rp235xa"]
 trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"]
 psram = ["dep:embedded-alloc"]
 overclock = []
@@ -63,15 +66,16 @@ cyw43 = { version = "0.3.0", features = [
 cyw43-pio = { version = "0.3.0", optional = true }
 
 critical-section = "1.2.0"
+cortex-m = { version = "0.7.7", features = ["inline-asm"] }
+cortex-m-rt = "0.7.5"
+panic-probe = { version = "0.3", features = ["print-defmt"] }
+portable-atomic = { version = "1.11", features = ["critical-section"] }
+assign-resources = "0.5.0"
+
 embedded-hal-bus = { version = "0.3.0", features = ["async"] }
 embedded-hal = "0.2.7"
 embedded-hal_2 = { package = "embedded-hal", version = "1.0.0" }
 embedded-hal-async = "1.0.0"
-cortex-m = { version = "0.7.7" }
-cortex-m-rt = "0.7.5"
-panic-probe = "0.3"
-portable-atomic = { version = "1.11", features = ["critical-section"] }
-assign-resources = "0.5.0"
 
 defmt = { version = "1.0.1", optional = true }
 defmt-rtt = "1.1.0"

kernel/build.rs

@@ -13,7 +13,7 @@ use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
 
-#[cfg(all(feature = "rp235x", not(feature = "pimoroni2w")))]
+#[cfg(all(feature = "rp235xa", not(feature = "pimoroni2w")))]
 const MEMORY: &[u8] = include_bytes!("rp2350.x");
 #[cfg(feature = "pimoroni2w")]
 const MEMORY: &'static [u8] = include_bytes!("rp2350.x");

kernel/src/display.rs

@@ -12,11 +12,11 @@ use embedded_hal_bus::spi::ExclusiveDevice;
 use st7365p_lcd::ST7365P;
 
 #[cfg(feature = "psram")]
-use crate::heap::HEAP;
+use {
-#[cfg(feature = "psram")]
+    crate::heap::HEAP,
-use core::alloc::{GlobalAlloc, Layout};
+    core::alloc::{GlobalAlloc, Layout},
-#[cfg(feature = "psram")]
+    embedded_graphics::{draw_target::DrawTarget, pixelcolor::Rgb565, prelude::RgbColor},
-use embedded_graphics::{draw_target::DrawTarget, pixelcolor::Rgb565, prelude::RgbColor};
+};
 
 #[cfg(feature = "fps")]
 pub use framebuffer::fps::{FPS_CANVAS, FPS_COUNTER};