From 2d31e62d8254075c492e6499b2bff8646195415e Mon Sep 17 00:00:00 2001 From: sawyer bristol Date: Thu, 17 Jul 2025 23:34:20 -0600 Subject: [PATCH] Squash merge keyboard-writer into main --- Cargo.lock | 225 +++++++++++++++++++++++++++++------- Cargo.toml | 5 +- src/display.rs | 140 +++++++++------------- src/main.rs | 87 +++++++++----- src/peripherals/keyboard.rs | 24 ++-- src/peripherals/mod.rs | 24 ++-- 6 files changed, 313 insertions(+), 192 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe98260..13db5ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,7 +42,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891" dependencies = [ - "term 1.0.2", + "term 1.1.0", ] [[package]] @@ -138,6 +138,18 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -447,12 +459,13 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "embassy-embedded-hal" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fea5ef5bed4d3468dfd44f5c9fa4cda8f54c86d4fb4ae683eacf9d39e2ea12" +checksum = "8578db196d74db92efdd5ebc546736dac1685499ee245b22eff92fa5e4b57945" dependencies = [ "embassy-futures", - "embassy-sync 0.6.2", + "embassy-hal-internal 0.3.0", + "embassy-sync 0.7.0", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0", @@ -505,6 +518,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "embassy-hal-internal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95285007a91b619dc9f26ea8f55452aa6c60f7115a4edc05085cd2bd3127cd7a" +dependencies = [ + "num-traits", +] + [[package]] name = "embassy-net-driver" version = "0.2.0" @@ -513,13 +535,13 @@ checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" [[package]] name = "embassy-net-driver-channel" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4818c32afec43e3cae234f324bad9a976c9aa7501022d26ff60a4017a1a006b7" +checksum = "25a567ab50319d866ad5e6c583ed665ba9b07865389644d3d82e45bf1497c934" dependencies = [ "embassy-futures", "embassy-net-driver", - "embassy-sync 0.6.2", + "embassy-sync 0.7.0", ] [[package]] @@ -536,7 +558,7 @@ dependencies = [ "document-features", "embassy-embedded-hal", "embassy-futures", - "embassy-hal-internal", + "embassy-hal-internal 0.2.0", "embassy-sync 0.6.2", "embassy-time", "embassy-usb-driver", @@ -574,7 +596,7 @@ dependencies = [ "document-features", "embassy-embedded-hal", "embassy-futures", - "embassy-hal-internal", + "embassy-hal-internal 0.2.0", "embassy-sync 0.6.2", "embassy-time", "embassy-time-driver", @@ -666,11 +688,12 @@ dependencies = [ [[package]] name = "embassy-usb-driver" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" +checksum = "340c5ce591ef58c6449e43f51d2c53efe1bf0bb6a40cbf80afa0d259c7d52c76" dependencies = [ - "defmt 0.3.100", + "defmt 1.0.1", + "embedded-io-async", ] [[package]] @@ -844,6 +867,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.31" @@ -989,15 +1018,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1006,9 +1026,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown", @@ -1022,7 +1042,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1101,7 +1121,7 @@ dependencies = [ "regex-syntax 0.8.5", "sha3", "string_cache", - "term 1.0.2", + "term 1.1.0", "unicode-xid", "walkdir", ] @@ -1288,7 +1308,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -1355,10 +1375,13 @@ dependencies = [ "embedded-hal-async", "embedded-hal-bus", "embedded-sdmmc", + "heapless", "panic-probe", "portable-atomic", + "spin", "st7365p-lcd", "static_cell", + "talc", "trouble-host", ] @@ -1541,6 +1564,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand_core" version = "0.6.4" @@ -1604,9 +1633,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" dependencies = [ "bytemuck", ] @@ -1728,12 +1757,24 @@ dependencies = [ ] [[package]] -name = "st7365p-lcd" +name = "spin" version = "0.10.0" -source = "git+https://github.com/legitcamper/st7365p-lcd-rs#d751e8d30f1a3f964ffe05e4bb16f82112fbefce" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" dependencies = [ + "lock_api", +] + +[[package]] +name = "st7365p-lcd" +version = "0.11.0" +source = "git+https://github.com/legitcamper/st7365p-lcd-rs?branch=async#87abf450404865dcb535292e9e1a6a2457fd4599" +dependencies = [ + "bitvec", "embedded-graphics-core", "embedded-hal 1.0.0", + "embedded-hal-async", + "heapless", "nb 1.1.0", ] @@ -1792,6 +1833,21 @@ 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 = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "term" version = "0.7.0" @@ -1805,12 +1861,11 @@ dependencies = [ [[package]] name = "term" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a984c8d058c627faaf5e8e2ed493fa3c51771889196de1016cf9c1c6e90d750" +checksum = "a43bddab41f8626c7bdaab872bbba75f8df5847b516d77c569c746e2ae5eb746" dependencies = [ - "home", - "windows-sys", + "windows-sys 0.60.2", ] [[package]] @@ -2061,7 +2116,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -2076,7 +2131,16 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", ] [[package]] @@ -2085,14 +2149,30 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -2101,48 +2181,105 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "zerocopy" version = "0.8.26" diff --git a/Cargo.toml b/Cargo.toml index 5a9425d..6477884 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,10 @@ 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 = { git = "https://github.com/legitcamper/st7365p-lcd-rs", branch = "async" } static_cell = "2.1.1" bitflags = "2.9.1" +talc = "4.4.3" +spin = "0.10.0" +heapless = "0.8.0" diff --git a/src/display.rs b/src/display.rs index fe3f2b0..7cf9ab4 100644 --- a/src/display.rs +++ b/src/display.rs @@ -1,21 +1,35 @@ +use core::sync::atomic::Ordering; + +use defmt::info; use embassy_rp::{ gpio::{Level, Output}, peripherals::{PIN_13, PIN_14, PIN_15, SPI1}, - spi::{Blocking, Spi}, + spi::{Async, Spi}, }; -use embassy_time::{Delay, Timer}; +use embassy_sync::{blocking_mutex::raw::ThreadModeRawMutex, signal::Signal}; +use embassy_time::{Delay, Instant, Timer}; use embedded_graphics::{ - Drawable, Pixel, - pixelcolor::{Rgb565, raw::RawU16}, - prelude::{DrawTarget, OriginDimensions, Point, Primitive, RawData, RgbColor, Size}, - primitives::{PrimitiveStyle, Rectangle}, + Drawable, + draw_target::DrawTarget, + mono_font::{MonoTextStyle, ascii::FONT_10X20}, + pixelcolor::Rgb565, + prelude::{Dimensions, Point, RgbColor, Size}, + primitives::Rectangle, + text::{Alignment, Text}, }; use embedded_hal_bus::spi::ExclusiveDevice; -use st7365p_lcd::{Orientation, ST7365P}; +use portable_atomic::AtomicBool; +use st7365p_lcd::{FrameBuffer, ST7365P}; -#[embassy_executor::task] -pub async fn display_task( - spi: Spi<'static, SPI1, Blocking>, +use crate::LAST_TEXT_RECT; + +const SCREEN_WIDTH: usize = 320; +const SCREEN_HEIGHT: usize = 320; + +pub static DISPLAY_SIGNAL: Signal = Signal::new(); + +pub async fn display_handler( + spi: Spi<'static, SPI1, Async>, cs: PIN_13, data: PIN_14, reset: PIN_15, @@ -25,89 +39,49 @@ pub async fn display_task( spi_device, Output::new(data, Level::Low), Some(Output::new(reset, Level::High)), - true, false, - 320, - 320, + true, + Delay, ); - display.init(&mut Delay).unwrap(); - display.set_orientation(&Orientation::Landscape).unwrap(); - let mut virtual_display = VirtualDisplay::new(display, 320 / 2, 320 / 2); + let mut framebuffer: FrameBuffer< + SCREEN_WIDTH, + SCREEN_HEIGHT, + { SCREEN_WIDTH * SCREEN_HEIGHT }, + > = FrameBuffer::new(); + display.init().await.unwrap(); + display.set_custom_orientation(0x40).await.unwrap(); + framebuffer.draw(&mut display).await.unwrap(); + display.set_on().await.unwrap(); - 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(); + DISPLAY_SIGNAL.signal(()); loop { - Timer::after_millis(500).await; - } -} + DISPLAY_SIGNAL.wait().await; -/// simple abstraction over real display & resolution to reduce frame buffer size -/// by cutting the resolution by 1/4 -struct VirtualDisplay { - display: ST7365P< - ExclusiveDevice, Output<'static>, Delay>, - Output<'static>, - Output<'static>, - >, - width: u32, - height: u32, -} + let text_string = crate::STRING.lock().await.clone(); -impl VirtualDisplay { - pub fn new( - display: ST7365P< - ExclusiveDevice, Output<'static>, Delay>, - Output<'static>, - Output<'static>, - >, - new_width: u32, - new_height: u32, - ) -> Self { - Self { - display, - width: new_width, - height: new_height, - } - } -} + let text = Text::with_alignment( + &text_string, + Point::new(160, 160), + MonoTextStyle::new(&FONT_10X20, Rgb565::RED), + Alignment::Center, + ); -impl DrawTarget for VirtualDisplay { - type Color = Rgb565; - type Error = (); - - fn draw_iter(&mut self, pixels: I) -> Result<(), Self::Error> - where - I: IntoIterator>, - { - 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)?; + { + let rect = LAST_TEXT_RECT.lock().await; + if let Some(rect) = *rect.borrow() { + framebuffer.fill_solid(&rect, Rgb565::BLACK).unwrap(); } + *rect.borrow_mut() = Some(text.bounding_box()); } - Ok(()) - } -} -impl OriginDimensions for VirtualDisplay { - fn size(&self) -> Size { - Size::new(self.width, self.height) + text.draw(&mut framebuffer).unwrap(); + + let start = Instant::now(); + framebuffer + .partial_draw_batched(&mut display) + .await + .unwrap(); + info!("Elapsed {}ms", start.elapsed().as_millis()); } } diff --git a/src/main.rs b/src/main.rs index 56b63f8..e754b93 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,57 +1,82 @@ #![feature(impl_trait_in_assoc_type)] +#![feature(ascii_char)] #![no_std] #![no_main] -#[cfg(feature = "defmt")] -use defmt::*; +use crate::{ + display::DISPLAY_SIGNAL, + peripherals::keyboard::{KeyCode, KeyState, read_keyboard_fifo}, +}; + use {defmt_rtt as _, panic_probe as _}; +use core::cell::RefCell; use embassy_executor::Spawner; +use embassy_futures::join::join; 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_rp::{i2c, i2c::I2c, spi}; +use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; +use embassy_sync::mutex::Mutex; use embassy_time::Timer; -use embedded_hal_bus::spi::ExclusiveDevice; -use embedded_sdmmc::asynchronous::{File, SdCard, ShortFileName, VolumeIdx, VolumeManager}; -use static_cell::StaticCell; +use embedded_graphics::primitives::Rectangle; +use heapless::String; mod peripherals; -use peripherals::{keyboard::KeyEvent, peripherals_task}; +use peripherals::conf_peripherals; mod display; -use display::display_task; +use display::display_handler; embassy_rp::bind_interrupts!(struct Irqs { I2C1_IRQ => i2c::InterruptHandler; }); +static STRING: Mutex> = Mutex::new(String::new()); +static LAST_TEXT_RECT: Mutex>> = + Mutex::new(RefCell::new(None)); + #[embassy_executor::main] -async fn main(spawner: Spawner) { +async fn main(_spawner: Spawner) { let p = embassy_rp::init(Default::default()); - static KEYBOARD_EVENTS: StaticCell> = StaticCell::new(); - let keyboard_events = KEYBOARD_EVENTS.init(Channel::new()); + STRING.lock().await.push_str("Press Del").unwrap(); // configure keyboard event handler let mut config = i2c::Config::default(); - config.frequency = 100_000; + config.frequency = 400_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(); + conf_peripherals(i2c1).await; - // // 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); - // spawner - // .spawn(display_task(spi1, p.PIN_13, p.PIN_14, p.PIN_15)) - // .unwrap(); + 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, + ); + + join( + async { + loop { + Timer::after_millis(20).await; + if let Some(key) = read_keyboard_fifo().await + && key.state == KeyState::Pressed + { + let mut string = STRING.lock().await; + match key.key { + KeyCode::Backspace => { + string.pop().unwrap(); + } + KeyCode::Del => { + string.clear(); + } + KeyCode::Char(c) => { + string.push(c).unwrap(); + } + _ => (), + } + DISPLAY_SIGNAL.signal(()); + } + } + }, + display_handler(spi1, p.PIN_13, p.PIN_14, p.PIN_15), + ) + .await; } diff --git a/src/peripherals/keyboard.rs b/src/peripherals/keyboard.rs index eaa07c7..208a335 100644 --- a/src/peripherals/keyboard.rs +++ b/src/peripherals/keyboard.rs @@ -1,12 +1,3 @@ -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; @@ -17,7 +8,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(channel: &mut Sender<'static, NoopRawMutex, KeyEvent, 10>) { +pub async fn read_keyboard_fifo() -> Option { let mut i2c = PERIPHERAL_BUS.get().lock().await; let i2c = i2c.as_mut().unwrap(); @@ -40,16 +31,15 @@ pub async fn read_keyboard_fifo(channel: &mut Sender<'static, NoopRawMutex, KeyE .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"); + return Some(KeyEvent { + state: KeyState::from(event[0]), + key: KeyCode::from(event[1]), + mods: Modifiers::NONE, + }); } } } + None } const REG_ID_DEB: u8 = 0x06; diff --git a/src/peripherals/mod.rs b/src/peripherals/mod.rs index b3e7d1a..d00c7ec 100644 --- a/src/peripherals/mod.rs +++ b/src/peripherals/mod.rs @@ -5,13 +5,10 @@ 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}; +use embassy_sync::{blocking_mutex::raw::NoopRawMutex, lazy_lock::LazyLock, mutex::Mutex}; +use embassy_time::Timer; pub mod keyboard; -use keyboard::{KeyCode, KeyEvent, KeyState}; use crate::peripherals::keyboard::{configure_keyboard, read_keyboard_fifo}; @@ -25,23 +22,18 @@ 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>, -) { +pub async fn conf_peripherals(i2c: I2CBUS) { 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; - } + // empty keys + while read_keyboard_fifo().await.is_some() {} + + // set_lcd_backlight(255).await; + set_key_backlight(0).await; } /// return major & minor mcu version