fix font size

add status bar
fix text alignment
2025-06-30 19:20:30 -06:00 · 2025-06-30 17:50:53 -06:00 · 2025-06-29 13:34:29 -06:00 · 2025-06-29 08:44:17 -06:00 · 2025-06-27 21:23:38 -06:00 · 2025-06-27 18:41:01 -06:00
16 changed files with 570 additions and 378 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,6 +12,12 @@ dependencies = [
 "regex",
 ]

+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -21,6 +27,12 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -81,6 +93,12 @@ dependencies = [
 "rustc_version",
 ]

+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bisync"
 version = "0.3.0"
@@ -186,6 +204,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.1"
@@ -252,6 +276,15 @@ dependencies = [
 "debug-helper",
 ]

+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "critical-section"
 version = "1.2.0"
@@ -704,6 +737,19 @@ dependencies = [
 "defmt 0.3.100",
 ]

+[[package]]
+name = "embedded-graphics-simulator"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31606a4fb7d9d3a79a38d27bc2954cfa98682c8fea4b22c09a442785a80424e"
+dependencies = [
+ "base64",
+ "embedded-graphics",
+ "image",
+ "ouroboros",
+ "sdl2",
+]
+
 [[package]]
 name = "embedded-hal"
 version = "0.2.7"
@@ -832,6 +878,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "fixed"
 version = "1.29.0"
@@ -856,6 +911,16 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"

+[[package]]
+name = "flate2"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "float-cmp"
 version = "0.9.0"
@@ -1010,6 +1075,12 @@ dependencies = [
 "stable_deref_trait",
 ]

+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -1031,6 +1102,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

+[[package]]
+name = "image"
+version = "0.25.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "num-traits",
+ "png",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.10.0"
@@ -1208,6 +1291,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815"

+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "nb"
 version = "0.1.3"
@@ -1285,6 +1378,30 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

+[[package]]
+name = "ouroboros"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "panic-probe"
 version = "0.3.2"
