works

.gitignore

@@ -2,5 +2,3 @@
 *.uf2
 abi_sys.h
 assets/gif/bad_apple.gif
-picolibc
-user-apps/gboy/Peanut-GB

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "picolibc"]
-	path = picolibc
-	url = https://github.com/picolibc/picolibc
-[submodule "user-apps/gboy/Peanut-GB"]
-	path = user-apps/gboy/Peanut-GB
-	url = https://github.com/deltabeard/Peanut-GB

Cargo.toml

@@ -9,7 +9,6 @@ members = [
   "user-apps/snake",
   "user-apps/gallery",
   "user-apps/gif",
-  "user-apps/wav_player",
 ]
 
 [profile.release]
@@ -24,7 +23,7 @@ codegen-units = 1
 lto = true
 debug = false
 opt-level = "z"
-panic = "unwind"
+panic = "abort"
 
 [profile.dev]
 lto = true

abi/src/lib.rs

@@ -3,8 +3,8 @@
 
 extern crate alloc;
 
-use abi_sys::{RngRequest, keyboard::KeyEvent};
-pub use abi_sys::{keyboard, print};
+pub use abi_sys::{self, keyboard};
+use abi_sys::{RngRequest, alloc, dealloc, keyboard::KeyEvent};
 pub use alloc::format;
 use core::alloc::{GlobalAlloc, Layout};
 use rand_core::RngCore;
@@ -16,19 +16,19 @@ struct Alloc;
 
 unsafe impl GlobalAlloc for Alloc {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        abi_sys::alloc(layout.into())
+        alloc(layout.into())
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        abi_sys::dealloc(ptr, layout.into());
+        dealloc(ptr, layout.into());
     }
 }
 
 #[macro_export]
