fix font size

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,12 +27,24 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "arrform"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7cf566ecc5c9d82b973e81d30babf6583c9b497f86295c952d538c3254ef4e6"
+
 [[package]]
 name = "ascii-canvas"
 version = "3.0.0"
@@ -75,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"
@@ -180,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"
@@ -246,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"
@@ -698,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"
@@ -759,6 +811,27 @@ dependencies = [
  "embedded-io",
 ]
 
+[[package]]
+name = "embedded-layout"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a90553247f2b05c59ac7894ea13d830636c2b1203fa03bff400eddbd1fa9f52"
+dependencies = [
+ "embedded-graphics",
+ "embedded-layout-macros",
+]
+
+[[package]]
+name = "embedded-layout-macros"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f6e621fe4c7e05b695274b722dc0a60bacd1c8696b58191baa0154713d52400"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.104",
+]
+
 [[package]]
 name = "embedded-sdmmc"
 version = "0.8.0"
@@ -805,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"
@@ -829,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"
@@ -983,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"
@@ -1005,10 +1103,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
-name = "indexmap"
+name = "image"
-version = "2.9.0"
+version = "0.25.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "num-traits",
+ "png",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1181,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"
@@ -1258,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"
@@ -1336,6 +1480,7 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 name = "picocalc-os-rs"
 version = "0.1.0"
 dependencies = [
+ "bitflags 2.9.1",
  "bt-hci",
  "cortex-m",
  "cortex-m-rt",
@@ -1350,14 +1495,18 @@ dependencies = [
  "embassy-sync 0.7.0",
  "embassy-time",
  "embedded-graphics",
+ "embedded-graphics-simulator",
  "embedded-hal 0.2.7",
  "embedded-hal-async",
  "embedded-hal-bus",
  "embedded-sdmmc",
  "panic-probe",
  "portable-atomic",
+ "shared",
+ "spin",
  "st7365p-lcd",
  "static_cell",
+ "talc",
  "trouble-host",
 ]
 
@@ -1461,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"
@@ -1531,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"
@@ -1665,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"
@@ -1696,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"
@@ -1726,12 +1950,23 @@ 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",
+ "embedded-hal-async",
  "nb 1.1.0",
 ]
 
@@ -1741,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"
@@ -1790,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"
@@ -1942,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"
@@ -2141,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"

Cargo.toml

@@ -1,7 +1,7 @@
-[package]
+[workspace]
-name = "picocalc-os-rs"
+resolver = "3"
-version = "0.1.0"
+members = ["pico", "shared", "simulator"]
-edition = "2024"
+
 
 [profile.release]
 debug = 2
@@ -9,69 +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-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" }
-st7365p-lcd = { path = "../ST7365P-lcd-rs" }
-
-static_cell = "2.1.1"

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"

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;
+    }
+}

pico/src/main.rs

@@ -1,4 +1,5 @@
 #![feature(impl_trait_in_assoc_type)]
+#![feature(ascii_char)]
 #![no_std]
 #![no_main]
 
@@ -39,24 +40,21 @@ async fn main(spawner: Spawner) {
     static KEYBOARD_EVENTS: StaticCell<Channel<NoopRawMutex, KeyEvent, 10>> = StaticCell::new();
     let keyboard_events = KEYBOARD_EVENTS.init(Channel::new());
 
-    // configure keyboard event handler
+    // // configure keyboard event handler
-    let config = i2c::Config::default();
+    // let mut config = i2c::Config::default();
-    let i2c1 = I2c::new_async(p.I2C1, p.PIN_7, p.PIN_6, Irqs, config);
+    // config.frequency = 100_000;
-    spawner
+    // let i2c1 = I2c::new_async(p.I2C1, p.PIN_7, p.PIN_6, Irqs, config);
-        .spawn(peripherals_task(i2c1, keyboard_events.sender()))
+    // spawner
-        .unwrap();
+    //     .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_blocking(p.SPI1, p.PIN_10, p.PIN_11, p.PIN_12, config);
+    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();
-
-    let receiver = keyboard_events.receiver();
-    loop {
-        let key = receiver.receive().await;
-        info!("got key: {}", key.key as u8);
-    }
 }

pico/src/peripherals/keyboard.rs