@@ -1363,7 +1480,6 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 name = "picocalc-os-rs"
 version = "0.1.0"
 dependencies = [
- "arrform",
 "bitflags 2.9.1",
 "bt-hci",
 "cortex-m",
@@ -1379,17 +1495,18 @@ dependencies = [
 "embassy-sync 0.7.0",
 "embassy-time",
 "embedded-graphics",
+ "embedded-graphics-simulator",
 "embedded-hal 0.2.7",
- "embedded-hal 1.0.0",
 "embedded-hal-async",
 "embedded-hal-bus",
- "embedded-layout",
 "embedded-sdmmc",
- "heapless",
 "panic-probe",
 "portable-atomic",
+ "shared",
+ "spin",
 "st7365p-lcd",
 "static_cell",
+ "talc",
 "trouble-host",
 ]

@@ -1493,6 +1610,19 @@ dependencies = [
 "syn 2.0.104",
 ]

+[[package]]
+name = "png"
+version = "0.17.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -1563,6 +1693,19 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+ "version_check",
+ "yansi",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.40"
@@ -1697,6 +1840,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

+[[package]]
+name = "sdl2"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b498da7d14d1ad6c839729bd4ad6fc11d90a57583605f3b4df2cd709a9cd380"
+dependencies = [
+ "bitflags 1.3.2",
+ "lazy_static",
+ "libc",
+ "sdl2-sys",
+]
+
+[[package]]
+name = "sdl2-sys"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "version-compare",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -1728,6 +1894,32 @@ dependencies = [
 "keccak",
 ]

+[[package]]
+name = "shared"
+version = "0.1.0"
+dependencies = [
+ "arrform",
+ "embedded-graphics",
+ "embedded-graphics-core",
+ "embedded-layout",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simulator"
+version = "0.1.0"
+dependencies = [
+ "embedded-graphics",
+ "embedded-graphics-simulator",
+ "embedded-layout",
+ "shared",
+]
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -1758,9 +1950,19 @@ dependencies = [
 "rgb",
 ]

+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "st7365p-lcd"
 version = "0.10.0"
+source = "git+https://github.com/legitcamper/st7365p-lcd-rs?branch=async#9f8da568ff695a00afb6b8b8cf9573fad408a66f"
 dependencies = [
 "embedded-graphics-core",
 "embedded-hal 1.0.0",
@@ -1774,6 +1976,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"

+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "static_cell"
 version = "2.1.1"
@@ -1823,6 +2031,15 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "talc"
+version = "4.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ae828aa394de34c7de08f522d1b86bd1c182c668d27da69caadda00590f26d"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "term"
 version = "0.7.0"
@@ -1975,6 +2192,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"

+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -2174,6 +2397,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "zerocopy"
 version = "0.8.26"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
-[package]
-name = "picocalc-os-rs"
-version = "0.1.0"
-edition = "2024"
+[workspace]
+resolver = "3"
+members = ["pico", "shared", "simulator"]
+

 [profile.release]
 debug = 2
@@ -9,73 +9,3 @@ debug = 2
 [profile.dev]
 lto = true
 opt-level = "z"
-
-[features]
-default = ["rp235x", "defmt"]
-rp2040 = ["embassy-rp/rp2040"]
-rp235x = ["embassy-rp/rp235xb"]
-trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"]
-defmt = [
-  "dep:defmt",
-  "panic-probe/print-defmt",
-  "embassy-executor/defmt",
-  "embassy-time/defmt",
-  "embassy-time/defmt-timestamp-uptime",
-  "embassy-rp/defmt",
-  "embassy-sync/defmt",
-  "embedded-graphics/defmt",
-  "embedded-sdmmc/defmt-log",
-  # "bt-hci/defmt",
-  # "cyw43/defmt",
-  # "cyw43-pio/defmt",
-]
-
-[dependencies]
-embassy-executor = { version = "0.7", features = [
-  "arch-cortex-m",
-  "executor-interrupt",
-  "executor-thread",
-  "nightly",
-] }
-embassy-rp = { version = "0.4.0", features = [
-  "critical-section-impl",
-  "unstable-pac",
-  "time-driver",
-  "binary-info",
-] }
-embassy-futures = "0.1.1"
-embassy-time = "0.4.0"
-embassy-embedded-hal = "0.3.0"
-embassy-sync = { version = "0.7" }
-trouble-host = { version = "0.1", features = [
-  "derive",
-  "scan",
-], optional = true }
-bt-hci = { version = "0.2", default-features = false, optional = true }
-cyw43 = { version = "0.3.0", features = [
-  "firmware-logs",
-  "bluetooth",
-], optional = true }
-cyw43-pio = { version = "0.3.0", optional = true }
-
-embedded-hal-bus = { version = "0.3.0", features = ["async"] }
-embedded-hal = "0.2.7"
-embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
-embedded-hal-async = "1.0.0"
-cortex-m = { version = "0.7.7" }
-cortex-m-rt = "0.7.5"
-panic-probe = "0.3"
-portable-atomic = { version = "1.11", features = ["critical-section"] }
-static_cell = "2.1.1"
-bitflags = "2.9.1"
-heapless = "0.8.0"
-arrform = "0.1.1"
-
-defmt = { version = "0.3", optional = true }
-defmt-rtt = "0.4.2"
-
-embedded-graphics = { version = "0.8.1" }
-embedded-layout = "0.4.2"
-embedded-sdmmc = { git = "https://github.com/Be-ing/embedded-sdmmc-rs", branch = "bisync", default-features = false }
-# st7365p-lcd = { git = "https://github.com/legitcamper/st7365p-lcd-rs", branch = "async" }
-st7365p-lcd = { path = "../ST7365P-lcd-rs" }
--- a/pico/Cargo.toml
+++ b/pico/Cargo.toml
@@ -0,0 +1,76 @@
+[package]
+name = "picocalc-os-rs"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+default = ["rp235x", "defmt"]
+rp2040 = ["embassy-rp/rp2040"]
+rp235x = ["embassy-rp/rp235xb"]
+trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"]
+defmt = [
+  "dep:defmt",
+  "panic-probe/print-defmt",
+  "embassy-executor/defmt",
+  "embassy-time/defmt",
+  "embassy-time/defmt-timestamp-uptime",
+  "embassy-rp/defmt",
+  "embassy-sync/defmt",
+  "embedded-graphics/defmt",
+  "embedded-sdmmc/defmt-log",
+  # "bt-hci/defmt",
+  # "cyw43/defmt",
+  # "cyw43-pio/defmt",
+]
+
+[dev-dependencies]
+embedded-graphics-simulator = { version = "0.7.0", default-features = false }
+
+[dependencies]
+embassy-executor = { version = "0.7", features = [
+  "arch-cortex-m",
+  "executor-interrupt",
+  "executor-thread",
+  "nightly",
+] }
+embassy-rp = { version = "0.4.0", features = [
+  "critical-section-impl",
+  "unstable-pac",
+  "time-driver",
+  "binary-info",
+] }
+embassy-futures = "0.1.1"
+embassy-time = "0.4.0"
+embassy-embedded-hal = "0.3.0"
+embassy-sync = { version = "0.7" }
+trouble-host = { version = "0.1", features = [
+  "derive",
+  "scan",
+], optional = true }
+bt-hci = { version = "0.2", default-features = false, optional = true }
+cyw43 = { version = "0.3.0", features = [
+  "firmware-logs",
+  "bluetooth",
+], optional = true }
+cyw43-pio = { version = "0.3.0", optional = true }
+
+embedded-hal-bus = { version = "0.3.0", features = ["async"] }
+embedded-hal = "0.2.7"
+embedded-hal-async = "1.0.0"
+cortex-m = { version = "0.7.7" }
+cortex-m-rt = "0.7.5"
+panic-probe = "0.3"
+portable-atomic = { version = "1.11", features = ["critical-section"] }
+
+defmt = { version = "0.3", optional = true }
+defmt-rtt = "0.4.2"
+
+embedded-graphics = { version = "0.8.1" }
+embedded-sdmmc = { git = "https://github.com/Be-ing/embedded-sdmmc-rs", branch = "bisync", default-features = false }
+st7365p-lcd = { git = "https://github.com/legitcamper/st7365p-lcd-rs", branch = "async" }
+shared = { path = "../shared" }
+
+static_cell = "2.1.1"
+bitflags = "2.9.1"
+talc = "4.4.3"
+spin = "0.10.0"
--- a/pico/build.rs
+++ b/pico/build.rs
--- a/pico/memory.x
+++ b/pico/memory.x
--- a/pico/src/display.rs
+++ b/pico/src/display.rs
@@ -0,0 +1,61 @@
+use defmt::info;
+use embassy_rp::{
+    gpio::{Level, Output},
+    peripherals::{PIN_13, PIN_14, PIN_15, SPI1},
+    spi::{Async, Spi},
+};
+use embassy_time::{Delay, Timer};
+use embedded_graphics::{
+    Drawable,
+    mono_font::{MonoFont, MonoTextStyle, ascii::FONT_10X20},
+    pixelcolor::Rgb565,
+    prelude::{Point, WebColors},
+    text::{Baseline, Text, TextStyle},
+};
+use embedded_hal_bus::spi::ExclusiveDevice;
+use st7365p_lcd::{FrameBuffer, ST7365P};
+
+use shared::{SCREEN_HEIGHT, SCREEN_WIDTH, TextBuffer};
+
+type SPI = Spi<'static, SPI1, Async>;
+
+type FRAMEBUFFER = FrameBuffer<
+    SCREEN_WIDTH,
+    SCREEN_HEIGHT,
+    ExclusiveDevice<Spi<'static, SPI1, Async>, Output<'static>, Delay>,
+    Output<'static>,
+    Output<'static>,
+>;
+
+#[embassy_executor::task]
+pub async fn display_task(spi: SPI, cs: PIN_13, data: PIN_14, reset: PIN_15) {
+    let spi_device = ExclusiveDevice::new(spi, Output::new(cs, Level::Low), Delay).unwrap();
+    let display = ST7365P::new(
+        spi_device,
+        Output::new(data, Level::Low),
+        Some(Output::new(reset, Level::High)),
+        false,
+        true,
+        SCREEN_WIDTH as u32,
+        SCREEN_HEIGHT as u32,
+    );
+    let mut framebuffer: FRAMEBUFFER = FrameBuffer::new(display);
+
+    framebuffer.init(&mut Delay).await.unwrap();
+    framebuffer.display.set_offset(0, 0);
+    framebuffer
+        .display
+        .set_custom_orientation(0x60)
+        .await
+        .unwrap();
+
+    let mut textbuffer = TextBuffer::new();
+    textbuffer.fill('A');
+    textbuffer.draw(&mut framebuffer);
+    info!("finished rendering");
+
+    loop {
+        framebuffer.draw().await.unwrap();
+        Timer::after_millis(500).await;
+    }
+}
--- a/pico/src/main.rs
+++ b/pico/src/main.rs
@@ -0,0 +1,60 @@
+#![feature(impl_trait_in_assoc_type)]
+#![feature(ascii_char)]
+#![no_std]
+#![no_main]
+
+#[cfg(feature = "defmt")]
+use defmt::*;
+use {defmt_rtt as _, panic_probe as _};
+
+use embassy_executor::Spawner;
+use embassy_rp::peripherals::I2C1;
+use embassy_rp::spi::Spi;
+use embassy_rp::{
+    bind_interrupts,
+    gpio::{Level, Output},
+    i2c,
+    i2c::I2c,
+    spi,
+};
+use embassy_sync::blocking_mutex::raw::NoopRawMutex;
+use embassy_sync::channel::Channel;
+use embassy_time::Timer;
+use embedded_hal_bus::spi::ExclusiveDevice;
+use embedded_sdmmc::asynchronous::{File, SdCard, ShortFileName, VolumeIdx, VolumeManager};
+use static_cell::StaticCell;
+
+mod peripherals;
+use peripherals::{keyboard::KeyEvent, peripherals_task};
+mod display;
+use display::display_task;
+
+embassy_rp::bind_interrupts!(struct Irqs {
+    I2C1_IRQ => i2c::InterruptHandler<I2C1>;
+});
+
+#[embassy_executor::main]
+async fn main(spawner: Spawner) {
+    let p = embassy_rp::init(Default::default());
+
+    static KEYBOARD_EVENTS: StaticCell<Channel<NoopRawMutex, KeyEvent, 10>> = StaticCell::new();
+    let keyboard_events = KEYBOARD_EVENTS.init(Channel::new());
+
+    // // configure keyboard event handler
+    // let mut config = i2c::Config::default();
+    // config.frequency = 100_000;
+    // let i2c1 = I2c::new_async(p.I2C1, p.PIN_7, p.PIN_6, Irqs, config);
+    // spawner
+    //     .spawn(peripherals_task(i2c1, keyboard_events.sender()))
+    //     .unwrap();
+
+    // configure display handler
+    let mut config = spi::Config::default();
+    config.frequency = 16_000_000;
+    let spi1 = spi::Spi::new(
+        p.SPI1, p.PIN_10, p.PIN_11, p.PIN_12, p.DMA_CH0, p.DMA_CH1, config,
+    );
+    spawner
+        .spawn(display_task(spi1, p.PIN_13, p.PIN_14, p.PIN_15))
+        .unwrap();
+}
--- a/pico/src/peripherals/keyboard.rs
+++ b/pico/src/peripherals/keyboard.rs
@@ -17,7 +17,7 @@ const KEY_CAPSLOCK: u8 = 1 << 5;
 const KEY_NUMLOCK: u8 = 1 << 6;
 const KEY_COUNT_MASK: u8 = 0x1F; // 0x1F == 31

-pub async fn read_keyboard_fifo() -> Option<KeyEvent> {
+pub async fn read_keyboard_fifo(channel: &mut Sender<'static, NoopRawMutex, KeyEvent, 10>) {
    let mut i2c = PERIPHERAL_BUS.get().lock().await;
    let i2c = i2c.as_mut().unwrap();

@@ -40,15 +40,16 @@ pub async fn read_keyboard_fifo() -> Option<KeyEvent> {
                .await
                .is_ok()
            {
-                return Some(KeyEvent {
-                    state: KeyState::from(event[0]),
-                    key: KeyCode::from(event[1]),
-                    mods: Modifiers::NONE,
-                });
+                channel
+                    .try_send(KeyEvent {
+                        state: KeyState::from(event[0]),
+                        key: KeyCode::from(event[1]),
+                        mods: Modifiers::NONE,
+                    })
+                    .expect("Failed to push key");
            }
        }
    }
-    None
 }

 const REG_ID_DEB: u8 = 0x06;
--- a/pico/src/peripherals/mod.rs
+++ b/pico/src/peripherals/mod.rs
@@ -25,7 +25,11 @@ const REG_ID_VER: u8 = 0x01;
 const REG_ID_RST: u8 = 0x08;
 const REG_ID_INT: u8 = 0x03;

-pub async fn conf_peripherals(i2c: I2CBUS) {
+#[embassy_executor::task]
+pub async fn peripherals_task(
+    i2c: I2CBUS,
+    mut keyboard_channel: Sender<'static, NoopRawMutex, KeyEvent, 10>,
+) {
    Timer::after(embassy_time::Duration::from_millis(100)).await;

    PERIPHERAL_BUS.get().lock().await.replace(i2c);
@@ -33,6 +37,11 @@ pub async fn conf_peripherals(i2c: I2CBUS) {
    configure_keyboard(200, 100).await;
    set_lcd_backlight(255).await;
    set_key_backlight(0).await;
+
+    loop {
+        Timer::after(Duration::from_millis(200)).await;
+        read_keyboard_fifo(&mut keyboard_channel).await;
+    }
 }

 /// return major & minor mcu version
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "nightly-2025-06-18"
 components = ["rust-src", "rustfmt", "rust-analyzer"]
-targets = ["thumbv6m-none-eabi"]
+targets = ["thumbv6m-none-eabi", "x86_64-unknown-linux-gnu"]
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "shared"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+arrform = "0.1.1"
+embedded-graphics = "0.8.1"
+embedded-graphics-core = "0.4.0"
+embedded-layout = "0.4.2"
--- a/shared/src/lib.rs
+++ b/shared/src/lib.rs
@@ -0,0 +1,77 @@
+pub mod screen {
+    use arrform::{ArrForm, arrform};
+    use embedded_graphics::{
+        Drawable,
+        draw_target::DrawTarget,
+        mono_font::{
+            MonoTextStyle,
+            ascii::{FONT_6X10, FONT_9X15, FONT_10X20},
+        },
+        pixelcolor::Rgb565,
+        prelude::{Point, RgbColor, Size},
+        primitives::Rectangle,
+        text::Text,
+    };
+    use embedded_layout::{
+        align::{horizontal, vertical},
+        layout::linear::LinearLayout,
+        prelude::*,
+    };
+
+    pub const SCREEN_WIDTH: usize = 320;
+    pub const SCREEN_HEIGHT: usize = 320;
+
+    pub const STATUS_BAR_WIDTH: usize = 320;
+    pub const STATUS_BAR_HEIGHT: usize = 40;
+
+    pub struct UI {
+        pub status_bar: StatusBar,
+    }
+
+    impl UI {
+        pub fn new() -> Self {
+            Self {
+                status_bar: StatusBar {
+                    battery: 100,
+                    backlight: 100,
+                    volume: 100,
+                },
+            }
+        }
+
+        pub fn draw_status_bar<D: DrawTarget<Color = Rgb565>>(&mut self, target: &mut D) {
+            let text_style = MonoTextStyle::new(&FONT_9X15, Rgb565::WHITE);
+
+            let status_bar = Rectangle::new(
+                Point::new(0, 0),
+                Size::new(STATUS_BAR_WIDTH as u32, STATUS_BAR_HEIGHT as u32),
+            );
+            let _ = LinearLayout::horizontal(
+                Chain::new(Text::new(
+                    arrform!(20, "Bat: {}", self.status_bar.battery).as_str(),
+                    Point::zero(),
+                    text_style,
+                ))
+                .append(Text::new(
+                    arrform!(20, "Lght: {}", self.status_bar.backlight).as_str(),
+                    Point::zero(),
+                    text_style,
+                ))
+                .append(Text::new(
+                    arrform!(20, "Vol: {}", self.status_bar.volume).as_str(),
+                    Point::zero(),
+                    text_style,
+                )),
+            )
+            .arrange()
+            .align_to(&status_bar, horizontal::Center, vertical::Center)
+            .draw(target);
+        }
+    }
+
+    pub struct StatusBar {
+        pub battery: u8,
+        pub backlight: u8,
+        pub volume: u8,
+    }
+}
--- a/simulator/Cargo.toml
+++ b/simulator/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "simulator"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+embedded-graphics = "0.8.1"
+embedded-graphics-simulator = "0.7.0"
+embedded-layout = "0.4.2"
+shared = { path = "../shared" }
--- a/simulator/src/main.rs
+++ b/simulator/src/main.rs
@@ -0,0 +1,20 @@
+use embedded_graphics::{pixelcolor::Rgb565, prelude::Size};
+use embedded_graphics_simulator::{
+    BinaryColorTheme, OutputSettingsBuilder, SimulatorDisplay, Window,
+};
+
+use shared::screen::{SCREEN_HEIGHT, SCREEN_WIDTH, UI};
+
+fn main() -> Result<(), core::convert::Infallible> {
+    let mut display =
+        SimulatorDisplay::<Rgb565>::new(Size::new(SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32));
+
+    let mut ui = UI::new();
+
+    ui.draw_status_bar(&mut display);
+
+    let output_settings = OutputSettingsBuilder::new().build();
+    Window::new("Hello World", &output_settings).show_static(&display);
+
+    Ok(())
+}
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,180 +0,0 @@
-use arrform::{ArrForm, arrform};
-use core::fmt::Debug;
-use defmt::info;
-use embassy_rp::{
-    gpio::{Level, Output},
-    peripherals::{PIN_13, PIN_14, PIN_15, SPI1},
-    spi::{Async, Spi},
-};
-use embassy_time::{Delay, Timer};
-use embedded_graphics::{
-    Drawable,
-    draw_target::DrawTarget,
-    mono_font::{
-        MonoTextStyle,
-        ascii::{FONT_6X10, FONT_9X15, FONT_10X20},
-    },
-    pixelcolor::Rgb565,
-    prelude::{Point, RgbColor, Size},
-    primitives::{PrimitiveStyle, Rectangle, StyledDrawable},
-    text::Text,
-};
-use embedded_hal_1::digital::OutputPin;
-use embedded_hal_async::spi::SpiDevice;
-use embedded_hal_bus::spi::{ExclusiveDevice, NoDelay};
-use embedded_layout::{
-    align::{horizontal, vertical},
-    layout::linear::LinearLayout,
-    object_chain::Chain,
-    prelude::*,
-};
-use heapless::{String, Vec};
-use st7365p_lcd::{FrameBuffer, Orientation, ST7365P};
-
-pub const SCREEN_WIDTH: usize = 320;
-pub const SCREEN_HEIGHT: usize = 320;
-
-pub const STATUS_BAR_WIDTH: usize = 320;
-pub const STATUS_BAR_HEIGHT: usize = 40;
-
-pub type FRAMEBUFFER = FrameBuffer<
-    SCREEN_WIDTH,
-    SCREEN_HEIGHT,
-    ExclusiveDevice<Spi<'static, SPI1, Async>, Output<'static>, Delay>,
-    Output<'static>,
-    Output<'static>,
->;
-
-pub struct UI<const MAX_SELECTIONS: usize, const MAX_STR_LEN: usize> {
-    pub status_bar: StatusBar,
-    pub selections_list: SelectionList<MAX_SELECTIONS, MAX_STR_LEN>,
-}
-
-impl<const MAX_SELECTIONS: usize, const MAX_STR_LEN: usize> UI<MAX_SELECTIONS, MAX_STR_LEN> {
-    pub fn new() -> Self {
-        Self {
-            status_bar: StatusBar {
-                battery: 100,
-                backlight: 100,
-                volume: 100,
-            },
-            selections_list: SelectionList::new(Vec::new()),
-        }
-    }
-
-    pub fn draw<D: DrawTarget<Color = Rgb565>>(&mut self, target: &mut D)
-    where
-        <D as DrawTarget>::Error: Debug,
-    {
-        self.draw_status_bar(target);
-        self.draw_selection(target);
-    }
-
-    fn draw_selection<D: DrawTarget<Color = Rgb565>>(&mut self, target: &mut D) {
-        let text_style = MonoTextStyle::new(&FONT_9X15, Rgb565::WHITE);
-
-        let selection = Rectangle::new(
-            Point::new(0, STATUS_BAR_HEIGHT as i32 + 1),
-            Size::new(
-                SCREEN_WIDTH as u32,
-                (SCREEN_HEIGHT - STATUS_BAR_HEIGHT) as u32 - 1,
-            ),
-        );
-
-        let _ = if self.selections_list.selections.is_empty() {
-            LinearLayout::horizontal(Chain::new(Text::new(
-                "No Programs found on SD Card\nEnsure programs end with '.rhai',\nand are located in the root directory",
-                Point::zero(),
-                text_style,
-            )))
-            .arrange()
-            .align_to(&selection, horizontal::Center, vertical::Center).draw(target)
-        } else {
-            LinearLayout::horizontal(
-                Chain::new(Text::new(
-                    arrform!(20, "Bat: {}", self.status_bar.battery).as_str(),
-                    Point::zero(),
-                    text_style,
-                ))
-                .append(Text::new(" ", Point::zero(), text_style))
-                .append(Text::new(
-                    arrform!(20, "Lght: {}", self.status_bar.backlight).as_str(),
-                    Point::zero(),
-                    text_style,
-                ))
-                .append(Text::new(" ", Point::zero(), text_style))
-                .append(Text::new(
-                    arrform!(20, "Vol: {}", self.status_bar.volume).as_str(),
-                    Point::zero(),
-                    text_style,
-                )),
-            )
-            .arrange()
-            .align_to(&selection, horizontal::Left, vertical::Center)
-            .draw(target)
-        };
-    }
-
-    fn draw_status_bar<D: DrawTarget<Color = Rgb565>>(&mut self, target: &mut D) {
-        let text_style = MonoTextStyle::new(&FONT_9X15, Rgb565::WHITE);
-
-        let status_bar = Rectangle::new(
-            Point::new(0, 0),
-            Size::new(STATUS_BAR_WIDTH as u32, STATUS_BAR_HEIGHT as u32),
-        );
-        let _ = LinearLayout::horizontal(
-            Chain::new(Text::new(
-                arrform!(20, "Bat: {}", self.status_bar.battery).as_str(),
-                Point::zero(),
-                text_style,
-            ))
-            .append(Text::new(
-                arrform!(20, "Lght: {}", self.status_bar.backlight).as_str(),
-                Point::zero(),
-                text_style,
-            ))
-            .append(Text::new(
-                arrform!(20, "Vol: {}", self.status_bar.volume).as_str(),
-                Point::zero(),
-                text_style,
-            )),
-        )
-        .arrange()
-        .align_to(&status_bar, horizontal::Center, vertical::Center)
-        .draw(target);
-    }
-}
-
-pub struct StatusBar {
-    pub battery: u8,
-    pub backlight: u8,
-    pub volume: u8,
-}
-
-pub struct SelectionList<const MAX_SELECTION: usize, const MAX_STR_LEN: usize> {
-    current_selection: u16,
-    selections: Vec<String<MAX_STR_LEN>, MAX_SELECTION>,
-}
-
-impl<const MAX_SELECTION: usize, const MAX_STR_LEN: usize>
-    SelectionList<MAX_SELECTION, MAX_STR_LEN>
-{
-    pub fn new(selections: Vec<String<MAX_STR_LEN>, MAX_SELECTION>) -> Self {
-        Self {
-            selections,
-            current_selection: 0,
-        }
-    }
-
-    pub fn down(&mut self) {
-        if self.current_selection + 1 < self.selections.len() as u16 {
-            self.current_selection += 1
-        }
-    }
-
-    pub fn up(&mut self) {
-        if self.current_selection > self.selections.len() as u16 {
-            self.current_selection -= 1
-        }
-    }
-}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,111 +0,0 @@
-#![feature(impl_trait_in_assoc_type)]
-#![no_std]
-#![no_main]
-
-#[cfg(feature = "defmt")]
-use defmt::*;
-use embedded_graphics::{
-    pixelcolor::Rgb565,
-    prelude::{Point, RgbColor, Size},
-    primitives::{PrimitiveStyle, Rectangle, StyledDrawable},
-};
-use {defmt_rtt as _, panic_probe as _};
-
-use crate::display::{FRAMEBUFFER, SCREEN_HEIGHT, SCREEN_WIDTH, UI};
-use crate::peripherals::{
-    conf_peripherals,
-    keyboard::{KeyEvent, read_keyboard_fifo},
-};
-use embassy_executor::Spawner;
-use embassy_rp::peripherals::{I2C1, PIN_13, PIN_14, PIN_15, SPI1};
-use embassy_rp::spi::Spi;
-use embassy_rp::{
-    bind_interrupts,
-    gpio::{Level, Output},
-    i2c,
-    i2c::I2c,
-    spi,
-};
-use embassy_sync::blocking_mutex::raw::NoopRawMutex;
-use embassy_sync::channel::Channel;
-use embassy_time::{Delay, Timer};
-use embedded_hal_1::spi::SpiDevice;
-use embedded_hal_bus::spi::ExclusiveDevice;
-use embedded_sdmmc::asynchronous::{File, SdCard, ShortFileName, VolumeIdx, VolumeManager};
-use st7365p_lcd::{FrameBuffer, ST7365P};
-use static_cell::StaticCell;
-
-mod display;
-mod peripherals;
-
-embassy_rp::bind_interrupts!(
-    struct Irqs {
-        I2C1_IRQ => i2c::InterruptHandler<I2C1>;
-    }
-);
-
-#[embassy_executor::main]
-async fn main(spawner: Spawner) {
-    let p = embassy_rp::init(Default::default());
-
-    let mut i2c1_config = i2c::Config::default();
-    i2c1_config.frequency = 100_000;
-    let i2c1 = I2c::new_async(p.I2C1, p.PIN_7, p.PIN_6, Irqs, i2c1_config);
-    conf_peripherals(i2c1).await;
-
-    let mut spi1_config = spi::Config::default();
-    spi1_config.frequency = 16_000_000;
-    let spi1 = Spi::new(
-        p.SPI1,
-        p.PIN_10,
-        p.PIN_11,
-        p.PIN_12,
-        p.DMA_CH0,
-        p.DMA_CH1,
-        spi1_config,
-    );
-
-    spawner
-        .spawn(main_task(spi1, p.PIN_13, p.PIN_14, p.PIN_15))
-        .unwrap();
-}
-
-#[embassy_executor::task]
-async fn main_task(
-    spi1: Spi<'static, SPI1, spi::Async>,
-    spi1_cs: PIN_13,
-    spi1_data: PIN_14,
-    spi1_reset: PIN_15,
-) {
-    let spi_device = ExclusiveDevice::new(spi1, Output::new(spi1_cs, Level::Low), Delay).unwrap();
-    let display = ST7365P::new(
-        spi_device,
-        Output::new(spi1_data, Level::Low),
-        Some(Output::new(spi1_reset, Level::High)),
-        false,
-        true,
-        SCREEN_WIDTH as u32,
-        SCREEN_HEIGHT as u32,
-    );
-    let mut framebuffer: FRAMEBUFFER = FrameBuffer::new(display);
-    framebuffer.init(&mut Delay).await.unwrap();
-    framebuffer
-        .display
-        .set_custom_orientation(0x60)
-        .await
-        .unwrap();
-
-    // let mut ui: UI<50, 25> = UI::new();
-
-    // read_keyboard_fifo().await;
-    Rectangle::new(Point::new(0, 0), Size::new(319, 319))
-        .draw_styled(&PrimitiveStyle::with_fill(Rgb565::RED), &mut framebuffer)
-        .unwrap();
-    // ui.draw(&mut framebuffer);
-    framebuffer.draw().await.unwrap();
-
-    loop {
-        info!("Done");
-        Timer::after_millis(500).await;
-    }
-}
Author	SHA1	Message	Date
sawyer bristol	530e1770f1	fix font size	2025-06-30 19:20:30 -06:00
sawyer bristol	7be20e9469	add status bar	2025-06-30 17:50:53 -06:00
sawyer bristol	0ad706dfc9	fix text alignment	2025-06-29 13:34:29 -06:00
sawyer bristol	073fa58121	split screen logic into seprate crate for testing	2025-06-29 08:44:17 -06:00
sawyer bristol	06a158623d	wip text buffer for terminal	2025-06-27 21:23:38 -06:00
sawyer bristol	a687122696	fix bad display init	2025-06-27 18:41:01 -06:00
sawyer bristol	a42cfb6bc5	text wrong?	2025-06-27 15:29:08 -06:00
sawyer bristol	cf479cc00a	diy framebuffer	2025-06-27 12:23:05 -06:00