-macro_rules! println {
+macro_rules! print {
     ($($arg:tt)*) => {{
         let s = $crate::format!($($arg)*);
-        $crate::print(s.as_ptr(), s.len());
+        $crate::abi_sys::print(s.as_ptr(), s.len());
     }};
 }
 
@@ -45,8 +45,6 @@ pub fn get_key() -> KeyEvent {
 }
 
 pub mod display {
-    use core::sync::atomic::{AtomicBool, Ordering};
-
     use abi_sys::CPixel;
     use embedded_graphics::{
         Pixel,
@@ -61,28 +59,12 @@ pub mod display {
 
     pub type Pixel565 = Pixel<Rgb565>;
 
-    const BUF_SIZE: usize = 1024;
+    const BUF_SIZE: usize = 15 * 1024; // tune this for performance
     static mut BUF: [CPixel; BUF_SIZE] = [CPixel::new(); BUF_SIZE];
+    // const BUF_SIZE: usize = 250 * 1024; // tune this for performance
+    // static mut BUF: Lazy<Vec<CPixel>> = Lazy::new(|| vec![const { CPixel::new() }; BUF_SIZE]);
 
-    static DISPLAY_TAKEN: AtomicBool = AtomicBool::new(false);
-
-    pub struct Display {
-        _private: (),
-    }
-
-    impl Display {
-        /// Only one instance of Display can be taken
-        pub fn take() -> Option<Display> {
-            if DISPLAY_TAKEN
-                .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
-                .is_ok()
-            {
-                Some(Self { _private: () })
-            } else {
-                None
-            }
-        }
-    }
+    pub struct Display;
 
     impl Dimensions for Display {
         fn bounding_box(&self) -> Rectangle {
@@ -158,30 +140,20 @@ impl RngCore for Rng {
 }
 
 pub mod fs {
-    use alloc::vec::Vec;
     use core::fmt::Display;
 
-    pub fn read_file(file: &str, start_from: usize, buf: &mut [u8]) -> usize {
+    use alloc::{format, vec::Vec};
+
+    pub fn read_file(file: &str, read_from: usize, buf: &mut [u8]) -> usize {
         abi_sys::read_file(
             file.as_ptr(),
             file.len(),
-            start_from,
+            read_from,
             buf.as_mut_ptr(),
             buf.len(),
         )
     }
 
-    pub fn write_file(file: &str, start_from: usize, buf: &[u8]) {
-        abi_sys::write_file(
-            file.as_ptr(),
-            file.len(),
-            start_from,
-            buf.as_ptr(),
-            buf.len(),
-        )
-    }
-
-    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
     pub struct FileName<'a> {
         full: &'a str,
         base: &'a str,
@@ -225,7 +197,7 @@ pub mod fs {
     const MAX_ENTRY_NAME_LEN: usize = 25;
     const MAX_ENTRIES: usize = 25;
 
-    #[derive(Clone, Copy, Debug)]
+    #[derive(Clone, Copy)]
     pub struct Entries([[u8; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES]);
 
     impl Entries {
@@ -267,11 +239,3 @@ pub mod fs {
         abi_sys::file_len(str.as_ptr(), str.len())
     }
 }
-
-pub mod audio {
-    pub use abi_sys::{AUDIO_BUFFER_LEN, AUDIO_BUFFER_SAMPLES, audio_buffer_ready};
-
-    pub fn send_audio_buffer(buf: &[u8]) {
-        abi_sys::send_audio_buffer(buf.as_ptr(), buf.len())
-    }
-}

abi_sys/src/lib.rs

@@ -12,7 +12,7 @@ use strum::{EnumCount, EnumIter};
 
 pub type EntryFn = fn();
 
-pub const ABI_CALL_TABLE_COUNT: usize = 14;
+pub const ABI_CALL_TABLE_COUNT: usize = 11;
 const _: () = assert!(ABI_CALL_TABLE_COUNT == CallTable::COUNT);
 
 #[derive(Clone, Copy, EnumIter, EnumCount)]
@@ -28,10 +28,7 @@ pub enum CallTable {
     GenRand = 7,
     ListDir = 8,
     ReadFile = 9,
-    WriteFile = 10,
-    FileLen = 11,
-    AudioBufferReady = 12,
-    SendAudioBuffer = 13,
+    FileLen = 10,
 }
 
 #[unsafe(no_mangle)]
@@ -441,24 +438,6 @@ pub extern "C" fn read_file(
     }
 }
 
-pub type WriteFile =
-    extern "C" fn(str: *const u8, len: usize, write_from: usize, buf: *const u8, buf_len: usize);
-
-#[unsafe(no_mangle)]
-pub extern "C" fn write_file(
-    str: *const u8,
-    len: usize,
-    write_from: usize,
-    buf: *const u8,
-    buf_len: usize,
-) {
-    unsafe {
-        let ptr = CALL_ABI_TABLE[CallTable::WriteFile as usize];
-        let f: WriteFile = core::mem::transmute(ptr);
-        f(str, len, write_from, buf, buf_len)
-    }
-}
-
 pub type FileLen = extern "C" fn(str: *const u8, len: usize) -> usize;
 
 #[unsafe(no_mangle)]
@@ -469,28 +448,3 @@ pub extern "C" fn file_len(str: *const u8, len: usize) -> usize {
         f(str, len)
     }
 }
-
-pub type AudioBufferReady = extern "C" fn() -> bool;
-
-#[allow(unused)]
-pub fn audio_buffer_ready() -> bool {
-    unsafe {
-        let ptr = CALL_ABI_TABLE[CallTable::AudioBufferReady as usize];
-        let f: AudioBufferReady = core::mem::transmute(ptr);
-        f()
-    }
-}
-
-pub const AUDIO_BUFFER_SAMPLES: usize = 1024;
-pub const AUDIO_BUFFER_LEN: usize = AUDIO_BUFFER_SAMPLES * 2;
-
-pub type SendAudioBuffer = extern "C" fn(ptr: *const u8, len: usize);
-
-#[allow(unused)]
-pub fn send_audio_buffer(buf: *const u8, len: usize) {
-    unsafe {
-        let ptr = CALL_ABI_TABLE[CallTable::SendAudioBuffer as usize];
-        let f: SendAudioBuffer = core::mem::transmute(ptr);
-        f(buf, len)
-    }
-}

justfile

@@ -1,7 +1,5 @@
 kernel-dev board:
-    cargo run --bin kernel --features {{board}}  --features fps
-kernel-release-probe board:
-    cargo run --bin kernel --profile release --features {{board}}  --features fps
+    cargo run --bin kernel --features {{board}}
 kernel-release board:
     cargo build --bin kernel --release --no-default-features --features {{board}}
     elf2uf2-rs -d target/thumbv8m.main-none-eabihf/release/kernel
@@ -11,26 +9,6 @@ binary-args := "RUSTFLAGS=\"-C link-arg=-pie -C relocation-model=pic\""
 cbindgen:
     cbindgen abi_sys --output abi_sys.h -q
 
-newlib:
-    #!/bin/bash
-    cd picolibc
-    mkdir build
-    cd build
-    CONFIG_PICOLIBC=true ../scripts/do-configure thumbv8m_main_fp-none-eabi \
-        --buildtype=minsize \
-        -Dtests=true \
-        -Dtinystdio=false \
-        -Dsingle-thread=true \
-        -Db_pie=true \
-        -Ddefault_library=static \
-        -Dtinystdio=false \
-        -Dnewlib-nano-malloc=true \
-        -Dmultilib=false \
-        -Dpicolib=true \
-        "$@" 
-    DESTDIR=./install meson install
-    ninja
-
 userapp app:
      {{binary-args}} cargo build --bin {{app}} --profile release-binary
 
@@ -39,20 +17,3 @@ userapps: cbindgen
     just userapp snake
     just userapp gallery
     just userapp gif
-    just userapp wav_player
-
-copy-userapp app:
-    cp ./target/thumbv8m.main-none-eabihf/release-binary/{{app}} /run/media/$(whoami)/PICOCALC/{{app}}.bin
-
-copy-userapps:
-    #!/bin/bash
-    just userapps
-    just copy-userapp calculator
-    just copy-userapp snake
-    just copy-userapp gallery
-    just copy-userapp gif
-    just copy-userapp wav_player
-
-    DEV=$(lsblk -o LABEL,NAME -nr | awk -v L="PICOCALC" '$1==L {print "/dev/" $2}')
-    udisksctl unmount -b "$DEV"
-    udisksctl power-off -b "$DEV"    

kernel/Cargo.toml

@@ -12,13 +12,10 @@ bench = false
 
 [features]
 default = ["rp235x", "defmt"]
-pimoroni2w = ["rp235x", "psram"]
-# rp2040 = ["embassy-rp/rp2040"] # unsupported, ram too small for fb
+pimoroni2w = ["rp235x"]
+rp2040 = ["embassy-rp/rp2040"]
 rp235x = ["embassy-rp/rp235xb"]
 trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"]
-psram = ["dep:embedded-alloc"]
-overclock = []
-fps = []
 defmt = [
   "dep:defmt",
   "panic-probe/print-defmt",
@@ -73,17 +70,16 @@ 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"
+defmt = { version = "0.3", optional = true }
+defmt-rtt = "0.4.2"
 
 embedded-sdmmc = { version = "0.9", default-features = false }
 st7365p-lcd = { git = "https://github.com/legitcamper/st7365p-lcd-rs", rev = "a784b9e6df0769371dfc522528e770cf8fc6403a" } # async branch
 embedded-graphics = { version = "0.8.1" }
 embedded-text = "0.7.2"
 embedded-layout = "0.4.2"
+kolibri-embedded-gui = "0.1.0"
 
-micromath = "2.1.0"
-fixed = "1.29.0"
 strum = { version = "0.27.2", default-features = false }
 rand = { version = "0.9.0", default-features = false }
 once_cell = { version = "1.21.3", default-features = false }
@@ -94,9 +90,7 @@ spin = "0.10.0"
 num_enum = { version = "0.7.4", default-features = false }
 goblin = { version = "0.10.1", default-features = false, features = ["elf32"] }
 talc = "4.4.3"
-embedded-alloc = { version = "0.6.0", features = [
-  "allocator_api",
-], optional = true }
+embedded-alloc = { version = "0.6.0", features = ["allocator_api"] }
 bumpalo = "3.19.0"
 
 abi_sys = { path = "../abi_sys" }

kernel/src/abi.rs

@@ -1,24 +1,16 @@
 use abi_sys::{
-    AUDIO_BUFFER_SAMPLES, AllocAbi, AudioBufferReady, CLayout, CPixel, DeallocAbi, DrawIterAbi,
-    FileLen, GenRand, GetMsAbi, ListDir, PrintAbi, ReadFile, RngRequest, SendAudioBuffer,
-    SleepMsAbi, WriteFile, keyboard::*,
+    AllocAbi, CLayout, CPixel, DeallocAbi, DrawIterAbi, FileLen, GenRand, GetMsAbi, ListDir,
+    PrintAbi, ReadFile, RngRequest, SleepMsAbi, keyboard::*,
 };
 use alloc::{string::ToString, vec::Vec};
-use core::{ffi::c_char, ptr, sync::atomic::Ordering};
+use core::{alloc::GlobalAlloc, ffi::c_char, ptr, sync::atomic::Ordering};
 use embassy_rp::clocks::{RoscRng, clk_sys_freq};
 use embassy_time::Instant;
 use embedded_graphics::draw_target::DrawTarget;
 use embedded_sdmmc::LfnBuffer;
 use heapless::spsc::Queue;
 
-#[cfg(feature = "psram")]
-use crate::heap::HEAP;
-
-#[cfg(feature = "psram")]
-use core::alloc::GlobalAlloc;
-
 use crate::{
-    audio::{AUDIO_BUFFER, AUDIO_BUFFER_READY},
     display::FRAMEBUFFER,
     framebuffer::FB_PAUSED,
     storage::{Dir, File, SDCARD},
@@ -28,14 +20,10 @@ const _: AllocAbi = alloc;
 pub extern "C" fn alloc(layout: CLayout) -> *mut u8 {
     // SAFETY: caller guarantees layout is valid
     unsafe {
-        #[cfg(feature = "psram")]
-        {
-            return HEAP.alloc(layout.into());
-        }
-
-        #[cfg(not(feature = "psram"))]
-        {
-            return alloc::alloc::alloc(layout.into());
+        if cfg!(feature = "pimoroni2w") {
+            crate::heap::HEAP.alloc(layout.into())
+        } else {
+            alloc::alloc::alloc(layout.into())
         }
     }
 }
@@ -43,14 +31,12 @@ pub extern "C" fn alloc(layout: CLayout) -> *mut u8 {
 const _: DeallocAbi = dealloc;
 pub extern "C" fn dealloc(ptr: *mut u8, layout: CLayout) {
     // SAFETY: caller guarantees ptr and layout are valid
-    #[cfg(feature = "psram")]
-    {
-        unsafe { HEAP.dealloc(ptr, layout.into()) }
+    unsafe {
+        if cfg!(feature = "pimoroni2w") {
+            crate::heap::HEAP.dealloc(ptr, layout.into())
+        } else {
+            alloc::alloc::dealloc(ptr, layout.into())
         }
-
-    #[cfg(not(feature = "psram"))]
-    {
-        unsafe { alloc::alloc::dealloc(ptr, layout.into()) }
     }
 }
 
@@ -220,8 +206,7 @@ fn recurse_file<T>(
                 }
             }
         })
-        .expect("Failed to iterate dir");
-
+        .unwrap();
         if let Some(name) = short_name {
             let mut file = dir
                 .open_file_in_dir(name, embedded_sdmmc::Mode::ReadWriteAppend)
@@ -245,17 +230,7 @@ pub extern "C" fn read_file(
 ) -> usize {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let file = unsafe { core::str::from_raw_parts(str, len) };
-
-    let mut components: [&str; 8] = [""; 8];
-    let mut count = 0;
-    for part in file.split('/') {
-        if count >= components.len() {
-            break;
-        }
-        components[count] = part;
-        count += 1;
-    }
-
+    let file: Vec<&str> = file.split('/').collect();
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let mut buf = unsafe { core::slice::from_raw_parts_mut(buf, buf_len) };
 
@@ -265,8 +240,8 @@ pub extern "C" fn read_file(
     let sd = guard.as_mut().unwrap();
     if !file.is_empty() {
         sd.access_root_dir(|root| {
-            if let Ok(result) = recurse_file(&root, &components[1..count], |file| {
-                file.seek_from_start(start_from as u32).unwrap_or(());
+            if let Ok(result) = recurse_file(&root, &file[1..], |file| {
+                file.seek_from_start(start_from as u32).unwrap();
                 file.read(&mut buf).unwrap()
             }) {
                 read = result
@@ -276,46 +251,9 @@ pub extern "C" fn read_file(
     read
 }
 
-const _: WriteFile = write_file;
-pub extern "C" fn write_file(
-    str: *const u8,
-    len: usize,
-    start_from: usize,
-    buf: *const u8,
-    buf_len: usize,
-) {
-    // SAFETY: caller guarantees str ptr is valid for `len` bytes
-    let file = unsafe { core::str::from_raw_parts(str, len) };
-
-    let mut components: [&str; 8] = [""; 8];
-    let mut count = 0;
-    for part in file.split('/') {
-        if count >= components.len() {
-            break;
-        }
-        components[count] = part;
-        count += 1;
-    }
-
-    // SAFETY: caller guarantees buf ptr is valid for `buf_len` bytes
-    let buf = unsafe { core::slice::from_raw_parts(buf, buf_len) };
-
-    let mut guard = SDCARD.get().try_lock().expect("Failed to get sdcard");
-    let sd = guard.as_mut().unwrap();
-    if !file.is_empty() {
-        sd.access_root_dir(|root| {
-            recurse_file(&root, &components[1..count], |file| {
-                file.seek_from_start(start_from as u32).unwrap();
-                file.write(&buf).unwrap()
-            })
-            .unwrap_or(())
-        });
-    };
-}
-
 const _: FileLen = file_len;
 pub extern "C" fn file_len(str: *const u8, len: usize) -> usize {
-    // SAFETY: caller guarantees str ptr is valid for `len` bytes
+    // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let file = unsafe { core::str::from_raw_parts(str, len) };
     let file: Vec<&str> = file.split('/').collect();
 
@@ -332,28 +270,3 @@ pub extern "C" fn file_len(str: *const u8, len: usize) -> usize {
     }
     len as usize
 }
-
-const _: AudioBufferReady = audio_buffer_ready;
-pub extern "C" fn audio_buffer_ready() -> bool {
-    AUDIO_BUFFER_READY.load(Ordering::Acquire)
-}
-
-const _: SendAudioBuffer = send_audio_buffer;
-pub extern "C" fn send_audio_buffer(ptr: *const u8, len: usize) {
-    // SAFETY: caller guarantees `ptr` is valid for `len` bytes
-    let buf = unsafe { core::slice::from_raw_parts(ptr, len) };
-
-    while !AUDIO_BUFFER_READY.load(Ordering::Acquire) {}
-
-    if buf.len() == AUDIO_BUFFER_SAMPLES * 2 {
-        AUDIO_BUFFER_READY.store(false, Ordering::Release);
-        unsafe { AUDIO_BUFFER.copy_from_slice(buf) };
-    } else {
-        #[cfg(feature = "defmt")]
-        defmt::warn!(
-            "user audio stream was wrong size: {} should be {}",
-            buf.len(),
-            AUDIO_BUFFER_SAMPLES * 2
-        )
-    }
-}

kernel/src/audio.rs

@@ -1,149 +0,0 @@
-use crate::Audio;
-use core::sync::atomic::{AtomicBool, Ordering};
-use embassy_futures::join::join;
-use embassy_rp::{
-    Peri,
-    clocks::clk_sys_freq,
-    dma::{AnyChannel, Channel},
-    gpio::Level,
-    pio::{
-        Common, Config, Direction, FifoJoin, Instance, LoadedProgram, PioPin, ShiftConfig,
-        StateMachine, program::pio_asm,
-    },
-};
-use fixed::traits::ToFixed;
-
-pub const SAMPLE_RATE_HZ: u32 = 22_050;
-const AUDIO_BUFFER_SAMPLES: usize = 1024;
-const _: () = assert!(AUDIO_BUFFER_SAMPLES == abi_sys::AUDIO_BUFFER_SAMPLES);
-
-// 8bit stereo interleaved PCM audio buffers
-pub static mut AUDIO_BUFFER: [u8; AUDIO_BUFFER_SAMPLES * 2] = [0; AUDIO_BUFFER_SAMPLES * 2];
-static mut AUDIO_BUFFER_1: [u8; AUDIO_BUFFER_SAMPLES * 2] = [0; AUDIO_BUFFER_SAMPLES * 2];
-
-pub static AUDIO_BUFFER_READY: AtomicBool = AtomicBool::new(true);
-
-#[embassy_executor::task]
-pub async fn audio_handler(mut audio: Audio) {
-    const SILENCE_VALUE: u8 = u8::MAX / 2;
-
-    let prg = PioPwmAudioProgram8Bit::new(&mut audio.pio);
-    let mut pwm_pio_left =
-        PioPwmAudio::new(audio.dma0, &mut audio.pio, audio.sm0, audio.left, &prg);
-    let mut pwm_pio_right =
-        PioPwmAudio::new(audio.dma1, &mut audio.pio, audio.sm1, audio.right, &prg);
-
-    loop {
-        write_samples(&mut pwm_pio_left, &mut pwm_pio_right, unsafe {
-            &AUDIO_BUFFER_1
-        })
-        .await;
-        unsafe { &mut AUDIO_BUFFER_1 }.fill(SILENCE_VALUE);
-
-        unsafe { core::mem::swap(&mut AUDIO_BUFFER, &mut AUDIO_BUFFER_1) };
-        AUDIO_BUFFER_READY.store(true, Ordering::Release)
-    }
-}
-
-async fn write_samples<PIO: Instance>(
-    left: &mut PioPwmAudio<'static, PIO, 0>,
-    right: &mut PioPwmAudio<'static, PIO, 1>,
-    buf: &[u8],
-) {
-    // pack two samples per word
-    let mut packed_buf_left: [u32; AUDIO_BUFFER_SAMPLES / 2] = [0; AUDIO_BUFFER_SAMPLES / 2];
-    let mut packed_buf_right: [u32; AUDIO_BUFFER_SAMPLES / 2] = [0; AUDIO_BUFFER_SAMPLES / 2];
-
-    for ((pl, pr), sample) in packed_buf_left
-        .iter_mut()
-        .zip(packed_buf_right.iter_mut())
-        .zip(buf.chunks(4))
-    {
-        *pl = pack_u8_samples(sample[0], sample[2]);
-        *pr = pack_u8_samples(sample[1], sample[3]);
-    }
-
-    let left_fut = left
-        .sm
-        .tx()
-        .dma_push(left.dma.reborrow(), &packed_buf_left, false);
-
-    let right_fut = right
-        .sm
-        .tx()
-        .dma_push(right.dma.reborrow(), &packed_buf_right, false);
-
-    join(left_fut, right_fut).await;
-}
-
-struct PioPwmAudioProgram8Bit<'d, PIO: Instance>(LoadedProgram<'d, PIO>);
-
-/// Writes one sample to pwm as high and low time
-impl<'d, PIO: Instance> PioPwmAudioProgram8Bit<'d, PIO> {
-    fn new(common: &mut Common<'d, PIO>) -> Self {
-        // only uses 16 bits top for high, bottom for low
-        // allows two samples per word
-        let prg = pio_asm!(
-            "out x, 8", // pwm high time
-            "out y, 8", // pwm low time
-            "loop_high:",
-            "set pins, 1",       // keep pin high
-            "jmp x-- loop_high", // decrement X until 0
-            "loop_low:",
-            "set pins, 0",      // keep pin low
-            "jmp y-- loop_low", // decrement Y until 0
-        );
-
-        let prg = common.load_program(&prg.program);
-
-        Self(prg)
-    }
-}
-
-struct PioPwmAudio<'d, PIO: Instance, const SM: usize> {
-    dma: Peri<'d, AnyChannel>,
-    sm: StateMachine<'d, PIO, SM>,
-}
-
-impl<'d, PIO: Instance, const SM: usize> PioPwmAudio<'d, PIO, SM> {
-    fn new(
-        dma: Peri<'d, impl Channel>,
-        pio: &mut Common<'d, PIO>,
-        mut sm: StateMachine<'d, PIO, SM>,
-        pin: Peri<'d, impl PioPin>,
-        prg: &PioPwmAudioProgram8Bit<'d, PIO>,
-    ) -> Self {
-        let pin = pio.make_pio_pin(pin);
-        sm.set_pins(Level::High, &[&pin]);
-        sm.set_pin_dirs(Direction::Out, &[&pin]);
-
-        let mut cfg = Config::default();
-        cfg.set_set_pins(&[&pin]);
-        cfg.fifo_join = FifoJoin::TxOnly;
-        let mut shift_cfg = ShiftConfig::default();
-        shift_cfg.auto_fill = true;
-        cfg.shift_out = shift_cfg;
-        cfg.use_program(&prg.0, &[]);
-        sm.set_config(&cfg);
-
-        let target_clock = (u8::MAX as u32 + 1) * SAMPLE_RATE_HZ;
-        let divider = (clk_sys_freq() / (target_clock * 2)).to_fixed();
-        sm.set_clock_divider(divider);
-
-        sm.set_enable(true);
-
-        Self {
-            dma: dma.into(),
-            sm,
-        }
-    }
-}
-
-/// packs two u8 samples into 32bit word
-fn pack_u8_samples(sample1: u8, sample2: u8) -> u32 {
-    (u8_pcm_to_pwm(sample1) as u32) << 16 | u8_pcm_to_pwm(sample2) as u32
-}
-
-fn u8_pcm_to_pwm(sample: u8) -> u16 {
-    ((sample as u16) << 8) | ((u8::MAX - sample) as u16)
-}

kernel/src/display.rs

@@ -1,24 +1,20 @@
 use crate::framebuffer::{self, AtomicFrameBuffer, FB_PAUSED};
 use core::alloc::{GlobalAlloc, Layout};
 use core::sync::atomic::Ordering;
-use embassy_futures::yield_now;
 use embassy_rp::{
     Peri,
     gpio::{Level, Output},
     peripherals::{PIN_13, PIN_14, PIN_15, SPI1},
     spi::{Async, Spi},
 };
-use embassy_time::Delay;
-use embedded_graphics::{draw_target::DrawTarget, pixelcolor::Rgb565, prelude::RgbColor};
+use embassy_time::{Delay, Timer};
+use embedded_graphics::{
+    pixelcolor::Rgb565,
+    prelude::{DrawTarget, RgbColor},
+};
 use embedded_hal_bus::spi::ExclusiveDevice;
 use st7365p_lcd::ST7365P;
 
-#[cfg(feature = "psram")]
-use crate::heap::HEAP;
-
-#[cfg(feature = "fps")]
-pub use framebuffer::fps::{FPS_CANVAS, FPS_COUNTER};
-
 type DISPLAY = ST7365P<
     ExclusiveDevice<Spi<'static, SPI1, Async>, Output<'static>, Delay>,
     Output<'static>,
@@ -33,21 +29,18 @@ pub static mut FRAMEBUFFER: Option<AtomicFrameBuffer> = None;
 
 fn init_fb() {
     unsafe {
-        #[cfg(feature = "psram")]
-        {
-            let slab = HEAP.alloc(Layout::array::<u16>(framebuffer::SIZE).unwrap()) as *mut u16;
+        FRAMEBUFFER = Some(if cfg!(not(feature = "pimoroni2w")) {
+            static mut BUF: [u16; framebuffer::SIZE] = [0; framebuffer::SIZE];
+            AtomicFrameBuffer::new(&mut BUF)
+        } else {
+            let slab = crate::heap::HEAP.alloc(Layout::array::<u16>(framebuffer::SIZE).unwrap())
+                as *mut u16;
             let buf = core::slice::from_raw_parts_mut(slab, framebuffer::SIZE);
 
             let mut fb = AtomicFrameBuffer::new(buf);
             fb.clear(Rgb565::BLACK).unwrap();
-            FRAMEBUFFER = Some(fb);
-        }
-
-        #[cfg(not(feature = "psram"))]
-        {
-            static mut BUF: [u16; framebuffer::SIZE] = [0; framebuffer::SIZE];
-            FRAMEBUFFER = Some(AtomicFrameBuffer::new(&mut BUF));
-        }
+            fb
+        });
     }
 }
 
@@ -85,21 +78,7 @@ pub async fn init_display(
 
 #[embassy_executor::task]
 pub async fn display_handler(mut display: DISPLAY) {
-    use embassy_time::{Instant, Timer};
-
-    // Target ~60 Hz refresh (≈16.67 ms per frame)
-    const FRAME_TIME_MS: u64 = 1000 / 60;
-
     loop {
-        let start = Instant::now();
-
-        #[cfg(feature = "fps")]
-        unsafe {
-            if FPS_COUNTER.should_draw() {
-                FPS_CANVAS.draw_fps().await;
-            }
-        }
-
         if !FB_PAUSED.load(Ordering::Acquire) {
             unsafe {
                 FRAMEBUFFER
@@ -107,15 +86,11 @@ pub async fn display_handler(mut display: DISPLAY) {
                     .unwrap()
                     .partial_draw(&mut display)
                     .await
-                    .unwrap();
-            }
+                    .unwrap()
+            };
         }
 
-        let elapsed = start.elapsed().as_millis() as u64;
-        if elapsed < FRAME_TIME_MS {
-            Timer::after_millis(FRAME_TIME_MS - elapsed).await;
-        } else {
-            yield_now().await;
-        }
+        // small yield to allow other tasks to run
+        Timer::after_nanos(500).await;
     }
 }

kernel/src/elf.rs

@@ -2,7 +2,8 @@ use crate::{
     abi,
     storage::{File, SDCARD},
 };
-use abi_sys::{CallTable, EntryFn};
+use abi_sys::CallTable;
+use abi_sys::EntryFn;
 use alloc::{vec, vec::Vec};
 use bumpalo::Bump;
 use core::ptr;
@@ -205,10 +206,7 @@ fn patch_abi(
                             CallTable::GenRand => abi::gen_rand as usize,
                             CallTable::ListDir => abi::list_dir as usize,
                             CallTable::ReadFile => abi::read_file as usize,
-                            CallTable::WriteFile => abi::write_file as usize,
                             CallTable::FileLen => abi::file_len as usize,
-                            CallTable::AudioBufferReady => abi::audio_buffer_ready as usize,
-                            CallTable::SendAudioBuffer => abi::send_audio_buffer as usize,
                         };
                         unsafe {
                             table_base.add(idx as usize).write(ptr);

kernel/src/framebuffer.rs

@@ -13,9 +13,6 @@ use embedded_hal_2::digital::OutputPin;
 use embedded_hal_async::{delay::DelayNs, spi::SpiDevice};
 use st7365p_lcd::ST7365P;
 
-#[cfg(feature = "fps")]
-use fps::{FPS_CANVAS, FPS_CANVAS_HEIGHT, FPS_CANVAS_WIDTH, FPS_CANVAS_X, FPS_CANVAS_Y};
-
 const TILE_SIZE: usize = 16; // 16x16 tile
 const TILE_COUNT: usize = (SCREEN_WIDTH / TILE_SIZE) * (SCREEN_HEIGHT / TILE_SIZE); // 400 tiles
 const NUM_TILE_ROWS: usize = SCREEN_WIDTH / TILE_SIZE;
@@ -133,34 +130,9 @@ impl<'a> AtomicFrameBuffer<'a> {
             tile.store(false, Ordering::Release);
         }
 
-        #[cfg(feature = "fps")]
-        unsafe {
-            crate::display::FPS_COUNTER.measure()
-        }
-
         Ok(())
     }
 
-    // used when doing a full screen refresh fps must be drawn into fb
-    // unfortunately it is not garenteed to not be drawn over before
-    // being pushed to the display
-    #[cfg(feature = "fps")]
-    pub fn draw_fps_into_fb(&mut self) {
-        unsafe {
-            let canvas = &FPS_CANVAS.canvas;
-
-            for y in 0..FPS_CANVAS_HEIGHT {
-                let fb_y = FPS_CANVAS_Y + y;
-                let fb_row_start = fb_y * SCREEN_WIDTH + FPS_CANVAS_X;
-                let canvas_row_start = y * FPS_CANVAS_WIDTH;
-
-                self.fb[fb_row_start..fb_row_start + FPS_CANVAS_WIDTH].copy_from_slice(
-                    &canvas[canvas_row_start..canvas_row_start + FPS_CANVAS_WIDTH],
-                );
-            }
-        }
-    }
-
     // copy N tiles horizontally to the right into batch tile buf
     fn append_tiles_to_batch(
         &mut self,
@@ -180,45 +152,6 @@ impl<'a> AtomicFrameBuffer<'a> {
                 &self.fb[fb_row_offset..fb_row_offset + (total_tiles as usize * TILE_SIZE)];
 
             batch_row.copy_from_slice(fb_row);
-
-            // override fps pixel region with fps
-            // avoids writing to fps, and having it overridden before draw
-            #[cfg(feature = "fps")]
-            {
-                let global_y = tile_y as usize * TILE_SIZE + batch_row_num;
-
-                if global_y >= FPS_CANVAS_Y && global_y < FPS_CANVAS_Y + FPS_CANVAS_HEIGHT {
-                    let start_x = tile_x as usize * TILE_SIZE;
-                    let end_x = start_x + (total_tiles as usize * TILE_SIZE);
-
-                    // horizontal overlap check
-                    let fps_x0 = FPS_CANVAS_X;
-                    let fps_x1 = FPS_CANVAS_X + FPS_CANVAS_WIDTH;
-
-                    let x0 = start_x.max(fps_x0);
-                    let x1 = end_x.min(fps_x1);
-
-                    if x1 > x0 {
-                        let row_in_fps = global_y - FPS_CANVAS_Y;
-                        let fps_off = row_in_fps
-                            .checked_mul(FPS_CANVAS_WIDTH)
-                            .and_then(|v| v.checked_add(x0 - fps_x0));
-                        let batch_off = x0 - start_x;
-                        let len = x1 - x0;
-
-                        if let Some(fps_off) = fps_off {
-                            let fps_len_ok = fps_off + len <= unsafe { FPS_CANVAS.canvas.len() };
-                            let batch_len_ok = batch_off + len <= batch_row.len();
-
-                            if fps_len_ok && batch_len_ok {
-                                batch_row[batch_off..batch_off + len].copy_from_slice(unsafe {
-                                    &FPS_CANVAS.canvas[fps_off..fps_off + len]
-                                });
-                            }
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -234,25 +167,9 @@ impl<'a> AtomicFrameBuffer<'a> {
         DELAY: DelayNs,
     {
         if self.should_full_draw() {
-            #[cfg(feature = "fps")]
-            self.draw_fps_into_fb();
             return self.draw(display).await;
         }
 
-        #[cfg(feature = "fps")]
-        {
-            let fps_tile_x = FPS_CANVAS_X / TILE_SIZE;
-            let fps_tile_y = FPS_CANVAS_Y / TILE_SIZE;
-            let fps_tile_w = (FPS_CANVAS_WIDTH + TILE_SIZE - 1) / TILE_SIZE;
-            let fps_tile_h = (FPS_CANVAS_HEIGHT + TILE_SIZE - 1) / TILE_SIZE;
-
-            for ty in fps_tile_y..fps_tile_y + fps_tile_h {
-                for tx in fps_tile_x..fps_tile_x + fps_tile_w {
-                    self.dirty_tiles[ty * NUM_TILE_COLS + tx].store(true, Ordering::Release);
-                }
-            }
-        }
-
         for tile_row in 0..NUM_TILE_ROWS {
             let row_start_idx = tile_row * NUM_TILE_COLS;
             let mut col = 0;
@@ -299,11 +216,6 @@ impl<'a> AtomicFrameBuffer<'a> {
             }
         }
 
-        #[cfg(feature = "fps")]
-        unsafe {
-            crate::display::FPS_COUNTER.measure()
-        }
-
         Ok(())
     }
 }
@@ -429,146 +341,3 @@ impl<'a> OriginDimensions for AtomicFrameBuffer<'a> {
         Size::new(SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32)
     }
 }
-
-#[cfg(feature = "fps")]
-pub mod fps {
-    use crate::display::SCREEN_WIDTH;
-    use core::fmt::Write;
-    use embassy_time::{Duration, Instant};
-    use embedded_graphics::{
-        Drawable, Pixel,
-        draw_target::DrawTarget,
-        geometry::Point,
-        mono_font::{MonoTextStyle, ascii::FONT_8X13},
-        pixelcolor::Rgb565,
-        prelude::{IntoStorage, OriginDimensions, RgbColor, Size},
-        text::{Alignment, Text},
-    };
-
-    pub static mut FPS_COUNTER: FpsCounter = FpsCounter::new();
-    pub static mut FPS_CANVAS: FpsCanvas = FpsCanvas::new();
-
-    // "FPS: 120" = 8 len
-    const FPS_LEN: usize = 8;
-    pub const FPS_CANVAS_WIDTH: usize = (FONT_8X13.character_size.width + 4) as usize * FPS_LEN;
-    pub const FPS_CANVAS_HEIGHT: usize = FONT_8X13.character_size.height as usize;
-
-    // puts canvas in the top right of the display
-    // top left point of canvas
-    pub const FPS_CANVAS_X: usize = SCREEN_WIDTH - FPS_CANVAS_WIDTH;
-    pub const FPS_CANVAS_Y: usize = 0;
-
-    pub struct FpsCanvas {
-        pub canvas: [u16; FPS_CANVAS_HEIGHT * FPS_CANVAS_WIDTH],
-    }
-
-    impl FpsCanvas {
-        const fn new() -> Self {
-            Self {
-                canvas: [0; FPS_CANVAS_HEIGHT * FPS_CANVAS_WIDTH],
-            }
-        }
-
-        fn clear(&mut self) {
-            for p in &mut self.canvas {
-                *p = 0;
-            }
-        }
-
-        pub async fn draw_fps(&mut self) {
-            let mut buf: heapless::String<FPS_LEN> = heapless::String::new();
-            let fps = unsafe { FPS_COUNTER.smoothed };
-            let _ = write!(buf, "FPS: {}", fps as u8);
-
-            self.clear();
-            let text_style = MonoTextStyle::new(&FONT_8X13, Rgb565::WHITE);
-            Text::with_alignment(
-                buf.as_str(),
-                Point::new(
-                    FPS_CANVAS_WIDTH as i32 / 2,
-                    (FPS_CANVAS_HEIGHT as i32 + 8) / 2,
-                ),
-                text_style,
-                Alignment::Center,
-            )
-            .draw(self)
-            .unwrap();
-        }
-    }
-
-    impl DrawTarget for FpsCanvas {
-        type Error = ();
-        type Color = Rgb565;
-
-        fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
-        where
-            I: IntoIterator<Item = Pixel<Self::Color>>,
-        {
-            for Pixel(point, color) in pixels {
-                if point.x < 0
-                    || point.x >= FPS_CANVAS_WIDTH as i32
-                    || point.y < 0
-                    || point.y >= FPS_CANVAS_HEIGHT as i32
-                {
-                    continue;
-                }
-
-                let index = (point.y as usize) * FPS_CANVAS_WIDTH + point.x as usize;
-                self.canvas[index] = color.into_storage();
-            }
-            Ok(())
-        }
-    }
-
-    impl OriginDimensions for FpsCanvas {
-        fn size(&self) -> Size {
-            Size::new(FPS_CANVAS_WIDTH as u32, FPS_CANVAS_HEIGHT as u32)
-        }
-    }
-
-    pub struct FpsCounter {
-        last_frame: Option<Instant>,
-        smoothed: f32,
-        last_draw: Option<Instant>,
-    }
-
-    impl FpsCounter {
-        pub const fn new() -> Self {
-            Self {
-                last_frame: None,
-                smoothed: 0.0,
-                last_draw: None,
-            }
-        }
-
-        // Is called once per frame or partial frame to update FPS
-        pub fn measure(&mut self) {
-            let now = Instant::now();
-
-            if let Some(last) = self.last_frame {
-                let dt_us = (now - last).as_micros() as f32;
-                if dt_us > 0.0 {
-                    let current = 1_000_000.0 / dt_us;
-                    self.smoothed = if self.smoothed == 0.0 {
-                        current
-                    } else {
-                        0.9 * self.smoothed + 0.1 * current
-                    };
-                }
-            }
-
-            self.last_frame = Some(now);
-        }
-
-        pub fn should_draw(&mut self) -> bool {
-            let now = Instant::now();
-            match self.last_draw {
-                Some(last) if now - last < Duration::from_millis(200) => false,
-                _ => {
-                    self.last_draw = Some(now);
-                    true
-                }
-            }
-        }
-    }
-}

kernel/src/main.rs

@@ -9,35 +9,32 @@
 extern crate alloc;
 
 mod abi;
-mod audio;
 mod display;
 mod elf;
 mod framebuffer;
+#[allow(unused)]
+mod heap;
 mod peripherals;
+#[allow(unused)]
+mod psram;
 mod scsi;
 mod storage;
 mod ui;
 mod usb;
 mod utils;
 
-#[cfg(feature = "psram")]
-#[allow(unused)]
-mod heap;
-#[cfg(feature = "psram")]
-#[allow(unused)]
-mod psram;
-
-#[cfg(feature = "psram")]
-use crate::{heap::HEAP, heap::init_qmi_psram_heap, psram::init_psram, psram::init_psram_qmi};
+#[cfg(feature = "pimoroni2w")]
+use crate::{heap::init_qmi_psram_heap, psram::init_psram_qmi};
 
 use crate::{
     abi::{KEY_CACHE, MS_SINCE_LAUNCH},
-    audio::audio_handler,
     display::{FRAMEBUFFER, display_handler, init_display},
+    heap::HEAP,
     peripherals::{
         conf_peripherals,
         keyboard::{KeyState, read_keyboard_fifo},
     },
+    psram::init_psram,
     scsi::MSC_SHUTDOWN,
     storage::{SDCARD, SdCard},
     ui::{SELECTIONS, clear_selection, ui_handler},
@@ -49,17 +46,15 @@ use embassy_executor::{Executor, Spawner};
 use embassy_futures::{join::join, select::select};
 use embassy_rp::{
     Peri,
-    clocks::ClockConfig,
-    config::Config,
     gpio::{Input, Level, Output, Pull},
     i2c::{self, I2c},
     multicore::{Stack, spawn_core1},
     peripherals::{
         DMA_CH0, DMA_CH1, DMA_CH3, DMA_CH4, I2C1, PIN_2, PIN_3, PIN_6, PIN_7, PIN_10, PIN_11,
         PIN_12, PIN_13, PIN_14, PIN_15, PIN_16, PIN_17, PIN_18, PIN_19, PIN_20, PIN_21, PIN_22,
-        PIN_26, PIN_27, PIO0, SPI0, SPI1, USB, WATCHDOG,
+        PIO0, SPI0, SPI1, USB, WATCHDOG,
     },
-    pio::{self, Common, Pio, StateMachine},
+    pio,
     spi::{self, Spi},
     usb as embassy_rp_usb,
     watchdog::{ResetReason, Watchdog},
@@ -121,17 +116,9 @@ async fn watchdog_task(mut watchdog: Watchdog) {
 static ENABLE_UI: AtomicBool = AtomicBool::new(true);
 static UI_CHANGE: Signal<CriticalSectionRawMutex, ()> = Signal::new();
 
-const OVERCLOCK: u32 = 300_000_000;
-
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = if cfg!(feature = "overclock") {
-        let clocks = ClockConfig::system_freq(OVERCLOCK).unwrap();
-        let config = Config::new(clocks);
-        embassy_rp::init(config)
-    } else {
-        embassy_rp::init(Default::default())
-    };
+    let p = embassy_rp::init(Default::default());
 
     spawn_core1(
         p.CORE1,
@@ -153,19 +140,6 @@ async fn main(_spawner: Spawner) {
         data: p.PIN_14,
         reset: p.PIN_15,
     };
-    let Pio {
-        common, sm0, sm1, ..
-    } = Pio::new(p.PIO0, Irqs);
-
-    let audio = Audio {
-        pio: common,
-        sm0,
-        dma0: p.DMA_CH3,
-        left: p.PIN_26,
-        sm1,
-        dma1: p.DMA_CH4,
-        right: p.PIN_27,
-    };
     let sd = Sd {
         spi: p.SPI0,
         clk: p.PIN_18,
@@ -174,15 +148,15 @@ async fn main(_spawner: Spawner) {
         cs: p.PIN_17,
         det: p.PIN_22,
     };
-    // let psram = Psram {
-    //     pio: p.PIO0,
-    //     sclk: p.PIN_21,
-    //     mosi: p.PIN_2,
-    //     miso: p.PIN_3,
-    //     cs: p.PIN_20,
-    //     dma1: p.DMA_CH3,
-    //     dma2: p.DMA_CH4,
-    // };
+    let psram = Psram {
+        pio: p.PIO0,
+        sclk: p.PIN_21,
+        mosi: p.PIN_2,
+        miso: p.PIN_3,
+        cs: p.PIN_20,
+        dma1: p.DMA_CH3,
+        dma2: p.DMA_CH4,
+    };
     let mcu = Mcu {
         i2c: p.I2C1,
         clk: p.PIN_7,
@@ -192,7 +166,7 @@ async fn main(_spawner: Spawner) {
     executor0.run(|spawner| {
         spawner
             .spawn(kernel_task(
-                spawner, p.WATCHDOG, display, audio, sd, mcu, p.USB,
+                spawner, p.WATCHDOG, display, sd, psram, mcu, p.USB,
             ))
             .unwrap()
     });
@@ -246,15 +220,6 @@ struct Display {
     data: Peri<'static, PIN_14>,
     reset: Peri<'static, PIN_15>,
 }
-struct Audio {
-    pio: Common<'static, PIO0>,
-    dma0: Peri<'static, DMA_CH3>,
-    sm0: StateMachine<'static, PIO0, 0>,
-    left: Peri<'static, PIN_26>,
-    dma1: Peri<'static, DMA_CH4>,
-    sm1: StateMachine<'static, PIO0, 1>,
-    right: Peri<'static, PIN_27>,
-}
 struct Sd {
     spi: Peri<'static, SPI0>,
     clk: Peri<'static, PIN_18>,
@@ -289,7 +254,7 @@ async fn setup_mcu(mcu: Mcu) {
 
 async fn setup_display(display: Display, spawner: Spawner) {
     let mut config = spi::Config::default();
-    config.frequency = 192_000_000;
+    config.frequency = 64_000_000;
     let spi = Spi::new(
         display.spi,
         display.clk,
@@ -305,22 +270,22 @@ async fn setup_display(display: Display, spawner: Spawner) {
 
 // psram is kind of useless on the pico calc
 // ive opted to use the pimoroni with on onboard xip psram instead
-// async fn setup_psram(psram: Psram) {
-//     let psram = init_psram(
-//         psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
-//     )
-//     .await;
+async fn setup_psram(psram: Psram) {
+    let psram = init_psram(
+        psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
+    )
+    .await;
 
-//     #[cfg(feature = "defmt")]
-//     defmt::info!("psram size: {}", psram.size);
+    #[cfg(feature = "defmt")]
+    defmt::info!("psram size: {}", psram.size);
 
-//     if psram.size == 0 {
-//         #[cfg(feature = "defmt")]
-//         defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
-//     }
-// }
+    if psram.size == 0 {
+        #[cfg(feature = "defmt")]
+        defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
+    }
+}
 
-#[cfg(feature = "psram")]
+#[cfg(feature = "pimoroni2w")]
 async fn setup_qmi_psram() {
     Timer::after_millis(250).await;
     let psram_qmi_size = init_psram_qmi(&embassy_rp::pac::QMI, &embassy_rp::pac::XIP_CTRL);
@@ -356,9 +321,8 @@ async fn kernel_task(
     spawner: Spawner,
     watchdog: Peri<'static, WATCHDOG>,
     display: Display,
-    audio: Audio,
     sd: Sd,
-    // _psram: Psram,
+    psram: Psram,
     mcu: Mcu,
     usb: Peri<'static, USB>,
 ) {
@@ -366,25 +330,19 @@ async fn kernel_task(
         .spawn(watchdog_task(Watchdog::new(watchdog)))
         .unwrap();
 
-    #[cfg(feature = "debug")]
-    defmt::info!("Clock: {}", embassy_rp::clocks::clk_sys_freq());
-
     setup_mcu(mcu).await;
 
-    #[cfg(feature = "defmt")]
     defmt::info!("setting up psram");
     Timer::after_millis(100).await;
 
     // setup_psram(psram).await;
-    #[cfg(feature = "psram")]
+    #[cfg(feature = "pimoroni2w")]
     setup_qmi_psram().await;
 
     Timer::after_millis(100).await;
     setup_display(display, spawner).await;
     setup_sd(sd).await;
 
-    spawner.spawn(audio_handler(audio)).unwrap();
-
     let _usb = embassy_rp_usb::Driver::new(usb, Irqs);
     // spawner.spawn(usb_handler(usb)).unwrap();
 
@@ -404,8 +362,7 @@ async fn prog_search_handler() {
             let mut guard = SDCARD.get().lock().await;
             let sd = guard.as_mut().unwrap();
 
-            let mut files = sd.list_files_by_extension(".bin").unwrap();
-            files.sort();
+            let files = sd.list_files_by_extension(".bin").unwrap();
             let mut select = SELECTIONS.lock().await;
 
             if *select.selections() != files {
@@ -420,10 +377,12 @@ async fn prog_search_handler() {
 async fn key_handler() {
     loop {
         if let Some(event) = read_keyboard_fifo().await {
+            if let KeyState::Pressed = event.state {
                 unsafe {
                     let _ = KEY_CACHE.enqueue(event);
                 }
             }
+        }
         Timer::after_millis(50).await;
     }
 }

kernel/src/storage.rs

@@ -35,24 +35,12 @@ impl TimeSource for DummyTimeSource {
     }
 }
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq)]
 pub struct FileName {
     pub long_name: String,
     pub short_name: ShortFileName,
 }
 
-impl PartialOrd for FileName {
-    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
-        Some(self.long_name.cmp(&other.long_name))
-    }
-}
-
-impl Ord for FileName {
-    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-        self.long_name.cmp(&other.long_name)
-    }
-}
-
 pub struct SdCard {
     det: Input<'static>,
     volume_mgr: VolMgr,

kernel/src/ui.rs

@@ -75,7 +75,7 @@ pub async fn clear_selection() {
 
 async fn draw_selection() {
     let mut guard = SELECTIONS.lock().await;
-    let file_names = guard.selections.clone();
+    let file_names = &guard.selections.clone();
 
     let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
     let display_area = unsafe { FRAMEBUFFER.as_mut().unwrap().bounding_box() };
@@ -99,7 +99,7 @@ async fn draw_selection() {
     } else {
         let mut views: alloc::vec::Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
 
-        for i in &file_names {
+        for i in file_names {
             views.push(Text::new(&i.long_name, Point::zero(), text_style));
         }
 

selection_ui/src/lib.rs

@@ -6,57 +6,50 @@ use abi::{
     display::Display,
     get_key,
     keyboard::{KeyCode, KeyState},
+    print, sleep,
 };
 use alloc::vec::Vec;
 use embedded_graphics::{
     Drawable,
     mono_font::{MonoTextStyle, ascii::FONT_10X20},
     pixelcolor::Rgb565,
-    prelude::{Dimensions, DrawTarget, Point, Primitive, RgbColor},
+    prelude::{Dimensions, Point, Primitive, RgbColor, Size},
     primitives::{PrimitiveStyle, Rectangle},
-    text::{Alignment, Text, renderer::TextRenderer},
+    text::Text,
 };
 use embedded_layout::{
     align::{horizontal, vertical},
     layout::linear::{FixedMargin, LinearLayout},
     prelude::*,
 };
-
-#[derive(Debug)]
-pub enum SelectionUiError<DisplayError> {
-    SelectionListEmpty,
-    DisplayError(DisplayError),
-}
+use embedded_text::TextBox;
 
 pub struct SelectionUi<'a> {
     selection: usize,
     items: &'a [&'a str],
+    error: &'a str,
     last_bounds: Option<Rectangle>,
 }
 
 impl<'a> SelectionUi<'a> {
-    pub fn new(items: &'a [&'a str]) -> Self {
+    pub fn new(items: &'a [&'a str], error: &'a str) -> Self {
         Self {
             selection: 0,
             items,
+            error,
             last_bounds: None,
         }
     }
 
-    pub fn run_selection_ui(
-        &mut self,
-        display: &mut Display,
-    ) -> Result<Option<usize>, SelectionUiError<<Display as DrawTarget>::Error>> {
+    pub fn run_selection_ui(&mut self, display: &mut Display) -> Result<Option<usize>, ()> {
         self.draw(display)?;
         let selection;
         loop {
             let key = get_key();
             if key.state == KeyState::Pressed {
+                print!("Got Key press: {:?}", key.key);
                 if let Some(s) = self.update(display, key.key)? {
                     selection = Some(s);
-                    display
-                        .clear(Rgb565::BLACK)
-                        .map_err(|e| SelectionUiError::DisplayError(e))?;
                     break;
                 }
             }
@@ -66,41 +59,36 @@ impl<'a> SelectionUi<'a> {
 
     /// updates the display with a new keypress.
     /// returns selection idx if selected
-    pub fn update(
-        &mut self,
-        display: &mut Display,
-        key: KeyCode,
-    ) -> Result<Option<usize>, SelectionUiError<<Display as DrawTarget>::Error>> {
+    pub fn update(&mut self, display: &mut Display, key: KeyCode) -> Result<Option<usize>, ()> {
         match key {
-            KeyCode::Down => {
-                self.selection = (self.selection + 1).min(self.items.len() - 1);
-            }
-            KeyCode::Up => {
+            KeyCode::JoyUp => {
                 self.selection = self.selection.saturating_sub(1);
             }
-            KeyCode::Enter | KeyCode::Right => return Ok(Some(self.selection)),
-            _ => return Ok(None),
+            KeyCode::JoyDown => {
+                self.selection = self.selection.saturating_add(1);
+            }
+            KeyCode::Enter | KeyCode::JoyRight => return Ok(Some(self.selection)),
+            _ => return Ok(Some(self.selection)),
         };
         self.draw(display)?;
         Ok(None)
     }
 
-    fn draw(
-        &mut self,
-        display: &mut Display,
-    ) -> Result<(), SelectionUiError<<Display as DrawTarget>::Error>> {
+    fn draw(&mut self, display: &mut Display) -> Result<(), ()> {
         let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
         let display_area = display.bounding_box();
 
         if self.items.is_empty() {
-            return Err(SelectionUiError::SelectionListEmpty);
-        }
-
-        if let Some(bounds) = self.last_bounds {
-            Rectangle::new(bounds.top_left, bounds.size)
-                .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
+            TextBox::new(
+                &self.error,
+                Rectangle::new(
+                    Point::new(25, 25),
+                    Size::new(display_area.size.width - 50, display_area.size.width - 50),
+                ),
+                text_style,
+            )
             .draw(display)
-                .map_err(|e| SelectionUiError::DisplayError(e))?;
+            .unwrap();
         }
 
         let mut views: Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
@@ -117,32 +105,15 @@ impl<'a> SelectionUi<'a> {
             .arrange()
             .align_to(&display_area, horizontal::Center, vertical::Center);
 
-        layout
-            .draw(display)
-            .map_err(|e| SelectionUiError::DisplayError(e))?;
-
         // draw selected box
-        if let Some(selected_bounds) = layout.inner().get(self.selection) {
-            let selected_bounds = selected_bounds.bounding_box();
+        let selected_bounds = layout.inner().get(self.selection).ok_or(())?.bounding_box();
         Rectangle::new(selected_bounds.top_left, selected_bounds.size)
             .into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
-                .draw(display)
-                .map_err(|e| SelectionUiError::DisplayError(e))?;
+            .draw(display)?;
 
-            self.last_bounds = Some(selected_bounds);
-        }
+        self.last_bounds = Some(layout.bounds());
 
+        layout.draw(display)?;
         Ok(())
     }
 }
-
-pub fn draw_text_center<'a, S>(
-    display: &mut Display,
-    text: &'a str,
-    style: S,
-) -> Result<Point, <Display as DrawTarget>::Error>
-where
-    S: TextRenderer<Color = <Display as DrawTarget>::Color>,
-{
-    Text::with_alignment(text, Point::zero(), style, Alignment::Center).draw(display)
-}

user-apps/calculator/src/main.rs

@@ -6,7 +6,7 @@ use abi::{
     display::Display,
     get_key,
     keyboard::{KeyCode, KeyState},
-    println,
+    print,
 };
 use alloc::{format, string::String, vec, vec::Vec};
 use core::panic::PanicInfo;
@@ -28,7 +28,7 @@ use embedded_layout::{
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -38,8 +38,8 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Calculator app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Calculator app");
+    let mut display = Display;
 
     let mut input = vec!['e', 'x', 'p', 'r', ':', ' '];
     let input_min = input.len();
@@ -104,7 +104,7 @@ pub fn main() {
         }
 
         let event = get_key();
-        if event.state == KeyState::Released {
+        if event.state != KeyState::Idle {
             match event.key {
                 KeyCode::Char(ch) => {
                     input.push(ch);

user-apps/gallery/src/main.rs

@@ -8,7 +8,7 @@ use abi::{
     fs::{Entries, list_dir, read_file},
     get_key,
     keyboard::{KeyCode, KeyState},
-    println,
+    print,
 };
 use alloc::{format, vec};
 use core::panic::PanicInfo;
@@ -20,7 +20,7 @@ use tinybmp::Bmp;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location());
+    print!("user panic: {} @ {:?}", info.message(), info.location());
     loop {}
 }
 
@@ -30,9 +30,9 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Gallery app");
+    print!("Starting Gallery app");
     let mut bmp_buf = vec![0_u8; 100_000];
-    let mut display = Display::take().unwrap();
+    let mut display = Display;
 
     let grid_cols = 3;
     let grid_rows = 3;
@@ -49,7 +49,7 @@ pub fn main() {
             break; // only draw 3x3
         }
 
-        println!("file: {}", file);
+        print!("file: {}", file);
         if file.extension().unwrap_or("") == "bmp" || file.extension().unwrap_or("") == "BMP" {
             let file_path = format!("/images/{}", file);
 

user-apps/gif/Cargo.toml

@@ -5,6 +5,6 @@ edition = "2024"
 
 [dependencies]
 abi = { path = "../../abi" }
-selection_ui = { path = "../../selection_ui" }
 embedded-graphics = "0.8.1"
+selection_ui = { path = "../../selection_ui" }
 tinygif = { git = "https://github.com/LegitCamper/tinygif" }

user-apps/gif/src/main.rs

@@ -3,27 +3,23 @@
 
 extern crate alloc;
 use abi::{
-    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
+    display::Display,
     fs::{Entries, file_len, list_dir, read_file},
     get_key, get_ms,
     keyboard::{KeyCode, KeyState},
-    println, sleep,
+    print, sleep,
 };
 use alloc::{format, vec, vec::Vec};
 use core::panic::PanicInfo;
 use embedded_graphics::{
-    image::ImageDrawable,
-    mono_font::{MonoTextStyle, ascii::FONT_6X10},
-    pixelcolor::Rgb565,
-    prelude::{Point, RgbColor},
-    transform::Transform,
+    image::ImageDrawable, pixelcolor::Rgb565, prelude::Point, transform::Transform,
 };
-use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
+use selection_ui::SelectionUi;
 use tinygif::Gif;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -33,56 +29,41 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Gif app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Gif app");
+    let mut display = Display;
 
     let mut entries = Entries::new();
     list_dir("/gifs", &mut entries);
 
     let mut files = entries.entries();
     files.retain(|e| e.extension().unwrap_or("") == "gif");
-    let mut gifs = files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
-    gifs.sort();
+    let gifs = &files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
 
-    let mut selection_ui = SelectionUi::new(&mut gifs);
-    let selection = match selection_ui.run_selection_ui(&mut display) {
-        Ok(maybe_sel) => maybe_sel,
-        Err(e) => match e {
-            SelectionUiError::SelectionListEmpty => {
-                draw_text_center(
-                    &mut display,
-                    "No Gifs were found in /gifs",
-                    MonoTextStyle::new(&FONT_6X10, Rgb565::RED),
-                )
-                .expect("Display Error");
-                None
-            }
-            SelectionUiError::DisplayError(_) => panic!("Display Error"),
-        },
-    };
+    let mut selection_ui = SelectionUi::new(&gifs, "No Gif files found in /gifs");
+    let selection = selection_ui
+        .run_selection_ui(&mut display)
+        .expect("failed to draw")
+        .expect("Failed to get user selection");
 
-    assert!(selection.is_some());
-
-    let file_name = format!("/gifs/{}", gifs[selection.unwrap()]);
+    let file_name = format!("/gifs/{}", gifs[selection]);
     let size = file_len(&file_name);
     let mut buf = vec![0_u8; size];
     let read = read_file(&file_name, 0, &mut buf);
-    println!("read: {}, file size: {}", read, size);
+    print!("read: {}, file size: {}", read, size);
     assert!(read == size);
 
     let gif = Gif::<Rgb565>::from_slice(&buf).expect("Failed to parse gif");
-
-    let translation = Point::new(
-        (SCREEN_WIDTH as i32 - gif.width() as i32) / 2,
-        (SCREEN_HEIGHT as i32 - gif.height() as i32) / 2,
-    );
+    let height = gif.height();
 
     let mut frame_num = 0;
     loop {
         for mut frame in gif.frames() {
             let start = get_ms();
 
-            frame.translate_mut(translation).draw(&mut display).unwrap();
+            frame
+                .translate_mut(Point::new(0, (320 - height as i32) / 2))
+                .draw(&mut display)
+                .unwrap();
             frame_num += 1;
 
             if frame_num % 5 == 0 {

user-apps/snake/src/main.rs

@@ -7,7 +7,7 @@ use abi::{
     display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
     get_key,
     keyboard::{KeyCode, KeyState},
-    println, sleep,
+    print, sleep,
 };
 use core::panic::PanicInfo;
 use embedded_graphics::{pixelcolor::Rgb565, prelude::RgbColor};
@@ -15,7 +15,7 @@ use embedded_snake::{Direction, SnakeGame};
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -27,8 +27,8 @@ pub extern "Rust" fn _start() {
 const CELL_SIZE: usize = 8;
 
 pub fn main() {
-    println!("Starting Snake app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Snake app");
+    let mut display = Display;
 
     let mut game = SnakeGame::<100, Rgb565, Rng>::new(
         SCREEN_WIDTH as u16,

user-apps/wav_player/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "wav_player"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-abi = { path = "../../abi" }
-selection_ui = { path = "../../selection_ui" }
-embedded-graphics = "0.8.1"
-rand = { version = "0.9.0", default-features = false }
-embedded-audio = { git = "https://github.com/LegitCamper/embedded-audio" }

user-apps/wav_player/build.rs

@@ -1,28 +0,0 @@
-//! This build script copies the `memory.x` file from the crate root into
-//! a directory where the linker can always find it at build time.
-//! For many projects this is optional, as the linker always searches the
-//! project root directory -- wherever `Cargo.toml` is. However, if you
-//! are using a workspace or have a more complicated build setup, this
-//! build script becomes required. Additionally, by requesting that
-//! Cargo re-run the build script whenever `memory.x` is changed,
-//! updating `memory.x` ensures a rebuild of the application with the
-//! new memory settings.
-
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-
-fn main() {
-    // Put `memory.x` in our output directory and ensure it's
-    // on the linker search path.
-    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    File::create(out.join("memory.x"))
-        .unwrap()
-        .write_all(include_bytes!("../memory.x"))
-        .unwrap();
-    println!("cargo:rustc-link-search={}", out.display());
-
-    println!("cargo:rerun-if-changed=memory.x");
-    println!("cargo:rustc-link-arg-bins=-Tmemory.x");
-}

user-apps/wav_player/src/main.rs

@@ -1,139 +0,0 @@
-#![no_std]
-#![no_main]
-
-extern crate alloc;
-use abi::{
-    audio::{AUDIO_BUFFER_LEN, audio_buffer_ready, send_audio_buffer},
-    display::Display,
-    format,
-    fs::{Entries, file_len, list_dir, read_file},
-    get_key,
-    keyboard::{KeyCode, KeyState},
-    println,
-};
-use alloc::{string::String, vec::Vec};
-use core::panic::PanicInfo;
-use embedded_audio::{AudioFile, PlatformFile, PlatformFileError, wav::Wav};
-use embedded_graphics::{
-    mono_font::{MonoTextStyle, ascii::FONT_6X10},
-    pixelcolor::Rgb565,
-    prelude::RgbColor,
-};
-use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
-    loop {}
-}
-
-#[unsafe(no_mangle)]
-pub extern "Rust" fn _start() {
-    main()
-}
-
-pub fn main() {
-    println!("Starting Wav player app");
-    let mut display = Display::take().unwrap();
-
-    loop {
-        let mut entries = Entries::new();
-        list_dir("/music", &mut entries);
-
-        let mut files = entries.entries();
-        files.retain(|e| e.extension().unwrap_or("") == "wav");
-        let mut wavs = files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
-        wavs.sort();
-
-        let mut selection_ui = SelectionUi::new(&mut wavs);
-        let selection = match selection_ui.run_selection_ui(&mut display) {
-            Ok(maybe_sel) => maybe_sel,
-            Err(e) => match e {
-                SelectionUiError::SelectionListEmpty => {
-                    draw_text_center(
-                        &mut display,
-                        "No Wavs were found in /gifs",
-                        MonoTextStyle::new(&FONT_6X10, Rgb565::RED),
-                    )
-                    .expect("Display Error");
-                    None
-                }
-                SelectionUiError::DisplayError(_) => panic!("Display Error"),
-            },
-        };
-
-        assert!(selection.is_some());
-
-        let file_name = format!("/music/{}", wavs[selection.unwrap()]);
-        let file = File::new(String::from(file_name));
-        let mut wav = Wav::new(file).unwrap();
-        println!("sample rate: {}", wav.sample_rate());
-        println!("channels: {:?}", wav.channels() as u8);
-
-        let mut buf = [0_u8; AUDIO_BUFFER_LEN];
-
-        loop {
-            if audio_buffer_ready() {
-                if wav.is_eof() {
-                    break;
-                }
-
-                let _read = wav.read(&mut buf).unwrap();
-                send_audio_buffer(&buf);
-            }
-
-            let event = get_key();
-            if event.state == KeyState::Released {
-                match event.key {
-                    KeyCode::Esc => return,
-                    _ => (),
-                }
-            }
-        }
-    }
-}
-
-struct File {
-    current_pos: usize,
-    file: String,
-}
-
-impl File {
-    fn new(file: String) -> Self {
-        Self {
-            current_pos: 0,
-            file,
-        }
-    }
-}
-
-impl PlatformFile for File {
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize, PlatformFileError> {
-        let read = read_file(&self.file, self.current_pos, buf);
-        self.current_pos += read;
-        Ok(read)
-    }
-
-    fn seek_from_current(&mut self, offset: i64) -> Result<(), PlatformFileError> {
-        if offset.is_positive() {
-            self.current_pos += offset as usize;
-        } else {
-            self.current_pos -= offset as usize;
-        }
-        Ok(())
-    }
-
-    fn seek_from_start(&mut self, offset: usize) -> Result<(), PlatformFileError> {
-        self.current_pos = offset;
-        Ok(())
-    }
-
-    fn seek_from_end(&mut self, offset: usize) -> Result<(), PlatformFileError> {
-        self.current_pos = self.length() - offset;
-        Ok(())
-    }
-
-    fn length(&mut self) -> usize {
-        file_len(&self.file)
-    }
-}