@@ -0,0 +1,207 @@
+use defmt::{info, warn};
+use embassy_rp::{
+    i2c::{Async, I2c},
+    peripherals::I2C1,
+};
+use embassy_sync::{
+    blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex},
+    channel::Sender,
+};
+
+use crate::peripherals::PERIPHERAL_BUS;
+
+const REG_ID_KEY: u8 = 0x04;
+const REG_ID_FIF: u8 = 0x09;
+
+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(channel: &mut Sender<'static, NoopRawMutex, KeyEvent, 10>) {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let mut key_status = [0_u8; 1];
+
+    if i2c
+        .write_read_async(super::MCU_ADDR, [REG_ID_KEY], &mut key_status)
+        .await
+        .is_ok()
+    {
+        let _caps = key_status[0] & KEY_CAPSLOCK == KEY_CAPSLOCK;
+        let _num = key_status[0] & KEY_NUMLOCK == KEY_NUMLOCK;
+        let fifo_count = key_status[0] & KEY_COUNT_MASK;
+
+        if fifo_count >= 1 {
+            let mut event = [0_u8; 2];
+
+            if i2c
+                .write_read_async(super::MCU_ADDR, [REG_ID_FIF], &mut event)
+                .await
+                .is_ok()
+            {
+                channel
+                    .try_send(KeyEvent {
+                        state: KeyState::from(event[0]),
+                        key: KeyCode::from(event[1]),
+                        mods: Modifiers::NONE,
+                    })
+                    .expect("Failed to push key");
+            }
+        }
+    }
+}
+
+const REG_ID_DEB: u8 = 0x06;
+const REG_ID_FRQ: u8 = 0x07;
+
+pub async fn configure_keyboard(debounce: u8, poll_freq: u8) {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let _ = i2c
+        .write_read_async(super::MCU_ADDR, [REG_ID_DEB], &mut [debounce])
+        .await;
+
+    let _ = i2c
+        .write_read_async(super::MCU_ADDR, [REG_ID_FRQ], &mut [poll_freq])
+        .await;
+}
+
+bitflags::bitflags! {
+    #[derive(Default, Debug, PartialEq, Eq, Clone, Copy)]
+    pub struct Modifiers: u8 {
+        const NONE = 0;
+        const CTRL = 1;
+        const ALT = 2;
+        const LSHIFT = 4;
+        const RSHIFT = 8;
+        const SYM = 16;
+    }
+}
+
+#[derive(Debug)]
+pub struct KeyEvent {
+    pub key: KeyCode,
+    pub state: KeyState,
+    pub mods: Modifiers,
+}
+
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum KeyState {
+    Idle = 0,
+    Pressed = 1,
+    Hold = 2,
+    Released = 3,
+}
+
+impl From<u8> for KeyState {
+    fn from(value: u8) -> Self {
+        match value {
+            1 => KeyState::Pressed,
+            2 => KeyState::Hold,
+            3 => KeyState::Released,
+            0 | _ => KeyState::Idle,
+        }
+    }
+}
+
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum KeyCode {
+    JoyUp = 0x01,
+    JoyDown = 0x02,
+    JoyLeft = 0x03,
+    JoyRight = 0x04,
+    JoyCenter = 0x05,
+    BtnLeft1 = 0x06,
+    BtnRight1 = 0x07,
+    BtnLeft2 = 0x11,
+    BtnRight2 = 0x12,
+    Backspace = 0x08,
+    Tab = 0x09,
+    Enter = 0x0A,
+    ModAlt = 0xA1,
+    ModShiftLeft = 0xA2,
+    ModShiftRight = 0xA3,
+    ModSym = 0xA4,
+    ModCtrl = 0xA5,
+    Esc = 0xB1,
+    Left = 0xB4,
+    Up = 0xB5,
+    Down = 0xB6,
+    Right = 0xB7,
+    Break = 0xD0,
+    Insert = 0xD1,
+    Home = 0xD2,
+    Del = 0xD4,
+    End = 0xD5,
+    PageUp = 0xD6,
+    PageDown = 0xD7,
+    CapsLock = 0xC1,
+    F1 = 0x81,
+    F2 = 0x82,
+    F3 = 0x83,
+    F4 = 0x84,
+    F5 = 0x85,
+    F6 = 0x86,
+    F7 = 0x87,
+    F8 = 0x88,
+    F9 = 0x89,
+    F10 = 0x90,
+    Char(char),
+    Unknown(u8),
+}
+
+impl From<u8> for KeyCode {
+    fn from(value: u8) -> Self {
+        match value {
+            0x01 => Self::JoyUp,
+            0x02 => Self::JoyDown,
+            0x03 => Self::JoyLeft,
+            0x04 => Self::JoyRight,
+            0x05 => Self::JoyCenter,
+            0x06 => Self::BtnLeft1,
+            0x07 => Self::BtnRight1,
+            0x08 => Self::Backspace,
+            0x09 => Self::Tab,
+            0x0A => Self::Enter,
+            0x11 => Self::BtnLeft2,
+            0x12 => Self::BtnRight2,
+            0xA1 => Self::ModAlt,
+            0xA2 => Self::ModShiftLeft,
+            0xA3 => Self::ModShiftRight,
+            0xA4 => Self::ModSym,
+            0xA5 => Self::ModCtrl,
+            0xB1 => Self::Esc,
+            0xB4 => Self::Left,
+            0xB5 => Self::Up,
+            0xB6 => Self::Down,
+            0xB7 => Self::Right,
+            0xC1 => Self::CapsLock,
+            0xD0 => Self::Break,
+            0xD1 => Self::Insert,
+            0xD2 => Self::Home,
+            0xD4 => Self::Del,
+            0xD5 => Self::End,
+            0xD6 => Self::PageUp,
+            0xD7 => Self::PageDown,
+            0x81 => Self::F1,
+            0x82 => Self::F2,
+            0x83 => Self::F3,
+            0x84 => Self::F4,
+            0x85 => Self::F5,
+            0x86 => Self::F6,
+            0x87 => Self::F7,
+            0x88 => Self::F8,
+            0x89 => Self::F9,
+            0x90 => Self::F10,
+            _ => match char::from_u32(value as u32) {
+                Some(c) => Self::Char(c),
+                None => Self::Unknown(value),
+            },
+        }
+    }
+}

