Merge branch 'main' into nes

fix release

.gitignore

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

.gitmodules

@@ -0,0 +1,6 @@
+[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

@@ -4,9 +4,12 @@ members = [
   "kernel",
   "abi_sys",
   "abi",
+  "selection_ui",
   "user-apps/calculator",
   "user-apps/snake",
   "user-apps/gallery",
+  "user-apps/gif",
+  "user-apps/gboy",
 ]
 
 [profile.release]
@@ -17,10 +20,12 @@ codegen-units = 1
 
 [profile.release-binary]
 inherits = "release"
+codegen-units = 1
 lto = true
 debug = false
-opt-level = "s"
+opt-level = "z"
+panic = "unwind"
 
 [profile.dev]
 lto = true
-opt-level = "z"
+opt-level = "s"

abi/Cargo.toml

@@ -4,9 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-embedded-sdmmc = { version = "0.9.0", default-features = false }
-embedded-graphics = "0.8.1"
 abi_sys = { path = "../abi_sys" }
-talc = "4.4.3"
+embedded-graphics = "0.8.1"
-spin = "0.10.0"
+once_cell = { version = "1", default-features = false }
 rand_core = "0.9.3"

abi/src/lib.rs

@@ -1,32 +1,52 @@
 #![no_std]
-
+#![allow(static_mut_refs)]
-pub use abi_sys::keyboard;
-use abi_sys::{RngRequest, keyboard::KeyEvent};
-use rand_core::RngCore;
-use talc::*;
 
 extern crate alloc;
 
-static mut ARENA: [u8; 10000] = [0; 10000];
+use abi_sys::{RngRequest, alloc, dealloc, keyboard::KeyEvent};
+pub use abi_sys::{keyboard, print};
+pub use alloc::format;
+use core::alloc::{GlobalAlloc, Layout};
+use rand_core::RngCore;
 
 #[global_allocator]
-static ALLOCATOR: Talck<spin::Mutex<()>, ClaimOnOom> =
+static ALLOC: Alloc = Alloc;
-    Talc::new(unsafe { ClaimOnOom::new(Span::from_array(core::ptr::addr_of!(ARENA).cast_mut())) })
-        .lock();
 
-pub fn print(msg: &str) {
+struct Alloc;
-    abi_sys::print(msg.as_ptr(), msg.len());
+
+unsafe impl GlobalAlloc for Alloc {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        alloc(layout.into())
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        dealloc(ptr, layout.into());
+    }
+}
+
+#[macro_export]
+macro_rules! println {
+    ($($arg:tt)*) => {{
+        let s = $crate::format!($($arg)*);
+        $crate::print(s.as_ptr(), s.len());
+    }};
 }
 
 pub fn sleep(ms: u64) {
     abi_sys::sleep(ms);
 }
 
+pub fn get_ms() -> u64 {
+    abi_sys::get_ms()
+}
+
 pub fn get_key() -> KeyEvent {
     abi_sys::keyboard::get_key().into()
 }
 
 pub mod display {
+    use core::sync::atomic::{AtomicBool, Ordering};
+
     use abi_sys::CPixel;
     use embedded_graphics::{
         Pixel,
@@ -41,13 +61,28 @@ pub mod display {
 
     pub type Pixel565 = Pixel<Rgb565>;
 
-    pub fn lock_display(lock: bool) {
+    const BUF_SIZE: usize = 1024;
-        abi_sys::lock_display(lock);
+    static mut BUF: [CPixel; BUF_SIZE] = [CPixel::new(); BUF_SIZE];
+
+    static DISPLAY_TAKEN: AtomicBool = AtomicBool::new(false);
+
+    pub struct Display {
+        _private: (),
     }
 
-    const BUF_SIZE: usize = 1024; // tune this for performance
+    impl Display {
-
+        /// Only one instance of Display can be taken
-    pub struct Display;
+        pub fn take() -> Option<Display> {
+            if DISPLAY_TAKEN
+                .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
+                .is_ok()
+            {
+                Some(Self { _private: () })
+            } else {
+                None
+            }
+        }
+    }
 
     impl Dimensions for Display {
         fn bounding_box(&self) -> Rectangle {
@@ -69,21 +104,19 @@ pub mod display {
         where
             I: IntoIterator<Item = Pixel<Self::Color>>,
         {
-            let mut buf: [CPixel; BUF_SIZE] = [CPixel::new(); BUF_SIZE];
-
             let mut count = 0;
             for p in pixels {
-                buf[count] = p.into();
+                unsafe { BUF[count] = p.into() };
                 count += 1;
 
-                if count == BUF_SIZE {
+                if count == BUF_SIZE - 1 {
-                    abi_sys::draw_iter(buf.as_ptr(), count);
+                    abi_sys::draw_iter(unsafe { BUF.as_ptr() }, count);
                     count = 0;
                 }
             }
 
             if count > 0 {
-                abi_sys::draw_iter(buf.as_ptr(), count);
+                abi_sys::draw_iter(unsafe { BUF.as_ptr() }, count);
             }
 
             Ok(())
@@ -125,20 +158,109 @@ impl RngCore for Rng {
 }
 
 pub mod fs {
-    use embedded_sdmmc::DirEntry;
+    use alloc::vec::Vec;
+    use core::fmt::Display;
 
-    pub fn read_file(file: &str, read_from: usize, buf: &mut [u8]) -> usize {
+    pub fn read_file(file: &str, start_from: usize, buf: &mut [u8]) -> usize {
         abi_sys::read_file(
             file.as_ptr(),
             file.len(),
-            read_from,
+            start_from,
             buf.as_mut_ptr(),
             buf.len(),
         )
     }
 
-    pub fn list_dir(path: &str, files: &mut [Option<DirEntry>]) -> usize {
+    pub fn write_file(file: &str, start_from: usize, buf: &[u8]) {
-        abi_sys::list_dir(path.as_ptr(), path.len(), files.as_mut_ptr(), files.len())
+        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,
+        ext: Option<&'a str>,
+    }
+
+    impl<'a> FileName<'a> {
+        pub fn full_name(&self) -> &str {
+            self.full
+        }
+
+        pub fn base(&self) -> &str {
+            self.base
+        }
+
+        pub fn extension(&self) -> Option<&str> {
+            self.ext
+        }
+    }
+
+    impl<'a> Display for FileName<'a> {
+        fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+            write!(f, "{}", self.full_name())
+        }
+    }
+
+    impl<'a> From<&'a str> for FileName<'a> {
+        fn from(s: &'a str) -> FileName<'a> {
+            let full = s;
+
+            // Split on last dot for extension
+            let (base, ext) = match s.rfind('.') {
+                Some(idx) => (&s[..idx], Some(&s[idx + 1..])),
+                None => (s, None),
+            };
+
+            FileName { full, base, ext }
+        }
+    }
+
+    const MAX_ENTRY_NAME_LEN: usize = 25;
+    const MAX_ENTRIES: usize = 25;
+
+    #[derive(Clone, Copy, Debug)]
+    pub struct Entries([[u8; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES]);
+
+    impl Entries {
+        pub fn new() -> Self {
+            Self([[0; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES])
+        }
+
+        /// Get list of file names after listing
+        pub fn entries<'a>(&'a self) -> Vec<FileName<'a>> {
+            self.0
+                .iter()
+                .filter_map(|buf| {
+                    let nul_pos = buf.iter().position(|&b| b == 0).unwrap_or(buf.len());
+                    Some(core::str::from_utf8(&buf[..nul_pos]).ok()?.into())
+                })
+                .collect()
+        }
+
+        fn as_ptrs(&mut self) -> [*mut u8; MAX_ENTRIES] {
+            let mut ptrs: [*mut u8; MAX_ENTRIES] = [core::ptr::null_mut(); MAX_ENTRIES];
+            for (i, buf) in self.0.iter_mut().enumerate() {
+                ptrs[i] = buf.as_mut_ptr();
+            }
+            ptrs
+        }
+    }
+
+    pub fn list_dir(path: &str, entries: &mut Entries) -> usize {
+        abi_sys::list_dir(
+            path.as_ptr(),
+            path.len(),
+            entries.as_ptrs().as_mut_ptr(),
+            MAX_ENTRIES,
+            MAX_ENTRY_NAME_LEN,
+        )
     }
 
     pub fn file_len(str: &str) -> usize {

abi_sys/Cargo.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2024"
 
 [features]
-default = []
+default = ["alloc"]
+alloc = []
 defmt = ["dep:defmt"]
 
 [dependencies]
 strum = { version = "0.27.2", default-features = false, features = ["derive"] }
 bitflags = "2.9.4"
 embedded-graphics = "0.8.1"
-embedded-sdmmc = { version = "0.9.0", default-features = false }
 defmt = { version = "0.3", optional = true }
 
 [build-dependencies]

abi_sys/src/lib.rs

@@ -1,42 +1,88 @@
 #![no_std]
+#[cfg(feature = "alloc")]
+use core::alloc::Layout;
 
+use core::ffi::c_char;
 use embedded_graphics::{
     Pixel,
     pixelcolor::{Rgb565, raw::RawU16},
     prelude::{IntoStorage, Point},
 };
-use embedded_sdmmc::DirEntry;
+use strum::{EnumCount, EnumIter};
-use strum::EnumIter;
-
-pub const ABI_CALL_TABLE_COUNT: usize = 10;
-
-#[derive(Clone, Copy, EnumIter)]
-#[repr(u8)]
-pub enum CallAbiTable {
-    PrintString = 0,
-    SleepMs = 1,
-    GetMs = 2,
-    LockDisplay = 3,
-    DrawIter = 4,
-    GetKey = 5,
-    GenRand = 6,
-    ListDir = 7,
-    ReadFile = 8,
-    FileLen = 9,
-}
 
 pub type EntryFn = fn();
 
+pub const ABI_CALL_TABLE_COUNT: usize = 12;
+const _: () = assert!(ABI_CALL_TABLE_COUNT == CallTable::COUNT);
+
+#[derive(Clone, Copy, EnumIter, EnumCount)]
+#[repr(u8)]
+pub enum CallTable {
+    Alloc = 0,
+    Dealloc = 1,
+    PrintString = 2,
+    SleepMs = 3,
+    GetMs = 4,
+    DrawIter = 5,
+    GetKey = 6,
+    GenRand = 7,
+    ListDir = 8,
+    ReadFile = 9,
+    WriteFile = 10,
+    FileLen = 11,
+}
+
 #[unsafe(no_mangle)]
 #[unsafe(link_section = ".syscall_table")]
 pub static mut CALL_ABI_TABLE: [usize; ABI_CALL_TABLE_COUNT] = [0; ABI_CALL_TABLE_COUNT];
 
+#[cfg(feature = "alloc")]
+#[repr(C)]
+pub struct CLayout {
+    size: usize,
+    alignment: usize,
+}
+
+#[cfg(feature = "alloc")]
+impl Into<Layout> for CLayout {
+    fn into(self) -> Layout {
+        unsafe { Layout::from_size_align_unchecked(self.size, self.alignment) }
+    }
+}
+
+#[cfg(feature = "alloc")]
+impl From<Layout> for CLayout {
+    fn from(value: Layout) -> Self {
+        Self {
+            size: value.size(),
+            alignment: value.align(),
+        }
+    }
+}
+
+pub type AllocAbi = extern "C" fn(layout: CLayout) -> *mut u8;
+
+#[unsafe(no_mangle)]
+pub extern "C" fn alloc(layout: CLayout) -> *mut u8 {
+    let f: AllocAbi = unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::Alloc as usize]) };
+    f(layout)
+}
+
+pub type DeallocAbi = extern "C" fn(ptr: *mut u8, layout: CLayout);
+
+#[unsafe(no_mangle)]
+pub extern "C" fn dealloc(ptr: *mut u8, layout: CLayout) {
+    let f: DeallocAbi =
+        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::Dealloc as usize]) };
+    f(ptr, layout)
+}
+
 pub type PrintAbi = extern "C" fn(ptr: *const u8, len: usize);
 
 #[unsafe(no_mangle)]
 pub extern "C" fn print(ptr: *const u8, len: usize) {
     let f: PrintAbi =
-        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::PrintString as usize]) };
+        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::PrintString as usize]) };
     f(ptr, len);
 }
 
@@ -45,7 +91,7 @@ pub type SleepMsAbi = extern "C" fn(ms: u64);
 #[unsafe(no_mangle)]
 pub extern "C" fn sleep(ms: u64) {
     let f: SleepMsAbi =
-        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::SleepMs as usize]) };
+        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::SleepMs as usize]) };
     f(ms);
 }
 
