From c21a54618cb7e7c66a76dd9b9201a49fbf87ce4c Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Mon, 8 Sep 2025 14:56:23 -1000
Subject: [PATCH 01/19] First draft of screen support

---
 ui-stm32/Cargo.toml        |  3 ++-
 ui-stm32/src/board/ev13.rs | 25 ++++++++++++++++++++++++-
 ui-stm32/src/board/mod.rs  |  2 ++
 ui-stm32/src/main.rs       | 24 ++++++++++++++++++++++--
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/ui-stm32/Cargo.toml b/ui-stm32/Cargo.toml
index 8cdb6612..23bb70cc 100644
--- a/ui-stm32/Cargo.toml
+++ b/ui-stm32/Cargo.toml
@@ -20,12 +20,13 @@ defmt-rtt = "1.0.0"
 
 embassy-executor = { version = "0.8.0", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] }
 embassy-futures = { version = "0.1.1", features = ["defmt"] }
-embassy-stm32 = { version = "0.3.0", features = ["defmt", "stm32f405rg", "memory-x", "time-driver-tim4", "exti", "chrono"] }
+embassy-stm32 = { version = "0.3.0", features = ["defmt", "stm32f405rg", "memory-x", "time-driver-tim1", "exti", "chrono"] }
 embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
 
 heapless = { version = "0.8", default-features = false }
 panic-probe = { version = "1.0.0", features = ["print-defmt"] }
 embassy-sync = { version = "0.7.1", features = ["defmt"] }
+num_enum = { version = "0.7.4", default-features = false }
 
 [profile.release]
 debug = 2
diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index a6a44beb..6a8471da 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -1,12 +1,14 @@
-use super::{Button, Keyboard, StatusLed};
+use super::{screen::Screen, Button, Keyboard, StatusLed};
 use embassy_stm32::{
     exti::ExtiInput,
     gpio::{Input, Level, Output, Pull, Speed},
+    spi::Spi,
 };
 use ui_app::{Led, Outputs};
 
 pub struct Board {
     status_led: StatusLed,
+    pub screen: Screen, // XXX should not be pub
     pub ptt_button: Option<Button>,
     pub ai_button: Option<Button>,
     pub keyboard: Option<Keyboard>,
@@ -45,8 +47,29 @@ impl Board {
         ];
         let keyboard = Keyboard::new(cols, rows);
 
+        // Screen
+        let chip_select = Output::new(p.PB8, Level::Low, Speed::Low);
+        let data_command = Output::new(p.PB9, Level::Low, Speed::Low);
+        let reset = Output::new(p.PC13, Level::Low, Speed::Low);
+        let backlight = Output::new(p.PC14, Level::Low, Speed::Low);
+
+        let config = {
+            use embassy_stm32::spi::*;
+            let mut config = Config::default();
+            config.mode.polarity = Polarity::IdleLow;
+            config.mode.phase = Phase::CaptureOnFirstTransition;
+            config.bit_order = BitOrder::MsbFirst;
+            config
+        };
+        let spi1 = Spi::new_blocking_txonly(p.SPI1, p.PA5, p.PA7, config);
+        let mut screen = Screen::new(chip_select, data_command, reset, backlight, spi1);
+
+        // TODO(RLB): NET UART
+        // TODO(RLB): MGMT UART
+
         Self {
             status_led,
+            screen,
             ptt_button: Some(ptt_button),
             ai_button: Some(ai_button),
             keyboard: Some(keyboard),
diff --git a/ui-stm32/src/board/mod.rs b/ui-stm32/src/board/mod.rs
index 028d9745..48c2c60c 100644
--- a/ui-stm32/src/board/mod.rs
+++ b/ui-stm32/src/board/mod.rs
@@ -27,6 +27,8 @@ use ui_app::Led;
 mod keyboard;
 pub use keyboard::Keyboard;
 
+mod screen;
+
 struct StatusLed {
     r: Output<'static>,
     g: Output<'static>,
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 3c8df546..388d53d2 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -4,7 +4,7 @@
 mod board;
 
 use board::{Board, Button, Keyboard};
-use ui_app::{App, Event};
+use ui_app::{App, Color, Event, Led, Outputs};
 
 use defmt::*;
 use embassy_executor::Spawner;
@@ -40,6 +40,7 @@ async fn monitor_keyboard(mut keyboard: Keyboard, events: EventSender) {
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let mut board = Board::new();
+    /*
     let mut app = App::new();
 
     // Capture button events
@@ -63,11 +64,30 @@ async fn main(spawner: Spawner) {
         EVENT_QUEUE.sender()
     )));
 
+    board.screen.init().await; // XXX
+    //board.screen.clear_screen(0b00000_111111_00000); // XXX
+
     app.start(&mut board);
+    */
 
     // Main event loop
-    loop {
+    let colors = [
+        Color::Black,
+        Color::Red,
+        Color::Green,
+        Color::Blue,
+        Color::Cyan,
+        Color::Purple,
+        Color::Yellow,
+        Color::White,
+    ];
+    for i in 0.. {
+        let color = colors[i % colors.len()];
+        board.status_led().set_color(color);
+
+        /*
         let event = EVENT_QUEUE.receive().await;
         app.handle(event, &mut board);
+        */
     }
 }

From 1003908a08f92955356e5cfa6a4e1069d23ac6ca Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Tue, 9 Sep 2025 10:39:29 -1000
Subject: [PATCH 02/19] Add missing file

---
 ui-stm32/src/board/screen.rs | 147 +++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 ui-stm32/src/board/screen.rs

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
new file mode 100644
index 00000000..b11982d1
--- /dev/null
+++ b/ui-stm32/src/board/screen.rs
@@ -0,0 +1,147 @@
+use core::convert::TryFrom;
+use embassy_stm32::{gpio::Output, mode::Blocking, spi::Spi};
+use embassy_time::Timer;
+use num_enum::IntoPrimitive;
+
+pub struct Screen {
+    chip_select: Output<'static>,
+    data_command: Output<'static>,
+    reset: Output<'static>,
+    backlight: Output<'static>,
+    spi: Spi<'static, Blocking>,
+}
+
+impl Screen {
+    pub fn new(
+        chip_select: Output<'static>,
+        data_command: Output<'static>,
+        reset: Output<'static>,
+        backlight: Output<'static>,
+        spi: Spi<'static, Blocking>,
+    ) -> Self {
+        Self {
+            chip_select,
+            data_command,
+            reset,
+            backlight,
+            spi,
+        }
+    }
+
+    // Initial command sequence borrowed from
+    //
+    // https://github.com/yuri91/ili9341-rs/blob/master/src/lib.rs#L139
+    //
+    // It might be better to put this in new(), as is done there.
+    pub async fn init(&mut self) {
+        // Chip select pin is always held low
+        self.chip_select.set_low();
+
+        // Do hardware reset by holding reset low for at least 10us, then wait 5ms for the reset to
+        // occur before sending more commands.
+        self.reset.set_low();
+        Timer::after_micros(100).await;
+        self.reset.set_high();
+        Timer::after_millis(5).await;
+
+        // Do hardware reset, then wait 120ms for the reset to occur before sending more commands.
+        self.send_command(Command::SoftwareReset, &[]);
+        Timer::after_millis(120).await;
+
+        // Set portrait orientation
+        self.set_orientation(Orientation::Portrait);
+
+        // Set the pixel format to rgb565
+        self.send_command(Command::SetPixelFormat, &[0x55]);
+
+        // Have the display emerge from sleep, then wait 5ms for it to wake up
+        self.send_command(Command::SleepModeOff, &[]);
+        Timer::after_millis(5).await;
+
+        // Turn the display on
+        self.send_command(Command::DisplayOn, &[]);
+
+        // Turn on the backlight
+        self.set_backlight(true);
+    }
+
+    pub fn clear_screen(&mut self, color: u16) {
+        const WIDTH: usize = 240;
+        const HEIGHT: usize = 320;
+
+        let row = [color; WIDTH];
+
+        self.set_window(0, 0, WIDTH, HEIGHT);
+        for i in 0..HEIGHT {
+            self.spi.blocking_write(&row).unwrap();
+        }
+    }
+
+    fn set_window(&mut self, x0: usize, y0: usize, x1: usize, y1: usize) {
+        let mut x_data = [0u8; 4];
+        x_data[..2].copy_from_slice(&(x0 as u16).to_be_bytes());
+        x_data[2..].copy_from_slice(&(x1 as u16).to_be_bytes());
+
+        let mut y_data = [0u8; 4];
+        y_data[..2].copy_from_slice(&(y0 as u16).to_be_bytes());
+        y_data[2..].copy_from_slice(&(y1 as u16).to_be_bytes());
+
+        self.send_command(Command::SetColumnAddress, &x_data);
+        self.send_command(Command::SetPageAddress, &y_data);
+    }
+
+    fn send_command(&mut self, cmd: Command, data: &[u8]) {
+        self.data_command.set_low();
+        self.spi.blocking_write(&[u8::from(cmd)]).unwrap(); // TODO propagate error
+
+        self.send_data(data);
+    }
+
+    fn send_data(&mut self, data: &[u8]) {
+        self.data_command.set_high();
+        self.spi.blocking_write(data).unwrap(); // TODO propagate error
+    }
+
+    fn set_orientation(&mut self, orientation: Orientation) {
+        // TODO set internal width/height
+        self.send_command(Command::MemoryAccessControl, &[u8::from(orientation)]);
+    }
+
+    pub fn set_backlight(&mut self, on: bool) {
+        self.backlight.set_level(on.into());
+    }
+}
+
+#[derive(Copy, Clone, IntoPrimitive)]
+#[repr(u8)]
+enum Command {
+    SetColumnAddress = 0x2a,
+    ContentAdaptiveBrightness = 0x55,
+    DisplayOff = 0x28,
+    DisplayOn = 0x29,
+    IdleModeFrameRate = 0xb2,
+    IdleModeOff = 0x38,
+    IdleModeOn = 0x39,
+    InvertOff = 0x20,
+    InvertOn = 0x21,
+    MemoryAccessControl = 0x36,
+    MemoryWrite = 0x2c,
+    NormalModeFrameRate = 0xb1,
+    SetPageAddress = 0x2b,
+    SetPixelFormat = 0x3a,
+    SetBrightness = 0x51,
+    SleepModeOff = 0x11,
+    SleepModeOn = 0x10,
+    SoftwareReset = 0x01,
+    VerticalScrollAddr = 0x37,
+    VerticalScrollDefine = 0x33,
+}
+
+#[derive(Copy, Clone, IntoPrimitive)]
+#[repr(u8)]
+enum Orientation {
+    Portrait = 0x40 | 0x08,
+    Landscape = 0x20 | 0x08,
+    PortraitFlipped = 0x80 | 0x08,
+    LandscapeFlipped = 0x40 | 0x80 | 0x20 | 0x08,
+}

From 8f6fa90b68a85b3934f71505c38423257ba0f49f Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Tue, 9 Sep 2025 11:14:46 -1000
Subject: [PATCH 03/19] Add generic interface and Tauri implementation

---
 ui-app/src/lib.rs             | 57 ++++++++++++++++++++++++++++
 ui-tauri/src-tauri/src/lib.rs | 71 ++++++++++++++++++++++++++++++++++-
 ui-tauri/src/main.js          |  6 ++-
 3 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/ui-app/src/lib.rs b/ui-app/src/lib.rs
index b1780fa6..6fd954bb 100644
--- a/ui-app/src/lib.rs
+++ b/ui-app/src/lib.rs
@@ -113,8 +113,21 @@ pub trait Led {
     }
 }
 
+fn rgb565(r: u8, g: u8, b: u8) -> u16 {
+    // Discard the low-order bits of the colors
+    (((r as u16) >> 3) << 11) | (((g as u16) >> 2) << 5) | ((b as u16) >> 3)
+}
+
+pub trait Screen {
+    fn width(&self) -> usize;
+    fn height(&self) -> usize;
+    fn fill(&mut self, color: u16);
+    fn draw(&mut self, left: usize, right: usize, top: usize, bottom: usize, data: &[u16]);
+}
+
 pub trait Outputs {
     fn status_led(&mut self) -> &mut impl Led;
+    fn screen(&mut self) -> &mut impl Screen;
     fn log(&mut self, message: &str);
 }
 
@@ -134,7 +147,51 @@ impl App {
     }
 
     pub fn start(&mut self, out: &mut impl Outputs) {
+        // Extinguish the status LED
         out.status_led().set_color(Color::Black);
+
+        // Draw a test pattern to the screen
+        const SIZE: usize = 10;
+        let screen = out.screen();
+        let mut data = [0_u16; SIZE * SIZE];
+
+        // Background
+        screen.fill(rgb565(0x88, 0x88, 0x88));
+
+        // Upper left = R
+        let (x0, x1, y0, y1) = (SIZE, SIZE + SIZE, SIZE, SIZE + SIZE);
+        data.fill(rgb565(0xFF, 0x00, 0x00));
+        screen.draw(x0, x1, y0, y1, &data);
+
+        // Upper right = G
+        let (x0, x1, y0, y1) = (
+            screen.width() - SIZE - SIZE,
+            screen.width() - SIZE,
+            SIZE,
+            SIZE + SIZE,
+        );
+        data.fill(rgb565(0x00, 0xFF, 0x00));
+        screen.draw(x0, x1, y0, y1, &data);
+
+        // Lower left = B
+        let (x0, x1, y0, y1) = (
+            SIZE,
+            SIZE + SIZE,
+            screen.height() - SIZE - SIZE,
+            screen.height() - SIZE,
+        );
+        data.fill(rgb565(0x00, 0x00, 0xFF));
+        screen.draw(x0, x1, y0, y1, &data);
+
+        // Lower right = Y
+        let (x0, x1, y0, y1) = (
+            screen.width() - SIZE - SIZE,
+            screen.width() - SIZE,
+            screen.height() - SIZE - SIZE,
+            screen.height() - SIZE,
+        );
+        data.fill(rgb565(0xFF, 0xFF, 0x00));
+        screen.draw(x0, x1, y0, y1, &data);
     }
 
     pub fn handle(&mut self, event: Event, out: &mut impl Outputs) {
diff --git a/ui-tauri/src-tauri/src/lib.rs b/ui-tauri/src-tauri/src/lib.rs
index d9cf49f3..b8c70804 100644
--- a/ui-tauri/src-tauri/src/lib.rs
+++ b/ui-tauri/src-tauri/src/lib.rs
@@ -5,7 +5,7 @@ use core::ops::DerefMut;
 use once_cell::sync::OnceCell;
 use std::sync::Mutex;
 use tauri::Emitter;
-use ui_app::{App, Event, Key, KeyValue, Led, Outputs};
+use ui_app::{App, Event, Key, KeyValue, Led, Outputs, Screen};
 
 mod hactar_vaporwave;
 
@@ -19,6 +19,17 @@ mod cmd {
         pub g: usize,
         pub b: usize,
     }
+
+    #[derive(Clone, Serialize)]
+    pub struct Draw<'a> {
+        pub left: usize,
+        pub right: usize,
+        pub top: usize,
+        pub bottom: usize,
+
+        /// Data in <canvas> RGBA format
+        pub data: &'a [u8],
+    }
 }
 
 const UI_LED_NAME: &str = "led-ui";
@@ -47,11 +58,69 @@ impl Led for Board {
     }
 }
 
+impl Screen for Board {
+    fn width(&self) -> usize {
+        320
+    }
+
+    fn height(&self) -> usize {
+        240
+    }
+
+    fn fill(&mut self, color: u16) {
+        let data = [color; 320 * 240];
+        self.draw(0, self.width(), 0, self.height(), &data);
+    }
+
+    fn draw(&mut self, left: usize, right: usize, top: usize, bottom: usize, data: &[u16]) {
+        println!(
+            "draw {} {} {} {} ({} x {} == {}? {})",
+            left,
+            right,
+            top,
+            bottom,
+            (right - left),
+            (bottom - top),
+            data.len(),
+            data.len() == (right - left) * (bottom - top)
+        );
+
+        // Unpack the rgb565 values to RGBA tuples
+        let data: Vec<u8> = data
+            .iter()
+            .map(|rgb565| {
+                [
+                    (((rgb565 & 0b11111_000000_00000) >> 11) << 3) as u8, // R
+                    (((rgb565 & 0b00000_111111_00000) >> 5) << 2) as u8,  // G
+                    (((rgb565 & 0b00000_000000_11111) >> 0) << 3) as u8,  // B
+                    (0xff as u8),                                         // A
+                ]
+            })
+            .flatten()
+            .collect();
+
+        // Send the draw command to the UI
+        let cmd = cmd::Draw {
+            left,
+            right,
+            top,
+            bottom,
+            data: data.as_slice(),
+        };
+
+        self.app.emit("Screen", cmd).unwrap();
+    }
+}
+
 impl Outputs for Board {
     fn status_led(&mut self) -> &mut impl Led {
         self
     }
 
+    fn screen(&mut self) -> &mut impl Screen {
+        self
+    }
+
     fn log(&mut self, message: &str) {
         println!("LOG: {}", message);
     }
diff --git a/ui-tauri/src/main.js b/ui-tauri/src/main.js
index 8ad83e88..16d5bccc 100644
--- a/ui-tauri/src/main.js
+++ b/ui-tauri/src/main.js
@@ -70,11 +70,13 @@ async function handle_ptt(e) {
 }
 
 async function handle_screen(e) {
-  let { left, top, width, height, data } = e.payload;
+  let { left, right, top, bottom, data } = e.payload;
 
   const screen = document.getElementById("screen");
   const ctx = screen.getContext("2d");
 
+  const width = right - left;
+  const height = bottom - top;
   const imageData = ctx.createImageData(width, height);
 
   if (data.length != imageData.data.length) {
@@ -102,7 +104,7 @@ async function handle_events() {
   const ptt_state = listen('PttState', handle_ptt);
   const screen = listen('Screen', handle_screen);
   const led = listen('LED', handle_led);
-  return Promise.all([ptt_state, screen])
+  return Promise.all([ptt_state, screen, led])
 }
 
 window.addEventListener("DOMContentLoaded", async () => {

From f9869c51caabd2abf6b56ceae01e8f10873a39ec Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Tue, 9 Sep 2025 12:56:46 -1000
Subject: [PATCH 04/19] Implement Screen in stm32 and do some cleanup

---
 ui-stm32/src/board/ev13.rs   |  6 +++-
 ui-stm32/src/board/mod.rs    |  1 +
 ui-stm32/src/board/screen.rs | 65 +++++++++++++++++++++++-------------
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index 6a8471da..f3060cab 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -1,4 +1,4 @@
-use super::{screen::Screen, Button, Keyboard, StatusLed};
+use super::{Button, Keyboard, Screen, StatusLed};
 use embassy_stm32::{
     exti::ExtiInput,
     gpio::{Input, Level, Output, Pull, Speed},
@@ -82,6 +82,10 @@ impl Outputs for Board {
         &mut self.status_led
     }
 
+    fn screen(&mut self) -> &mut impl ui_app::Screen {
+        &mut self.screen
+    }
+
     fn log(&mut self, message: &str) {
         defmt::info!("{}", message);
     }
diff --git a/ui-stm32/src/board/mod.rs b/ui-stm32/src/board/mod.rs
index 48c2c60c..b9e27446 100644
--- a/ui-stm32/src/board/mod.rs
+++ b/ui-stm32/src/board/mod.rs
@@ -28,6 +28,7 @@ mod keyboard;
 pub use keyboard::Keyboard;
 
 mod screen;
+pub use screen::Screen;
 
 struct StatusLed {
     r: Output<'static>,
diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index b11982d1..5b37f57e 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -1,5 +1,9 @@
 use core::convert::TryFrom;
-use embassy_stm32::{gpio::Output, mode::Blocking, spi::Spi};
+use embassy_stm32::{
+    gpio::Output,
+    mode::Blocking,
+    spi::{Spi, Word},
+};
 use embassy_time::Timer;
 use num_enum::IntoPrimitive;
 
@@ -11,7 +15,36 @@ pub struct Screen {
     spi: Spi<'static, Blocking>,
 }
 
+impl ui_app::Screen for Screen {
+    fn width(&self) -> usize {
+        Self::WIDTH
+    }
+
+    fn height(&self) -> usize {
+        Self::HEIGHT
+    }
+
+    fn fill(&mut self, color: u16) {
+        let row = [color; Self::WIDTH];
+
+        self.set_window(0, 0, Self::WIDTH, Self::HEIGHT);
+        self.send_command(Command::WriteMemory, &[]);
+        for i in 0..Self::HEIGHT {
+            self.spi.blocking_write(&row).unwrap();
+        }
+    }
+
+    fn draw(&mut self, left: usize, right: usize, top: usize, bottom: usize, data: &[u16]) {
+        self.set_window(left, right, top, bottom);
+        self.send_command(Command::WriteMemory, &[]);
+        self.send_data(data);
+    }
+}
+
 impl Screen {
+    const WIDTH: usize = 320;
+    const HEIGHT: usize = 240;
+
     pub fn new(
         chip_select: Output<'static>,
         data_command: Output<'static>,
@@ -49,7 +82,10 @@ impl Screen {
         Timer::after_millis(120).await;
 
         // Set portrait orientation
-        self.set_orientation(Orientation::Portrait);
+        self.send_command(
+            Command::MemoryAccessControl,
+            &[u8::from(Orientation::Portrait)],
+        );
 
         // Set the pixel format to rgb565
         self.send_command(Command::SetPixelFormat, &[0x55]);
@@ -65,19 +101,7 @@ impl Screen {
         self.set_backlight(true);
     }
 
-    pub fn clear_screen(&mut self, color: u16) {
-        const WIDTH: usize = 240;
-        const HEIGHT: usize = 320;
-
-        let row = [color; WIDTH];
-
-        self.set_window(0, 0, WIDTH, HEIGHT);
-        for i in 0..HEIGHT {
-            self.spi.blocking_write(&row).unwrap();
-        }
-    }
-
-    fn set_window(&mut self, x0: usize, y0: usize, x1: usize, y1: usize) {
+    fn set_window(&mut self, x0: usize, x1: usize, y0: usize, y1: usize) {
         let mut x_data = [0u8; 4];
         x_data[..2].copy_from_slice(&(x0 as u16).to_be_bytes());
         x_data[2..].copy_from_slice(&(x1 as u16).to_be_bytes());
@@ -97,16 +121,11 @@ impl Screen {
         self.send_data(data);
     }
 
-    fn send_data(&mut self, data: &[u8]) {
+    fn send_data<W: Word>(&mut self, data: &[W]) {
         self.data_command.set_high();
         self.spi.blocking_write(data).unwrap(); // TODO propagate error
     }
 
-    fn set_orientation(&mut self, orientation: Orientation) {
-        // TODO set internal width/height
-        self.send_command(Command::MemoryAccessControl, &[u8::from(orientation)]);
-    }
-
     pub fn set_backlight(&mut self, on: bool) {
         self.backlight.set_level(on.into());
     }
@@ -125,7 +144,7 @@ enum Command {
     InvertOff = 0x20,
     InvertOn = 0x21,
     MemoryAccessControl = 0x36,
-    MemoryWrite = 0x2c,
+    WriteMemory = 0x2c,
     NormalModeFrameRate = 0xb1,
     SetPageAddress = 0x2b,
     SetPixelFormat = 0x3a,
@@ -134,7 +153,7 @@ enum Command {
     SleepModeOn = 0x10,
     SoftwareReset = 0x01,
     VerticalScrollAddr = 0x37,
-    VerticalScrollDefine = 0x33,
+    DefineVerticalScroll = 0x33,
 }
 
 #[derive(Copy, Clone, IntoPrimitive)]

From fba894059a144d9f3f85fae83fab9b0fa5f13f51 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Tue, 9 Sep 2025 13:48:51 -1000
Subject: [PATCH 05/19] Add clock configuration

---
 ui-stm32/src/board/ev13.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index f3060cab..b04771c1 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -16,6 +16,36 @@ pub struct Board {
 
 impl Board {
     pub fn new() -> Self {
+        let config = {
+            use embassy_stm32::{rcc::*, time::Hertz};
+
+            let mut config = embassy_stm32::Config::default();
+
+            config.rcc.hse = Some(Hse {
+                freq: Hertz(6_000_000),
+                mode: HseMode::Bypass,
+            });
+            config.rcc.sys = Sysclk::PLL1_P;
+            config.rcc.pll_src = PllSource::HSE;
+            config.rcc.pll = Some(Pll {
+                prediv: PllPreDiv::DIV3,
+                mul: PllMul::MUL168,
+                divp: Some(PllPDiv::DIV2),
+                divq: Some(PllQDiv::DIV7),
+                divr: None,
+            });
+
+            config.rcc.ahb_pre = AHBPrescaler::DIV1;
+            config.rcc.apb1_pre = APBPrescaler::DIV4;
+            config.rcc.apb2_pre = APBPrescaler::DIV2;
+            config.rcc.ls = LsConfig {
+                rtc: RtcClockSource::LSI,
+                lsi: true,
+                lse: None,
+            };
+
+            config
+        };
         let p = embassy_stm32::init(Default::default());
 
         // Status LED

From 9b44bc3c8809366216d7314707920fda3550a12a Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:24:02 -1000
Subject: [PATCH 06/19] Add color loop for Suhas's amusement

---
 ui-stm32/src/main.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 388d53d2..0e42fb3c 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -84,6 +84,7 @@ async fn main(spawner: Spawner) {
     for i in 0.. {
         let color = colors[i % colors.len()];
         board.status_led().set_color(color);
+        embassy_time::Timer::after_millis(1000).await;
 
         /*
         let event = EVENT_QUEUE.receive().await;

From 153cc572dd58de8fb4d94329e7aaa157bc141c9a Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:30:52 -1000
Subject: [PATCH 07/19] Now actually add clock config

---
 ui-stm32/src/board/ev13.rs   |  4 ++--
 ui-stm32/src/board/screen.rs |  3 +--
 ui-stm32/src/main.rs         | 24 +++---------------------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index b04771c1..33c6aa14 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -46,7 +46,7 @@ impl Board {
 
             config
         };
-        let p = embassy_stm32::init(Default::default());
+        let p = embassy_stm32::init(config);
 
         // Status LED
         let r = Output::new(p.PA4, Level::Low, Speed::Low);
@@ -92,7 +92,7 @@ impl Board {
             config
         };
         let spi1 = Spi::new_blocking_txonly(p.SPI1, p.PA5, p.PA7, config);
-        let mut screen = Screen::new(chip_select, data_command, reset, backlight, spi1);
+        let screen = Screen::new(chip_select, data_command, reset, backlight, spi1);
 
         // TODO(RLB): NET UART
         // TODO(RLB): MGMT UART
diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index 5b37f57e..a20939b4 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -1,4 +1,3 @@
-use core::convert::TryFrom;
 use embassy_stm32::{
     gpio::Output,
     mode::Blocking,
@@ -29,7 +28,7 @@ impl ui_app::Screen for Screen {
 
         self.set_window(0, 0, Self::WIDTH, Self::HEIGHT);
         self.send_command(Command::WriteMemory, &[]);
-        for i in 0..Self::HEIGHT {
+        for _ in 0..Self::HEIGHT {
             self.spi.blocking_write(&row).unwrap();
         }
     }
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 0e42fb3c..9f4996e6 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -4,7 +4,7 @@
 mod board;
 
 use board::{Board, Button, Keyboard};
-use ui_app::{App, Color, Event, Led, Outputs};
+use ui_app::{App, Event, Screen};
 
 use defmt::*;
 use embassy_executor::Spawner;
@@ -40,7 +40,6 @@ async fn monitor_keyboard(mut keyboard: Keyboard, events: EventSender) {
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let mut board = Board::new();
-    /*
     let mut app = App::new();
 
     // Capture button events
@@ -65,30 +64,13 @@ async fn main(spawner: Spawner) {
     )));
 
     board.screen.init().await; // XXX
-    //board.screen.clear_screen(0b00000_111111_00000); // XXX
+    board.screen.fill(0b00000_111111_00000); // XXX
 
     app.start(&mut board);
-    */
 
     // Main event loop
-    let colors = [
-        Color::Black,
-        Color::Red,
-        Color::Green,
-        Color::Blue,
-        Color::Cyan,
-        Color::Purple,
-        Color::Yellow,
-        Color::White,
-    ];
-    for i in 0.. {
-        let color = colors[i % colors.len()];
-        board.status_led().set_color(color);
-        embassy_time::Timer::after_millis(1000).await;
-
-        /*
+    loop {
         let event = EVENT_QUEUE.receive().await;
         app.handle(event, &mut board);
-        */
     }
 }

From 9521b7ac953f5bee86844264f0eeaf9f56bf36bb Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:37:04 -1000
Subject: [PATCH 08/19] Blink backlight to see if that at least works

---
 ui-stm32/src/board/screen.rs | 8 ++++----
 ui-stm32/src/main.rs         | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index a20939b4..5d49eeef 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -72,13 +72,13 @@ impl Screen {
         // Do hardware reset by holding reset low for at least 10us, then wait 5ms for the reset to
         // occur before sending more commands.
         self.reset.set_low();
-        Timer::after_micros(100).await;
+        Timer::after_millis(200).await;
         self.reset.set_high();
-        Timer::after_millis(5).await;
+        Timer::after_millis(200).await;
 
         // Do hardware reset, then wait 120ms for the reset to occur before sending more commands.
         self.send_command(Command::SoftwareReset, &[]);
-        Timer::after_millis(120).await;
+        Timer::after_millis(200).await;
 
         // Set portrait orientation
         self.send_command(
@@ -91,7 +91,7 @@ impl Screen {
 
         // Have the display emerge from sleep, then wait 5ms for it to wake up
         self.send_command(Command::SleepModeOff, &[]);
-        Timer::after_millis(5).await;
+        Timer::after_millis(200).await;
 
         // Turn the display on
         self.send_command(Command::DisplayOn, &[]);
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 9f4996e6..097613da 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -69,8 +69,15 @@ async fn main(spawner: Spawner) {
     app.start(&mut board);
 
     // Main event loop
+    let mut backlight_on = false;
     loop {
+        embassy_time::Timer::after_millis(500).await;
+        backlight_on = !backlight_on;
+        board.screen.set_backlight(backlight_on);
+
+        /*
         let event = EVENT_QUEUE.receive().await;
         app.handle(event, &mut board);
+        */
     }
 }

From cda05d8a9454428a39602dee650b6becaef7d6c5 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:42:45 -1000
Subject: [PATCH 09/19] Debug indicators

---
 ui-stm32/src/board/screen.rs |  2 ++
 ui-stm32/src/main.rs         | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index 5d49eeef..47adb1f8 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -130,6 +130,7 @@ impl Screen {
     }
 }
 
+#[allow(dead_code)]
 #[derive(Copy, Clone, IntoPrimitive)]
 #[repr(u8)]
 enum Command {
@@ -155,6 +156,7 @@ enum Command {
     DefineVerticalScroll = 0x33,
 }
 
+#[allow(dead_code)]
 #[derive(Copy, Clone, IntoPrimitive)]
 #[repr(u8)]
 enum Orientation {
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 097613da..f22b4514 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -4,7 +4,7 @@
 mod board;
 
 use board::{Board, Button, Keyboard};
-use ui_app::{App, Event, Screen};
+use ui_app::{App, Color, Event, Led, Outputs, Screen};
 
 use defmt::*;
 use embassy_executor::Spawner;
@@ -63,18 +63,30 @@ async fn main(spawner: Spawner) {
         EVENT_QUEUE.sender()
     )));
 
+    debug!("screen init");
     board.screen.init().await; // XXX
+
+    debug!("screen fill");
     board.screen.fill(0b00000_111111_00000); // XXX
 
+    debug!("app start");
     app.start(&mut board);
 
     // Main event loop
     let mut backlight_on = false;
     loop {
-        embassy_time::Timer::after_millis(500).await;
+        embassy_time::Timer::after_millis(1000).await;
+        debug!("blink");
+
         backlight_on = !backlight_on;
         board.screen.set_backlight(backlight_on);
 
+        board.status_led().set_color(if backlight_on {
+            Color::Green
+        } else {
+            Color::Black
+        });
+
         /*
         let event = EVENT_QUEUE.receive().await;
         app.handle(event, &mut board);

From d81d01317375ce62e2443eef64063845c6900997 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:47:50 -1000
Subject: [PATCH 10/19] More debug lines

---
 ui-stm32/src/board/screen.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index 47adb1f8..ffbb09bf 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -67,36 +67,45 @@ impl Screen {
     // It might be better to put this in new(), as is done there.
     pub async fn init(&mut self) {
         // Chip select pin is always held low
+        defmt::debug!("chip_select");
         self.chip_select.set_low();
 
         // Do hardware reset by holding reset low for at least 10us, then wait 5ms for the reset to
         // occur before sending more commands.
+        defmt::debug!("reset low");
         self.reset.set_low();
         Timer::after_millis(200).await;
+        defmt::debug!("reset high");
         self.reset.set_high();
         Timer::after_millis(200).await;
 
         // Do hardware reset, then wait 120ms for the reset to occur before sending more commands.
+        defmt::debug!("software reset");
         self.send_command(Command::SoftwareReset, &[]);
         Timer::after_millis(200).await;
 
         // Set portrait orientation
+        defmt::debug!("set orientation");
         self.send_command(
             Command::MemoryAccessControl,
             &[u8::from(Orientation::Portrait)],
         );
 
         // Set the pixel format to rgb565
+        defmt::debug!("set pixel format");
         self.send_command(Command::SetPixelFormat, &[0x55]);
 
         // Have the display emerge from sleep, then wait 5ms for it to wake up
+        defmt::debug!("set sleep mode off");
         self.send_command(Command::SleepModeOff, &[]);
         Timer::after_millis(200).await;
 
         // Turn the display on
+        defmt::debug!("display on");
         self.send_command(Command::DisplayOn, &[]);
 
         // Turn on the backlight
+        defmt::debug!("backlight on");
         self.set_backlight(true);
     }
 

From 85db9fecf5494ef9fd1a7138e5f703fb0e2cc12d Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:55:39 -1000
Subject: [PATCH 11/19] One more debug line

---
 ui-stm32/src/board/screen.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index ffbb09bf..d74cd750 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -74,6 +74,7 @@ impl Screen {
         // occur before sending more commands.
         defmt::debug!("reset low");
         self.reset.set_low();
+        defmt::debug!("after_millis");
         Timer::after_millis(200).await;
         defmt::debug!("reset high");
         self.reset.set_high();

From 815cd4b184cfdf70a2ba8e811c63da2f035bf327 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 09:57:57 -1000
Subject: [PATCH 12/19] Revert clock config

---
 ui-stm32/src/board/ev13.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index 33c6aa14..6758fdb8 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -16,6 +16,7 @@ pub struct Board {
 
 impl Board {
     pub fn new() -> Self {
+        /*
         let config = {
             use embassy_stm32::{rcc::*, time::Hertz};
 
@@ -46,7 +47,8 @@ impl Board {
 
             config
         };
-        let p = embassy_stm32::init(config);
+        */
+        let p = embassy_stm32::init(Default::default());
 
         // Status LED
         let r = Output::new(p.PA4, Level::Low, Speed::Low);

From fd8740e9b2d0c165b986a142688dde8996ddc615 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 10:27:20 -1000
Subject: [PATCH 13/19] Remove duplicate screen fill

---
 ui-stm32/src/main.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 8cb34041..4ba02673 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -72,9 +72,6 @@ async fn main(spawner: Spawner) {
     debug!("screen init");
     board.screen.init().await; // XXX
 
-    debug!("screen fill");
-    board.screen.fill(0b00000_111111_00000); // XXX
-
     debug!("app start");
     app.start(&mut board);
 

From 185a4b8ca854d0acc14e56b5a20754e02c5f1b73 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 10:34:04 -1000
Subject: [PATCH 14/19] Fix screen dimensions

---
 ui-stm32/src/board/screen.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index d74cd750..c4405f3a 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -41,8 +41,8 @@ impl ui_app::Screen for Screen {
 }
 
 impl Screen {
-    const WIDTH: usize = 320;
-    const HEIGHT: usize = 240;
+    const WIDTH: usize = 240;
+    const HEIGHT: usize = 320;
 
     pub fn new(
         chip_select: Output<'static>,

From 00e8b96a10acae97c7373ea38f7874dadc926728 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 12:29:47 -1000
Subject: [PATCH 15/19] Cleanup

---
 ui-stm32/src/board/ev13.rs   | 10 ++++-----
 ui-stm32/src/board/screen.rs | 40 +++++++++++++++++-------------------
 ui-stm32/src/main.rs         | 22 ++------------------
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index 6758fdb8..eb443951 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -8,15 +8,14 @@ use ui_app::{Led, Outputs};
 
 pub struct Board {
     status_led: StatusLed,
-    pub screen: Screen, // XXX should not be pub
+    screen: Screen,
     pub ptt_button: Option<Button>,
     pub ai_button: Option<Button>,
     pub keyboard: Option<Keyboard>,
 }
 
 impl Board {
-    pub fn new() -> Self {
-        /*
+    pub async fn new() -> Self {
         let config = {
             use embassy_stm32::{rcc::*, time::Hertz};
 
@@ -47,8 +46,7 @@ impl Board {
 
             config
         };
-        */
-        let p = embassy_stm32::init(Default::default());
+        let p = embassy_stm32::init(config);
 
         // Status LED
         let r = Output::new(p.PA4, Level::Low, Speed::Low);
@@ -94,7 +92,7 @@ impl Board {
             config
         };
         let spi1 = Spi::new_blocking_txonly(p.SPI1, p.PA5, p.PA7, config);
-        let screen = Screen::new(chip_select, data_command, reset, backlight, spi1);
+        let screen = Screen::new(chip_select, data_command, reset, backlight, spi1).await;
 
         // TODO(RLB): NET UART
         // TODO(RLB): MGMT UART
diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index c4405f3a..d14d5bd7 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -44,70 +44,68 @@ impl Screen {
     const WIDTH: usize = 240;
     const HEIGHT: usize = 320;
 
-    pub fn new(
+    // Initial command sequence borrowed from
+    //
+    // https://github.com/yuri91/ili9341-rs/blob/master/src/lib.rs#L139
+    pub async fn new(
         chip_select: Output<'static>,
         data_command: Output<'static>,
         reset: Output<'static>,
         backlight: Output<'static>,
         spi: Spi<'static, Blocking>,
     ) -> Self {
-        Self {
+        let mut screen = Self {
             chip_select,
             data_command,
             reset,
             backlight,
             spi,
-        }
-    }
+        };
 
-    // Initial command sequence borrowed from
-    //
-    // https://github.com/yuri91/ili9341-rs/blob/master/src/lib.rs#L139
-    //
-    // It might be better to put this in new(), as is done there.
-    pub async fn init(&mut self) {
         // Chip select pin is always held low
         defmt::debug!("chip_select");
-        self.chip_select.set_low();
+        screen.chip_select.set_low();
 
         // Do hardware reset by holding reset low for at least 10us, then wait 5ms for the reset to
         // occur before sending more commands.
         defmt::debug!("reset low");
-        self.reset.set_low();
+        screen.reset.set_low();
         defmt::debug!("after_millis");
         Timer::after_millis(200).await;
         defmt::debug!("reset high");
-        self.reset.set_high();
+        screen.reset.set_high();
         Timer::after_millis(200).await;
 
         // Do hardware reset, then wait 120ms for the reset to occur before sending more commands.
         defmt::debug!("software reset");
-        self.send_command(Command::SoftwareReset, &[]);
+        screen.send_command(Command::SoftwareReset, &[]);
         Timer::after_millis(200).await;
 
         // Set portrait orientation
         defmt::debug!("set orientation");
-        self.send_command(
+        screen.send_command(
             Command::MemoryAccessControl,
             &[u8::from(Orientation::Portrait)],
         );
 
         // Set the pixel format to rgb565
         defmt::debug!("set pixel format");
-        self.send_command(Command::SetPixelFormat, &[0x55]);
+        screen.send_command(Command::SetPixelFormat, &[0x55]);
 
         // Have the display emerge from sleep, then wait 5ms for it to wake up
         defmt::debug!("set sleep mode off");
-        self.send_command(Command::SleepModeOff, &[]);
+        screen.send_command(Command::SleepModeOff, &[]);
         Timer::after_millis(200).await;
 
         // Turn the display on
         defmt::debug!("display on");
-        self.send_command(Command::DisplayOn, &[]);
+        screen.send_command(Command::DisplayOn, &[]);
 
         // Turn on the backlight
         defmt::debug!("backlight on");
-        self.set_backlight(true);
+        screen.set_backlight(true);
+
+        screen
     }
 
     fn set_window(&mut self, x0: usize, x1: usize, y0: usize, y1: usize) {
@@ -125,14 +123,14 @@ impl Screen {
 
     fn send_command(&mut self, cmd: Command, data: &[u8]) {
         self.data_command.set_low();
-        self.spi.blocking_write(&[u8::from(cmd)]).unwrap(); // TODO propagate error
+        self.spi.blocking_write(&[u8::from(cmd)]).unwrap();
 
         self.send_data(data);
     }
 
     fn send_data<W: Word>(&mut self, data: &[W]) {
         self.data_command.set_high();
-        self.spi.blocking_write(data).unwrap(); // TODO propagate error
+        self.spi.blocking_write(data).unwrap();
     }
 
     pub fn set_backlight(&mut self, on: bool) {
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index 4ba02673..cddfc0db 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -4,7 +4,7 @@
 mod board;
 
 use board::{Board, Button, Keyboard};
-use ui_app::{App, Color, Event, Led, Outputs, Screen};
+use ui_app::{App, Event};
 
 use defmt::*;
 use embassy_executor::Spawner;
@@ -45,7 +45,7 @@ async fn monitor_keyboard(mut keyboard: Keyboard, events: EventSender) {
 
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
-    let mut board = Board::new();
+    let mut board = Board::new().await;
     let mut app = App::new();
 
     // Capture button events
@@ -69,30 +69,12 @@ async fn main(spawner: Spawner) {
         EVENT_QUEUE.sender()
     )));
 
-    debug!("screen init");
-    board.screen.init().await; // XXX
-
     debug!("app start");
     app.start(&mut board);
 
     // Main event loop
-    let mut backlight_on = false;
     loop {
-        embassy_time::Timer::after_millis(1000).await;
-        debug!("blink");
-
-        backlight_on = !backlight_on;
-        board.screen.set_backlight(backlight_on);
-
-        board.status_led().set_color(if backlight_on {
-            Color::Green
-        } else {
-            Color::Black
-        });
-
-        /*
         let event = EVENT_QUEUE.receive().await;
         app.handle(event, &mut board);
-        */
     }
 }

From dbb8990748c39f4f78d1577ae220d89217bd02c9 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 12:32:52 -1000
Subject: [PATCH 16/19] Backport screen support to EV12

---
 ui-stm32/src/board/ev12.rs | 63 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/ui-stm32/src/board/ev12.rs b/ui-stm32/src/board/ev12.rs
index b58e5e5a..af90eff1 100644
--- a/ui-stm32/src/board/ev12.rs
+++ b/ui-stm32/src/board/ev12.rs
@@ -1,20 +1,52 @@
-use super::{Button, Keyboard, StatusLed};
+use super::{Button, Keyboard, Screen, StatusLed};
 use embassy_stm32::{
     exti::ExtiInput,
     gpio::{Input, Level, Output, Pull, Speed},
+    spi::Spi,
 };
 use ui_app::{Led, Outputs};
 
 pub struct Board {
     status_led: StatusLed,
+    screen: Screen,
     pub ptt_button: Option<Button>,
     pub ai_button: Option<Button>,
     pub keyboard: Option<Keyboard>,
 }
 
 impl Board {
-    pub fn new() -> Self {
-        let p = embassy_stm32::init(Default::default());
+    pub async fn new() -> Self {
+        let config = {
+            use embassy_stm32::{rcc::*, time::Hertz};
+
+            let mut config = embassy_stm32::Config::default();
+
+            config.rcc.hse = Some(Hse {
+                freq: Hertz(6_000_000),
+                mode: HseMode::Bypass,
+            });
+            config.rcc.sys = Sysclk::PLL1_P;
+            config.rcc.pll_src = PllSource::HSE;
+            config.rcc.pll = Some(Pll {
+                prediv: PllPreDiv::DIV3,
+                mul: PllMul::MUL168,
+                divp: Some(PllPDiv::DIV2),
+                divq: Some(PllQDiv::DIV7),
+                divr: None,
+            });
+
+            config.rcc.ahb_pre = AHBPrescaler::DIV1;
+            config.rcc.apb1_pre = APBPrescaler::DIV4;
+            config.rcc.apb2_pre = APBPrescaler::DIV2;
+            config.rcc.ls = LsConfig {
+                rtc: RtcClockSource::LSI,
+                lsi: true,
+                lse: None,
+            };
+
+            config
+        };
+        let p = embassy_stm32::init(config);
 
         // Status LED
         let r = Output::new(p.PA6, Level::Low, Speed::Low);
@@ -45,8 +77,29 @@ impl Board {
         ];
         let keyboard = Keyboard::new(cols, rows);
 
+        // Screen
+        let chip_select = Output::new(p.PB8, Level::Low, Speed::Low);
+        let data_command = Output::new(p.PB9, Level::Low, Speed::Low);
+        let reset = Output::new(p.PC13, Level::Low, Speed::Low);
+        let backlight = Output::new(p.PC14, Level::Low, Speed::Low);
+
+        let config = {
+            use embassy_stm32::spi::*;
+            let mut config = Config::default();
+            config.mode.polarity = Polarity::IdleLow;
+            config.mode.phase = Phase::CaptureOnFirstTransition;
+            config.bit_order = BitOrder::MsbFirst;
+            config
+        };
+        let spi1 = Spi::new_blocking_txonly(p.SPI1, p.PA5, p.PA7, config);
+        let screen = Screen::new(chip_select, data_command, reset, backlight, spi1).await;
+
+        // TODO(RLB): NET UART
+        // TODO(RLB): MGMT UART
+
         Self {
             status_led,
+            screen,
             ptt_button: Some(ptt_button),
             ai_button: Some(ai_button),
             keyboard: Some(keyboard),
@@ -59,6 +112,10 @@ impl Outputs for Board {
         &mut self.status_led
     }
 
+    fn screen(&mut self) -> &mut impl ui_app::Screen {
+        &mut self.screen
+    }
+
     fn log(&mut self, message: &str) {
         defmt::info!("{}", message);
     }

From 6be778c742131a2b2c650b073152424f91ec1b24 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 13:00:36 -1000
Subject: [PATCH 17/19] Revert clock config

---
 ui-stm32/src/board/ev13.rs | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/ui-stm32/src/board/ev13.rs b/ui-stm32/src/board/ev13.rs
index eb443951..0507e652 100644
--- a/ui-stm32/src/board/ev13.rs
+++ b/ui-stm32/src/board/ev13.rs
@@ -16,37 +16,7 @@ pub struct Board {
 
 impl Board {
     pub async fn new() -> Self {
-        let config = {
-            use embassy_stm32::{rcc::*, time::Hertz};
-
-            let mut config = embassy_stm32::Config::default();
-
-            config.rcc.hse = Some(Hse {
-                freq: Hertz(6_000_000),
-                mode: HseMode::Bypass,
-            });
-            config.rcc.sys = Sysclk::PLL1_P;
-            config.rcc.pll_src = PllSource::HSE;
-            config.rcc.pll = Some(Pll {
-                prediv: PllPreDiv::DIV3,
-                mul: PllMul::MUL168,
-                divp: Some(PllPDiv::DIV2),
-                divq: Some(PllQDiv::DIV7),
-                divr: None,
-            });
-
-            config.rcc.ahb_pre = AHBPrescaler::DIV1;
-            config.rcc.apb1_pre = APBPrescaler::DIV4;
-            config.rcc.apb2_pre = APBPrescaler::DIV2;
-            config.rcc.ls = LsConfig {
-                rtc: RtcClockSource::LSI,
-                lsi: true,
-                lse: None,
-            };
-
-            config
-        };
-        let p = embassy_stm32::init(config);
+        let p = embassy_stm32::init(Default::default());
 
         // Status LED
         let r = Output::new(p.PA4, Level::Low, Speed::Low);

From 65ba6a12d7e8a793acab74340748d69a2ea1a4f0 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 14:27:01 -1000
Subject: [PATCH 18/19] Clean up debug lines

---
 ui-stm32/src/board/screen.rs | 10 ----------
 ui-stm32/src/main.rs         |  1 -
 2 files changed, 11 deletions(-)

diff --git a/ui-stm32/src/board/screen.rs b/ui-stm32/src/board/screen.rs
index d14d5bd7..7ec1cb67 100644
--- a/ui-stm32/src/board/screen.rs
+++ b/ui-stm32/src/board/screen.rs
@@ -63,46 +63,36 @@ impl Screen {
         };
 
         // Chip select pin is always held low
-        defmt::debug!("chip_select");
         screen.chip_select.set_low();
 
         // Do hardware reset by holding reset low for at least 10us, then wait 5ms for the reset to
         // occur before sending more commands.
-        defmt::debug!("reset low");
         screen.reset.set_low();
-        defmt::debug!("after_millis");
         Timer::after_millis(200).await;
-        defmt::debug!("reset high");
         screen.reset.set_high();
         Timer::after_millis(200).await;
 
         // Do hardware reset, then wait 120ms for the reset to occur before sending more commands.
-        defmt::debug!("software reset");
         screen.send_command(Command::SoftwareReset, &[]);
         Timer::after_millis(200).await;
 
         // Set portrait orientation
-        defmt::debug!("set orientation");
         screen.send_command(
             Command::MemoryAccessControl,
             &[u8::from(Orientation::Portrait)],
         );
 
         // Set the pixel format to rgb565
-        defmt::debug!("set pixel format");
         screen.send_command(Command::SetPixelFormat, &[0x55]);
 
         // Have the display emerge from sleep, then wait 5ms for it to wake up
-        defmt::debug!("set sleep mode off");
         screen.send_command(Command::SleepModeOff, &[]);
         Timer::after_millis(200).await;
 
         // Turn the display on
-        defmt::debug!("display on");
         screen.send_command(Command::DisplayOn, &[]);
 
         // Turn on the backlight
-        defmt::debug!("backlight on");
         screen.set_backlight(true);
 
         screen
diff --git a/ui-stm32/src/main.rs b/ui-stm32/src/main.rs
index cddfc0db..85b08b28 100644
--- a/ui-stm32/src/main.rs
+++ b/ui-stm32/src/main.rs
@@ -69,7 +69,6 @@ async fn main(spawner: Spawner) {
         EVENT_QUEUE.sender()
     )));
 
-    debug!("app start");
     app.start(&mut board);
 
     // Main event loop

From feb519d9aa39cc356f593a5b59ab3ee0354c9401 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 10 Sep 2025 16:47:44 -1000
Subject: [PATCH 19/19] Fix app tests

---
 ui-app/tests/integration.rs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ui-app/tests/integration.rs b/ui-app/tests/integration.rs
index 7e2b6d8b..fa5c9b91 100644
--- a/ui-app/tests/integration.rs
+++ b/ui-app/tests/integration.rs
@@ -11,9 +11,32 @@ impl Led for MockLed {
     }
 }
 
+// TODO: Test screen logic
+#[derive(Default)]
+struct MockScreen;
+
+impl Screen for MockScreen {
+    fn width(&self) -> usize {
+        240
+    }
+
+    fn height(&self) -> usize {
+        320
+    }
+
+    fn fill(&mut self, _color: u16) {
+        // TODO: Store pixels
+    }
+
+    fn draw(&mut self, _left: usize, _right: usize, _top: usize, _bottom: usize, _data: &[u16]) {
+        // TODO: Store pixels
+    }
+}
+
 #[derive(Default)]
 struct MockOutputs {
     status_led: MockLed,
+    screen: MockScreen,
     last_message: String,
 }
 
@@ -22,6 +45,10 @@ impl Outputs for MockOutputs {
         &mut self.status_led
     }
 
+    fn screen(&mut self) -> &mut impl Screen {
+        &mut self.screen
+    }
+
     fn log(&mut self, message: &str) {
         self.last_message = message.into();
     }