From b65385fc44ec4a57b3a590302f4af196a848d316 Mon Sep 17 00:00:00 2001 From: sawyer bristol Date: Wed, 21 Jan 2026 15:26:58 -0700 Subject: [PATCH] small fixes probe fix feat fix --- .cargo/config.toml | 2 +- README.md | 2 +- kernel/Cargo.toml | 20 ++++++++++++-------- kernel/build.rs | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index ed4802e..3194995 100644 --- a/.cargo/config.toml +++ b/.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" diff --git a/README.md b/README.md index 712a29c..9ed5d58 100644 --- a/README.md +++ b/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 diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 5c03af9..ef33549 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -10,11 +10,14 @@ test = false doctest = false bench = false +[profile.release] +debug = true + [features] -default = ["rp235x"] -pimoroni2w = ["rp235x", "psram"] +default = ["rp235xa"] +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" diff --git a/kernel/build.rs b/kernel/build.rs index a3a1b63..f04c134 100644 --- a/kernel/build.rs +++ b/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");