Rename display type aliases

This commit is contained in:
2026-08-23 19:30:10 +02:00
parent b2a8fdea5e
commit f59ee96cbc
11 changed files with 38 additions and 42 deletions
+4 -4
View File
@@ -10,9 +10,9 @@
use alloc::boxed::Box;
use creaturedex::card::decoder::split_nfc_hex;
use creaturedex::card::model::Card;
use creaturedex::display::secondary_oled::DualSecondaryDisplay;
use creaturedex::display::secondary_oled::SecondaryDisplay;
use creaturedex::display::shared_bus;
use creaturedex::display::tertiary_lcd::{TertiaryI2cLcd, init_tertiary_lcd, write_wrapped};
use creaturedex::display::tertiary_lcd::{TertiaryDisplay, init_tertiary_lcd, write_wrapped};
use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
use creaturedex::navigation::inputs::Inputs;
use creaturedex::navigation::navigation::{self, CARD_DATA};
@@ -95,7 +95,7 @@ async fn main(spawner: Spawner) {
let shared_i2c = Box::leak(Box::new(AtomicCell::new(i2c)));
log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
let mut lcd: TertiaryI2cLcd = init_tertiary_lcd(AtomicDevice::new(shared_i2c));
let mut lcd: TertiaryDisplay = init_tertiary_lcd(AtomicDevice::new(shared_i2c));
if let Err(e) = write_wrapped(&mut lcd, "Testing more than 16 chars what happens now?") {
log::error!(
"Tertiary LCD startup text write failed over shared I2C bus; check the shared bus, wiring, and device responses: {e}"
@@ -179,7 +179,7 @@ async fn nfc_driver_task(
}
}
fn display_shit(oled: &mut DualSecondaryDisplay<'static>, text: &str) {
fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
oled.clear().unwrap();
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);