global access to framebuff

kernel/src/display.rs

@@ -1,4 +1,4 @@
-use core::sync::atomic::Ordering;
+use core::{cell::RefCell, sync::atomic::Ordering};
 
 use defmt::info;
 use embassy_rp::{
@@ -6,7 +6,7 @@ use embassy_rp::{
     peripherals::{PIN_13, PIN_14, PIN_15, SPI1},
     spi::{Async, Spi},
 };
-use embassy_sync::{blocking_mutex::raw::ThreadModeRawMutex, signal::Signal};
+use embassy_sync::{blocking_mutex::raw::ThreadModeRawMutex, mutex::Mutex, signal::Signal};
 use embassy_time::{Delay, Instant, Timer};
 use embedded_graphics::{
     Drawable,
@@ -20,19 +20,31 @@ use embedded_graphics::{
 use embedded_hal_bus::spi::ExclusiveDevice;
 use portable_atomic::AtomicBool;
 use st7365p_lcd::{FrameBuffer, ST7365P};
+use static_cell::StaticCell;
+
+type DISPLAY = ST7365P<
+    ExclusiveDevice<Spi<'static, SPI1, Async>, Output<'static>, Delay>,
+    Output<'static>,
+    Output<'static>,
+    Delay,
+>;
 
 const SCREEN_WIDTH: usize = 320;
 const SCREEN_HEIGHT: usize = 320;
 
-pub static DISPLAY_SIGNAL: Signal<ThreadModeRawMutex, ()> = Signal::new();
+type FB = FrameBuffer<SCREEN_WIDTH, SCREEN_HEIGHT, { SCREEN_WIDTH * SCREEN_HEIGHT }>;
+static FRAMEBUFFER_CELL: StaticCell<FB> = StaticCell::new();
+pub static FRAMEBUFFER: Mutex<ThreadModeRawMutex, RefCell<Option<&'static mut FB>>> =
+    Mutex::new(RefCell::new(None));
 
-pub async fn display_handler(
+pub async fn init_display(
     spi: Spi<'static, SPI1, Async>,
     cs: PIN_13,
     data: PIN_14,
     reset: PIN_15,
-) {
+) -> DISPLAY {
     let spi_device = ExclusiveDevice::new(spi, Output::new(cs, Level::Low), Delay).unwrap();
+    defmt::info!("spi made");
     let mut display = ST7365P::new(
         spi_device,
         Output::new(data, Level::Low),
@@ -41,28 +53,31 @@ pub async fn display_handler(
         true,
         Delay,
     );
-    let mut framebuffer: FrameBuffer<
-        SCREEN_WIDTH,
-        SCREEN_HEIGHT,
-        { SCREEN_WIDTH * SCREEN_HEIGHT },
-    > = FrameBuffer::new();
+    let framebuffer = FRAMEBUFFER_CELL.init(FrameBuffer::new());
     display.init().await.unwrap();
     display.set_custom_orientation(0x40).await.unwrap();
     framebuffer.draw(&mut display).await.unwrap();
     display.set_on().await.unwrap();
+    FRAMEBUFFER
+        .lock()
+        .await
+        .swap(&RefCell::new(Some(framebuffer)));
 
-    DISPLAY_SIGNAL.signal(());
+    display
+}
 
+pub async fn display_handler(mut display: DISPLAY) {
     loop {
-        DISPLAY_SIGNAL.wait().await;
-
-        // text.draw(&mut framebuffer).unwrap();
-
-        let start = Instant::now();
-        framebuffer
+        defmt::info!("drawing");
+        FRAMEBUFFER
+            .lock()
+            .await
+            .borrow_mut()
+            .as_mut()
+            .unwrap()
             .partial_draw_batched(&mut display)
             .await
             .unwrap();
-        info!("Elapsed {}ms", start.elapsed().as_millis());
+        Timer::after_millis(32).await; // 30 fps
     }
 }