@@ -53,19 +99,10 @@ pub type GetMsAbi = extern "C" fn() -> u64;
 
 #[unsafe(no_mangle)]
 pub extern "C" fn get_ms() -> u64 {
-    let f: GetMsAbi = unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::GetMs as usize]) };
+    let f: GetMsAbi = unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::GetMs as usize]) };
     f()
 }
 
-pub type LockDisplay = extern "C" fn(lock: bool);
-
-#[unsafe(no_mangle)]
-pub extern "C" fn lock_display(lock: bool) {
-    let f: LockDisplay =
-        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::LockDisplay as usize]) };
-    f(lock);
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct CPixel {
@@ -75,7 +112,7 @@ pub struct CPixel {
 }
 
 impl CPixel {
-    pub fn new() -> Self {
+    pub const fn new() -> Self {
         Self {
             x: 0,
             y: 0,
@@ -105,12 +142,12 @@ pub type DrawIterAbi = extern "C" fn(ptr: *const CPixel, len: usize);
 #[unsafe(no_mangle)]
 pub extern "C" fn draw_iter(ptr: *const CPixel, len: usize) {
     let f: DrawIterAbi =
-        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::DrawIter as usize]) };
+        unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::DrawIter as usize]) };
     f(ptr, len);
 }
 
 pub mod keyboard {
-    use crate::{CALL_ABI_TABLE, CallAbiTable};
+    use crate::{CALL_ABI_TABLE, CallTable};
 
     bitflags::bitflags! {
         #[derive(Default, Debug, PartialEq, Eq, Clone, Copy)]
@@ -333,7 +370,7 @@ pub mod keyboard {
     #[unsafe(no_mangle)]
     pub extern "C" fn get_key() -> KeyEventC {
         let f: GetKeyAbi =
-            unsafe { core::mem::transmute(CALL_ABI_TABLE[CallAbiTable::GetKey as usize]) };
+            unsafe { core::mem::transmute(CALL_ABI_TABLE[CallTable::GetKey as usize]) };
         f()
     }
 }
@@ -350,7 +387,7 @@ pub type GenRand = extern "C" fn(req: &mut RngRequest);
 #[unsafe(no_mangle)]
 pub extern "C" fn gen_rand(req: &mut RngRequest) {
     unsafe {
-        let ptr = CALL_ABI_TABLE[CallAbiTable::GenRand as usize];
+        let ptr = CALL_ABI_TABLE[CallTable::GenRand as usize];
         let f: GenRand = core::mem::transmute(ptr);
         f(req)
     }
@@ -359,21 +396,23 @@ pub extern "C" fn gen_rand(req: &mut RngRequest) {
 pub type ListDir = extern "C" fn(
     str: *const u8,
     len: usize,
-    files: *mut Option<DirEntry>,
+    entries: *mut *mut c_char,
     file_len: usize,
+    max_entry_str_len: usize,
 ) -> usize;
 
 #[unsafe(no_mangle)]
 pub extern "C" fn list_dir(
     str: *const u8,
     len: usize,
-    files: *mut Option<DirEntry>,
+    entries: *mut *mut c_char,
-    file_len: usize,
+    entry_count: usize,
+    max_entry_str_len: usize,
 ) -> usize {
     unsafe {
-        let ptr = CALL_ABI_TABLE[CallAbiTable::ListDir as usize];
+        let ptr = CALL_ABI_TABLE[CallTable::ListDir as usize];
         let f: ListDir = core::mem::transmute(ptr);
-        f(str, len, files, file_len)
+        f(str, len, entries, entry_count, max_entry_str_len)
     }
 }
 
@@ -394,18 +433,36 @@ pub extern "C" fn read_file(
     buf_len: usize,
 ) -> usize {
     unsafe {
-        let ptr = CALL_ABI_TABLE[CallAbiTable::ReadFile as usize];
+        let ptr = CALL_ABI_TABLE[CallTable::ReadFile as usize];
         let f: ReadFile = core::mem::transmute(ptr);
         f(str, len, read_from, buf, buf_len)
     }
 }
 
+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)]
 pub extern "C" fn file_len(str: *const u8, len: usize) -> usize {
     unsafe {
-        let ptr = CALL_ABI_TABLE[CallAbiTable::FileLen as usize];
+        let ptr = CALL_ABI_TABLE[CallTable::FileLen as usize];
         let f: FileLen = core::mem::transmute(ptr);
         f(str, len)
     }

justfile

@@ -1,5 +1,7 @@
 kernel-dev board:
-    cargo run --bin kernel --features {{board}}
+    cargo run --bin kernel --features {{board}}  --features fps
+kernel-release-probe board:
+    cargo run --bin kernel --profile release --features {{board}}  --features fps
 kernel-release board:
     cargo build --bin kernel --release --no-default-features --features {{board}}
     elf2uf2-rs -d target/thumbv8m.main-none-eabihf/release/kernel
@@ -9,6 +11,26 @@ 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
 
@@ -16,3 +38,20 @@ userapps: cbindgen
     just userapp calculator
     just userapp snake
     just userapp gallery
+    just userapp gif
+    just userapp gboy
+
+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
+
+    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,10 +12,13 @@ bench = false
 
 [features]
 default = ["rp235x", "defmt"]
-pimoroni2w = ["rp235x"]
+pimoroni2w = ["rp235x", "psram"]
-rp2040 = ["embassy-rp/rp2040"]
+# rp2040 = ["embassy-rp/rp2040"] # unsupported, ram too small for fb
 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",
@@ -70,15 +73,14 @@ panic-probe = "0.3"
 portable-atomic = { version = "1.11", features = ["critical-section"] }
 assign-resources = "0.5.0"
 
-defmt = { version = "0.3", optional = true }
+defmt = { version = "1.0.1", optional = true }
-defmt-rtt = "0.4.2"
+defmt-rtt = "1.1.0"
 
 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"
 
 strum = { version = "0.27.2", default-features = false }
 rand = { version = "0.9.0", default-features = false }
@@ -90,7 +92,9 @@ 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 = "0.6.0"
+embedded-alloc = { version = "0.6.0", features = [
+  "allocator_api",
+], optional = true }
 bumpalo = "3.19.0"
 
 abi_sys = { path = "../abi_sys" }

kernel/pimoroni2w.x

@@ -2,7 +2,7 @@ MEMORY {
     FLASH : ORIGIN = 0x10000000, LENGTH = 16M - 4K
 
     RAM : ORIGIN = 0x20000000, LENGTH = 512K
-    SRAM4 : ORIGIN = 0x20080000, LENGTH = 4K
+    # SRAM4 : ORIGIN = 0x20080000, LENGTH = 4K
     SRAM5 : ORIGIN = 0x20081000, LENGTH = 4K
 }
 

kernel/src/abi.rs

@@ -1,20 +1,57 @@
 use abi_sys::{
-    CPixel, DrawIterAbi, FileLen, GenRand, GetMsAbi, ListDir, LockDisplay, PrintAbi, ReadFile,
+    AllocAbi, CLayout, CPixel, DeallocAbi, DrawIterAbi, FileLen, GenRand, GetMsAbi, ListDir,
-    RngRequest, SleepMsAbi, keyboard::*,
+    PrintAbi, ReadFile, RngRequest, SleepMsAbi, WriteFile, keyboard::*,
 };
 use alloc::{string::ToString, vec::Vec};
-use core::sync::atomic::Ordering;
+use core::{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::{DirEntry, LfnBuffer};
+use embedded_sdmmc::LfnBuffer;
 use heapless::spsc::Queue;
 
+#[cfg(feature = "psram")]
+use crate::heap::HEAP;
+
+#[cfg(feature = "psram")]
+use core::alloc::GlobalAlloc;
+
 use crate::{
-    display::{FB_PAUSED, FRAMEBUFFER},
+    display::FRAMEBUFFER,
+    framebuffer::FB_PAUSED,
     storage::{Dir, File, SDCARD},
 };
 
+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());
+        }
+    }
+}
+
+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()) }
+    }
+
+    #[cfg(not(feature = "psram"))]
+    {
+        unsafe { alloc::alloc::dealloc(ptr, layout.into()) }
+    }
+}
+
 const _: PrintAbi = print;
 pub extern "C" fn print(ptr: *const u8, len: usize) {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
@@ -48,19 +85,16 @@ pub extern "C" fn get_ms() -> u64 {
         .as_millis()
 }
 
-const _: LockDisplay = lock_display;
-pub extern "C" fn lock_display(lock: bool) {
-    FB_PAUSED.store(lock, Ordering::Relaxed);
-}
-
 const _: DrawIterAbi = draw_iter;
-// TODO: maybe return result
 pub extern "C" fn draw_iter(cpixels: *const CPixel, len: usize) {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let cpixels = unsafe { core::slice::from_raw_parts(cpixels, len) };
 
     let iter = cpixels.iter().copied().map(|c: CPixel| c.into());
-    unsafe { FRAMEBUFFER.draw_iter(iter).unwrap() }
+
+    FB_PAUSED.store(true, Ordering::Release);
+    unsafe { FRAMEBUFFER.as_mut().unwrap().draw_iter(iter).unwrap() }
+    FB_PAUSED.store(false, Ordering::Release);
 }
 
 pub static mut KEY_CACHE: Queue<KeyEvent, 32> = Queue::new();
@@ -94,11 +128,27 @@ pub extern "C" fn gen_rand(req: &mut RngRequest) {
     }
 }
 