pico/src/peripherals/mod.rs

@@ -0,0 +1,106 @@
+//! handles all the peripherals exposed by mcu through i2c (keyboard & battery registers)
+//!
+
+use embassy_rp::{
+    i2c::{Async, I2c},
+    peripherals::I2C1,
+};
+use embassy_sync::{
+    blocking_mutex::raw::NoopRawMutex, channel::Sender, lazy_lock::LazyLock, mutex::Mutex,
+};
+use embassy_time::{Duration, Timer};
+
+pub mod keyboard;
+use keyboard::{KeyCode, KeyEvent, KeyState};
+
+use crate::peripherals::keyboard::{configure_keyboard, read_keyboard_fifo};
+
+const MCU_ADDR: u8 = 0x1F;
+
+type I2CBUS = I2c<'static, I2C1, Async>;
+pub static PERIPHERAL_BUS: LazyLock<Mutex<NoopRawMutex, Option<I2CBUS>>> =
+    LazyLock::new(|| Mutex::new(None));
+
+const REG_ID_VER: u8 = 0x01;
+const REG_ID_RST: u8 = 0x08;
+const REG_ID_INT: u8 = 0x03;
+
+#[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);
+
+    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
+async fn get_version() -> (u8, u8) {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let mut ver = [0_u8; 1];
+    let _ = i2c.write_read_async(MCU_ADDR, [REG_ID_VER], &mut ver).await;
+
+    (ver[0] >> 4, ver[0] & 0x0F)
+}
+
+const REG_ID_BKL: u8 = 0x05;
+pub async fn set_lcd_backlight(brightness: u8) {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let _ = i2c
+        .write_read_async(MCU_ADDR, [REG_ID_BKL], &mut [brightness])
+        .await;
+}
+pub async fn get_lcd_backlight() -> u8 {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let mut buf = [0_u8; 2];
+
+    let _ = i2c.write_read_async(MCU_ADDR, [REG_ID_BKL], &mut buf).await;
+    buf[1]
+}
+
+const REG_ID_BK2: u8 = 0x0A;
+pub async fn set_key_backlight(brightness: u8) {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let _ = i2c
+        .write_read_async(MCU_ADDR, [REG_ID_BK2], &mut [brightness])
+        .await;
+}
+pub async fn get_key_backlight() -> u8 {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let mut buf = [0_u8; 2];
+
+    let _ = i2c.write_read_async(MCU_ADDR, [REG_ID_BK2], &mut buf).await;
+    buf[1]
+}
+
+const REG_ID_BAT: u8 = 0x0b;
+pub async fn get_battery() -> u8 {
+    let mut i2c = PERIPHERAL_BUS.get().lock().await;
+    let i2c = i2c.as_mut().unwrap();
+
+    let mut buf = [0_u8; 2];
+
+    let _ = i2c.write_read_async(MCU_ADDR, [REG_ID_BAT], &mut buf).await;
+
+    buf[1]
+}

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"]

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"

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,
+    }
+}

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" }

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(())
+}

src/display.rs

@@ -1,113 +0,0 @@
-use embassy_rp::{
-    gpio::{Level, Output},
-    peripherals::{PIN_13, PIN_14, PIN_15, SPI1},
-    spi::{Blocking, Spi},
-};
-use embassy_time::{Delay, Timer};
-use embedded_graphics::{
-    Drawable, Pixel,
-    pixelcolor::{Rgb565, raw::RawU16},
-    prelude::{DrawTarget, OriginDimensions, Point, Primitive, RawData, RgbColor, Size},
-    primitives::{PrimitiveStyle, Rectangle},
-};
-use embedded_hal_bus::spi::ExclusiveDevice;
-use st7365p_lcd::{Orientation, ST7365P};
-
-#[embassy_executor::task]
-pub async fn display_task(
-    spi: Spi<'static, SPI1, Blocking>,
-    cs: PIN_13,
-    data: PIN_14,
-    reset: PIN_15,
-) {
-    let spi_device = ExclusiveDevice::new(spi, Output::new(cs, Level::Low), Delay).unwrap();
-    let mut display = ST7365P::new(
-        spi_device,
-        Output::new(data, Level::Low),
-        Some(Output::new(reset, Level::High)),
-        true,
-        false,
-        320,
-        320,
-    );
-    display.init(&mut Delay).unwrap();
-    display.set_orientation(&Orientation::Landscape).unwrap();
-    let mut virtual_display = VirtualDisplay::new(display, 320 / 2, 320 / 2);
-
-    let thin_stroke = PrimitiveStyle::with_stroke(Rgb565::RED, 20);
-
-    Rectangle::new(Point::new(10, 10), Size::new(100, 100))
-        .into_styled(thin_stroke)
-        .draw(&mut virtual_display)
-        .unwrap();
-
-    loop {
-        Timer::after_millis(500).await;
-    }
-}
-
-/// simple abstraction over real display & resolution to reduce frame buffer size
-/// by cutting the resolution by 1/4
-struct VirtualDisplay {
-    display: ST7365P<
-        ExclusiveDevice<Spi<'static, SPI1, Blocking>, Output<'static>, Delay>,
-        Output<'static>,
-        Output<'static>,
-    >,
-    width: u32,
-    height: u32,
-}
-
-impl VirtualDisplay {
-    pub fn new(
-        display: ST7365P<
-            ExclusiveDevice<Spi<'static, SPI1, Blocking>, Output<'static>, Delay>,
-            Output<'static>,
-            Output<'static>,
-        >,
-        new_width: u32,
-        new_height: u32,
-    ) -> Self {
-        Self {
-            display,
-            width: new_width,
-            height: new_height,
-        }
-    }
-}
-
-impl DrawTarget for VirtualDisplay {
-    type Color = Rgb565;
-    type Error = ();
-
-    fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
-    where
-        I: IntoIterator<Item = Pixel<Self::Color>>,
-    {
-        for Pixel(coord, color) in pixels.into_iter() {
-            // Check bounds on the *virtual* (already reduced) resolution
-            if coord.x >= 0
-                && coord.y >= 0
-                && coord.x < self.width as i32
-                && coord.y < self.height as i32
-            {
-                let px = coord.x as u16 * 2;
-                let py = coord.y as u16 * 2;
-                let raw_color = RawU16::from(color).into_inner();
-
-                // Draw the 2x2 block on the underlying hardware
-                self.display.set_pixel(px, py, raw_color)?;
-                self.display.set_pixel(px + 1, py, raw_color)?;
-                self.display.set_pixel(px, py + 1, raw_color)?;
-                self.display.set_pixel(px + 1, py + 1, raw_color)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl OriginDimensions for VirtualDisplay {
-    fn size(&self) -> Size {
-        Size::new(self.width, self.height)
-    }
-}

src/peripherals/battery.rs

@@ -1,20 +0,0 @@
-use embassy_rp::{
-    i2c::{Async, I2c},
-    peripherals::I2C1,
-};
-use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, mutex::Mutex, watch::Watch};
-
-const REG_ID_BAT: u8 = 0x0b;
-
-pub static BATTERY_PCT: Watch<CriticalSectionRawMutex, u8, 1> = Watch::new();
-
-pub async fn read_battery(i2c: &mut I2c<'static, I2C1, Async>) {
-    let mut buf = [0_u8; 2];
-    i2c.write_read_async(super::MCU_ADDR, [REG_ID_BAT], &mut buf)
-        .await
-        .unwrap();
-
-    if buf[0] == REG_ID_BAT {
-        BATTERY_PCT.sender().send(buf[0]);
-    }
-}

src/peripherals/keyboard.rs

@@ -1,186 +0,0 @@
-use embassy_rp::{
-    i2c::{Async, I2c},
-    peripherals::I2C1,
-};
-use embassy_sync::{
-    blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex},
-    channel::Sender,
-};
-
-const REG_ID_KEY: u8 = 0x04;
-const REG_ID_FIF: u8 = 0x09;
-
-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(
-    i2c: &mut I2c<'static, I2C1, Async>,
-    channel: &mut Sender<'static, NoopRawMutex, KeyEvent, 10>,
-) {
-    let mut key_status = [0_u8; 1];
-
-    if i2c
-        .write_read_async(super::MCU_ADDR, [REG_ID_KEY], &mut key_status)
-        .await
-        .is_ok()
-    {
-        // TODO: use caps & num lock
-        let caps = key_status[0] & KEY_CAPSLOCK == KEY_CAPSLOCK;
-        let num = key_status[0] & KEY_NUMLOCK == KEY_NUMLOCK;
-        let fifo_count = key_status[0] & KEY_COUNT_MASK;
-
-        if fifo_count >= 1 {
-            let mut event = [0_u8; 2];
-
-            if i2c
-                .write_read_async(super::MCU_ADDR, [REG_ID_FIF], &mut event)
-                .await
-                .is_ok()
-            {
-                if let Ok(state) = KeyState::try_from(event[0]) {
-                    if let Ok(key) = KeyCode::try_from(event[1]) {
-                        let _ = channel.try_send(KeyEvent { key, state });
-                    }
-                }
-            }
-        }
-    }
-}
-
-pub struct KeyEvent {
-    pub key: KeyCode,
-    pub state: KeyState,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum KeyState {
-    Idle = 0,
-    Pressed,
-    Hold,
-    Released,
-}
-
-impl TryFrom<u8> for KeyState {
-    type Error = ();
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        match value {
-            0 => Ok(KeyState::Idle),
-            1 => Ok(KeyState::Pressed),
-            2 => Ok(KeyState::Hold),
-            3 => Ok(KeyState::Released),
-            _ => Err(()),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum KeyCode {
-    // Joystick
-    JoyUp = 0x01,
-    JoyDown = 0x02,
-    JoyLeft = 0x03,
-    JoyRight = 0x04,
-    JoyCenter = 0x05,
-
-    // Buttons
-    BtnLeft1 = 0x06,
-    BtnRight1 = 0x07,
-    BtnLeft2 = 0x11,
-    BtnRight2 = 0x12,
-
-    // Basic Keys
-    Backspace = 0x08,
-    Tab = 0x09,
-    Enter = 0x0A,
-
-    // Modifiers
-    ModAlt = 0xA1,
-    ModShiftLeft = 0xA2,
-    ModShiftRight = 0xA3,
-    ModSym = 0xA4,
-    ModCtrl = 0xA5,
-
-    // Navigation
-    Esc = 0xB1,
-    Left = 0xB4,
-    Up = 0xB5,
-    Down = 0xB6,
-    Right = 0xB7,
-
-    // Specials
-    Break = 0xD0,
-    Insert = 0xD1,
-    Home = 0xD2,
-    Del = 0xD4,
-    End = 0xD5,
-    PageUp = 0xD6,
-    PageDown = 0xD7,
-
-    // Locks
-    CapsLock = 0xC1,
-
-    // Function keys
-    F1 = 0x81,
-    F2 = 0x82,
-    F3 = 0x83,
-    F4 = 0x84,
-    F5 = 0x85,
-    F6 = 0x86,
-    F7 = 0x87,
-    F8 = 0x88,
-    F9 = 0x89,
-    F10 = 0x90,
-}
-
-impl TryFrom<u8> for KeyCode {
-    type Error = ();
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        use KeyCode::*;
-        match value {
-            0x01 => Ok(JoyUp),
-            0x02 => Ok(JoyDown),
-            0x03 => Ok(JoyLeft),
-            0x04 => Ok(JoyRight),
-            0x05 => Ok(JoyCenter),
-            0x06 => Ok(BtnLeft1),
-            0x07 => Ok(BtnRight1),
-            0x08 => Ok(Backspace),
-            0x09 => Ok(Tab),
-            0x0A => Ok(Enter),
-            0x11 => Ok(BtnLeft2),
-            0x12 => Ok(BtnRight2),
-            0xA1 => Ok(ModAlt),
-            0xA2 => Ok(ModShiftLeft),
-            0xA3 => Ok(ModShiftRight),
-            0xA4 => Ok(ModSym),
-            0xA5 => Ok(ModCtrl),
-            0xB1 => Ok(Esc),
-            0xB4 => Ok(Left),
-            0xB5 => Ok(Up),
-            0xB6 => Ok(Down),
-            0xB7 => Ok(Right),
-            0xC1 => Ok(CapsLock),
-            0xD0 => Ok(Break),
-            0xD1 => Ok(Insert),
-            0xD2 => Ok(Home),
-            0xD4 => Ok(Del),
-            0xD5 => Ok(End),
-            0xD6 => Ok(PageUp),
-            0xD7 => Ok(PageDown),
-            0x81 => Ok(F1),
-            0x82 => Ok(F2),
-            0x83 => Ok(F3),
-            0x84 => Ok(F4),
-            0x85 => Ok(F5),
-            0x86 => Ok(F6),
-            0x87 => Ok(F7),
-            0x88 => Ok(F8),
-            0x89 => Ok(F9),
-            0x90 => Ok(F10),
-            _ => Err(()),
-        }
-    }
-}

src/peripherals/mod.rs

@@ -1,72 +0,0 @@
-//! handles all the peripherals exposed by mcu through i2c (keyboard & battery registers)
-//!
-
-use embassy_futures::join::join;
-use embassy_rp::{
-    i2c::{Async, I2c},
-    peripherals::I2C1,
-};
-use embassy_sync::{blocking_mutex::raw::NoopRawMutex, channel::Sender, mutex::Mutex};
-use embassy_time::{Duration, Timer};
-
-#[cfg(feature = "defmt")]
-use defmt::info;
-
-pub mod keyboard;
-use keyboard::{KeyCode, KeyEvent, KeyState};
-mod battery;
-pub use battery::BATTERY_PCT;
-use battery::read_battery;
-
-use crate::peripherals::keyboard::read_keyboard_fifo;
-
-const MCU_ADDR: u8 = 0x1F;
-
-const REG_ID_VER: u8 = 0x01;
-const REG_ID_CFG: u8 = 0x02;
-const REG_ID_INT: u8 = 0x03;
-const REG_ID_KEY: u8 = 0x04;
-const REG_ID_BKL: u8 = 0x05;
-const REG_ID_DEB: u8 = 0x06;
-const REG_ID_FRQ: u8 = 0x07;
-const REG_ID_RST: u8 = 0x08;
-const REG_ID_FIF: u8 = 0x09;
-const REG_ID_BK2: u8 = 0x0A;
-const REG_ID_C64_MTX: u8 = 0x0c;
-const REG_ID_C64_JS: u8 = 0x0d;
-
-#[embassy_executor::task]
-pub async fn peripherals_task(
-    mut i2c: I2c<'static, I2C1, Async>,
-    mut keyboard_channel: Sender<'static, NoopRawMutex, KeyEvent, 10>,
-) {
-    Timer::after(embassy_time::Duration::from_millis(100)).await;
-
-    #[cfg(feature = "defmt")]
-    {
-        let mut ver = [0_u8; 1];
-        if let Ok(firm_ver) = i2c.write_read_async(MCU_ADDR, [REG_ID_VER], &mut ver).await {
-            info!("stm32 firmware version: v{}", ver[0]);
-        }
-    }
-
-    let i2c: Mutex<NoopRawMutex, I2c<'static, I2C1, Async>> = Mutex::new(i2c);
-
-    join(
-        async {
-            loop {
-                Timer::after(Duration::from_secs(10)).await;
-                let mut guard = i2c.lock().await;
-                read_battery(&mut guard).await;
-            }
-        },
-        async {
-            loop {
-                Timer::after(Duration::from_millis(50)).await;
-                let mut guard = i2c.lock().await;
-                read_keyboard_fifo(&mut guard, &mut keyboard_channel).await;
-            }
-        },
-    )
-    .await;
-}