-fn get_dir_entries(dir: &Dir, files: &mut [Option<DirEntry>]) -> usize {
+unsafe fn copy_entry_to_user_buf(name: &[u8], dest: *mut c_char, max_str_len: usize) {
+    if !dest.is_null() {
+        let len = name.len().min(max_str_len - 1);
+        unsafe {
+            ptr::copy_nonoverlapping(name.as_ptr(), dest as *mut u8, len);
+            *dest.add(len) = 0; // nul terminator
+        }
+    }
+}
+
+unsafe fn get_dir_entries(dir: &Dir, entries: &mut [*mut c_char], max_str_len: usize) -> usize {
+    let mut b = [0; 25];
+    let mut buf = LfnBuffer::new(&mut b);
     let mut i = 0;
-    dir.iterate_dir(|entry| {
+    dir.iterate_dir_lfn(&mut buf, |entry, lfn_name| {
-        if i < files.len() {
+        if i < entries.len() {
-            files[i] = Some(entry.clone());
+            if let Some(name) = lfn_name {
+                unsafe { copy_entry_to_user_buf(name.as_bytes(), entries[i], max_str_len) };
+            } else {
+                unsafe { copy_entry_to_user_buf(entry.name.base_name(), entries[i], max_str_len) };
+            }
             i += 1;
         }
     })
@@ -106,24 +156,30 @@ fn get_dir_entries(dir: &Dir, files: &mut [Option<DirEntry>]) -> usize {
     i
 }
 
-fn recurse_dir(dir: &Dir, dirs: &[&str], files: &mut [Option<DirEntry>]) -> usize {
+unsafe fn recurse_dir(
+    dir: &Dir,
+    dirs: &[&str],
+    entries: &mut [*mut c_char],
+    max_str_len: usize,
+) -> usize {
     if dirs.is_empty() {
-        return get_dir_entries(dir, files);
+        return unsafe { get_dir_entries(dir, entries, max_str_len) };
     }
 
     let dir = dir.open_dir(dirs[0]).unwrap();
-    recurse_dir(&dir, &dirs[1..], files)
+    unsafe { recurse_dir(&dir, &dirs[1..], entries, max_str_len) }
 }
 
 const _: ListDir = list_dir;
 pub extern "C" fn list_dir(
     dir: *const u8,
     len: usize,
-    files: *mut Option<DirEntry>,
+    entries: *mut *mut c_char,
     files_len: usize,
+    max_entry_str_len: usize,
 ) -> usize {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
-    let files = unsafe { core::slice::from_raw_parts_mut(files, files_len) };
+    let files = unsafe { core::slice::from_raw_parts_mut(entries, files_len) };
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let dir = unsafe { core::str::from_raw_parts(dir, len) };
     let dirs: Vec<&str> = dir.split('/').collect();
@@ -134,10 +190,12 @@ pub extern "C" fn list_dir(
     let mut wrote = 0;
     sd.access_root_dir(|root| {
         if dirs[0] == "" && dirs.len() >= 2 {
+            unsafe {
                 if dir == "/" {
-                wrote = get_dir_entries(&root, files);
+                    wrote = get_dir_entries(&root, files, max_entry_str_len);
                 } else {
-                wrote = recurse_dir(&root, &dirs[1..], files);
+                    wrote = recurse_dir(&root, &dirs[1..], files, max_entry_str_len);
+                }
             }
         }
     });
@@ -149,6 +207,7 @@ fn recurse_file<T>(
     dirs: &[&str],
     mut access: impl FnMut(&mut File) -> T,
 ) -> Result<T, ()> {
+    defmt::info!("dir: {}, dirs: {}", dir, dirs);
     if dirs.len() == 1 {
         let mut b = [0_u8; 50];
         let mut buf = LfnBuffer::new(&mut b);
@@ -160,7 +219,8 @@ fn recurse_file<T>(
                 }
             }
         })
-        .unwrap();
+        .expect("Failed to iterate dir");
+
         if let Some(name) = short_name {
             let mut file = dir
                 .open_file_in_dir(name, embedded_sdmmc::Mode::ReadWriteAppend)
@@ -184,7 +244,17 @@ 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 file: Vec<&str> = file.split('/').collect();
+
+    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 `ptr` is valid for `len` bytes
     let mut buf = unsafe { core::slice::from_raw_parts_mut(buf, buf_len) };
 
@@ -194,8 +264,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, &file[1..], |file| {
+            if let Ok(result) = recurse_file(&root, &components[1..count], |file| {
-                file.seek_from_start(start_from as u32).unwrap();
+                file.seek_from_start(start_from as u32).unwrap_or(());
                 file.read(&mut buf).unwrap()
             }) {
                 read = result
@@ -205,9 +275,46 @@ 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 `ptr` is valid for `len` bytes
+    // SAFETY: caller guarantees str ptr is valid for `len` bytes
     let file = unsafe { core::str::from_raw_parts(str, len) };
     let file: Vec<&str> = file.split('/').collect();
 

kernel/src/display.rs

@@ -1,6 +1,6 @@
-use core::sync::atomic::{AtomicBool, Ordering};
+use crate::framebuffer::{self, AtomicFrameBuffer, FB_PAUSED};
-
+use core::alloc::{GlobalAlloc, Layout};
-use crate::framebuffer::AtomicFrameBuffer;
+use core::sync::atomic::Ordering;
 use embassy_rp::{
     Peri,
     gpio::{Level, Output},
@@ -8,9 +8,19 @@ use embassy_rp::{
     spi::{Async, Spi},
 };
 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>,
@@ -21,8 +31,27 @@ type DISPLAY = ST7365P<
 pub const SCREEN_WIDTH: usize = 320;
 pub const SCREEN_HEIGHT: usize = 320;
 
-pub static mut FRAMEBUFFER: AtomicFrameBuffer = AtomicFrameBuffer::new();
+pub static mut FRAMEBUFFER: Option<AtomicFrameBuffer> = None;
-pub static FB_PAUSED: AtomicBool = AtomicBool::new(false);
+
+fn init_fb() {
+    unsafe {
+        #[cfg(feature = "psram")]
+        {
+            let slab = 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));
+        }
+    }
+}
 
 pub async fn init_display(
     spi: Spi<'static, SPI1, Async>,
@@ -30,6 +59,8 @@ pub async fn init_display(
     data: Peri<'static, PIN_14>,
     reset: Peri<'static, PIN_15>,
 ) -> DISPLAY {
+    init_fb();
+
     let spi_device = ExclusiveDevice::new(spi, Output::new(cs, Level::Low), Delay).unwrap();
     let mut display = ST7365P::new(
         spi_device,
@@ -41,7 +72,14 @@ pub async fn init_display(
     );
     display.init().await.unwrap();
     display.set_custom_orientation(0x40).await.unwrap();
-    unsafe { FRAMEBUFFER.draw(&mut display).await.unwrap() }
+    unsafe {
+        FRAMEBUFFER
+            .as_mut()
+            .unwrap()
+            .draw(&mut display)
+            .await
+            .unwrap()
+    }
     display.set_on().await.unwrap();
 
     display
@@ -49,16 +87,37 @@ 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 {
-        if !FB_PAUSED.load(Ordering::Acquire) {
+        let start = Instant::now();
+
+        #[cfg(feature = "fps")]
         unsafe {
-                FRAMEBUFFER
+            if FPS_COUNTER.should_draw() {
-                    .partial_draw_batched(&mut display)
+                FPS_CANVAS.draw_fps().await;
-                    .await
-                    .unwrap()
             }
         }
 
-        Timer::after_millis(10).await;
+        if !FB_PAUSED.load(Ordering::Acquire) {
+            unsafe {
+                FRAMEBUFFER
+                    .as_mut()
+                    .unwrap()
+                    .partial_draw(&mut display)
+                    .await
+                    .unwrap();
+            }
+        }
+
+        let elapsed = start.elapsed().as_millis() as u64;
+        if elapsed < FRAME_TIME_MS {
+            Timer::after_millis(FRAME_TIME_MS - elapsed).await;
+        } else {
+            Timer::after_millis(1).await;
+        }
     }
 }

kernel/src/elf.rs

@@ -2,7 +2,7 @@ use crate::{
     abi,
     storage::{File, SDCARD},
 };
-use abi_sys::CallAbiTable;
+use abi_sys::CallTable;
 use abi_sys::EntryFn;
 use alloc::{vec, vec::Vec};
 use bumpalo::Bump;
@@ -194,18 +194,20 @@ fn patch_abi(
                         unsafe { base.add((sym.st_value as usize) - min_vaddr as usize) }
                             as *mut usize;
 
-                    for (idx, call) in CallAbiTable::iter().enumerate() {
+                    for (idx, call) in CallTable::iter().enumerate() {
                         let ptr = match call {
-                            CallAbiTable::PrintString => abi::print as usize,
+                            CallTable::Alloc => abi::alloc as usize,
-                            CallAbiTable::SleepMs => abi::sleep as usize,
+                            CallTable::Dealloc => abi::dealloc as usize,
-                            CallAbiTable::GetMs => abi::get_ms as usize,
+                            CallTable::PrintString => abi::print as usize,
-                            CallAbiTable::LockDisplay => abi::lock_display as usize,
+                            CallTable::SleepMs => abi::sleep as usize,
-                            CallAbiTable::DrawIter => abi::draw_iter as usize,
+                            CallTable::GetMs => abi::get_ms as usize,
-                            CallAbiTable::GetKey => abi::get_key as usize,
+                            CallTable::DrawIter => abi::draw_iter as usize,
-                            CallAbiTable::GenRand => abi::gen_rand as usize,
+                            CallTable::GetKey => abi::get_key as usize,
-                            CallAbiTable::ListDir => abi::list_dir as usize,
+                            CallTable::GenRand => abi::gen_rand as usize,
-                            CallAbiTable::ReadFile => abi::read_file as usize,
+                            CallTable::ListDir => abi::list_dir as usize,
-                            CallAbiTable::FileLen => abi::file_len as usize,
+                            CallTable::ReadFile => abi::read_file as usize,
+                            CallTable::WriteFile => abi::write_file as usize,
+                            CallTable::FileLen => abi::file_len as usize,
                         };
                         unsafe {
                             table_base.add(idx as usize).write(ptr);

kernel/src/framebuffer.rs

@@ -1,6 +1,5 @@
 use crate::display::{SCREEN_HEIGHT, SCREEN_WIDTH};
 use core::sync::atomic::{AtomicBool, Ordering};
-use embassy_sync::lazy_lock::LazyLock;
 use embedded_graphics::{
     draw_target::DrawTarget,
     pixelcolor::{
@@ -12,34 +11,38 @@ use embedded_graphics::{
 };
 use embedded_hal_2::digital::OutputPin;
 use embedded_hal_async::{delay::DelayNs, spi::SpiDevice};
-use heapless::Vec;
 use st7365p_lcd::ST7365P;
 
-pub const TILE_SIZE: usize = 16; // 16x16 tile
+#[cfg(feature = "fps")]
-pub const TILE_COUNT: usize = (SCREEN_WIDTH / TILE_SIZE) * (SCREEN_HEIGHT / TILE_SIZE); // 400 tiles
+use fps::{FPS_CANVAS, FPS_CANVAS_HEIGHT, FPS_CANVAS_WIDTH, FPS_CANVAS_X, FPS_CANVAS_Y};
 
-// Group of tiles for batching
+const TILE_SIZE: usize = 16; // 16x16 tile
-pub const MAX_META_TILES: usize = SCREEN_WIDTH / TILE_SIZE; // max number of meta tiles in buffer
+const TILE_COUNT: usize = (SCREEN_WIDTH / TILE_SIZE) * (SCREEN_HEIGHT / TILE_SIZE); // 400 tiles
-type MetaTileVec = heapless::Vec<Rectangle, { TILE_COUNT / MAX_META_TILES }>;
+const NUM_TILE_ROWS: usize = SCREEN_WIDTH / TILE_SIZE;
+const NUM_TILE_COLS: usize = SCREEN_WIDTH / TILE_SIZE;
 
-const SIZE: usize = SCREEN_HEIGHT * SCREEN_WIDTH;
+const MAX_BATCH_TILES: usize = (SCREEN_WIDTH / TILE_SIZE) * 2;
+type BatchTileBuf = [u16; MAX_BATCH_TILES * TILE_SIZE * TILE_SIZE];
 
-static mut BUFFER: [u16; SIZE] = [0; SIZE];
+pub const SIZE: usize = SCREEN_HEIGHT * SCREEN_WIDTH;
 
-static mut DIRTY_TILES: LazyLock<heapless::Vec<AtomicBool, TILE_COUNT>> = LazyLock::new(|| {
+pub static FB_PAUSED: AtomicBool = AtomicBool::new(false);
-    let mut tiles = Vec::new();
-    for _ in 0..TILE_COUNT {
-        tiles.push(AtomicBool::new(true)).unwrap();
-    }
-    tiles
-});
 
 #[allow(dead_code)]
-pub struct AtomicFrameBuffer;
+pub struct AtomicFrameBuffer<'a> {
+    fb: &'a mut [u16],
+    dirty_tiles: [AtomicBool; TILE_COUNT],
+    batch_tile_buf: BatchTileBuf,
+}
 
-impl AtomicFrameBuffer {
+impl<'a> AtomicFrameBuffer<'a> {
-    pub const fn new() -> Self {
+    pub fn new(buffer: &'a mut [u16]) -> Self {
-        Self
+        assert!(buffer.len() == SIZE);
+        Self {
+            fb: buffer,
+            dirty_tiles: core::array::from_fn(|_| AtomicBool::new(true)),
+            batch_tile_buf: [0; MAX_BATCH_TILES * TILE_SIZE * TILE_SIZE],
+        }
     }
 
     fn mark_tiles_dirty(&mut self, rect: Rectangle) {
@@ -52,18 +55,12 @@ impl AtomicFrameBuffer {
         for ty in start_ty..=end_ty {
             for tx in start_tx..=end_tx {
                 let tile_idx = ty * tiles_x + tx;
-                unsafe { DIRTY_TILES.get_mut()[tile_idx].store(true, Ordering::Relaxed) };
+                self.dirty_tiles[tile_idx].store(true, Ordering::Release);
             }
         }
     }
 
-    fn set_pixel(&mut self, x: u16, y: u16, color: u16) -> Result<(), ()> {
+    fn set_pixels<P: IntoIterator<Item = u16>>(
-        unsafe { BUFFER[(y as usize * SCREEN_WIDTH) + x as usize] = color };
-
-        Ok(())
-    }
-
-    fn set_pixels_buffered<P: IntoIterator<Item = u16>>(
         &mut self,
         sx: u16,
         sy: u16,
@@ -84,7 +81,7 @@ impl AtomicFrameBuffer {
         for y in sy..=ey {
             for x in sx..=ex {
                 if let Some(color) = color_iter.next() {
-                    unsafe { BUFFER[(y as usize * SCREEN_WIDTH) + x as usize] = color };
+                    self.fb[(y as usize * SCREEN_WIDTH) + x as usize] = color;
                 } else {
                     return Err(()); // Not enough data
                 }
@@ -99,60 +96,17 @@ impl AtomicFrameBuffer {
         Ok(())
     }
 
-    // walk the dirty tiles and mark groups of tiles(meta-tiles) for batched updates
+    // Checks if a full draw would be faster than individual tile batches
-    fn find_meta_tiles(&mut self, tiles_x: usize, tiles_y: usize) -> MetaTileVec {
+    fn should_full_draw(&self) -> bool {
-        let mut meta_tiles: MetaTileVec = heapless::Vec::new();
+        let threshold_pixels = SIZE * 80 / 100;
+        let mut dirty_pixels = 0;
 
-        for ty in 0..tiles_y {
+        self.dirty_tiles.iter().any(|tile| {
-            let mut tx = 0;
+            if tile.load(Ordering::Acquire) {
-            while tx < tiles_x {
+                dirty_pixels += TILE_SIZE * TILE_SIZE;
-                let idx = ty * tiles_x + tx;
-                if !unsafe { DIRTY_TILES.get()[idx].load(Ordering::Acquire) } {
-                    tx += 1;
-                    continue;
             }
-
+            dirty_pixels >= threshold_pixels
-                // Start meta-tile at this tile
+        })
-                let mut width_tiles = 1;
-                let height_tiles = 1;
-
-                // Grow horizontally, but keep under MAX_TILES_PER_METATILE
-                while tx + width_tiles < tiles_x
-                    && unsafe {
-                        DIRTY_TILES.get()[ty * tiles_x + tx + width_tiles].load(Ordering::Relaxed)
-                    }
-                    && (width_tiles + height_tiles) <= MAX_META_TILES
-                {
-                    width_tiles += 1;
-                }
-
-                // TODO: for simplicity, skipped vertical growth
-
-                for x_off in 0..width_tiles {
-                    unsafe {
-                        DIRTY_TILES.get()[ty * tiles_x + tx + x_off]
-                            .store(false, Ordering::Release);
-                    };
-                }
-
-                // new meta-tile pos
-                let rect = Rectangle::new(
-                    Point::new((tx * TILE_SIZE) as i32, (ty * TILE_SIZE) as i32),
-                    Size::new(
-                        (width_tiles * TILE_SIZE) as u32,
-                        (height_tiles * TILE_SIZE) as u32,
-                    ),
-                );
-
-                if meta_tiles.push(rect).is_err() {
-                    return meta_tiles;
-                };
-
-                tx += width_tiles;
-            }
-        }
-
-        meta_tiles
     }
 
     /// Sends the entire framebuffer to the display
@@ -171,21 +125,105 @@ impl AtomicFrameBuffer {
                 0,
                 self.size().width as u16 - 1,
                 self.size().height as u16 - 1,
-                unsafe { &BUFFER },
+                &self.fb[..],
             )
             .await?;
 
-        unsafe {
+        for tile in self.dirty_tiles.iter() {
-            for tile in DIRTY_TILES.get_mut().iter() {
             tile.store(false, Ordering::Release);
         }
-        };
+
+        #[cfg(feature = "fps")]
+        unsafe {
+            crate::display::FPS_COUNTER.measure()
+        }
 
         Ok(())
     }
 
-    /// Sends only dirty tiles (16x16px) in batches to the display
+    // used when doing a full screen refresh fps must be drawn into fb
-    pub async fn partial_draw_batched<SPI, DC, RST, DELAY>(
+    // 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,
+        tile_x: u16,
+        tile_y: u16,
+        total_tiles: u16, // number of tiles being written to buf
+    ) {
+        debug_assert!(total_tiles as usize <= NUM_TILE_COLS);
+        for batch_row_num in 0..TILE_SIZE {
+            let batch_row_offset = batch_row_num * total_tiles as usize * TILE_SIZE;
+            let batch_row = &mut self.batch_tile_buf
+                [batch_row_offset..batch_row_offset + (total_tiles as usize * TILE_SIZE)];
+
+            let fb_row_offset = (tile_y as usize * TILE_SIZE + batch_row_num) * SCREEN_WIDTH
+                + tile_x as usize * TILE_SIZE;
+            let fb_row =
+                &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]
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Pushes tiles to the display in batches to avoid full frame pushes (unless needed)
+    pub async fn partial_draw<SPI, DC, RST, DELAY>(
         &mut self,
         display: &mut ST7365P<SPI, DC, RST, DELAY>,
     ) -> Result<(), ()>
@@ -195,65 +233,82 @@ impl AtomicFrameBuffer {
         RST: OutputPin,
         DELAY: DelayNs,
     {
-        if unsafe { DIRTY_TILES.get().iter().any(|p| p.load(Ordering::Acquire)) } {
+        if self.should_full_draw() {
-            let tiles_x = (SCREEN_WIDTH + TILE_SIZE - 1) / TILE_SIZE;
+            #[cfg(feature = "fps")]
-            let tiles_y = (SCREEN_HEIGHT + TILE_SIZE - 1) / TILE_SIZE;
+            self.draw_fps_into_fb();
-
+            return self.draw(display).await;
-            let meta_tiles = self.find_meta_tiles(tiles_x, tiles_y);
-
-            // buffer for copying meta tiles before sending to display
-            let mut pixel_buffer: heapless::Vec<u16, { MAX_META_TILES * TILE_SIZE * TILE_SIZE }> =
-                Vec::new();
-
-            for rect in meta_tiles {
-                let rect_width = rect.size.width as usize;
-                let rect_height = rect.size.height as usize;
-                let rect_x = rect.top_left.x as usize;
-                let rect_y = rect.top_left.y as usize;
-
-                pixel_buffer.clear();
-
-                for row in 0..rect_height {
-                    let y = rect_y + row;
-                    let start = y * SCREEN_WIDTH + rect_x;
-                    let end = start + rect_width;
-
-                    // Safe: we guarantee buffer will not exceed MAX_META_TILE_PIXELS
-                    pixel_buffer
-                        .extend_from_slice(unsafe { &BUFFER[start..end] })
-                        .unwrap();
         }
 
+        #[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;
+
+            while col < NUM_TILE_COLS {
+                // Check for dirty tile
+                if self.dirty_tiles[row_start_idx + col].swap(false, Ordering::Acquire) {
+                    let run_start = col;
+                    let mut run_len = 1;
+
+                    // Extend run while contiguous dirty tiles and within MAX_BATCH_TILES
+                    while col + 1 < NUM_TILE_COLS
+                        && self.dirty_tiles[row_start_idx + col + 1].load(Ordering::Acquire)
+                        && run_len < MAX_BATCH_TILES
+                    {
+                        col += 1;
+                        run_len += 1;
+                    }
+
+                    // Copy the whole horizontal run into the batch buffer in one call
+                    let tile_x = run_start;
+                    let tile_y = tile_row;
+                    self.append_tiles_to_batch(tile_x as u16, tile_y as u16, run_len as u16);
+
+                    // Compute coordinates for display write
+                    let start_x = tile_x * TILE_SIZE;
+                    let end_x = start_x + run_len * TILE_SIZE - 1;
+                    let start_y = tile_y * TILE_SIZE;
+                    let end_y = start_y + TILE_SIZE - 1;
+
+                    // Send batch to display
                     display
                         .set_pixels_buffered(
-                        rect_x as u16,
+                            start_x as u16,
-                        rect_y as u16,
+                            start_y as u16,
-                        (rect_x + rect_width - 1) as u16,
+                            end_x as u16,
-                        (rect_y + rect_height - 1) as u16,
+                            end_y as u16,
-                        &pixel_buffer,
+                            &self.batch_tile_buf[..run_len * TILE_SIZE * TILE_SIZE],
                         )
                         .await?;
+                }
 
-                // walk the meta-tile and set as clean
+                col += 1;
-                let start_tx = rect_x / TILE_SIZE;
+            }
-                let start_ty = rect_y / TILE_SIZE;
+        }
-                let end_tx = (rect_x + rect_width - 1) / TILE_SIZE;
-                let end_ty = (rect_y + rect_height - 1) / TILE_SIZE;
 
-                for ty in start_ty..=end_ty {
+        #[cfg(feature = "fps")]
-                    for tx in start_tx..=end_tx {
+        unsafe {
-                        let tile_idx = ty * tiles_x + tx;
+            crate::display::FPS_COUNTER.measure()
-                        unsafe { DIRTY_TILES.get_mut()[tile_idx].store(false, Ordering::Release) };
-                    }
-                }
-            }
         }
 
         Ok(())
     }
 }
 
-impl DrawTarget for AtomicFrameBuffer {
+impl<'a> DrawTarget for AtomicFrameBuffer<'a> {
     type Error = ();
     type Color = Rgb565;
 
@@ -262,17 +317,20 @@ impl DrawTarget for AtomicFrameBuffer {
         I: IntoIterator<Item = Pixel<Self::Color>>,
     {
         let mut dirty_rect: Option<Rectangle> = None;
+        let mut changed = false;
 
         for Pixel(coord, color) in pixels {
             if coord.x >= 0 && coord.y >= 0 {
-                let x = coord.x as i32;
+                let x = coord.x;
-                let y = coord.y as i32;
+                let y = coord.y;
 
                 if (x as usize) < SCREEN_WIDTH && (y as usize) < SCREEN_HEIGHT {
-                    unsafe {
+                    let idx = (y as usize) * SCREEN_WIDTH + (x as usize);
-                        BUFFER[(y as usize) * SCREEN_WIDTH + (x as usize)] =
+                    let raw_color = RawU16::from(color).into_inner();
-                            RawU16::from(color).into_inner()
+                    if self.fb[idx] != raw_color {
-                    };
+                        self.fb[idx] = raw_color;
+                        changed = true;
+                    }
 
                     if let Some(ref mut rect) = dirty_rect {
                         rect.top_left.x = rect.top_left.x.min(x);
@@ -288,9 +346,11 @@ impl DrawTarget for AtomicFrameBuffer {
             }
         }
 
+        if changed {
             if let Some(rect) = dirty_rect {
                 self.mark_tiles_dirty(rect);
             }
+        }
 
         Ok(())
     }
@@ -307,6 +367,7 @@ impl DrawTarget for AtomicFrameBuffer {
             let area_width = area.size.width;
             let area_height = area.size.height;
             let mut colors = colors.into_iter();
+            let mut changed = false;
 
             for y in 0..area_height {
                 for x in 0..area_width {
@@ -314,11 +375,12 @@ impl DrawTarget for AtomicFrameBuffer {
 
                     if drawable_area.contains(p) {
                         if let Some(color) = colors.next() {
-                            self.set_pixel(
+                            let idx = (p.y as usize * SCREEN_WIDTH) + (p.x as usize);
-                                p.x as u16,
+                            let raw_color = RawU16::from(color).into_inner();
-                                p.y as u16,
+                            if self.fb[idx] != raw_color {
-                                RawU16::from(color).into_inner(),
+                                self.fb[idx] = raw_color;
-                            )?;
+                                changed = true;
+                            }
                         } else {
                             break;
                         }
@@ -329,8 +391,10 @@ impl DrawTarget for AtomicFrameBuffer {
                 }
             }
 
+            if changed {
                 self.mark_tiles_dirty(*area);
             }
+        }
 
         Ok(())
     }
@@ -343,7 +407,7 @@ impl DrawTarget for AtomicFrameBuffer {
     }
 
     fn clear(&mut self, color: Self::Color) -> Result<(), Self::Error> {
-        self.set_pixels_buffered(
+        self.set_pixels(
             0,
             0,
             self.size().width as u16 - 1,
@@ -352,7 +416,7 @@ impl DrawTarget for AtomicFrameBuffer {
                 .take((self.size().width * self.size().height) as usize),
         )?;
 
-        for tile in unsafe { DIRTY_TILES.get_mut() }.iter() {
+        for tile in self.dirty_tiles.iter() {
             tile.store(true, Ordering::Release);
         }
 
@@ -360,8 +424,151 @@ impl DrawTarget for AtomicFrameBuffer {
     }
 }
 
-impl OriginDimensions for AtomicFrameBuffer {
+impl<'a> OriginDimensions for AtomicFrameBuffer<'a> {
     fn size(&self) -> Size {
         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/heap.rs

@@ -2,14 +2,10 @@
 // https://github.com/wezterm/picocalc-wezterm/blob/main/src/heap.rs
 
 use core::alloc::{GlobalAlloc, Layout};
-use core::mem::MaybeUninit;
 use core::sync::atomic::{AtomicUsize, Ordering};
 use embedded_alloc::LlffHeap as Heap;
 
-#[global_allocator]
+pub static mut HEAP: PsramHeap = PsramHeap::empty();
-pub static HEAP: DualHeap = DualHeap::empty();
-const HEAP_SIZE: usize = 64 * 1024;
-static mut HEAP_MEM: [MaybeUninit<u8>; HEAP_SIZE] = [MaybeUninit::uninit(); HEAP_SIZE];
 
 struct Region {
     start: AtomicUsize,
@@ -38,95 +34,62 @@ impl Region {
     }
 }
 
-/// This is an allocator that combines two regions of memory.
-/// The intent is to use some of the directly connected RAM
-/// for this, and if we find some XIP capable PSRAM, add that
-/// as a secondary region.
-/// Allocation from the primary region is always preferred,
-/// as it is expected to be a bit faster than PSRAM.
 /// FIXME: PSRAM-allocated memory isn't compatible with
 /// CAS atomics, so we might need a bit of a think about this!
-pub struct DualHeap {
+pub struct PsramHeap {
-    primary: Heap,
+    heap: Heap,
-    primary_region: Region,
+    region: Region,
-    secondary: Heap,
 }
 
-impl DualHeap {
+impl PsramHeap {
     pub const fn empty() -> Self {
         Self {
-            primary: Heap::empty(),
+            heap: Heap::empty(),
-            primary_region: Region::default(),
+            region: Region::default(),
-            secondary: Heap::empty(),
         }
     }
 
-    unsafe fn add_primary(&self, region: Region) {
+    unsafe fn add_psram(&self, region: Region) {
         let start = region.start.load(Ordering::SeqCst);
         let size = region.size.load(Ordering::SeqCst);
         unsafe {
-            self.primary.init(start, size);
+            self.heap.init(start, size);
-        }
-        self.primary_region.start.store(start, Ordering::SeqCst);
-        self.primary_region.size.store(size, Ordering::SeqCst);
-    }
-
-    unsafe fn add_secondary(&self, region: Region) {
-        let start = region.start.load(Ordering::SeqCst);
-        let size = region.size.load(Ordering::SeqCst);
-        unsafe {
-            self.secondary.init(start, size);
         }
+        self.region.start.store(start, Ordering::SeqCst);
+        self.region.size.store(size, Ordering::SeqCst);
     }
 
     pub fn used(&self) -> usize {
-        self.primary.used() + self.secondary.used()
+        self.heap.used()
     }
 
     pub fn free(&self) -> usize {
-        self.primary.free() + self.secondary.free()
+        self.heap.free()
     }
 }
 
-unsafe impl GlobalAlloc for DualHeap {
+unsafe impl GlobalAlloc for PsramHeap {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         unsafe {
-            let ptr = self.primary.alloc(layout);
+            let ptr = self.heap.alloc(layout);
             if !ptr.is_null() {
                 return ptr;
+            } else {
+                panic!("HEAP FULL");
             }
-            // start using secondary area when primary heap is full
-            self.secondary.alloc(layout)
         }
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
         unsafe {
             let ptr_usize = ptr as usize;
-            if self.primary_region.contains(ptr_usize) {
+            if self.region.contains(ptr_usize) {
-                self.primary.dealloc(ptr, layout);
+                self.heap.dealloc(ptr, layout);
-            } else {
-                self.secondary.dealloc(ptr, layout);
             }
         }
     }
 }
 
-pub fn init_heap() {
-    let primary_start = &raw mut HEAP_MEM as usize;
-    unsafe { HEAP.add_primary(Region::new(primary_start, HEAP_SIZE)) }
-}
-
 pub fn init_qmi_psram_heap(size: u32) {
-    unsafe { HEAP.add_secondary(Region::new(0x11000000, size as usize)) }
+    unsafe { HEAP.add_psram(Region::new(0x11000000, size as usize)) }
-}
-
-pub async fn free_command(_args: &[&str]) {
-    let ram_used = HEAP.primary.used();
-    let ram_free = HEAP.primary.free();
-    let ram_total = ram_used + ram_free;
-
-    let qmi_used = HEAP.secondary.used();
-    let qmi_free = HEAP.secondary.free();
-    let qmi_total = qmi_used + qmi_free;
 }

kernel/src/main.rs

@@ -3,6 +3,8 @@
 #![cfg_attr(not(test), no_std)]
 #![cfg_attr(not(test), no_main)]
 #![allow(static_mut_refs)]
+#![feature(allocator_api)]
+#![feature(slice_ptr_get)]
 
 extern crate alloc;
 
@@ -10,18 +12,22 @@ mod abi;
 mod display;
 mod elf;
 mod framebuffer;
-#[cfg(feature = "pimoroni2w")]
-mod heap;
 mod peripherals;
-mod psram;
 mod scsi;
 mod storage;
 mod ui;
 mod usb;
 mod utils;
 
-#[cfg(feature = "pimoroni2w")]
+#[cfg(feature = "psram")]
-use crate::{heap::init_qmi_psram_heap, psram::init_psram_qmi};
+#[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};
 
 use crate::{
     abi::{KEY_CACHE, MS_SINCE_LAUNCH},
@@ -30,45 +36,45 @@ use crate::{
         conf_peripherals,
         keyboard::{KeyState, read_keyboard_fifo},
     },
-    psram::init_psram,
     scsi::MSC_SHUTDOWN,
     storage::{SDCARD, SdCard},
     ui::{SELECTIONS, clear_selection, ui_handler},
 };
 use abi_sys::EntryFn;
 use bumpalo::Bump;
-use embedded_graphics::{
-    pixelcolor::Rgb565,
-    prelude::{DrawTarget, RgbColor},
-};
-
-use {defmt_rtt as _, panic_probe as _};
-
 use core::sync::atomic::{AtomicBool, Ordering};
 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,
-        PIO0, SPI0, SPI1, USB,
+        PIO0, SPI0, SPI1, USB, WATCHDOG,
     },
     pio,
     spi::{self, Spi},
     usb as embassy_rp_usb,
+    watchdog::{ResetReason, Watchdog},
 };
 use embassy_sync::{
     blocking_mutex::raw::CriticalSectionRawMutex, channel::Channel, signal::Signal,
 };
-use embassy_time::{Delay, Instant, Timer};
+use embassy_time::{Delay, Duration, Instant, Ticker, Timer};
+use embedded_graphics::{
+    pixelcolor::Rgb565,
+    prelude::{DrawTarget, RgbColor},
+};
 use embedded_hal_bus::spi::ExclusiveDevice;
 use embedded_sdmmc::SdCard as SdmmcSdCard;
 use static_cell::StaticCell;
 use talc::*;
+use {defmt_rtt as _, panic_probe as _};
 
 embassy_rp::bind_interrupts!(struct Irqs {
     I2C1_IRQ => i2c::InterruptHandler<I2C1>;
@@ -81,20 +87,47 @@ static EXECUTOR0: StaticCell<Executor> = StaticCell::new();
 static EXECUTOR1: StaticCell<Executor> = StaticCell::new();
 
 #[cfg(not(feature = "pimoroni2w"))]
-static mut ARENA: [u8; 200 * 1024] = [0; 200 * 1024];
+static mut ARENA: [u8; 250 * 1024] = [0; 250 * 1024];
+#[cfg(feature = "pimoroni2w")]
+static mut ARENA: [u8; 400 * 1024] = [0; 400 * 1024];
 
-#[cfg(not(feature = "pimoroni2w"))]
 #[global_allocator]
 static ALLOCATOR: Talck<spin::Mutex<()>, ClaimOnOom> =
     Talc::new(unsafe { ClaimOnOom::new(Span::from_array(core::ptr::addr_of!(ARENA).cast_mut())) })
         .lock();
 
+#[embassy_executor::task]
+async fn watchdog_task(mut watchdog: Watchdog) {
+    if let Some(reason) = watchdog.reset_reason() {
+        let _reason = match reason {
+            ResetReason::Forced => "forced",
+            ResetReason::TimedOut => "timed out",
+        };
+        #[cfg(feature = "debug")]
+        defmt::error!("Watchdog reset reason: {}", _reason);
+    }
+
+    watchdog.start(Duration::from_secs(3));
+
+    let mut ticker = Ticker::every(Duration::from_secs(2));
+    loop {
+        watchdog.feed();
+        ticker.next().await;
+    }
+}
+
 static ENABLE_UI: AtomicBool = AtomicBool::new(true);
 static UI_CHANGE: Signal<CriticalSectionRawMutex, ()> = Signal::new();
 
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = embassy_rp::init(Default::default());
+    let p = if cfg!(feature = "overclock") {
+        let clocks = ClockConfig::system_freq(300_000_000).unwrap();
+        let config = Config::new(clocks);
+        embassy_rp::init(config)
+    } else {
+        embassy_rp::init(Default::default())
+    };
 
     spawn_core1(
         p.CORE1,
@@ -141,7 +174,9 @@ async fn main(_spawner: Spawner) {
     let executor0 = EXECUTOR0.init(Executor::new());
     executor0.run(|spawner| {
         spawner
-            .spawn(kernel_task(spawner, display, sd, psram, mcu, p.USB))
+            .spawn(kernel_task(
+                spawner, p.WATCHDOG, display, sd, psram, mcu, p.USB,
+            ))
             .unwrap()
     });
 }
@@ -175,7 +210,7 @@ async fn userland_task() {
         {
             ENABLE_UI.store(true, Ordering::Release);
             UI_CHANGE.signal(());
-            unsafe { FRAMEBUFFER.clear(Rgb565::BLACK).unwrap() };
+            unsafe { FRAMEBUFFER.as_mut().unwrap().clear(Rgb565::BLACK).unwrap() };
 
             let mut selections = SELECTIONS.lock().await;
             selections.set_changed(true);
@@ -202,6 +237,7 @@ struct Sd {
     cs: Peri<'static, PIN_17>,
     det: Peri<'static, PIN_22>,
 }
+#[allow(dead_code)]
 struct Psram {
     pio: Peri<'static, PIO0>,
     sclk: Peri<'static, PIN_21>,
@@ -227,7 +263,7 @@ async fn setup_mcu(mcu: Mcu) {
 
 async fn setup_display(display: Display, spawner: Spawner) {
     let mut config = spi::Config::default();
-    config.frequency = 16_000_000;
+    config.frequency = 192_000_000;
     let spi = Spi::new(
         display.spi,
         display.clk,
@@ -241,26 +277,36 @@ async fn setup_display(display: Display, spawner: Spawner) {
     spawner.spawn(display_handler(display)).unwrap();
 }
 
-async fn setup_psram(psram: Psram) {
+// psram is kind of useless on the pico calc
-    let psram = init_psram(
+// ive opted to use the pimoroni with on onboard xip psram instead
-        psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
+// async fn setup_psram(psram: Psram) {
-    )
+//     let psram = init_psram(
-    .await;
+//         psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
+//     )
+//     .await;
 
-    #[cfg(feature = "defmt")]
+//     #[cfg(feature = "defmt")]
-    defmt::info!("psram size: {}", psram.size);
+//     defmt::info!("psram size: {}", psram.size);
 
-    if psram.size == 0 {
+//     if psram.size == 0 {
-        #[cfg(feature = "defmt")]
+//         #[cfg(feature = "defmt")]
-        defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
+//         defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
-    }
+//     }
+// }
 
-    #[cfg(feature = "pimoroni2w")]
+#[cfg(feature = "psram")]
-    {
+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);
+    #[cfg(feature = "debug")]
+    defmt::info!("size:  {}", psram_qmi_size);
+    Timer::after_millis(100).await;
+
     if psram_qmi_size > 0 {
         init_qmi_psram_heap(psram_qmi_size);
-        }
+        return;
+    } else {
+        panic!("qmi psram not initialized");
     }
 }
 
@@ -282,16 +328,32 @@ async fn setup_sd(sd: Sd) {
 #[embassy_executor::task]
 async fn kernel_task(
     spawner: Spawner,
+    watchdog: Peri<'static, WATCHDOG>,
     display: Display,
     sd: Sd,
-    psram: Psram,
+    _psram: Psram,
     mcu: Mcu,
     usb: Peri<'static, USB>,
 ) {
+    spawner
+        .spawn(watchdog_task(Watchdog::new(watchdog)))
+        .unwrap();
+
+    #[cfg(feature = "debug")]
+    defmt::info!("Clock: {}", embassy_rp::clocks::clk_sys_freq());
+
     setup_mcu(mcu).await;
-    Timer::after_millis(250).await;
+
+    #[cfg(feature = "defmt")]
+    defmt::info!("setting up psram");
+    Timer::after_millis(100).await;
+
+    // setup_psram(psram).await;
+    #[cfg(feature = "psram")]
+    setup_qmi_psram().await;
+
+    Timer::after_millis(100).await;
     setup_display(display, spawner).await;
-    setup_psram(psram).await;
     setup_sd(sd).await;
 
     let _usb = embassy_rp_usb::Driver::new(usb, Irqs);
@@ -313,7 +375,8 @@ async fn prog_search_handler() {
             let mut guard = SDCARD.get().lock().await;
             let sd = guard.as_mut().unwrap();
 
-            let files = sd.list_files_by_extension(".bin").unwrap();
+            let mut files = sd.list_files_by_extension(".bin").unwrap();
+            files.sort();
             let mut select = SELECTIONS.lock().await;
 
             if *select.selections() != files {
@@ -328,12 +391,10 @@ 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/psram.rs

@@ -526,16 +526,11 @@ pub fn init_psram_qmi(
     let psram_size = detect_psram_qmi(qmi);
 
     if psram_size == 0 {
+        #[cfg(feature = "debug")]
+        defmt::error!("qmi psram size 0");
         return 0;
     }
 
-    // Set PSRAM timing for APS6404
-    //
-    // Using an rxdelay equal to the divisor isn't enough when running the APS6404 close to 133MHz.
-    // So: don't allow running at divisor 1 above 100MHz (because delay of 2 would be too late),
-    // and add an extra 1 to the rxdelay if the divided clock is > 100MHz (i.e. sys clock > 200MHz).
-    const MAX_PSRAM_FREQ: u32 = 133_000_000;
-
     let clock_hz = clk_peri_freq();
 
     let mut divisor: u32 = (clock_hz + MAX_PSRAM_FREQ - 1) / MAX_PSRAM_FREQ;
@@ -554,13 +549,13 @@ pub fn init_psram_qmi(
     let min_deselect: u32 = ((18 * 1_000_000 + (clock_period_fs - 1)) / clock_period_fs
         - u64::from(divisor + 1) / 2) as u32;
 
-    #[cfg(feature = "defmt")]
+    // #[cfg(feature = "defmt")]
-    defmt::info!(
+    // defmt::info!(
-        "clock_period_fs={} max_select={} min_deselect={}",
+    //     "clock_period_fs={} max_select={} min_deselect={}",
-        clock_period_fs,
+    //     clock_period_fs,
-        max_select,
+    //     max_select,
-        min_deselect
+    //     min_deselect
-    );
+    // );
 
     qmi.direct_csr().write(|w| {
         w.set_clkdiv(10);

kernel/src/storage.rs

@@ -35,12 +35,24 @@ impl TimeSource for DummyTimeSource {
     }
 }
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 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

@@ -1,9 +1,6 @@
 use crate::{
-    BINARY_CH,
+    BINARY_CH, display::FRAMEBUFFER, elf::load_binary, framebuffer::FB_PAUSED,
-    display::{FB_PAUSED, FRAMEBUFFER},
+    peripherals::keyboard, storage::FileName,
-    elf::load_binary,
-    peripherals::keyboard,
-    storage::FileName,
 };
 use abi_sys::keyboard::{KeyCode, KeyState};
 use alloc::{str::FromStr, string::String, vec::Vec};
@@ -71,17 +68,17 @@ pub async fn clear_selection() {
     if let Some(area) = sel.last_bounds {
         Rectangle::new(area.top_left, area.size)
             .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
-            .draw(unsafe { &mut FRAMEBUFFER })
+            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
             .unwrap();
     }
 }
 
 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.bounding_box() };
+    let display_area = unsafe { FRAMEBUFFER.as_mut().unwrap().bounding_box() };
 
     const NO_BINS: &str = "No Programs found on SD Card. Ensure programs end with '.bin', and are located in the root directory";
     let no_bins = String::from_str(NO_BINS).unwrap();
@@ -97,12 +94,12 @@ async fn draw_selection() {
             ),
             text_style,
         )
-        .draw(unsafe { &mut FRAMEBUFFER })
+        .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
         .unwrap();
     } 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));
         }
 
@@ -122,12 +119,14 @@ async fn draw_selection() {
             .bounding_box();
         Rectangle::new(selected_bounds.top_left, selected_bounds.size)
             .into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
-            .draw(unsafe { &mut FRAMEBUFFER })
+            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
             .unwrap();
 
         guard.last_bounds = Some(layout.bounds());
 
-        layout.draw(unsafe { &mut FRAMEBUFFER }).unwrap();
+        layout
+            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
+            .unwrap();
     }
 
     guard.changed = false;

selection_ui/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "selection_ui"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+abi = { path = "../abi" }
+embedded-graphics = "0.8.1"
+embedded-layout = "0.4.2"
+embedded-text = "0.7.3"

selection_ui/src/lib.rs

@@ -0,0 +1,148 @@
+#![no_std]
+
+extern crate alloc;
+
+use abi::{
+    display::Display,
+    get_key,
+    keyboard::{KeyCode, KeyState},
+};
+use alloc::vec::Vec;
+use embedded_graphics::{
+    Drawable,
+    mono_font::{MonoTextStyle, ascii::FONT_10X20},
+    pixelcolor::Rgb565,
+    prelude::{Dimensions, DrawTarget, Point, Primitive, RgbColor},
+    primitives::{PrimitiveStyle, Rectangle},
+    text::{Alignment, Text, renderer::TextRenderer},
+};
+use embedded_layout::{
+    align::{horizontal, vertical},
+    layout::linear::{FixedMargin, LinearLayout},
+    prelude::*,
+};
+
+#[derive(Debug)]
+pub enum SelectionUiError<DisplayError> {
+    SelectionListEmpty,
+    DisplayError(DisplayError),
+}
+
+pub struct SelectionUi<'a> {
+    selection: usize,
+    items: &'a [&'a str],
+    last_bounds: Option<Rectangle>,
+}
+
+impl<'a> SelectionUi<'a> {
+    pub fn new(items: &'a [&'a str]) -> Self {
+        Self {
+            selection: 0,
+            items,
+            last_bounds: None,
+        }
+    }
+
+    pub fn run_selection_ui(
+        &mut self,
+        display: &mut Display,
+    ) -> Result<Option<usize>, SelectionUiError<<Display as DrawTarget>::Error>> {
+        self.draw(display)?;
+        let selection;
+        loop {
+            let key = get_key();
+            if key.state == KeyState::Pressed {
+                if let Some(s) = self.update(display, key.key)? {
+                    selection = Some(s);
+                    display
+                        .clear(Rgb565::BLACK)
+                        .map_err(|e| SelectionUiError::DisplayError(e))?;
+                    break;
+                }
+            }
+        }
+        Ok(selection)
+    }
+
+    /// 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>> {
+        match key {
+            KeyCode::Down => {
+                self.selection = (self.selection + 1).min(self.items.len() - 1);
+            }
+            KeyCode::Up => {
+                self.selection = self.selection.saturating_sub(1);
+            }
+            KeyCode::Enter | KeyCode::Right => return Ok(Some(self.selection)),
+            _ => return Ok(None),
+        };
+        self.draw(display)?;
+        Ok(None)
+    }
+
+    fn draw(
+        &mut self,
+        display: &mut Display,
+    ) -> Result<(), SelectionUiError<<Display as DrawTarget>::Error>> {
+        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))
+                .draw(display)
+                .map_err(|e| SelectionUiError::DisplayError(e))?;
+        }
+
+        let mut views: Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
+
+        for i in self.items {
+            views.push(Text::new(i, Point::zero(), text_style));
+        }
+
+        let views_group = Views::new(views.as_mut_slice());
+
+        let layout = LinearLayout::vertical(views_group)
+            .with_alignment(horizontal::Center)
+            .with_spacing(FixedMargin(5))
+            .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();
+            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))?;
+
+            self.last_bounds = Some(selected_bounds);
+        }
+
+        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

@@ -3,10 +3,10 @@
 
 extern crate alloc;
 use abi::{
-    display::{Display, lock_display},
+    display::Display,
     get_key,
     keyboard::{KeyCode, KeyState},
-    print,
+    println,
 };
 use alloc::{format, string::String, vec, vec::Vec};
 use core::panic::PanicInfo;
@@ -28,11 +28,7 @@ use embedded_layout::{
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    print(&format!(
+    println!("user panic: {} @ {:?}", info.message(), info.location(),);
-        "user panic: {} @ {:?}",
-        info.message(),
-        info.location(),
-    ));
     loop {}
 }
 
@@ -42,8 +38,8 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    print("Starting Calculator app");
+    println!("Starting Calculator app");
-    let mut display = Display;
+    let mut display = Display::take().unwrap();
 
     let mut input = vec!['e', 'x', 'p', 'r', ':', ' '];
     let input_min = input.len();
@@ -62,8 +58,6 @@ pub fn main() {
 
     loop {
         if dirty {
-            lock_display(true);
-
             let style = PrimitiveStyle::with_fill(Rgb565::BLACK);
             if let Some(area) = last_area {
                 Rectangle::new(area.0.top_left, area.0.size)
@@ -107,11 +101,10 @@ pub fn main() {
             eq_layout.draw(&mut display).unwrap();
 
             dirty = false;
-            lock_display(false);
         }
 
         let event = get_key();
-        if event.state != KeyState::Idle {
+        if event.state == KeyState::Released {
             match event.key {
                 KeyCode::Char(ch) => {
                     input.push(ch);

user-apps/gallery/src/main.rs

@@ -4,13 +4,13 @@
 
 extern crate alloc;
 use abi::{
-    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH, lock_display},
+    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
-    fs::{list_dir, read_file},
+    fs::{Entries, list_dir, read_file},
     get_key,
     keyboard::{KeyCode, KeyState},
-    print,
+    println,
 };
-use alloc::{format, string::ToString};
+use alloc::{format, vec};
 use core::panic::PanicInfo;
 use embedded_graphics::{
     Drawable, image::Image, mono_font::MonoTextStyle, mono_font::ascii::FONT_6X10,
@@ -20,11 +20,7 @@ use tinybmp::Bmp;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    print(&format!(
+    println!("user panic: {} @ {:?}", info.message(), info.location());
-        "user panic: {} @ {:?}",
-        info.message(),
-        info.location(),
-    ));
     loop {}
 }
 
@@ -34,11 +30,10 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    print("Starting Gallery app");
+    println!("Starting Gallery app");
-    static mut BMP_BUF: [u8; 100_000] = [0_u8; 100_000];
+    let mut bmp_buf = vec![0_u8; 100_000];
-    let mut display = Display;
+    let mut display = Display::take().unwrap();
 
-    // Grid parameters
     let grid_cols = 3;
     let grid_rows = 3;
     let cell_width = SCREEN_WIDTH as i32 / grid_cols;
@@ -46,22 +41,21 @@ pub fn main() {
 
     let mut images_drawn = 0;
 
-    let mut files = [const { None }; 18];
+    let mut entries = Entries::new();
-    let files_num = list_dir("/images", &mut files);
+    let files_num = list_dir("/images", &mut entries);
 
-    for file in &files[2..files_num] {
+    for file in &entries.entries()[2..files_num] {
         if images_drawn >= grid_cols * grid_rows {
             break; // only draw 3x3
         }
 
-        if let Some(f) = file {
+        println!("file: {}", file);
-            print(&format!("file: {}", f.name));
+        if file.extension().unwrap_or("") == "bmp" || file.extension().unwrap_or("") == "BMP" {
-            if f.name.extension() == b"bmp" || f.name.extension() == b"BMP" {
+            let file_path = format!("/images/{}", file);
-                let file = format!("/images/{}", f.name);
 
-                let read = read_file(&file, 0, &mut unsafe { &mut BMP_BUF[..] });
+            let read = read_file(&file_path, 0, &mut &mut bmp_buf[..]);
             if read > 0 {
-                    let bmp = Bmp::from_slice(unsafe { &BMP_BUF }).expect("failed to parse bmp");
+                let bmp = Bmp::from_slice(&bmp_buf).expect("failed to parse bmp");
 
                 let row = images_drawn / grid_cols;
                 let col = images_drawn % grid_cols;
@@ -74,28 +68,20 @@ pub fn main() {
                 let x = cell_x + (cell_width - bmp_w) / 2;
                 let y = cell_y + 5; // 5px top margin
 
-                    lock_display(true);
                 Image::new(&bmp, Point::new(x, y))
                     .draw(&mut display)
                     .unwrap();
 
                 let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
                 let text_y = y + bmp_h + 2; // 2px gap under image
-                    Text::new(
+                Text::new(&file.base(), Point::new(cell_x + 2, text_y), text_style)
-                        f.name.to_string().as_str(),
-                        Point::new(cell_x + 2, text_y),
-                        text_style,
-                    )
                     .draw(&mut display)
                     .unwrap();
 
-                    lock_display(false);
-
                 images_drawn += 1;
             }
         }
     }
-    }
 
     loop {
         let event = get_key();

user-apps/gboy/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "gboy"
+version = "0.1.0"
+edition = "2024"
+
+[build-dependencies]
+bindgen = "0.71.0"
+cc = "1.2.44"
+
+[dependencies]
+abi = { path = "../../abi" }
+selection_ui = { path = "../../selection_ui" }
+embedded-graphics = "0.8.1"

user-apps/gboy/build.rs

@@ -0,0 +1,64 @@
+//! 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() {
+    bindgen();
+
+    // 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");
+}
+
+fn bindgen() {
+    let bindings = bindgen::Builder::default()
+        .header("Peanut-GB/peanut_gb.h")
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
+        .disable_nested_struct_naming()
+        .clang_arg("-I../../picolibc/newlib/libc/include/")
+        .clang_arg("-I../../picolibc/build/")
+        .use_core()
+        .generate()
+        .expect("Unable to generate bindings");
+
+    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
+    bindings
+        .write_to_file(out_path.join("bindings.rs"))
+        .expect("Couldn't write bindings!");
+
+    cc::Build::new()
+        .define("PEANUT_GB_IS_LITTLE_ENDIAN", None)
+        .define("ENABLE_LCD", None)
+        .file("peanut_gb_stub.c")
+        .include("Peanut-GB")
+        // optimization flags
+        .flag("-Ofast")
+        .flag("-fdata-sections")
+        .flag("-ffunction-sections")
+        .flag("-mcpu=cortex-m33")
+        .flag("-mthumb")
+        .flag("-g0")
+        .compile("peanut_gb");
+
+    println!("cargo:rustc-link-search=Peanut-GB");
+    println!("cargo:rustc-link-lib=peanut_gb");
+}

user-apps/gboy/peanut_gb_stub.c

@@ -0,0 +1 @@
+#include <peanut_gb.h>

user-apps/gboy/src/main.rs

@@ -0,0 +1,206 @@
+#![no_std]
+#![no_main]
+#![allow(static_mut_refs)]
+
+extern crate alloc;
+use abi::{
+    display::Display,
+    format,
+    fs::{Entries, file_len, list_dir, read_file, write_file},
+    get_key,
+    keyboard::{KeyCode, KeyState},
+    println,
+};
+use alloc::{vec, vec::Vec};
+use core::{cell::LazyCell, mem::MaybeUninit, panic::PanicInfo};
+use embedded_graphics::{
+    mono_font::{MonoTextStyle, ascii::FONT_6X10},
+    pixelcolor::Rgb565,
+    prelude::RgbColor,
+};
+use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
+
+mod peanut;
+use peanut::gb_run_frame;
+
+use crate::peanut::{
+    JOYPAD_A, JOYPAD_B, JOYPAD_DOWN, JOYPAD_LEFT, JOYPAD_RIGHT, JOYPAD_SELECT, JOYPAD_START,
+    JOYPAD_UP, gb_cart_ram_read, gb_cart_ram_write, gb_error, gb_get_rom_name, gb_get_save_size,
+    gb_init, gb_init_lcd, gb_reset, gb_rom_read, gb_s, lcd_draw_line,
+};
+
+static mut DISPLAY: LazyCell<Display> = LazyCell::new(|| Display::take().unwrap());
+
+const RAM_SIZE: usize = 32 * 1024; // largest ram size is 32k
+static mut RAM: [u8; RAM_SIZE] = [0; RAM_SIZE];
+
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    loop {}
+}
+
+#[unsafe(no_mangle)]
+pub extern "Rust" fn _start() {
+    main()
+}
+
+const GAME_PATH: &'static str = "/games/gameboy";
+
+static mut GAME_ROM: Option<Vec<u8>> = None;
+
+pub fn main() {
+    println!("Starting Gameboy app");
+
+    let mut entries = Entries::new();
+    list_dir(GAME_PATH, &mut entries);
+
+    let mut files = entries.entries();
+    files.retain(|e| {
+        let ext = e.extension().unwrap_or("");
+        ext == "gb" || ext == "GB"
+    });
+    let mut roms = files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
+    roms.sort();
+
+    let selection = {
+        let display = unsafe { &mut *DISPLAY };
+        let mut selection_ui = SelectionUi::new(&roms);
+        match selection_ui.run_selection_ui(display) {
+            Ok(maybe_sel) => maybe_sel,
+            Err(e) => match e {
+                SelectionUiError::SelectionListEmpty => {
+                    draw_text_center(
+                        display,
+                        &format!("No Roms were found in {}", GAME_PATH),
+                        MonoTextStyle::new(&FONT_6X10, Rgb565::RED),
+                    )
+                    .expect("Display Error");
+                    None
+                }
+                SelectionUiError::DisplayError(_) => panic!("Display Error"),
+            },
+        }
+    };
+
+    assert!(selection.is_some());
+
+    let file_name = format!("{}/{}", GAME_PATH, roms[selection.unwrap()]);
+    let size = file_len(&file_name);
+    unsafe { GAME_ROM = Some(vec![0_u8; size]) };
+    let read = read_file(&file_name, 0, unsafe { GAME_ROM.as_mut().unwrap() });
+    assert!(size == read);
+    println!("Rom size: {}", read);
+
+    let mut gb = MaybeUninit::<gb_s>::uninit();
+
+    let init_status = unsafe {
+        gb_init(
+            gb.as_mut_ptr(),
+            Some(gb_rom_read),
+            Some(gb_cart_ram_read),
+            Some(gb_cart_ram_write),
+            Some(gb_error),
+            core::ptr::null_mut(),
+        )
+    };
+    println!("gb init status: {}", init_status);
+
+    unsafe {
+        load_save(&mut gb.assume_init());
+    }
+
+    unsafe {
+        gb_init_lcd(gb.as_mut_ptr(), Some(lcd_draw_line));
+
+        // enable frame skip
+        // gb.assume_init().direct.set_frame_skip(!true); // active low
+    };
+
+    loop {
+        let event = get_key();
+        let button = match event.key {
+            KeyCode::Esc => {
+                unsafe { write_save(&mut gb.assume_init()) };
+                break;
+            }
+            KeyCode::Char('r') => {
+                unsafe { gb_reset(gb.as_mut_ptr()) };
+                continue;
+            }
+            KeyCode::Tab => JOYPAD_START as u8,
+            KeyCode::Del => JOYPAD_SELECT as u8,
+            KeyCode::Enter => JOYPAD_A as u8,
+            KeyCode::Backspace => JOYPAD_B as u8,
+            KeyCode::Up => JOYPAD_UP as u8,
+            KeyCode::Down => JOYPAD_DOWN as u8,
+            KeyCode::Left => JOYPAD_LEFT as u8,
+            KeyCode::Right => JOYPAD_RIGHT as u8,
+            _ => 0,
+        };
+
+        if button != 0 {
+            unsafe {
+                // bindgen incorrectly generates direct so manual manipulation is required :(
+                let direct_ptr = &mut gb.assume_init().direct as *mut _ as *mut u8;
+                let joypad_ptr = direct_ptr.add(2); // this is the joypad bitfield byte
+
+                if let KeyState::Pressed = event.state {
+                    *joypad_ptr &= !button;
+                } else if let KeyState::Released = event.state {
+                    *joypad_ptr |= button;
+                }
+
+                println!("joypad: {:b}", *joypad_ptr);
+            }
+        }
+
+        unsafe {
+            gb_run_frame(gb.as_mut_ptr());
+        }
+    }
+}
+
+unsafe fn load_save(gb: &mut gb_s) {
+    let mut buf = [0; 16];
+
+    unsafe {
+        gb_get_rom_name(gb, buf.as_mut_ptr());
+
+        let save_size = gb_get_save_size(gb);
+
+        if save_size > 0 {
+            read_file(
+                &format!(
+                    "{}/saves/{}.sav",
+                    GAME_PATH,
+                    str::from_utf8(&buf).expect("bad rom name")
+                ),
+                0,
+                &mut RAM,
+            );
+        }
+    }
+}
+
+unsafe fn write_save(gb: &mut gb_s) {
+    let mut buf = [0; 16];
+
+    unsafe {
+        gb_get_rom_name(gb, buf.as_mut_ptr());
+
+        let save_size = gb_get_save_size(gb);
+
+        if save_size > 0 {
+            write_file(
+                &format!(
+                    "{}/saves/{}.sav",
+                    GAME_PATH,
+                    str::from_utf8(&buf).expect("bad rom name")
+                ),
+                0,
+                &mut RAM,
+            );
+        }
+    }
+}

user-apps/gboy/src/peanut.rs

@@ -0,0 +1,102 @@
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
+use crate::{DISPLAY, GAME_ROM, RAM};
+
+#[allow(unused)]
+include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
+
+use abi::{display::Pixel565, println};
+use embedded_graphics::{Drawable, pixelcolor::Rgb565, prelude::Point};
+
+pub const GBOY_WIDTH: usize = 160;
+pub const GBOY_HEIGHT: usize = 144;
+
+pub unsafe extern "C" fn gb_rom_read(_gb: *mut gb_s, addr: u32) -> u8 {
+    unsafe { GAME_ROM.as_ref().unwrap()[addr as usize] }
+}
+
+pub unsafe extern "C" fn gb_cart_ram_read(_gb: *mut gb_s, addr: u32) -> u8 {
+    unsafe { RAM[addr as usize] }
+}
+
+pub unsafe extern "C" fn gb_cart_ram_write(_gb: *mut gb_s, addr: u32, val: u8) {
+    unsafe { RAM[addr as usize] = val }
+}
+
+pub unsafe extern "C" fn gb_error(_gb: *mut gb_s, err: gb_error_e, addr: u16) {
+    let e = match err {
+        0 => "UNKNOWN ERROR",
+        1 => "INVALID OPCODE",
+        2 => "INVALID READ",
+        3 => "INVALID WRITE",
+        4 => "HALT FOREVER",
+        5 => "INVALID MAX",
+        _ => unreachable!(),
+    };
+
+    println!("PeanutGB error: {}, addr: {}", e, addr);
+}
+
+const NUM_PALETTES: usize = 3;
+const SHADES_PER_PALETTE: usize = 4;
+
+const PALETTES: [[Rgb565; SHADES_PER_PALETTE]; NUM_PALETTES] = [
+    [
+        Rgb565::new(8, 24, 32),
+        Rgb565::new(52, 104, 86),
+        Rgb565::new(136, 192, 112),
+        Rgb565::new(224, 248, 208),
+    ], // BG
+    [
+        Rgb565::new(8, 24, 32),
+        Rgb565::new(52, 104, 86),
+        Rgb565::new(136, 192, 112),
+        Rgb565::new(224, 248, 208),
+    ], // OBJ0
+    [
+        Rgb565::new(8, 24, 32),
+        Rgb565::new(52, 104, 86),
+        Rgb565::new(136, 192, 112),
+        Rgb565::new(224, 248, 208),
+    ], // OBJ1
+];
+
+pub unsafe extern "C" fn lcd_draw_line(_gb: *mut gb_s, pixels: *const u8, line: u8) {
+    if line < GBOY_HEIGHT as u8 {
+        let pixels = unsafe { core::slice::from_raw_parts(pixels, GBOY_WIDTH) };
+        let y = line as u16;
+
+        for (x, &p) in pixels.iter().enumerate() {
+            let palette_idx = ((p & 0xF0) >> 4) as usize;
+            let shade_idx = (p & 0x03) as usize;
+
+            let color = PALETTES
+                .get(palette_idx)
+                .and_then(|pal| pal.get(shade_idx))
+                .copied()
+                .unwrap_or(Rgb565::new(0, 0, 0));
+
+            // let sx = (x as u16) * 2;
+            // let sy = y * 2;
+
+            // draw_color(color, sx, sy);
+            // draw_color(color, sx + 1, sy);
+            // draw_color(color, sx, sy + 1);
+            // draw_color(color, sx + 1, sy + 1);
+            //
+            draw_color(color, x as u16, y as u16);
+        }
+    }
+}
+
+fn draw_color(color: Rgb565, x: u16, y: u16) {
+    let mut pixel = Pixel565::default();
+    pixel.0 = Point::new(x.into(), y.into());
+    pixel.1 = color;
+
+    unsafe {
+        pixel.draw(&mut *DISPLAY).unwrap();
+    }
+}

user-apps/gif/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "gif"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+abi = { path = "../../abi" }
+selection_ui = { path = "../../selection_ui" }
+embedded-graphics = "0.8.1"
+tinygif = { git = "https://github.com/LegitCamper/tinygif" }

user-apps/gif/build.rs

@@ -0,0 +1,28 @@
+//! 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/gif/src/main.rs

@@ -0,0 +1,103 @@
+#![no_std]
+#![no_main]
+
+extern crate alloc;
+use abi::{
+    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
+    fs::{Entries, file_len, list_dir, read_file},
+    get_key, get_ms,
+    keyboard::{KeyCode, KeyState},
+    println, 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,
+};
+use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
+use tinygif::Gif;
+
+#[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 Gif app");
+    let mut display = Display::take().unwrap();
+
+    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 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"),
+        },
+    };
+
+    assert!(selection.is_some());
+
+    let file_name = format!("/gifs/{}", gifs[selection.unwrap()]);
+    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);
+    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 mut frame_num = 0;
+    loop {
+        for mut frame in gif.frames() {
+            let start = get_ms();
+
+            frame.translate_mut(translation).draw(&mut display).unwrap();
+            frame_num += 1;
+
+            if frame_num % 5 == 0 {
+                let event = get_key();
+                if event.state != KeyState::Idle {
+                    match event.key {
+                        KeyCode::Esc => {
+                            drop(buf);
+                            return;
+                        }
+                        _ => (),
+                    };
+                };
+            }
+            sleep(((frame.delay_centis as u64) * 10).saturating_sub(start));
+        }
+    }
+}

user-apps/memory.x

@@ -1,6 +1,6 @@
 MEMORY
 {
-  RAM : ORIGIN = 0x0, LENGTH = 150K
+  RAM : ORIGIN = 0x0, LENGTH = 250K
 }
 
 SECTIONS

user-apps/snake/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2024"
 [dependencies]
 abi = { path = "../../abi" }
 embedded-graphics = "0.8.1"
-embedded-snake = { path = "../../../embedded-snake-rs" }
+embedded-snake = { git = "https://github.com/LegitCamper/embedded-snake-rs" }
 rand = { version = "0.9.0", default-features = false }

user-apps/snake/src/main.rs

@@ -4,23 +4,18 @@
 extern crate alloc;
 use abi::{
     Rng,
-    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH, lock_display},
+    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
     get_key,
     keyboard::{KeyCode, KeyState},
-    print, sleep,
+    println, sleep,
 };
-use alloc::format;
 use core::panic::PanicInfo;
 use embedded_graphics::{pixelcolor::Rgb565, prelude::RgbColor};
 use embedded_snake::{Direction, SnakeGame};
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    print(&format!(
+    println!("user panic: {} @ {:?}", info.message(), info.location(),);
-        "user panic: {} @ {:?}",
-        info.message(),
-        info.location(),
-    ));
     loop {}
 }
 
@@ -32,8 +27,8 @@ pub extern "Rust" fn _start() {
 const CELL_SIZE: usize = 8;
 
 pub fn main() {
-    print("Starting Snake app");
+    println!("Starting Snake app");
-    let mut display = Display;
+    let mut display = Display::take().unwrap();
 
     let mut game = SnakeGame::<100, Rgb565, Rng>::new(
         SCREEN_WIDTH as u16,
@@ -62,10 +57,8 @@ pub fn main() {
         };
 
         // ensure all draws show up at once
-        lock_display(true);
         game.pre_draw(&mut display);
         game.draw(&mut display);
-        lock_display(false);
 
         sleep(15);
     }