From 88dce365adfc7ebb4bc1b1e42f0c90e7c6389912 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Sun, 2 Aug 2026 15:08:29 +0000 Subject: [PATCH 01/19] implement basic embassy framework --- Cargo.toml | 8 ++--- src/bin/main.rs | 60 +++++++++++++++--------------------- src/display/primary_lcd.rs | 17 +++++----- src/navigation.rs | 4 ++- src/navigation/input.rs | 15 --------- src/navigation/inputs.rs | 19 ++++++++++++ src/navigation/main_menu.rs | 3 ++ src/navigation/navigation.rs | 8 +++++ 8 files changed, 71 insertions(+), 63 deletions(-) delete mode 100644 src/navigation/input.rs create mode 100644 src/navigation/inputs.rs create mode 100644 src/navigation/main_menu.rs create mode 100644 src/navigation/navigation.rs diff --git a/Cargo.toml b/Cargo.toml index eeaf461..0955582 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ name = "creaturedex" path = "./src/bin/main.rs" [dependencies] -esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } +esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] } esp-rtos = { version = "0.3.0", features = [ "embassy", @@ -24,7 +24,8 @@ log = "0.4.27" critical-section = "1.2.0" embedded-io = "0.7.1" -embassy-executor = { version = "0.10.0", default-features = false } +embassy-executor = { version = "0.10.0", features = [ +] } embassy-time = { version = "0.5.1", default-features = false } esp-alloc = "0.10.0" esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [ @@ -44,7 +45,6 @@ ndef = "0.5.0" - # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html [profile.dev] # The default debug profile is too slow and too big for resource-constrained devices. @@ -59,4 +59,4 @@ opt-level = 's' [features] default = [] -wokwi = [] \ No newline at end of file +wokwi = [] diff --git a/src/bin/main.rs b/src/bin/main.rs index e09f649..97827ec 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -11,7 +11,8 @@ use creaturedex::card::mock::{MOCK_PAYLOAD, MOCK_PAYLOAD2}; use creaturedex::display::primary_lcd::init_primary_lcd; use creaturedex::display::views::card_view::render_nfc_payload; use creaturedex::drivers::nfc_pn532::NfcPn532Driver; -use creaturedex::navigation::input::init_navigation_button; +use creaturedex::navigation::inputs::Inputs; +use creaturedex::navigation::navigation; use creaturedex::navigation::state::NavigationState; use creaturedex::network::wifi::setup_wifi; use embassy_executor::Spawner; @@ -19,9 +20,10 @@ use embassy_time::Timer; use embedded_graphics::draw_target::DrawTarget; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::RgbColor; -use esp_hal::time::Duration; use esp_hal::clock::CpuClock; use esp_hal::delay::Delay; +use esp_hal::gpio::{Input, InputConfig, Pull}; +use esp_hal::time::Duration; use esp_hal::timer::timg::TimerGroup; use log::error; @@ -33,6 +35,8 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! { extern crate alloc; +const HEAP_SIZE: usize = 73744; + // This creates a default app-descriptor required by the esp-idf bootloader. // For more information see: esp_bootloader_esp_idf::esp_app_desc!(); @@ -48,26 +52,15 @@ async fn main(spawner: Spawner) { let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max()); let peripherals = esp_hal::init(config); - // The following GPIO pins are in use by some feature of the module and should not be used. - let _ = peripherals.GPIO27; - let _ = peripherals.GPIO28; - let _ = peripherals.GPIO29; - let _ = peripherals.GPIO30; - let _ = peripherals.GPIO31; - let _ = peripherals.GPIO32; - let _ = peripherals.GPIO33; - let _ = peripherals.GPIO34; + esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE); - esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744); - - let mut delay = Delay::new(); - let button1 = init_navigation_button(peripherals.GPIO38); - - let timg0 = TimerGroup::new(peripherals.TIMG0); let sw_interrupt = esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT); + let timg0 = TimerGroup::new(peripherals.TIMG0); esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0); + log::info!("Setup complete, entering main loop"); + let mut display = init_primary_lcd( peripherals.SPI2, peripherals.GPIO36, @@ -76,7 +69,6 @@ async fn main(spawner: Spawner) { peripherals.GPIO11, peripherals.GPIO10, peripherals.GPIO12, - &mut delay, ); setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; @@ -85,7 +77,8 @@ async fn main(spawner: Spawner) { let mut nav_state = NavigationState::new(); - let mut nfc_driver = NfcPn532Driver::new(peripherals.I2C0, peripherals.GPIO17, peripherals.GPIO18); + let mut nfc_driver = + NfcPn532Driver::new(peripherals.I2C0, peripherals.GPIO17, peripherals.GPIO18); let timeout = Duration::from_millis(1000); if nfc_driver.configure_sam(timeout).is_ok() { log::info!("NFC SAM configuration successful"); @@ -93,22 +86,19 @@ async fn main(spawner: Spawner) { log::error!("NFC SAM configuration failed"); } - loop { - if let Ok(card_data) = nfc_driver.read_card_data() { - log::info!("NFC Card Read: {:?}", card_data); - } + log::info!("Setup complete, entering main loop"); - if button1.is_low() { - log::info!("Button pressed!"); - display.clear(Rgb565::BLACK).unwrap(); - let payload = if nav_state.toggle_payload() { - &MOCK_PAYLOAD - } else { - &MOCK_PAYLOAD2 - }; + let mut nav_state = NavigationState::new(); - render_nfc_payload(&mut display, payload); - } - Timer::after_millis(10).await; - } + let button_config = InputConfig::default().with_pull(Pull::Up); + let mut inputs = Inputs { + up: Input::new(peripherals.GPIO38, button_config.clone()), + down: Input::new(peripherals.GPIO0, button_config.clone()), + left: Input::new(peripherals.GPIO1, button_config.clone()), + right: Input::new(peripherals.GPIO2, button_config.clone()), + back: Input::new(peripherals.GPIO3, button_config.clone()), + ok: Input::new(peripherals.GPIO4, button_config.clone()), + }; + + spawner.spawn(navigation::run(inputs).expect("run task failed")); } diff --git a/src/display/primary_lcd.rs b/src/display/primary_lcd.rs index efebe50..65e727d 100644 --- a/src/display/primary_lcd.rs +++ b/src/display/primary_lcd.rs @@ -6,15 +6,15 @@ use embedded_hal_bus::spi::ExclusiveDevice; use esp_hal::delay::Delay; use esp_hal::gpio::{Level, Output, OutputConfig}; use esp_hal::peripherals::{GPIO10, GPIO11, GPIO12, GPIO35, GPIO36, GPIO37, SPI2}; -use esp_hal::spi::{master::{Config, Spi}, Mode}; +use esp_hal::spi::{ + Mode, + master::{Config, Spi}, +}; use esp_hal::time::Rate; use ili9341::{DisplaySize240x320, Ili9341, Orientation}; pub type PrimaryLcdDisplay<'a> = Ili9341< - SPIInterface< - ExclusiveDevice, Output<'a>, Delay>, - Output<'a>, - >, + SPIInterface, Output<'a>, Delay>, Output<'a>>, Output<'a>, >; @@ -26,7 +26,6 @@ pub fn init_primary_lcd( cs: GPIO11<'static>, reset: GPIO10<'static>, dc: GPIO12<'static>, - delay: &mut Delay, ) -> PrimaryLcdDisplay<'static> { let freq = Rate::from_khz(60_000); log::info!("Display freq: {freq}"); @@ -40,8 +39,10 @@ pub fn init_primary_lcd( .with_mosi(mosi) .with_miso(miso); + let mut delay = Delay::new(); + let cs_main = Output::new(cs, Level::High, OutputConfig::default()); - let spi_dev = ExclusiveDevice::new(spi_bus, cs_main, *delay).unwrap(); + let spi_dev = ExclusiveDevice::new(spi_bus, cs_main, delay).unwrap(); let reset_main = Output::new(reset, Level::High, OutputConfig::default()); let spi_dc = Output::new(dc, Level::High, OutputConfig::default()); let iface = SPIInterface::new(spi_dev, spi_dc); @@ -49,7 +50,7 @@ pub fn init_primary_lcd( let mut display = Ili9341::new( iface, reset_main, - delay, + &mut delay, Orientation::Portrait, DisplaySize240x320, ) diff --git a/src/navigation.rs b/src/navigation.rs index 6856496..daeb191 100644 --- a/src/navigation.rs +++ b/src/navigation.rs @@ -1,2 +1,4 @@ -pub mod input; +pub mod inputs; +pub mod main_menu; +pub mod navigation; pub mod state; diff --git a/src/navigation/input.rs b/src/navigation/input.rs deleted file mode 100644 index 07f5426..0000000 --- a/src/navigation/input.rs +++ /dev/null @@ -1,15 +0,0 @@ -use esp_hal::gpio::{Input, InputConfig, Pull}; -use esp_hal::peripherals::GPIO38; - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum NavCommand { - NextCard, - PrevCard, - Select, - ScanTag, -} - -pub fn init_navigation_button(pin: GPIO38<'static>) -> Input<'static> { - let button_config = InputConfig::default().with_pull(Pull::Up); - Input::new(pin, button_config) -} diff --git a/src/navigation/inputs.rs b/src/navigation/inputs.rs new file mode 100644 index 0000000..f0bd35e --- /dev/null +++ b/src/navigation/inputs.rs @@ -0,0 +1,19 @@ +use esp_hal::gpio::{Input, InputConfig, Pull}; +use esp_hal::peripherals::Peripherals; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum NavCommand { + NextCard, + PrevCard, + Select, + ScanTag, +} + +pub struct Inputs { + pub up: Input<'static>, + pub down: Input<'static>, + pub left: Input<'static>, + pub right: Input<'static>, + pub back: Input<'static>, + pub ok: Input<'static>, +} diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs new file mode 100644 index 0000000..f92903d --- /dev/null +++ b/src/navigation/main_menu.rs @@ -0,0 +1,3 @@ +use crate::navigation::inputs::Inputs; + +pub async fn show(_inputs: &mut Inputs) {} diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs new file mode 100644 index 0000000..f2d51cc --- /dev/null +++ b/src/navigation/navigation.rs @@ -0,0 +1,8 @@ +use crate::navigation::inputs::Inputs; + +#[embassy_executor::task] +pub async fn run(mut inputs: Inputs) { + loop { + crate::navigation::main_menu::show(&mut inputs).await + } +} -- 2.39.5 From 6b8d076b3c3c8137b73ca7e9d563cfa65242ce59 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 20:02:11 +0000 Subject: [PATCH 02/19] working on main menu --- Cargo.lock | 17 +++++++++-------- Cargo.toml | 3 +-- src/navigation/main_menu.rs | 10 +++++++++- src/navigation/navigation.rs | 29 ++++++++++++++++++++++++++++- 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19bc895..601c3da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,6 +306,7 @@ dependencies = [ "critical-section", "display-interface-spi", "embassy-executor", + "embassy-futures", "embassy-time", "embedded-graphics", "embedded-graphics-core", @@ -1530,27 +1531,27 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-core", "futures-task", diff --git a/Cargo.toml b/Cargo.toml index 0955582..142ecff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ embedded-io = "0.7.1" embassy-executor = { version = "0.10.0", features = [ ] } embassy-time = { version = "0.5.1", default-features = false } +embassy-futures = "0.1.2" esp-alloc = "0.10.0" esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [ "ap", @@ -43,8 +44,6 @@ base64 = { version = "0.22", default-features = false, features = ["alloc"] } pn532 = "0.5.0" ndef = "0.5.0" - - # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html [profile.dev] # The default debug profile is too slow and too big for resource-constrained devices. diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index f92903d..3d1f1bc 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -1,3 +1,11 @@ use crate::navigation::inputs::Inputs; -pub async fn show(_inputs: &mut Inputs) {} +pub const MAX_SELECTED: i8 = 3; + +pub struct MainMenu { + pub selected: i8, +} + +impl MainMenu { + pub async fn display(self: &Self) {} +} diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index f2d51cc..4633f90 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,8 +1,35 @@ use crate::navigation::inputs::Inputs; +use crate::navigation::main_menu::{MAX_SELECTED, MainMenu}; + +use embassy_futures::select::Either6; +use embassy_futures::select::select6; #[embassy_executor::task] pub async fn run(mut inputs: Inputs) { + let mut state = MainMenu { selected: 0 }; + loop { - crate::navigation::main_menu::show(&mut inputs).await + let selection = select6( + inputs.up.wait_for_low(), + inputs.down.wait_for_low(), + inputs.left.wait_for_low(), + inputs.right.wait_for_low(), + inputs.ok.wait_for_low(), + inputs.back.wait_for_low(), + ) + .await; + + let value = match selection { + Either6::First(_) => (state.selected.wrapping_sub(1)) % MAX_SELECTED, + Either6::Second(_) => (state.selected.wrapping_add(1)) % MAX_SELECTED, + _ => continue, // Either6::Third(_) => , + // Either6::Fourth(_) => (), + // Either6::Fifth(_) => (), + // Either6::Sixth(_) => (), + }; + + state.selected = value; + + state.display().await } } -- 2.39.5 From f38181d98a20ff9fac58d007c1a6104bb97b0306 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 20:20:53 +0000 Subject: [PATCH 03/19] main menu first simple implementation of display and state --- src/bin/main.rs | 11 ++++---- src/navigation/main_menu.rs | 53 ++++++++++++++++++++++++++++++++++-- src/navigation/navigation.rs | 6 ++-- 3 files changed, 60 insertions(+), 10 deletions(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index 97827ec..57b6818 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -7,8 +7,9 @@ )] #![deny(clippy::large_stack_frames)] +use alloc::boxed::Box; use creaturedex::card::mock::{MOCK_PAYLOAD, MOCK_PAYLOAD2}; -use creaturedex::display::primary_lcd::init_primary_lcd; +use creaturedex::display::primary_lcd::{PrimaryLcdDisplay, init_primary_lcd}; use creaturedex::display::views::card_view::render_nfc_payload; use creaturedex::drivers::nfc_pn532::NfcPn532Driver; use creaturedex::navigation::inputs::Inputs; @@ -61,7 +62,7 @@ async fn main(spawner: Spawner) { log::info!("Setup complete, entering main loop"); - let mut display = init_primary_lcd( + let display: &mut PrimaryLcdDisplay = Box::leak(Box::new(init_primary_lcd( peripherals.SPI2, peripherals.GPIO36, peripherals.GPIO35, @@ -69,7 +70,7 @@ async fn main(spawner: Spawner) { peripherals.GPIO11, peripherals.GPIO10, peripherals.GPIO12, - ); + ))); setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; @@ -91,7 +92,7 @@ async fn main(spawner: Spawner) { let mut nav_state = NavigationState::new(); let button_config = InputConfig::default().with_pull(Pull::Up); - let mut inputs = Inputs { + let inputs = Inputs { up: Input::new(peripherals.GPIO38, button_config.clone()), down: Input::new(peripherals.GPIO0, button_config.clone()), left: Input::new(peripherals.GPIO1, button_config.clone()), @@ -100,5 +101,5 @@ async fn main(spawner: Spawner) { ok: Input::new(peripherals.GPIO4, button_config.clone()), }; - spawner.spawn(navigation::run(inputs).expect("run task failed")); + spawner.spawn(navigation::run(inputs, display).expect("run task failed")); } diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index 3d1f1bc..4c43ab2 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -1,4 +1,14 @@ -use crate::navigation::inputs::Inputs; +use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; + +use alloc::format; +use embedded_graphics::mono_font::MonoTextStyle; +use embedded_graphics::mono_font::ascii::FONT_6X10; +use embedded_graphics::pixelcolor::Rgb565; +use embedded_graphics::prelude::Point; +use embedded_graphics::prelude::RgbColor; +use embedded_graphics::text::Text; +use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; +use embedded_graphics_core::draw_target::DrawTarget; pub const MAX_SELECTED: i8 = 3; @@ -7,5 +17,44 @@ pub struct MainMenu { } impl MainMenu { - pub async fn display(self: &Self) {} + pub async fn display(&self, display: &mut PrimaryLcdDisplay<'static>) { + let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); + let selected_style = MonoTextStyle::new(&FONT_6X10, Rgb565::BLUE); + + Text::new( + &format!("Last card"), + Point::new(20, 240), + if self.selected == 0 { + selected_style + } else { + style + }, + ) + .draw(display) + .unwrap(); + + Text::new( + &format!("Journal"), + Point::new(20, 250), + if self.selected == 1 { + selected_style + } else { + style + }, + ) + .draw(display) + .unwrap(); + + Text::new( + &format!("Settings"), + Point::new(20, 260), + if self.selected == 1 { + selected_style + } else { + style + }, + ) + .draw(display) + .unwrap(); + } } diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index 4633f90..da61905 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,11 +1,11 @@ -use crate::navigation::inputs::Inputs; use crate::navigation::main_menu::{MAX_SELECTED, MainMenu}; +use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use embassy_futures::select::Either6; use embassy_futures::select::select6; #[embassy_executor::task] -pub async fn run(mut inputs: Inputs) { +pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { let mut state = MainMenu { selected: 0 }; loop { @@ -30,6 +30,6 @@ pub async fn run(mut inputs: Inputs) { state.selected = value; - state.display().await + state.display(display).await } } -- 2.39.5 From ca4ea67e7b22ffc15b41a927a05fefa7cdbae17e Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 20:36:18 +0000 Subject: [PATCH 04/19] update wokwi with buttons --- diagram.json | 117 +++++++++++++++++++++++++++++++++--------------- src/bin/main.rs | 10 ++--- 2 files changed, 86 insertions(+), 41 deletions(-) diff --git a/diagram.json b/diagram.json index 0e14a71..ba005e4 100644 --- a/diagram.json +++ b/diagram.json @@ -1,37 +1,82 @@ { - "version": 1, - "author": "CreatureDex", - "editor": "wokwi", - "parts": [ - { - "type": "board-esp32-s3-devkitc-1", - "id": "esp1", - "top": 67.2, - "left": -263.96, - "attrs": {} - }, - { "type": "wokwi-ili9341", "id": "lcd1", "top": -191.24, "left": -0.38, "attrs": {} }, - { - "type": "wokwi-pushbutton", - "id": "btn1", - "top": 131, - "left": -124.8, - "attrs": { "color": "green", "xray": "1", "key": "1" } - } - ], - "connections": [ - [ "esp1:TX", "$serialMonitor:RX", "", [] ], - [ "esp1:RX", "$serialMonitor:TX", "", [] ], - [ "lcd1:VCC", "esp1:3V3", "red", [ "v19.2", "h-57.6", "v-105.6", "h-124.95" ] ], - [ "lcd1:GND", "esp1:GND.2", "black", [ "v28.8", "h-76.8", "v-76.8" ] ], - [ "lcd1:CS", "esp1:11", "orange", [ "v0" ] ], - [ "lcd1:D/C", "esp1:12", "gold", [ "v0" ] ], - [ "lcd1:RESET", "esp1:10", "brown", [ "v0" ] ], - [ "lcd1:MOSI", "esp1:35", "violet", [ "v105.6", "h-124.8", "v-144" ] ], - [ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ], - [ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v105.6", "h172.8" ] ], - [ "btn1:1.l", "esp1:GND.2", "green", [ "h-9.6", "v-48" ] ], - [ "btn1:2.l", "esp1:38", "green", [ "h-9.6", "v19.4" ] ] - ], - "dependencies": {} -} \ No newline at end of file +"version": 1, +"author": "CreatureDex", +"editor": "wokwi", +"parts": [ + { + "type": "board-esp32-s3-devkitc-1", + "id": "esp1", + "top": 67.2, + "left": -263.96, + "attrs": {} + }, + { "type": "wokwi-ili9341", "id": "lcd1", "top": -200.8, "left": 354.9, "attrs": {} }, + { + "type": "wokwi-pushbutton", + "id": "btn-up", + "top": -99.4, + "left": -76.8, + "attrs": { "color": "RebeccaPurple", "xray": "1", "key": "1", "label": "Up" } + }, + { + "type": "wokwi-pushbutton", + "id": "btn-down", + "top": 25.4, + "left": -76.8, + "attrs": { "color": "green", "xray": "1", "key": "1", "label": "Down" } + }, + { + "type": "wokwi-pushbutton", + "id": "btn-left", + "top": -32.2, + "left": -163.2, + "attrs": { "color": "yellow", "xray": "1", "key": "1", "label": "Left" } + }, + { + "type": "wokwi-pushbutton", + "id": "btn-right", + "top": -32.2, + "left": 19.2, + "attrs": { "color": "red", "xray": "1", "key": "1", "label": "Right" } + }, + { + "type": "wokwi-pushbutton", + "id": "btn-ok", + "top": -99.4, + "left": 115.2, + "attrs": { "color": "Magenta", "xray": "1", "key": "1", "label": "Ok" } + }, + { + "type": "wokwi-pushbutton", + "id": "btn-back", + "top": 25.4, + "left": 115.2, + "attrs": { "color": "Lime", "xray": "1", "key": "1", "label": "Back" } + } +], +"connections": [ + [ "esp1:TX", "$serialMonitor:RX", "", [] ], + [ "esp1:RX", "$serialMonitor:TX", "", [] ], + [ "lcd1:VCC", "esp1:3V3", "red", [ "v19.2", "h-57.6", "v-105.6", "h-124.95" ] ], + [ "lcd1:GND", "esp1:GND.2", "black", [ "v28.8", "h-76.8", "v-76.8" ] ], + [ "lcd1:CS", "esp1:11", "orange", [ "v0" ] ], + [ "lcd1:D/C", "esp1:12", "gold", [ "v0" ] ], + [ "lcd1:RESET", "esp1:10", "brown", [ "v0" ] ], + [ "lcd1:MOSI", "esp1:35", "violet", [ "v105.6", "h-124.8", "v-144" ] ], + [ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ], + [ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v105.6", "h172.8" ] ], + [ "btn-up:2.l", "esp1:38", "purple", [ "h-9.6", "v19.4" ] ], + [ "btn-up:1.l", "esp1:GND.2", "black", [ "h0" ] ], + [ "btn-down:1.l", "esp1:GND.2", "black", [ "h0" ] ], + [ "btn-down:2.l", "esp1:39", "green", [ "h-19.2", "v115.4" ] ], + [ "btn-left:2.l", "esp1:40", "yellow", [ "h0", "v173" ] ], + [ "btn-left:1.l", "esp1:GND.2", "black", [ "h0" ] ], + [ "btn-right:2.l", "esp1:41", "red", [ "h-19.2", "v153.8" ] ], + [ "btn-right:1.l", "btn-left:1.r", "black", [ "h-96", "v28.8" ] ], + [ "btn-ok:2.l", "esp1:42", "Magenta", [ "h-19.2", "v211.58" ] ], + [ "btn-ok:1.l", "btn-up:1.r", "black", [ "h0" ] ], + [ "btn-back:1.l", "btn-down:1.r", "black", [ "h0" ] ], + [ "btn-back:2.l", "esp1:45", "Lime", [ "h-9.6", "v173" ] ] +], +"dependencies": {} +} diff --git a/src/bin/main.rs b/src/bin/main.rs index 57b6818..b18646d 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -94,11 +94,11 @@ async fn main(spawner: Spawner) { let button_config = InputConfig::default().with_pull(Pull::Up); let inputs = Inputs { up: Input::new(peripherals.GPIO38, button_config.clone()), - down: Input::new(peripherals.GPIO0, button_config.clone()), - left: Input::new(peripherals.GPIO1, button_config.clone()), - right: Input::new(peripherals.GPIO2, button_config.clone()), - back: Input::new(peripherals.GPIO3, button_config.clone()), - ok: Input::new(peripherals.GPIO4, button_config.clone()), + down: Input::new(peripherals.GPIO39, button_config.clone()), + left: Input::new(peripherals.GPIO40, button_config.clone()), + right: Input::new(peripherals.GPIO41, button_config.clone()), + back: Input::new(peripherals.GPIO42, button_config.clone()), + ok: Input::new(peripherals.GPIO45, button_config.clone()), }; spawner.spawn(navigation::run(inputs, display).expect("run task failed")); -- 2.39.5 From e361154295284540a648eb7bd1f64b9f218f734a Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 20:47:44 +0000 Subject: [PATCH 05/19] try to workout buttons --- src/bin/main.rs | 5 ++--- src/navigation/navigation.rs | 33 +++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index b18646d..1dd88c3 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -72,7 +72,7 @@ async fn main(spawner: Spawner) { peripherals.GPIO12, ))); - setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; + //setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; log::info!("Setup complete, entering main loop"); @@ -87,8 +87,6 @@ async fn main(spawner: Spawner) { log::error!("NFC SAM configuration failed"); } - log::info!("Setup complete, entering main loop"); - let mut nav_state = NavigationState::new(); let button_config = InputConfig::default().with_pull(Pull::Up); @@ -101,5 +99,6 @@ async fn main(spawner: Spawner) { ok: Input::new(peripherals.GPIO45, button_config.clone()), }; + log::info!("Setup complete, entering main loop"); spawner.spawn(navigation::run(inputs, display).expect("run task failed")); } diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index da61905..ba92677 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -8,7 +8,9 @@ use embassy_futures::select::select6; pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { let mut state = MainMenu { selected: 0 }; + log::info!("starting navigation"); loop { + log::info!("await button press"); let selection = select6( inputs.up.wait_for_low(), inputs.down.wait_for_low(), @@ -19,13 +21,32 @@ pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'st ) .await; + log::info!("button pressed"); let value = match selection { - Either6::First(_) => (state.selected.wrapping_sub(1)) % MAX_SELECTED, - Either6::Second(_) => (state.selected.wrapping_add(1)) % MAX_SELECTED, - _ => continue, // Either6::Third(_) => , - // Either6::Fourth(_) => (), - // Either6::Fifth(_) => (), - // Either6::Sixth(_) => (), + Either6::First(_) => { + log::info!("up pressed"); + (state.selected.wrapping_sub(1)) % MAX_SELECTED + } + Either6::Second(_) => { + log::info!("down pressed"); + (state.selected.wrapping_add(1)) % MAX_SELECTED + } + Either6::Third(_) => { + log::info!("left pressed"); + continue; + } + Either6::Fourth(_) => { + log::info!("right pressed"); + continue; + } + Either6::Fifth(_) => { + log::info!("ok pressed"); + continue; + } + Either6::Sixth(_) => { + log::info!("back pressed"); + continue; + } }; state.selected = value; -- 2.39.5 From 77b73902b845c8e21fae02630fbc5286455e970b Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 21:00:16 +0000 Subject: [PATCH 06/19] simple button debounce --- src/bin/main.rs | 6 ------ src/navigation/navigation.rs | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index 1dd88c3..813e465 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -60,8 +60,6 @@ async fn main(spawner: Spawner) { let timg0 = TimerGroup::new(peripherals.TIMG0); esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0); - log::info!("Setup complete, entering main loop"); - let display: &mut PrimaryLcdDisplay = Box::leak(Box::new(init_primary_lcd( peripherals.SPI2, peripherals.GPIO36, @@ -74,10 +72,6 @@ async fn main(spawner: Spawner) { //setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; - log::info!("Setup complete, entering main loop"); - - let mut nav_state = NavigationState::new(); - let mut nfc_driver = NfcPn532Driver::new(peripherals.I2C0, peripherals.GPIO17, peripherals.GPIO18); let timeout = Duration::from_millis(1000); diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index ba92677..e0f37a9 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -3,6 +3,9 @@ use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs} use embassy_futures::select::Either6; use embassy_futures::select::select6; +use embassy_time::{Duration, Timer}; + +const DEBOUNCE_DURATION_MILLIS: u64 = 100; #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { @@ -51,6 +54,8 @@ pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'st state.selected = value; - state.display(display).await + state.display(display).await; + + Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await; } } -- 2.39.5 From d3ac95a9bd8a08f4cea01af1f977827c5221c939 Mon Sep 17 00:00:00 2001 From: ede1998 Date: Fri, 14 Aug 2026 23:06:49 +0200 Subject: [PATCH 07/19] add scan menu --- src/navigation.rs | 1 + src/navigation/main_menu.rs | 6 ++- src/navigation/navigation.rs | 4 ++ src/navigation/scan_menu.rs | 72 ++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 src/navigation/scan_menu.rs diff --git a/src/navigation.rs b/src/navigation.rs index daeb191..6d97813 100644 --- a/src/navigation.rs +++ b/src/navigation.rs @@ -1,4 +1,5 @@ pub mod inputs; pub mod main_menu; pub mod navigation; +pub mod scan_menu; pub mod state; diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index 4c43ab2..32d4f0f 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -16,8 +16,8 @@ pub struct MainMenu { pub selected: i8, } -impl MainMenu { - pub async fn display(&self, display: &mut PrimaryLcdDisplay<'static>) { +impl super::navigation::Displayable for MainMenu { + fn display(&self, display: &mut PrimaryLcdDisplay<'static>) -> impl core::future::Future + Send { let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); let selected_style = MonoTextStyle::new(&FONT_6X10, Rgb565::BLUE); @@ -56,5 +56,7 @@ impl MainMenu { ) .draw(display) .unwrap(); + + core::future::ready(()) } } diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index e0f37a9..0e0f560 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -7,6 +7,10 @@ use embassy_time::{Duration, Timer}; const DEBOUNCE_DURATION_MILLIS: u64 = 100; +pub trait Displayable { + fn display(&self, display: &mut PrimaryLcdDisplay<'static>) -> impl core::future::Future + Send; +} + #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { let mut state = MainMenu { selected: 0 }; diff --git a/src/navigation/scan_menu.rs b/src/navigation/scan_menu.rs new file mode 100644 index 0000000..7166ac3 --- /dev/null +++ b/src/navigation/scan_menu.rs @@ -0,0 +1,72 @@ +use crate::display::primary_lcd::PrimaryLcdDisplay; + +use alloc::format; +use embedded_graphics::Drawable; +use embedded_graphics::geometry::AngleUnit as _; +use embedded_graphics::geometry::Dimensions as _; +use embedded_graphics::mono_font::MonoTextStyle; +use embedded_graphics::mono_font::ascii::FONT_6X10; +use embedded_graphics::pixelcolor::Rgb565; +use embedded_graphics::prelude::Point; +use embedded_graphics::prelude::RgbColor; +use embedded_graphics::primitives::Arc; +use embedded_graphics::primitives::Primitive as _; +use embedded_graphics::primitives::PrimitiveStyleBuilder; +use embedded_graphics::primitives::StrokeAlignment; +use embedded_graphics::text::Alignment; +use embedded_graphics::text::Baseline; +use embedded_graphics::text::Text; +use embedded_graphics::text::TextStyleBuilder; +use embedded_graphics_core::draw_target::DrawTarget; + +pub struct ScanMenu { + progress: u8, // 0..255 +} + +impl super::navigation::Displayable for ScanMenu { + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); + + Text::new("Scanning...", Point::new(20, 240), style) + .draw(display) + .unwrap(); + + // Create styles used by the drawing operations. + let arc_stroke = PrimitiveStyleBuilder::new() + .stroke_color(Rgb565::WHITE) + .stroke_width(5) + .stroke_alignment(StrokeAlignment::Inside) + .build(); + let character_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); + let text_style = TextStyleBuilder::new() + .baseline(Baseline::Middle) + .alignment(Alignment::Center) + .build(); + + display.clear(Rgb565::BLACK).unwrap(); + + let sweep = self.progress as f32 * 360.0 / 100.0; + + // Draw an arc with a 5px wide stroke. + Arc::new(Point::new(2, 2), 64 - 4, 90.0.deg(), sweep.deg()) + .into_styled(arc_stroke) + .draw(display) + .unwrap(); + + // Draw centered text. + let text = format!("{}%", self.progress); + Text::with_text_style( + &text, + display.bounding_box().center(), + character_style, + text_style, + ) + .draw(display) + .unwrap(); + + core::future::ready(()) + } +} -- 2.39.5 From 6c683e415f0c36b1c02ddb66dbb510a1097c84f0 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 21:18:08 +0000 Subject: [PATCH 08/19] main menu: wrap around correctly --- src/navigation/main_menu.rs | 19 +++++++++++-------- src/navigation/navigation.rs | 12 ++++++++++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index 32d4f0f..e25b199 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -2,7 +2,7 @@ use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs} use alloc::format; use embedded_graphics::mono_font::MonoTextStyle; -use embedded_graphics::mono_font::ascii::FONT_6X10; +use embedded_graphics::mono_font::ascii::FONT_10X20; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::Point; use embedded_graphics::prelude::RgbColor; @@ -17,13 +17,16 @@ pub struct MainMenu { } impl super::navigation::Displayable for MainMenu { - fn display(&self, display: &mut PrimaryLcdDisplay<'static>) -> impl core::future::Future + Send { - let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); - let selected_style = MonoTextStyle::new(&FONT_6X10, Rgb565::BLUE); + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); + let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE); Text::new( &format!("Last card"), - Point::new(20, 240), + Point::new(40, 40), if self.selected == 0 { selected_style } else { @@ -35,7 +38,7 @@ impl super::navigation::Displayable for MainMenu { Text::new( &format!("Journal"), - Point::new(20, 250), + Point::new(40, 60), if self.selected == 1 { selected_style } else { @@ -47,8 +50,8 @@ impl super::navigation::Displayable for MainMenu { Text::new( &format!("Settings"), - Point::new(20, 260), - if self.selected == 1 { + Point::new(40, 80), + if self.selected == 2 { selected_style } else { style diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index 0e0f560..4420449 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -8,13 +8,17 @@ use embassy_time::{Duration, Timer}; const DEBOUNCE_DURATION_MILLIS: u64 = 100; pub trait Displayable { - fn display(&self, display: &mut PrimaryLcdDisplay<'static>) -> impl core::future::Future + Send; + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send; } #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { let mut state = MainMenu { selected: 0 }; + state.display(display).await; log::info!("starting navigation"); loop { log::info!("await button press"); @@ -32,7 +36,11 @@ pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'st let value = match selection { Either6::First(_) => { log::info!("up pressed"); - (state.selected.wrapping_sub(1)) % MAX_SELECTED + if (state.selected - 1) < 0 { + MAX_SELECTED - 1 + } else { + state.selected - 1 + } } Either6::Second(_) => { log::info!("down pressed"); -- 2.39.5 From 0fb87f2913e33eaf4a69dbd5f778db65a078d67a Mon Sep 17 00:00:00 2001 From: ede1998 Date: Fri, 14 Aug 2026 23:27:39 +0200 Subject: [PATCH 09/19] Split into multi-menu --- src/navigation/main_menu.rs | 34 +++++++++++++++++++- src/navigation/navigation.rs | 62 ++++++++++++++---------------------- src/navigation/scan_menu.rs | 12 ++++++- src/navigation/state.rs | 54 +++++++++++++++++++++---------- 4 files changed, 105 insertions(+), 57 deletions(-) diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index e25b199..ffc842f 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -1,3 +1,5 @@ +use core::future; + use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use alloc::format; @@ -10,13 +12,16 @@ use embedded_graphics::text::Text; use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; use embedded_graphics_core::draw_target::DrawTarget; +use super::state::Menu; + pub const MAX_SELECTED: i8 = 3; +#[derive(Debug, Clone)] pub struct MainMenu { pub selected: i8, } -impl super::navigation::Displayable for MainMenu { +impl super::navigation::Navigable for MainMenu { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, @@ -62,4 +67,31 @@ impl super::navigation::Displayable for MainMenu { core::future::ready(()) } + + fn handle_input( + &self, + input: super::navigation::Action, + ) -> impl core::future::Future + Send { + let new_menu = match input { + super::navigation::Action::Up => { + let new_selected = if (self.selected - 1) < 0 { + MAX_SELECTED - 1 + } else { + self.selected - 1 + }; + Menu::Main(MainMenu { + selected: new_selected, + }) + } + super::navigation::Action::Down => { + let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED; + Menu::Main(MainMenu { + selected: new_selected, + }) + } + _ => Menu::Main(self.clone()), + }; + + future::ready(new_menu) + } } diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index 4420449..972168f 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,4 +1,4 @@ -use crate::navigation::main_menu::{MAX_SELECTED, MainMenu}; +use crate::navigation::state::{Menu, NavigationState}; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use embassy_futures::select::Either6; @@ -7,21 +7,30 @@ use embassy_time::{Duration, Timer}; const DEBOUNCE_DURATION_MILLIS: u64 = 100; -pub trait Displayable { +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum Action { + Up, + Down, + Left, + Right, + Ok, + Back, +} + +pub trait Navigable { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send; + fn handle_input(&self, input: Action) -> impl core::future::Future + Send; } #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { - let mut state = MainMenu { selected: 0 }; + let mut state = NavigationState::default(); - state.display(display).await; log::info!("starting navigation"); loop { - log::info!("await button press"); let selection = select6( inputs.up.wait_for_low(), inputs.down.wait_for_low(), @@ -32,41 +41,18 @@ pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'st ) .await; - log::info!("button pressed"); - let value = match selection { - Either6::First(_) => { - log::info!("up pressed"); - if (state.selected - 1) < 0 { - MAX_SELECTED - 1 - } else { - state.selected - 1 - } - } - Either6::Second(_) => { - log::info!("down pressed"); - (state.selected.wrapping_add(1)) % MAX_SELECTED - } - Either6::Third(_) => { - log::info!("left pressed"); - continue; - } - Either6::Fourth(_) => { - log::info!("right pressed"); - continue; - } - Either6::Fifth(_) => { - log::info!("ok pressed"); - continue; - } - Either6::Sixth(_) => { - log::info!("back pressed"); - continue; - } + let action = match selection { + Either6::First(_) => Action::Up, + Either6::Second(_) => Action::Down, + Either6::Third(_) => Action::Left, + Either6::Fourth(_) => Action::Right, + Either6::Fifth(_) => Action::Ok, + Either6::Sixth(_) => Action::Back, }; - state.selected = value; - - state.display(display).await; + log::info!("Action: {:?}", action); + state.current_screen = state.current_screen.handle_input(action).await; + state.current_screen.display(display).await; Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await; } diff --git a/src/navigation/scan_menu.rs b/src/navigation/scan_menu.rs index 7166ac3..e737feb 100644 --- a/src/navigation/scan_menu.rs +++ b/src/navigation/scan_menu.rs @@ -19,11 +19,14 @@ use embedded_graphics::text::Text; use embedded_graphics::text::TextStyleBuilder; use embedded_graphics_core::draw_target::DrawTarget; +use super::state::Menu; + +#[derive(Debug, Clone)] pub struct ScanMenu { progress: u8, // 0..255 } -impl super::navigation::Displayable for ScanMenu { +impl super::navigation::Navigable for ScanMenu { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, @@ -69,4 +72,11 @@ impl super::navigation::Displayable for ScanMenu { core::future::ready(()) } + + fn handle_input( + &self, + _input: super::navigation::Action, + ) -> impl core::future::Future + Send { + core::future::ready(Menu::Scan(self.clone())) + } } diff --git a/src/navigation/state.rs b/src/navigation/state.rs index 71e9548..9d2b3f3 100644 --- a/src/navigation/state.rs +++ b/src/navigation/state.rs @@ -1,23 +1,49 @@ -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum ScreenMode { - CardDetail, - DexGrid, +use crate::navigation::{main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu}; + +#[derive(Debug, Clone)] +pub enum Menu { + Main(MainMenu), + Scan(ScanMenu), Settings, } -#[derive(Debug, Clone, Copy)] +impl Navigable for Menu { + fn display( + &self, + display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + async move { + match self { + Menu::Main(main_menu) => main_menu.display(display).await, + Menu::Scan(scan_menu) => scan_menu.display(display).await, + Menu::Settings => {} + } + } + } + + fn handle_input( + &self, + input: crate::navigation::navigation::Action, + ) -> impl core::future::Future + Send { + async move { + match self { + Menu::Main(main_menu) => main_menu.handle_input(input).await, + Menu::Scan(scan_menu) => scan_menu.handle_input(input).await, + Menu::Settings => Self::Settings, + } + } + } +} + +#[derive(Debug, Clone)] pub struct NavigationState { - pub current_screen: ScreenMode, - pub card_index: usize, - pub use_first_payload: bool, + pub current_screen: Menu, } impl Default for NavigationState { fn default() -> Self { Self { - current_screen: ScreenMode::CardDetail, - card_index: 0, - use_first_payload: true, + current_screen: Menu::Main(MainMenu { selected: 0 }), } } } @@ -26,10 +52,4 @@ impl NavigationState { pub fn new() -> Self { Self::default() } - - pub fn toggle_payload(&mut self) -> bool { - let current = self.use_first_payload; - self.use_first_payload = !self.use_first_payload; - current - } } -- 2.39.5 From e1ab69d1ab3eb17020ac560af30457e234522f96 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 21:40:24 +0000 Subject: [PATCH 10/19] move menu drawing to own function --- src/navigation.rs | 2 ++ src/navigation/main_menu.rs | 49 ++++++------------------------------- src/navigation/menu_item.rs | 33 +++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 src/navigation/menu_item.rs diff --git a/src/navigation.rs b/src/navigation.rs index 6d97813..d228ed0 100644 --- a/src/navigation.rs +++ b/src/navigation.rs @@ -1,5 +1,7 @@ pub mod inputs; pub mod main_menu; +pub mod menu_item; pub mod navigation; pub mod scan_menu; +pub mod settings_menu; pub mod state; diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index ffc842f..9b03637 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -2,23 +2,20 @@ use core::future; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; -use alloc::format; +use crate::navigation::menu_item; + use embedded_graphics::mono_font::MonoTextStyle; use embedded_graphics::mono_font::ascii::FONT_10X20; use embedded_graphics::pixelcolor::Rgb565; -use embedded_graphics::prelude::Point; use embedded_graphics::prelude::RgbColor; -use embedded_graphics::text::Text; -use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; -use embedded_graphics_core::draw_target::DrawTarget; use super::state::Menu; -pub const MAX_SELECTED: i8 = 3; +pub const MAX_SELECTED: i32 = 3; #[derive(Debug, Clone)] pub struct MainMenu { - pub selected: i8, + pub selected: i32, } impl super::navigation::Navigable for MainMenu { @@ -29,41 +26,9 @@ impl super::navigation::Navigable for MainMenu { let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE); - Text::new( - &format!("Last card"), - Point::new(40, 40), - if self.selected == 0 { - selected_style - } else { - style - }, - ) - .draw(display) - .unwrap(); - - Text::new( - &format!("Journal"), - Point::new(40, 60), - if self.selected == 1 { - selected_style - } else { - style - }, - ) - .draw(display) - .unwrap(); - - Text::new( - &format!("Settings"), - Point::new(40, 80), - if self.selected == 2 { - selected_style - } else { - style - }, - ) - .draw(display) - .unwrap(); + menu_item::show(display, "Last card", 0, self.selected); + menu_item::show(display, "Journal", 1, self.selected); + menu_item::show(display, "Settings", 2, self.selected); core::future::ready(()) } diff --git a/src/navigation/menu_item.rs b/src/navigation/menu_item.rs new file mode 100644 index 0000000..f0a68ba --- /dev/null +++ b/src/navigation/menu_item.rs @@ -0,0 +1,33 @@ +use embedded_graphics::mono_font::MonoTextStyle; +use embedded_graphics::mono_font::ascii::FONT_10X20; +use embedded_graphics::pixelcolor::Rgb565; +use embedded_graphics::prelude::Point; +use embedded_graphics::prelude::RgbColor; +use embedded_graphics::text::Text; +use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; +use embedded_graphics_core::draw_target::DrawTarget; + +use crate::display::primary_lcd::PrimaryLcdDisplay; + +pub fn show<'a>( + display: &mut PrimaryLcdDisplay<'static>, + name: &str, + position: i32, + selected: i32, +) { + let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); + let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE); + + Text::new( + name, + Point::new(40, 40 + position * 40), + if position == selected { + selected_style + } else { + style + }, + ) + .draw(display) + .unwrap(); +} + -- 2.39.5 From 890a0e5d62711dbbc8ba76f38e6f6ad01fe7d01c Mon Sep 17 00:00:00 2001 From: rhetenor Date: Fri, 14 Aug 2026 21:57:25 +0000 Subject: [PATCH 11/19] implement settings menu --- src/navigation/main_menu.rs | 11 +++++++---- src/navigation/settings_menu.rs | 33 +++++++++++++++++++++++++++++++++ src/navigation/state.rs | 10 ++++++---- 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 src/navigation/settings_menu.rs diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index 9b03637..5d7cb71 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -3,11 +3,11 @@ use core::future; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use crate::navigation::menu_item; +use crate::navigation::settings_menu::SettingsMenu; -use embedded_graphics::mono_font::MonoTextStyle; -use embedded_graphics::mono_font::ascii::FONT_10X20; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::RgbColor; +use embedded_graphics_core::draw_target::DrawTarget; use super::state::Menu; @@ -23,8 +23,7 @@ impl super::navigation::Navigable for MainMenu { &self, display: &mut PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send { - let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); - let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE); + display.clear(Rgb565::BLACK).unwrap(); menu_item::show(display, "Last card", 0, self.selected); menu_item::show(display, "Journal", 1, self.selected); @@ -54,6 +53,10 @@ impl super::navigation::Navigable for MainMenu { selected: new_selected, }) } + super::navigation::Action::Ok => match self.selected { + 2 => Menu::Settings(SettingsMenu { selected: 0 }), + _ => Menu::Main(self.clone()), + }, _ => Menu::Main(self.clone()), }; diff --git a/src/navigation/settings_menu.rs b/src/navigation/settings_menu.rs new file mode 100644 index 0000000..c1a5eff --- /dev/null +++ b/src/navigation/settings_menu.rs @@ -0,0 +1,33 @@ +use crate::navigation::menu_item; +use crate::navigation::state::Menu; +use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; + +use embedded_graphics::pixelcolor::Rgb565; +use embedded_graphics::prelude::RgbColor; +use embedded_graphics_core::draw_target::DrawTarget; +pub const MAX_SELECTED: i8 = 2; + +#[derive(Debug, Clone)] +pub struct SettingsMenu { + pub selected: i32, +} + +impl super::navigation::Navigable for SettingsMenu { + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + display.clear(Rgb565::BLACK).unwrap(); + menu_item::show(display, "System Inforation", 0, self.selected); + menu_item::show(display, "Wifi Information", 1, self.selected); + + core::future::ready(()) + } + + fn handle_input( + &self, + input: super::navigation::Action, + ) -> impl core::future::Future + Send { + async move { Menu::Settings(SettingsMenu { selected: 0 }) } + } +} diff --git a/src/navigation/state.rs b/src/navigation/state.rs index 9d2b3f3..7171f45 100644 --- a/src/navigation/state.rs +++ b/src/navigation/state.rs @@ -1,10 +1,12 @@ -use crate::navigation::{main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu}; +use crate::navigation::{ + main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu, settings_menu::SettingsMenu, +}; #[derive(Debug, Clone)] pub enum Menu { Main(MainMenu), Scan(ScanMenu), - Settings, + Settings(SettingsMenu), } impl Navigable for Menu { @@ -16,7 +18,7 @@ impl Navigable for Menu { match self { Menu::Main(main_menu) => main_menu.display(display).await, Menu::Scan(scan_menu) => scan_menu.display(display).await, - Menu::Settings => {} + Menu::Settings(settings_menu) => settings_menu.display(display).await, } } } @@ -29,7 +31,7 @@ impl Navigable for Menu { match self { Menu::Main(main_menu) => main_menu.handle_input(input).await, Menu::Scan(scan_menu) => scan_menu.handle_input(input).await, - Menu::Settings => Self::Settings, + Menu::Settings(settings_menu) => settings_menu.handle_input(input).await, } } } -- 2.39.5 From 9792385af1700955f9de688889aba409f7a2082d Mon Sep 17 00:00:00 2001 From: ede1998 Date: Sat, 15 Aug 2026 00:17:20 +0200 Subject: [PATCH 12/19] beautify scan menu --- src/navigation/navigation.rs | 2 ++ src/navigation/scan_menu.rs | 65 ++++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index 972168f..153ee41 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,3 +1,4 @@ +use crate::navigation::scan_menu::ScanMenu; use crate::navigation::state::{Menu, NavigationState}; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; @@ -28,6 +29,7 @@ pub trait Navigable { #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { let mut state = NavigationState::default(); + // state.current_screen = Menu::Scan(ScanMenu { progress: (100 * 30 / 255) as u8 }); log::info!("starting navigation"); loop { diff --git a/src/navigation/scan_menu.rs b/src/navigation/scan_menu.rs index e737feb..f344f48 100644 --- a/src/navigation/scan_menu.rs +++ b/src/navigation/scan_menu.rs @@ -4,14 +4,16 @@ use alloc::format; use embedded_graphics::Drawable; use embedded_graphics::geometry::AngleUnit as _; use embedded_graphics::geometry::Dimensions as _; +use embedded_graphics::geometry::Size; use embedded_graphics::mono_font::MonoTextStyle; -use embedded_graphics::mono_font::ascii::FONT_6X10; +use embedded_graphics::mono_font::ascii::FONT_10X20; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::Point; use embedded_graphics::prelude::RgbColor; use embedded_graphics::primitives::Arc; use embedded_graphics::primitives::Primitive as _; use embedded_graphics::primitives::PrimitiveStyleBuilder; +use embedded_graphics::primitives::Rectangle; use embedded_graphics::primitives::StrokeAlignment; use embedded_graphics::text::Alignment; use embedded_graphics::text::Baseline; @@ -19,11 +21,12 @@ use embedded_graphics::text::Text; use embedded_graphics::text::TextStyleBuilder; use embedded_graphics_core::draw_target::DrawTarget; +use super::navigation::Action; use super::state::Menu; #[derive(Debug, Clone)] pub struct ScanMenu { - progress: u8, // 0..255 + pub progress: u8, // 0..255 } impl super::navigation::Navigable for ScanMenu { @@ -31,9 +34,12 @@ impl super::navigation::Navigable for ScanMenu { &self, display: &mut PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send { - let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); + let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); + display.clear(Rgb565::BLACK).unwrap(); - Text::new("Scanning...", Point::new(20, 240), style) + let display_area = display.bounding_box(); + + Text::new("Scanning...", Point::new(20, 30), style) .draw(display) .unwrap(); @@ -43,40 +49,49 @@ impl super::navigation::Navigable for ScanMenu { .stroke_width(5) .stroke_alignment(StrokeAlignment::Inside) .build(); - let character_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); + let character_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); let text_style = TextStyleBuilder::new() .baseline(Baseline::Middle) .alignment(Alignment::Center) .build(); - display.clear(Rgb565::BLACK).unwrap(); - - let sweep = self.progress as f32 * 360.0 / 100.0; + let sweep = self.progress as f32 * 360.0 / 255.0; + let width = display_area.size.width; + let bounding_box = + Rectangle::with_center(display_area.center(), Size::new_equal(4 * width / 5)); + // log::info!("bounding_box: {:?}", bounding_box); + // log::info!("display_area: {:?}", display_area); // Draw an arc with a 5px wide stroke. - Arc::new(Point::new(2, 2), 64 - 4, 90.0.deg(), sweep.deg()) - .into_styled(arc_stroke) - .draw(display) - .unwrap(); - - // Draw centered text. - let text = format!("{}%", self.progress); - Text::with_text_style( - &text, - display.bounding_box().center(), - character_style, - text_style, + Arc::new( + bounding_box.top_left, + bounding_box.size.width, + 90.0.deg(), + sweep.deg(), ) + .into_styled(arc_stroke) .draw(display) .unwrap(); + // Draw centered text. + let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.); + Text::with_text_style(&text, display_area.center(), character_style, text_style) + .draw(display) + .unwrap(); + core::future::ready(()) } - fn handle_input( - &self, - _input: super::navigation::Action, - ) -> impl core::future::Future + Send { - core::future::ready(Menu::Scan(self.clone())) + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + async move { + let new_progress = match input { + Action::Up => self.progress.wrapping_add(5), + _ => self.progress, + }; + + Menu::Scan(ScanMenu { + progress: new_progress, + }) + } } } -- 2.39.5 From 8a7456adbd159bd84cd2d17242a415e693d42344 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 18:53:17 +0000 Subject: [PATCH 13/19] implement back button --- src/navigation/main_menu.rs | 14 +++++++------- src/navigation/navigation.rs | 28 +++++++++++++++++++++------- src/navigation/scan_menu.rs | 6 +++--- src/navigation/settings_menu.rs | 6 +++--- src/navigation/state.rs | 31 +++++++++++++++++++++---------- 5 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/navigation/main_menu.rs b/src/navigation/main_menu.rs index 5d7cb71..3ebff0c 100644 --- a/src/navigation/main_menu.rs +++ b/src/navigation/main_menu.rs @@ -9,7 +9,7 @@ use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::RgbColor; use embedded_graphics_core::draw_target::DrawTarget; -use super::state::Menu; +use super::state::ScreenItem; pub const MAX_SELECTED: i32 = 3; @@ -35,7 +35,7 @@ impl super::navigation::Navigable for MainMenu { fn handle_input( &self, input: super::navigation::Action, - ) -> impl core::future::Future + Send { + ) -> impl core::future::Future + Send { let new_menu = match input { super::navigation::Action::Up => { let new_selected = if (self.selected - 1) < 0 { @@ -43,21 +43,21 @@ impl super::navigation::Navigable for MainMenu { } else { self.selected - 1 }; - Menu::Main(MainMenu { + ScreenItem::Main(MainMenu { selected: new_selected, }) } super::navigation::Action::Down => { let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED; - Menu::Main(MainMenu { + ScreenItem::Main(MainMenu { selected: new_selected, }) } super::navigation::Action::Ok => match self.selected { - 2 => Menu::Settings(SettingsMenu { selected: 0 }), - _ => Menu::Main(self.clone()), + 2 => ScreenItem::Settings(SettingsMenu { selected: 0 }), + _ => ScreenItem::Main(self.clone()), }, - _ => Menu::Main(self.clone()), + _ => ScreenItem::Main(self.clone()), }; future::ready(new_menu) diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index 153ee41..b0b008d 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,5 +1,5 @@ use crate::navigation::scan_menu::ScanMenu; -use crate::navigation::state::{Menu, NavigationState}; +use crate::navigation::state::{NavigationState, ScreenItem}; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use embassy_futures::select::Either6; @@ -23,15 +23,16 @@ pub trait Navigable { &self, display: &mut PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send; - fn handle_input(&self, input: Action) -> impl core::future::Future + Send; + fn handle_input(&self, input: Action) -> impl core::future::Future + Send; } #[embassy_executor::task] pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) { - let mut state = NavigationState::default(); - // state.current_screen = Menu::Scan(ScanMenu { progress: (100 * 30 / 255) as u8 }); - log::info!("starting navigation"); + + let mut state = NavigationState::new(); + state.screens.last().unwrap().display(display).await; + loop { let selection = select6( inputs.up.wait_for_low(), @@ -53,8 +54,21 @@ pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'st }; log::info!("Action: {:?}", action); - state.current_screen = state.current_screen.handle_input(action).await; - state.current_screen.display(display).await; + + let screen = match action { + Action::Back => state.back(), + _ => { + state + .screens + .last() + .expect("no screen on stack") + .handle_input(action) + .await + } + }; + + screen.display(display).await; + state.screens.push(screen); Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await; } diff --git a/src/navigation/scan_menu.rs b/src/navigation/scan_menu.rs index f344f48..31dc505 100644 --- a/src/navigation/scan_menu.rs +++ b/src/navigation/scan_menu.rs @@ -22,7 +22,7 @@ use embedded_graphics::text::TextStyleBuilder; use embedded_graphics_core::draw_target::DrawTarget; use super::navigation::Action; -use super::state::Menu; +use super::state::ScreenItem; #[derive(Debug, Clone)] pub struct ScanMenu { @@ -82,14 +82,14 @@ impl super::navigation::Navigable for ScanMenu { core::future::ready(()) } - fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { async move { let new_progress = match input { Action::Up => self.progress.wrapping_add(5), _ => self.progress, }; - Menu::Scan(ScanMenu { + ScreenItem::Scan(ScanMenu { progress: new_progress, }) } diff --git a/src/navigation/settings_menu.rs b/src/navigation/settings_menu.rs index c1a5eff..022e79f 100644 --- a/src/navigation/settings_menu.rs +++ b/src/navigation/settings_menu.rs @@ -1,5 +1,5 @@ use crate::navigation::menu_item; -use crate::navigation::state::Menu; +use crate::navigation::state::ScreenItem; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use embedded_graphics::pixelcolor::Rgb565; @@ -27,7 +27,7 @@ impl super::navigation::Navigable for SettingsMenu { fn handle_input( &self, input: super::navigation::Action, - ) -> impl core::future::Future + Send { - async move { Menu::Settings(SettingsMenu { selected: 0 }) } + ) -> impl core::future::Future + Send { + async move { ScreenItem::Settings(SettingsMenu { selected: 0 }) } } } diff --git a/src/navigation/state.rs b/src/navigation/state.rs index 7171f45..2d9da45 100644 --- a/src/navigation/state.rs +++ b/src/navigation/state.rs @@ -1,24 +1,26 @@ use crate::navigation::{ main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu, settings_menu::SettingsMenu, }; +use alloc::vec; +use alloc::vec::Vec; #[derive(Debug, Clone)] -pub enum Menu { +pub enum ScreenItem { Main(MainMenu), Scan(ScanMenu), Settings(SettingsMenu), } -impl Navigable for Menu { +impl Navigable for ScreenItem { fn display( &self, display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send { async move { match self { - Menu::Main(main_menu) => main_menu.display(display).await, - Menu::Scan(scan_menu) => scan_menu.display(display).await, - Menu::Settings(settings_menu) => settings_menu.display(display).await, + ScreenItem::Main(main_menu) => main_menu.display(display).await, + ScreenItem::Scan(scan_menu) => scan_menu.display(display).await, + ScreenItem::Settings(settings_menu) => settings_menu.display(display).await, } } } @@ -29,9 +31,9 @@ impl Navigable for Menu { ) -> impl core::future::Future + Send { async move { match self { - Menu::Main(main_menu) => main_menu.handle_input(input).await, - Menu::Scan(scan_menu) => scan_menu.handle_input(input).await, - Menu::Settings(settings_menu) => settings_menu.handle_input(input).await, + ScreenItem::Main(main_menu) => main_menu.handle_input(input).await, + ScreenItem::Scan(scan_menu) => scan_menu.handle_input(input).await, + ScreenItem::Settings(settings_menu) => settings_menu.handle_input(input).await, } } } @@ -39,13 +41,13 @@ impl Navigable for Menu { #[derive(Debug, Clone)] pub struct NavigationState { - pub current_screen: Menu, + pub screens: Vec, } impl Default for NavigationState { fn default() -> Self { Self { - current_screen: Menu::Main(MainMenu { selected: 0 }), + screens: vec![ScreenItem::Main(MainMenu { selected: 0 })], } } } @@ -54,4 +56,13 @@ impl NavigationState { pub fn new() -> Self { Self::default() } + + pub fn back(&mut self) -> ScreenItem { + let screen = self.screens.pop().unwrap(); + if self.screens.is_empty() { + log::info!("last screen"); + return screen; + } + self.screens.pop().unwrap() + } } -- 2.39.5 From ea3bd5c10b01c569084dc602845d9be5fef98567 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 18:55:24 +0000 Subject: [PATCH 14/19] wokwi: switch back and ok button --- diagram.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/diagram.json b/diagram.json index ba005e4..67de93d 100644 --- a/diagram.json +++ b/diagram.json @@ -41,17 +41,17 @@ }, { "type": "wokwi-pushbutton", - "id": "btn-ok", + "id": "btn-back", "top": -99.4, "left": 115.2, - "attrs": { "color": "Magenta", "xray": "1", "key": "1", "label": "Ok" } + "attrs": { "color": "Magenta", "xray": "1", "key": "1", "label": "Back" } }, { "type": "wokwi-pushbutton", - "id": "btn-back", + "id": "btn-ok", "top": 25.4, "left": 115.2, - "attrs": { "color": "Lime", "xray": "1", "key": "1", "label": "Back" } + "attrs": { "color": "Lime", "xray": "1", "key": "1", "label": "Ok" } } ], "connections": [ @@ -73,10 +73,10 @@ [ "btn-left:1.l", "esp1:GND.2", "black", [ "h0" ] ], [ "btn-right:2.l", "esp1:41", "red", [ "h-19.2", "v153.8" ] ], [ "btn-right:1.l", "btn-left:1.r", "black", [ "h-96", "v28.8" ] ], - [ "btn-ok:2.l", "esp1:42", "Magenta", [ "h-19.2", "v211.58" ] ], - [ "btn-ok:1.l", "btn-up:1.r", "black", [ "h0" ] ], - [ "btn-back:1.l", "btn-down:1.r", "black", [ "h0" ] ], - [ "btn-back:2.l", "esp1:45", "Lime", [ "h-9.6", "v173" ] ] + [ "btn-back:2.l", "esp1:42", "Magenta", [ "h-19.2", "v211.58" ] ], + [ "btn-back:1.l", "btn-up:1.r", "black", [ "h0" ] ], + [ "btn-ok:1.l", "btn-down:1.r", "black", [ "h0" ] ], + [ "btn-ok:2.l", "esp1:45", "Lime", [ "h-9.6", "v173" ] ] ], "dependencies": {} } -- 2.39.5 From 2bab03351bea7c202142579eb69348ff298eea33 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 19:24:43 +0000 Subject: [PATCH 15/19] refactor: move views to views sub folder --- src/bin/main.rs | 2 +- src/display.rs | 1 - src/display/views.rs | 3 -- src/display/views/menu_view.rs | 1 - src/lib.rs | 1 + src/navigation.rs | 4 -- src/navigation/navigation.rs | 6 +-- src/navigation/state.rs | 45 ++-------------------- src/views.rs | 7 ++++ src/{display => }/views/card_view.rs | 0 src/{navigation => views}/main_menu.rs | 31 +++++++-------- src/{navigation => views}/menu_item.rs | 0 src/{navigation => views}/scan_menu.rs | 10 ++--- src/{navigation => views}/settings_menu.rs | 16 ++++---- src/{display => }/views/status_bar.rs | 0 src/views/view.rs | 38 ++++++++++++++++++ 16 files changed, 79 insertions(+), 86 deletions(-) delete mode 100644 src/display/views.rs delete mode 100644 src/display/views/menu_view.rs create mode 100644 src/views.rs rename src/{display => }/views/card_view.rs (100%) rename src/{navigation => views}/main_menu.rs (59%) rename src/{navigation => views}/menu_item.rs (100%) rename src/{navigation => views}/scan_menu.rs (94%) rename src/{navigation => views}/settings_menu.rs (59%) rename src/{display => }/views/status_bar.rs (100%) create mode 100644 src/views/view.rs diff --git a/src/bin/main.rs b/src/bin/main.rs index 813e465..1c6baed 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -10,12 +10,12 @@ use alloc::boxed::Box; use creaturedex::card::mock::{MOCK_PAYLOAD, MOCK_PAYLOAD2}; use creaturedex::display::primary_lcd::{PrimaryLcdDisplay, init_primary_lcd}; -use creaturedex::display::views::card_view::render_nfc_payload; use creaturedex::drivers::nfc_pn532::NfcPn532Driver; use creaturedex::navigation::inputs::Inputs; use creaturedex::navigation::navigation; use creaturedex::navigation::state::NavigationState; use creaturedex::network::wifi::setup_wifi; +use creaturedex::views::card_view::render_nfc_payload; use embassy_executor::Spawner; use embassy_time::Timer; use embedded_graphics::draw_target::DrawTarget; diff --git a/src/display.rs b/src/display.rs index 8e7dab1..b700989 100644 --- a/src/display.rs +++ b/src/display.rs @@ -3,4 +3,3 @@ pub mod primary_lcd; pub mod secondary_oled; pub mod sprite; pub mod tertiary_lcd; -pub mod views; diff --git a/src/display/views.rs b/src/display/views.rs deleted file mode 100644 index 6fdd38d..0000000 --- a/src/display/views.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod card_view; -pub mod menu_view; -pub mod status_bar; diff --git a/src/display/views/menu_view.rs b/src/display/views/menu_view.rs deleted file mode 100644 index dd7ab64..0000000 --- a/src/display/views/menu_view.rs +++ /dev/null @@ -1 +0,0 @@ -// Menu view module diff --git a/src/lib.rs b/src/lib.rs index 7e00201..501ca20 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,3 +8,4 @@ pub mod drivers; pub mod navigation; pub mod network; pub mod storage; +pub mod views; diff --git a/src/navigation.rs b/src/navigation.rs index d228ed0..6bee9cb 100644 --- a/src/navigation.rs +++ b/src/navigation.rs @@ -1,7 +1,3 @@ pub mod inputs; -pub mod main_menu; -pub mod menu_item; pub mod navigation; -pub mod scan_menu; -pub mod settings_menu; pub mod state; diff --git a/src/navigation/navigation.rs b/src/navigation/navigation.rs index b0b008d..39539dd 100644 --- a/src/navigation/navigation.rs +++ b/src/navigation/navigation.rs @@ -1,5 +1,5 @@ -use crate::navigation::scan_menu::ScanMenu; -use crate::navigation::state::{NavigationState, ScreenItem}; +use crate::navigation::state::NavigationState; +use crate::views::view::View; use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; use embassy_futures::select::Either6; @@ -23,7 +23,7 @@ pub trait Navigable { &self, display: &mut PrimaryLcdDisplay<'static>, ) -> impl core::future::Future + Send; - fn handle_input(&self, input: Action) -> impl core::future::Future + Send; + fn handle_input(&self, input: Action) -> impl core::future::Future + Send; } #[embassy_executor::task] diff --git a/src/navigation/state.rs b/src/navigation/state.rs index 2d9da45..5fdcb13 100644 --- a/src/navigation/state.rs +++ b/src/navigation/state.rs @@ -1,53 +1,16 @@ -use crate::navigation::{ - main_menu::MainMenu, navigation::Navigable, scan_menu::ScanMenu, settings_menu::SettingsMenu, -}; +use crate::views::{main_menu::MainMenu, view::View}; use alloc::vec; use alloc::vec::Vec; -#[derive(Debug, Clone)] -pub enum ScreenItem { - Main(MainMenu), - Scan(ScanMenu), - Settings(SettingsMenu), -} - -impl Navigable for ScreenItem { - fn display( - &self, - display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>, - ) -> impl core::future::Future + Send { - async move { - match self { - ScreenItem::Main(main_menu) => main_menu.display(display).await, - ScreenItem::Scan(scan_menu) => scan_menu.display(display).await, - ScreenItem::Settings(settings_menu) => settings_menu.display(display).await, - } - } - } - - fn handle_input( - &self, - input: crate::navigation::navigation::Action, - ) -> impl core::future::Future + Send { - async move { - match self { - ScreenItem::Main(main_menu) => main_menu.handle_input(input).await, - ScreenItem::Scan(scan_menu) => scan_menu.handle_input(input).await, - ScreenItem::Settings(settings_menu) => settings_menu.handle_input(input).await, - } - } - } -} - #[derive(Debug, Clone)] pub struct NavigationState { - pub screens: Vec, + pub screens: Vec, } impl Default for NavigationState { fn default() -> Self { Self { - screens: vec![ScreenItem::Main(MainMenu { selected: 0 })], + screens: vec![View::Main(MainMenu { selected: 0 })], } } } @@ -57,7 +20,7 @@ impl NavigationState { Self::default() } - pub fn back(&mut self) -> ScreenItem { + pub fn back(&mut self) -> View { let screen = self.screens.pop().unwrap(); if self.screens.is_empty() { log::info!("last screen"); diff --git a/src/views.rs b/src/views.rs new file mode 100644 index 0000000..fa99794 --- /dev/null +++ b/src/views.rs @@ -0,0 +1,7 @@ +pub mod card_view; +pub mod main_menu; +pub mod menu_item; +pub mod scan_menu; +pub mod settings_menu; +pub mod status_bar; +pub mod view; diff --git a/src/display/views/card_view.rs b/src/views/card_view.rs similarity index 100% rename from src/display/views/card_view.rs rename to src/views/card_view.rs diff --git a/src/navigation/main_menu.rs b/src/views/main_menu.rs similarity index 59% rename from src/navigation/main_menu.rs rename to src/views/main_menu.rs index 3ebff0c..0cb2eec 100644 --- a/src/navigation/main_menu.rs +++ b/src/views/main_menu.rs @@ -1,16 +1,14 @@ use core::future; -use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; +use crate::display::primary_lcd::PrimaryLcdDisplay; -use crate::navigation::menu_item; -use crate::navigation::settings_menu::SettingsMenu; +use crate::views::{menu_item, settings_menu::SettingsMenu, view::View}; +use crate::navigation::navigation::{Action, Navigable}; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::RgbColor; use embedded_graphics_core::draw_target::DrawTarget; -use super::state::ScreenItem; - pub const MAX_SELECTED: i32 = 3; #[derive(Debug, Clone)] @@ -18,7 +16,7 @@ pub struct MainMenu { pub selected: i32, } -impl super::navigation::Navigable for MainMenu { +impl Navigable for MainMenu { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, @@ -32,32 +30,29 @@ impl super::navigation::Navigable for MainMenu { core::future::ready(()) } - fn handle_input( - &self, - input: super::navigation::Action, - ) -> impl core::future::Future + Send { + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { let new_menu = match input { - super::navigation::Action::Up => { + Action::Up => { let new_selected = if (self.selected - 1) < 0 { MAX_SELECTED - 1 } else { self.selected - 1 }; - ScreenItem::Main(MainMenu { + View::Main(MainMenu { selected: new_selected, }) } - super::navigation::Action::Down => { + Action::Down => { let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED; - ScreenItem::Main(MainMenu { + View::Main(MainMenu { selected: new_selected, }) } - super::navigation::Action::Ok => match self.selected { - 2 => ScreenItem::Settings(SettingsMenu { selected: 0 }), - _ => ScreenItem::Main(self.clone()), + Action::Ok => match self.selected { + 2 => View::Settings(SettingsMenu { selected: 0 }), + _ => View::Main(self.clone()), }, - _ => ScreenItem::Main(self.clone()), + _ => View::Main(self.clone()), }; future::ready(new_menu) diff --git a/src/navigation/menu_item.rs b/src/views/menu_item.rs similarity index 100% rename from src/navigation/menu_item.rs rename to src/views/menu_item.rs diff --git a/src/navigation/scan_menu.rs b/src/views/scan_menu.rs similarity index 94% rename from src/navigation/scan_menu.rs rename to src/views/scan_menu.rs index 31dc505..e113390 100644 --- a/src/navigation/scan_menu.rs +++ b/src/views/scan_menu.rs @@ -21,15 +21,15 @@ use embedded_graphics::text::Text; use embedded_graphics::text::TextStyleBuilder; use embedded_graphics_core::draw_target::DrawTarget; -use super::navigation::Action; -use super::state::ScreenItem; +use crate::navigation::navigation::{Action, Navigable}; +use crate::views::view::View; #[derive(Debug, Clone)] pub struct ScanMenu { pub progress: u8, // 0..255 } -impl super::navigation::Navigable for ScanMenu { +impl Navigable for ScanMenu { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, @@ -82,14 +82,14 @@ impl super::navigation::Navigable for ScanMenu { core::future::ready(()) } - fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { async move { let new_progress = match input { Action::Up => self.progress.wrapping_add(5), _ => self.progress, }; - ScreenItem::Scan(ScanMenu { + View::Scan(ScanMenu { progress: new_progress, }) } diff --git a/src/navigation/settings_menu.rs b/src/views/settings_menu.rs similarity index 59% rename from src/navigation/settings_menu.rs rename to src/views/settings_menu.rs index 022e79f..9ace455 100644 --- a/src/navigation/settings_menu.rs +++ b/src/views/settings_menu.rs @@ -1,6 +1,7 @@ -use crate::navigation::menu_item; -use crate::navigation::state::ScreenItem; -use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs}; +use crate::display::primary_lcd::PrimaryLcdDisplay; + +use crate::navigation::navigation::{Action, Navigable}; +use crate::views::{menu_item, view::View}; use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::RgbColor; @@ -12,7 +13,7 @@ pub struct SettingsMenu { pub selected: i32, } -impl super::navigation::Navigable for SettingsMenu { +impl Navigable for SettingsMenu { fn display( &self, display: &mut PrimaryLcdDisplay<'static>, @@ -24,10 +25,7 @@ impl super::navigation::Navigable for SettingsMenu { core::future::ready(()) } - fn handle_input( - &self, - input: super::navigation::Action, - ) -> impl core::future::Future + Send { - async move { ScreenItem::Settings(SettingsMenu { selected: 0 }) } + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + async move { View::Settings(SettingsMenu { selected: 0 }) } } } diff --git a/src/display/views/status_bar.rs b/src/views/status_bar.rs similarity index 100% rename from src/display/views/status_bar.rs rename to src/views/status_bar.rs diff --git a/src/views/view.rs b/src/views/view.rs new file mode 100644 index 0000000..d9db225 --- /dev/null +++ b/src/views/view.rs @@ -0,0 +1,38 @@ +use crate::views::{main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu}; + +use crate::navigation::navigation::Navigable; + +#[derive(Debug, Clone)] +pub enum View { + Main(MainMenu), + Scan(ScanMenu), + Settings(SettingsMenu), +} + +impl Navigable for View { + fn display( + &self, + display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + async move { + match self { + View::Main(main_menu) => main_menu.display(display).await, + View::Scan(scan_menu) => scan_menu.display(display).await, + View::Settings(settings_menu) => settings_menu.display(display).await, + } + } + } + + fn handle_input( + &self, + input: crate::navigation::navigation::Action, + ) -> impl core::future::Future + Send { + async move { + match self { + View::Main(main_menu) => main_menu.handle_input(input).await, + View::Scan(scan_menu) => scan_menu.handle_input(input).await, + View::Settings(settings_menu) => settings_menu.handle_input(input).await, + } + } + } +} -- 2.39.5 From a089c3a1ec7c7c97bdcde72bf7c843c621cd9c8b Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 19:51:47 +0000 Subject: [PATCH 16/19] add card model --- src/card/model.rs | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/card/model.rs b/src/card/model.rs index d18b837..0a69a54 100644 --- a/src/card/model.rs +++ b/src/card/model.rs @@ -1,3 +1,5 @@ +use alloc::{string::String, vec::Vec}; + #[derive(Debug, Clone, Copy)] pub struct NfcPayload<'a> { pub event_encoding: &'a [u8], @@ -9,3 +11,34 @@ pub struct NfcPayload<'a> { pub secret: &'a [u8], pub _opaque_trailer: &'a [u8], } + +#[derive(Debug, Clone)] +pub enum CardType { + Default, + Blueprint, + CYBER, + Nature, + Fossil, + Ghost, + Daemon, + Fairy, +} + +#[derive(Debug, Clone)] +pub struct Sprite { + pub data: Vec, +} + +#[derive(Debug, Clone)] +pub struct Card { + pub uuid: String, + pub name: String, + pub cardtype: CardType, + + pub trait1: String, + pub trait2: String, + pub trait3: String, + pub secret: String, + + pub sprite: Sprite, +} -- 2.39.5 From b55b444db45e7bd64530a435bf7038d7b7330940 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 19:53:56 +0000 Subject: [PATCH 17/19] implement journal view skelleton --- src/views.rs | 1 + src/views/journal_view.rs | 40 +++++++++++++++++++++++++++++++++++++++ src/views/main_menu.rs | 6 ++++++ src/views/view.rs | 8 +++++++- 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/views/journal_view.rs diff --git a/src/views.rs b/src/views.rs index fa99794..4d465b2 100644 --- a/src/views.rs +++ b/src/views.rs @@ -1,4 +1,5 @@ pub mod card_view; +pub mod journal_view; pub mod main_menu; pub mod menu_item; pub mod scan_menu; diff --git a/src/views/journal_view.rs b/src/views/journal_view.rs new file mode 100644 index 0000000..e9b7c37 --- /dev/null +++ b/src/views/journal_view.rs @@ -0,0 +1,40 @@ +use core::future; + +use alloc::vec::Vec; + +use embedded_graphics::pixelcolor::Rgb565; +use embedded_graphics::prelude::RgbColor; +use embedded_graphics_core::draw_target::DrawTarget; + +use crate::{ + card::model::Card, + display::primary_lcd::PrimaryLcdDisplay, + navigation::navigation::{Action, Navigable}, + views::view::View, +}; + +#[derive(Debug, Clone)] +pub struct JournalView { + pub cards: Vec, + pub selected_card: usize, +} + +impl Navigable for JournalView { + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + display.clear(Rgb565::BLACK).unwrap(); + + core::future::ready(()) + } + + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + let new_menu = match input { + Action::Ok => View::Journal(self.clone()), + _ => View::Journal(self.clone()), + }; + + future::ready(new_menu) + } +} diff --git a/src/views/main_menu.rs b/src/views/main_menu.rs index 0cb2eec..8840ba7 100644 --- a/src/views/main_menu.rs +++ b/src/views/main_menu.rs @@ -1,7 +1,9 @@ +use alloc::vec; use core::future; use crate::display::primary_lcd::PrimaryLcdDisplay; +use crate::views::journal_view::JournalView; use crate::views::{menu_item, settings_menu::SettingsMenu, view::View}; use crate::navigation::navigation::{Action, Navigable}; @@ -49,6 +51,10 @@ impl Navigable for MainMenu { }) } Action::Ok => match self.selected { + 1 => View::Journal(JournalView { + cards: vec![], + selected_card: 0, + }), 2 => View::Settings(SettingsMenu { selected: 0 }), _ => View::Main(self.clone()), }, diff --git a/src/views/view.rs b/src/views/view.rs index d9db225..bd0abc3 100644 --- a/src/views/view.rs +++ b/src/views/view.rs @@ -1,4 +1,7 @@ -use crate::views::{main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu}; +use crate::views::{ + journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu, + settings_menu::SettingsMenu, +}; use crate::navigation::navigation::Navigable; @@ -7,6 +10,7 @@ pub enum View { Main(MainMenu), Scan(ScanMenu), Settings(SettingsMenu), + Journal(JournalView), } impl Navigable for View { @@ -19,6 +23,7 @@ impl Navigable for View { View::Main(main_menu) => main_menu.display(display).await, View::Scan(scan_menu) => scan_menu.display(display).await, View::Settings(settings_menu) => settings_menu.display(display).await, + View::Journal(journal_view) => journal_view.display(display).await, } } } @@ -32,6 +37,7 @@ impl Navigable for View { View::Main(main_menu) => main_menu.handle_input(input).await, View::Scan(scan_menu) => scan_menu.handle_input(input).await, View::Settings(settings_menu) => settings_menu.handle_input(input).await, + View::Journal(journal_view) => journal_view.handle_input(input).await, } } } -- 2.39.5 From 68250b2924661340149c42127ed5798baa7dd11e Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 20:51:19 +0000 Subject: [PATCH 18/19] implement card model --- Cargo.lock | 1 + Cargo.toml | 1 + src/card/decoder.rs | 37 ++++++++++++++++++++++++------ src/card/model.rs | 52 ++++++++++++++++++++++++++++++++++-------- src/views/card_view.rs | 20 +++++++--------- 5 files changed, 82 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 601c3da..99be1df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,6 +322,7 @@ dependencies = [ "ili9341", "log", "ndef", + "num_enum", "pn532", ] diff --git a/Cargo.toml b/Cargo.toml index 142ecff..ba0ea29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,7 @@ embedded-graphics-core = "0.4.1" base64 = { version = "0.22", default-features = false, features = ["alloc"] } pn532 = "0.5.0" ndef = "0.5.0" +num_enum = { version = "0.7.6", default-features = false } # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html [profile.dev] diff --git a/src/card/decoder.rs b/src/card/decoder.rs index 9c865e8..60f2a39 100644 --- a/src/card/decoder.rs +++ b/src/card/decoder.rs @@ -1,5 +1,7 @@ -use alloc::string::{String, ToString}; +use core::fmt::Display; + use crate::card::model::NfcPayload; +use alloc::string::{String, ToString}; pub fn split_nfc_hex(payload: &[u8]) -> Option> { if payload.len() < 0x35A { @@ -18,13 +20,34 @@ pub fn split_nfc_hex(payload: &[u8]) -> Option> { }) } -pub fn decode_known_event(event_encoding: &[u8]) -> Option<&'static str> { +#[derive(Debug, Clone)] +pub enum Events { + CCC39, + CCC40, + GPN24, + GPN25, + Unknown, +} + +impl Display for Events { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match *self { + Events::CCC39 => write!(f, "39C3"), + Events::CCC40 => write!(f, "40C3"), + Events::GPN24 => write!(f, "GPN24"), + Events::GPN25 => write!(f, "GPN25"), + Events::Unknown => write!(f, "Unknown"), + } + } +} + +pub fn decode_known_event(event_encoding: &[u8]) -> Events { match event_encoding { - [0x39, 0xC3] => Some("39C3"), - [0x40, 0xC3] => Some("40C3"), // future proofing :) - [0xE9, 0x24] => Some("GPN 24"), - [0xE9, 0x25] => Some("GPN 25"), // future proofing :) - _ => None, + [0x39, 0xC3] => Events::CCC39, + [0x40, 0xC3] => Events::CCC40, // future proofing :) + [0xE9, 0x24] => Events::GPN24, + [0xE9, 0x25] => Events::GPN25, // future proofing :) + _ => Events::Unknown, } } diff --git a/src/card/model.rs b/src/card/model.rs index 0a69a54..e4fd0d4 100644 --- a/src/card/model.rs +++ b/src/card/model.rs @@ -1,4 +1,7 @@ use alloc::{string::String, vec::Vec}; +use num_enum::FromPrimitive; + +use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret}; #[derive(Debug, Clone, Copy)] pub struct NfcPayload<'a> { @@ -12,16 +15,18 @@ pub struct NfcPayload<'a> { pub _opaque_trailer: &'a [u8], } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)] +#[repr(u8)] pub enum CardType { - Default, - Blueprint, - CYBER, - Nature, - Fossil, - Ghost, - Daemon, - Fairy, + #[num_enum(default)] + Default = 0, + Blueprint = 1, + CYBER = 2, + Nature = 3, + Fossil = 4, + Ghost = 5, + Daemon = 6, + Fairy = 7, } #[derive(Debug, Clone)] @@ -32,8 +37,9 @@ pub struct Sprite { #[derive(Debug, Clone)] pub struct Card { pub uuid: String, - pub name: String, + pub event: Events, pub cardtype: CardType, + pub name: String, pub trait1: String, pub trait2: String, @@ -42,3 +48,29 @@ pub struct Card { pub sprite: Sprite, } + +impl TryFrom> for Card { + type Error = &'static str; + + fn try_from(payload: NfcPayload) -> Result { + let uuid: String = str::from_utf8(payload.card_uuid).unwrap().into(); + let event = decode_known_event(payload.event_encoding); + let cardtype = CardType::from(payload.card_type); + let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text); + let secret = decode_secret(payload.secret); + let sprite = Sprite { + data: payload.sprite.to_vec(), + }; + Ok(Self { + uuid, + event, + cardtype, + name, + trait1, + trait2, + trait3, + secret, + sprite, + }) + } +} diff --git a/src/views/card_view.rs b/src/views/card_view.rs index d298883..9af0f91 100644 --- a/src/views/card_view.rs +++ b/src/views/card_view.rs @@ -1,3 +1,9 @@ +use crate::card::decoder::{ + decode_known_event, decode_packed_card_text, decode_secret, split_nfc_hex, +}; +use crate::card::model::NfcPayload; +use crate::display::palette::{PALETTES, TYPE_STYLES}; +use crate::display::sprite::render_sprite_onto_ili9341; use alloc::{format, string::String}; use embedded_graphics::mono_font::MonoTextStyle; use embedded_graphics::mono_font::ascii::FONT_6X10; @@ -7,10 +13,6 @@ use embedded_graphics::prelude::RgbColor; use embedded_graphics::text::Text; use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; use embedded_graphics_core::draw_target::DrawTarget; -use crate::card::decoder::{decode_known_event, decode_packed_card_text, decode_secret, split_nfc_hex}; -use crate::card::model::NfcPayload; -use crate::display::palette::{PALETTES, TYPE_STYLES}; -use crate::display::sprite::render_sprite_onto_ili9341; pub fn render_nfc_payload(display: &mut D, payload: &[u8; 858]) where @@ -23,10 +25,7 @@ where let (name, trait1, trait2, trait3) = decode_packed_card_text(nfc_payload.packed_card_text); let secret = decode_secret(nfc_payload.secret); - let background = Rectangle::new( - Point::new(0, 0), - Size::new(240, 320), - ); + let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320)); let bg_color: Rgb565 = TYPE_STYLES[(nfc_payload.card_type - 1) as usize] .primary .into_rgb565(); @@ -48,10 +47,7 @@ where .draw(display) .unwrap(); Text::new( - &format!( - "Event: {}", - decode_known_event(nfc_payload.event_encoding).unwrap_or("Unknown") - ), + &format!("Event: {}", decode_known_event(nfc_payload.event_encoding)), Point::new(20, 260), style, ) -- 2.39.5 From e21c656088c7c73df97fde656e2bb6794bc553c1 Mon Sep 17 00:00:00 2001 From: rhetenor Date: Tue, 18 Aug 2026 21:43:06 +0000 Subject: [PATCH 19/19] implement card rendering with new card type and menu --- src/bin/main.rs | 1 - src/card/model.rs | 188 +++++++++++++++++++++++++++++++++++++- src/display/palette.rs | 198 ----------------------------------------- src/display/sprite.rs | 13 +-- src/views/card_view.rs | 126 ++++++++++++++------------ src/views/main_menu.rs | 9 +- src/views/view.rs | 4 + 7 files changed, 278 insertions(+), 261 deletions(-) diff --git a/src/bin/main.rs b/src/bin/main.rs index 1c6baed..2ff5d2e 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -15,7 +15,6 @@ use creaturedex::navigation::inputs::Inputs; use creaturedex::navigation::navigation; use creaturedex::navigation::state::NavigationState; use creaturedex::network::wifi::setup_wifi; -use creaturedex::views::card_view::render_nfc_payload; use embassy_executor::Spawner; use embassy_time::Timer; use embedded_graphics::draw_target::DrawTarget; diff --git a/src/card/model.rs b/src/card/model.rs index e4fd0d4..3b32fa7 100644 --- a/src/card/model.rs +++ b/src/card/model.rs @@ -1,7 +1,10 @@ +use core::fmt::Display; + use alloc::{string::String, vec::Vec}; use num_enum::FromPrimitive; use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret}; +use embedded_graphics::pixelcolor::Rgb565; #[derive(Debug, Clone, Copy)] pub struct NfcPayload<'a> { @@ -29,6 +32,189 @@ pub enum CardType { Fairy = 7, } +impl Display for CardType { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match *self { + CardType::Default => write!(f, "Default"), + CardType::Blueprint => write!(f, "Blueprint"), + CardType::CYBER => write!(f, "CYBER"), + CardType::Nature => write!(f, "Nature"), + CardType::Fossil => write!(f, "Fossil"), + CardType::Ghost => write!(f, "Ghost"), + CardType::Daemon => write!(f, "Daemon"), + CardType::Fairy => write!(f, "Fairy"), + } + } +} + +pub type PrimaryColor = Rgb565; +impl Into for CardType { + fn into(self) -> PrimaryColor { + match self { + CardType::Default => Rgb565::new(0xD8, 0x68, 0x30), + CardType::Blueprint => Rgb565::new(0x6D, 0x81, 0xFF), + CardType::CYBER => Rgb565::new(0xFF, 0xFF, 0x04), + CardType::Nature => Rgb565::new(0x55, 0xA0, 0x58), + CardType::Fossil => Rgb565::new(0xB9, 0x7A, 0x60), + CardType::Ghost => Rgb565::new(0xAB, 0xAB, 0xAB), + CardType::Daemon => Rgb565::new(0x60, 0x00, 0x88), + CardType::Fairy => Rgb565::new(0xB0, 0xA9, 0xE4), + } + } +} + +pub type Palette = [Rgb565; 16]; +impl Into for CardType { + fn into(self) -> Palette { + match self { + CardType::Default => [ + Rgb565::new(31, 23, 35), + Rgb565::new(60, 47, 82), + Rgb565::new(178, 39, 65), + Rgb565::new(70, 86, 165), + Rgb565::new(245, 70, 76), + Rgb565::new(216, 104, 48), + Rgb565::new(140, 127, 144), + Rgb565::new(73, 149, 243), + Rgb565::new(62, 197, 75), + Rgb565::new(240, 149, 72), + Rgb565::new(188, 176, 179), + Rgb565::new(247, 156, 136), + Rgb565::new(114, 222, 235), + Rgb565::new(180, 230, 86), + Rgb565::new(239, 208, 129), + Rgb565::new(255, 255, 255), + ], + CardType::Blueprint => [ + Rgb565::new(83, 67, 127), + Rgb565::new(44, 111, 153), + Rgb565::new(142, 88, 111), + Rgb565::new(0, 188, 170), + Rgb565::new(153, 104, 226), + Rgb565::new(109, 129, 255), + Rgb565::new(255, 84, 112), + Rgb565::new(196, 143, 158), + Rgb565::new(168, 159, 204), + Rgb565::new(190, 155, 255), + Rgb565::new(255, 155, 113), + Rgb565::new(127, 206, 255), + Rgb565::new(255, 155, 182), + Rgb565::new(255, 217, 174), + Rgb565::new(255, 217, 232), + Rgb565::new(255, 255, 255), + ], + CardType::CYBER => [ + Rgb565::new(0, 0, 0), + Rgb565::new(0, 0, 126), + Rgb565::new(0, 0, 255), + Rgb565::new(126, 0, 0), + Rgb565::new(126, 0, 126), + Rgb565::new(4, 126, 0), + Rgb565::new(254, 0, 0), + Rgb565::new(4, 126, 126), + Rgb565::new(254, 0, 255), + Rgb565::new(126, 126, 0), + Rgb565::new(126, 126, 126), + Rgb565::new(6, 255, 4), + Rgb565::new(6, 255, 255), + Rgb565::new(190, 190, 190), + Rgb565::new(255, 255, 4), + Rgb565::new(255, 255, 255), + ], + CardType::Nature => [ + Rgb565::new(35, 34, 40), + Rgb565::new(40, 66, 97), + Rgb565::new(30, 116, 83), + Rgb565::new(117, 77, 69), + Rgb565::new(95, 88, 84), + Rgb565::new(36, 133, 166), + Rgb565::new(198, 80, 70), + Rgb565::new(85, 160, 88), + Rgb565::new(135, 133, 115), + Rgb565::new(84, 186, 210), + Rgb565::new(161, 191, 65), + Rgb565::new(230, 146, 138), + Rgb565::new(184, 176, 149), + Rgb565::new(227, 192, 84), + Rgb565::new(195, 213, 199), + Rgb565::new(255, 255, 255), + ], + CardType::Fossil => [ + Rgb565::new(75, 61, 68), + Rgb565::new(119, 66, 81), + Rgb565::new(78, 84, 99), + Rgb565::new(100, 83, 85), + Rgb565::new(156, 82, 78), + Rgb565::new(132, 109, 89), + Rgb565::new(91, 125, 115), + Rgb565::new(125, 123, 98), + Rgb565::new(140, 124, 121), + Rgb565::new(185, 122, 96), + Rgb565::new(168, 138, 94), + Rgb565::new(142, 159, 125), + Rgb565::new(170, 162, 93), + Rgb565::new(169, 156, 141), + Rgb565::new(204, 168, 123), + Rgb565::new(255, 255, 255), + ], + CardType::Ghost => [ + Rgb565::new(0, 0, 0), + Rgb565::new(24, 24, 24), + Rgb565::new(40, 40, 40), + Rgb565::new(56, 56, 56), + Rgb565::new(71, 71, 71), + Rgb565::new(86, 86, 86), + Rgb565::new(100, 100, 100), + Rgb565::new(113, 113, 113), + Rgb565::new(126, 126, 126), + Rgb565::new(140, 140, 140), + Rgb565::new(155, 155, 155), + Rgb565::new(171, 171, 171), + Rgb565::new(189, 189, 189), + Rgb565::new(209, 209, 209), + Rgb565::new(231, 231, 231), + Rgb565::new(255, 255, 255), + ], + CardType::Daemon => [ + Rgb565::new(0, 3, 60), + Rgb565::new(96, 0, 136), + Rgb565::new(0, 56, 132), + Rgb565::new(42, 46, 121), + Rgb565::new(0, 82, 96), + Rgb565::new(177, 5, 133), + Rgb565::new(255, 0, 78), + Rgb565::new(172, 41, 206), + Rgb565::new(0, 157, 74), + Rgb565::new(0, 138, 197), + Rgb565::new(78, 110, 168), + Rgb565::new(255, 92, 255), + Rgb565::new(10, 255, 82), + Rgb565::new(0, 247, 255), + Rgb565::new(173, 212, 250), + Rgb565::new(255, 255, 255), + ], + CardType::Fairy => [ + Rgb565::new(40, 40, 46), + Rgb565::new(108, 86, 113), + Rgb565::new(135, 168, 137), + Rgb565::new(249, 130, 132), + Rgb565::new(176, 169, 228), + Rgb565::new(222, 163, 139), + Rgb565::new(172, 204, 228), + Rgb565::new(254, 170, 228), + Rgb565::new(217, 200, 191), + Rgb565::new(255, 195, 132), + Rgb565::new(176, 235, 147), + Rgb565::new(179, 227, 218), + Rgb565::new(233, 245, 157), + Rgb565::new(255, 230, 198), + Rgb565::new(255, 247, 160), + Rgb565::new(255, 255, 255), + ], + } + } +} + #[derive(Debug, Clone)] pub struct Sprite { pub data: Vec, @@ -53,7 +239,7 @@ impl TryFrom> for Card { type Error = &'static str; fn try_from(payload: NfcPayload) -> Result { - let uuid: String = str::from_utf8(payload.card_uuid).unwrap().into(); + let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into(); let event = decode_known_event(payload.event_encoding); let cardtype = CardType::from(payload.card_type); let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text); diff --git a/src/display/palette.rs b/src/display/palette.rs index b79330b..7dd2a74 100644 --- a/src/display/palette.rs +++ b/src/display/palette.rs @@ -15,201 +15,3 @@ pub struct TypeStyle { pub primary: Rgb, pub text: Rgb, } - -pub const PALETTES: [[Rgb; 16]; 8] = [ - // Palette Default - [ - Rgb(31, 23, 35), - Rgb(60, 47, 82), - Rgb(178, 39, 65), - Rgb(70, 86, 165), - Rgb(245, 70, 76), - Rgb(216, 104, 48), - Rgb(140, 127, 144), - Rgb(73, 149, 243), - Rgb(62, 197, 75), - Rgb(240, 149, 72), - Rgb(188, 176, 179), - Rgb(247, 156, 136), - Rgb(114, 222, 235), - Rgb(180, 230, 86), - Rgb(239, 208, 129), - Rgb(255, 255, 255), - ], - // Palette Blueprint - [ - Rgb(83, 67, 127), - Rgb(44, 111, 153), - Rgb(142, 88, 111), - Rgb(0, 188, 170), - Rgb(153, 104, 226), - Rgb(109, 129, 255), - Rgb(255, 84, 112), - Rgb(196, 143, 158), - Rgb(168, 159, 204), - Rgb(190, 155, 255), - Rgb(255, 155, 113), - Rgb(127, 206, 255), - Rgb(255, 155, 182), - Rgb(255, 217, 174), - Rgb(255, 217, 232), - Rgb(255, 255, 255), - ], - // Palette CYBER - [ - Rgb(0, 0, 0), - Rgb(0, 0, 126), - Rgb(0, 0, 255), - Rgb(126, 0, 0), - Rgb(126, 0, 126), - Rgb(4, 126, 0), - Rgb(254, 0, 0), - Rgb(4, 126, 126), - Rgb(254, 0, 255), - Rgb(126, 126, 0), - Rgb(126, 126, 126), - Rgb(6, 255, 4), - Rgb(6, 255, 255), - Rgb(190, 190, 190), - Rgb(255, 255, 4), - Rgb(255, 255, 255), - ], - // Palette Nature - [ - Rgb(35, 34, 40), - Rgb(40, 66, 97), - Rgb(30, 116, 83), - Rgb(117, 77, 69), - Rgb(95, 88, 84), - Rgb(36, 133, 166), - Rgb(198, 80, 70), - Rgb(85, 160, 88), - Rgb(135, 133, 115), - Rgb(84, 186, 210), - Rgb(161, 191, 65), - Rgb(230, 146, 138), - Rgb(184, 176, 149), - Rgb(227, 192, 84), - Rgb(195, 213, 199), - Rgb(255, 255, 255), - ], - // Palette Fossil - [ - Rgb(75, 61, 68), - Rgb(119, 66, 81), - Rgb(78, 84, 99), - Rgb(100, 83, 85), - Rgb(156, 82, 78), - Rgb(132, 109, 89), - Rgb(91, 125, 115), - Rgb(125, 123, 98), - Rgb(140, 124, 121), - Rgb(185, 122, 96), - Rgb(168, 138, 94), - Rgb(142, 159, 125), - Rgb(170, 162, 93), - Rgb(169, 156, 141), - Rgb(204, 168, 123), - Rgb(255, 255, 255), - ], - // Palette Ghost - [ - Rgb(0, 0, 0), - Rgb(24, 24, 24), - Rgb(40, 40, 40), - Rgb(56, 56, 56), - Rgb(71, 71, 71), - Rgb(86, 86, 86), - Rgb(100, 100, 100), - Rgb(113, 113, 113), - Rgb(126, 126, 126), - Rgb(140, 140, 140), - Rgb(155, 155, 155), - Rgb(171, 171, 171), - Rgb(189, 189, 189), - Rgb(209, 209, 209), - Rgb(231, 231, 231), - Rgb(255, 255, 255), - ], - // Palette Daemon - [ - Rgb(0, 3, 60), - Rgb(96, 0, 136), - Rgb(0, 56, 132), - Rgb(42, 46, 121), - Rgb(0, 82, 96), - Rgb(177, 5, 133), - Rgb(255, 0, 78), - Rgb(172, 41, 206), - Rgb(0, 157, 74), - Rgb(0, 138, 197), - Rgb(78, 110, 168), - Rgb(255, 92, 255), - Rgb(10, 255, 82), - Rgb(0, 247, 255), - Rgb(173, 212, 250), - Rgb(255, 255, 255), - ], - // Palette Fairy - [ - Rgb(40, 40, 46), - Rgb(108, 86, 113), - Rgb(135, 168, 137), - Rgb(249, 130, 132), - Rgb(176, 169, 228), - Rgb(222, 163, 139), - Rgb(172, 204, 228), - Rgb(254, 170, 228), - Rgb(217, 200, 191), - Rgb(255, 195, 132), - Rgb(176, 235, 147), - Rgb(179, 227, 218), - Rgb(233, 245, 157), - Rgb(255, 230, 198), - Rgb(255, 247, 160), - Rgb(255, 255, 255), - ], -]; - -pub const TYPE_STYLES: [TypeStyle; 8] = [ - TypeStyle { - name: "Default", - primary: Rgb(0xD8, 0x68, 0x30), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "Blueprint", - primary: Rgb(0x6D, 0x81, 0xFF), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "CYBER", - primary: Rgb(0xFF, 0xFF, 0x04), - text: Rgb(0x00, 0x00, 0x00), - }, - TypeStyle { - name: "Nature", - primary: Rgb(0x55, 0xA0, 0x58), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "Fossil", - primary: Rgb(0xB9, 0x7A, 0x60), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "Ghost", - primary: Rgb(0xAB, 0xAB, 0xAB), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "Daemon", - primary: Rgb(0x60, 0x00, 0x88), - text: Rgb(0xFF, 0xFF, 0xFF), - }, - TypeStyle { - name: "Fairy", - primary: Rgb(0xB0, 0xA9, 0xE4), - text: Rgb(0xFF, 0xFF, 0xFF), - }, -]; diff --git a/src/display/sprite.rs b/src/display/sprite.rs index a5ec12d..65c715b 100644 --- a/src/display/sprite.rs +++ b/src/display/sprite.rs @@ -1,8 +1,11 @@ -use embedded_graphics::{geometry::Size, pixelcolor::Rgb565, primitives::Rectangle, prelude::Point}; -use embedded_graphics_core::draw_target::DrawTarget; +use crate::card::model::Palette; use crate::display::palette::Rgb; +use embedded_graphics::{ + geometry::Size, pixelcolor::Rgb565, pixelcolor::RgbColor, prelude::Point, primitives::Rectangle, +}; +use embedded_graphics_core::draw_target::DrawTarget; -pub fn render_sprite_onto_ili9341(ili9341: &mut D, sprite: &[u8], palette: &[Rgb; 16]) +pub fn render_sprite_onto_ili9341(ili9341: &mut D, sprite: &[u8], palette: &Palette) where D: DrawTarget, { @@ -13,8 +16,8 @@ where // OPTIMIZATION 1: Pre-compute the 16-color palette to Rgb565 once. let mut palette565 = [Rgb565::new(0, 0, 0); 16]; - for (i, Rgb(r, g, b)) in palette.iter().enumerate() { - palette565[i] = Rgb565::new(*r >> 3, *g >> 2, *b >> 3); + for (i, c) in palette.iter().enumerate() { + palette565[i] = Rgb565::new(c.r() >> 3, c.g() >> 2, c.b() >> 3); } let mut src_width = 1usize; diff --git a/src/views/card_view.rs b/src/views/card_view.rs index 9af0f91..e3ae1a4 100644 --- a/src/views/card_view.rs +++ b/src/views/card_view.rs @@ -1,8 +1,3 @@ -use crate::card::decoder::{ - decode_known_event, decode_packed_card_text, decode_secret, split_nfc_hex, -}; -use crate::card::model::NfcPayload; -use crate::display::palette::{PALETTES, TYPE_STYLES}; use crate::display::sprite::render_sprite_onto_ili9341; use alloc::{format, string::String}; use embedded_graphics::mono_font::MonoTextStyle; @@ -14,81 +9,102 @@ use embedded_graphics::text::Text; use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle}; use embedded_graphics_core::draw_target::DrawTarget; -pub fn render_nfc_payload(display: &mut D, payload: &[u8; 858]) -where - D: DrawTarget, - D::Error: core::fmt::Debug, -{ - let nfc_payload: Option> = split_nfc_hex(payload); +use core::future; - if let Some(nfc_payload) = nfc_payload { - let (name, trait1, trait2, trait3) = decode_packed_card_text(nfc_payload.packed_card_text); - let secret = decode_secret(nfc_payload.secret); +use crate::{ + card::model::{Card, Palette}, + display::primary_lcd::PrimaryLcdDisplay, + navigation::navigation::{Action, Navigable}, + views::view::View, +}; + +#[derive(Debug, Clone)] +pub struct CardView { + pub card: Card, +} + +impl Navigable for CardView { + fn display( + &self, + display: &mut PrimaryLcdDisplay<'static>, + ) -> impl core::future::Future + Send { + display.clear(Rgb565::BLACK).unwrap(); let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320)); - let bg_color: Rgb565 = TYPE_STYLES[(nfc_payload.card_type - 1) as usize] - .primary - .into_rgb565(); + let bg_color = self.card.cardtype.clone().into(); let _ = display.fill_solid(&background, bg_color); let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE); - Text::new(&format!("Name: {}", name), Point::new(20, 240), style) - .draw(display) - .unwrap(); Text::new( - &format!( - "Type: {}", - TYPE_STYLES[(nfc_payload.card_type - 1) as usize].name - ), + &format!("Name: {}", self.card.name), + Point::new(20, 240), + style, + ) + .draw(display) + .unwrap(); + Text::new( + &format!("Type: {}", self.card.cardtype), Point::new(20, 250), style, ) .draw(display) .unwrap(); Text::new( - &format!("Event: {}", decode_known_event(nfc_payload.event_encoding)), + &format!("Event: {}", self.card.event), Point::new(20, 260), style, ) .draw(display) .unwrap(); Text::new( - &format!( - "UUID: {}", - nfc_payload - .card_uuid - .iter() - .map(|b| format!("{:02X}", b)) - .collect::() - ), + &format!("UUID: {}", self.card.uuid), Point::new(20, 270), style, ) .draw(display) .unwrap(); - Text::new(&format!("Trait1: {}", trait1), Point::new(20, 280), style) - .draw(display) - .unwrap(); - Text::new(&format!("Trait2: {}", trait2), Point::new(20, 290), style) - .draw(display) - .unwrap(); - Text::new(&format!("Trait3: {}", trait3), Point::new(20, 300), style) - .draw(display) - .unwrap(); - Text::new(&format!("Secret: {}", secret), Point::new(20, 310), style) - .draw(display) - .unwrap(); + Text::new( + &format!("Trait1: {}", self.card.trait1), + Point::new(20, 280), + style, + ) + .draw(display) + .unwrap(); + Text::new( + &format!("Trait2: {}", self.card.trait2), + Point::new(20, 290), + style, + ) + .draw(display) + .unwrap(); + Text::new( + &format!("Trait3: {}", self.card.trait3), + Point::new(20, 300), + style, + ) + .draw(display) + .unwrap(); + Text::new( + &format!("Secret: {}", self.card.secret), + Point::new(20, 310), + style, + ) + .draw(display) + .unwrap(); - render_sprite_onto_ili9341( - display, - nfc_payload.sprite, - &PALETTES[(nfc_payload.card_type - 1) as usize], - ); - } else { - log::error!( - "NFC payload too short to decode packed text: {} bytes", - payload.len() - ); + let palette: Palette = self.card.cardtype.clone().into(); + render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette); + + core::future::ready(()) + } + + fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + let new_menu = match input { + Action::Ok => View::Card(self.clone()), + _ => View::Card(self.clone()), + }; + + future::ready(new_menu) } } diff --git a/src/views/main_menu.rs b/src/views/main_menu.rs index 8840ba7..59d0937 100644 --- a/src/views/main_menu.rs +++ b/src/views/main_menu.rs @@ -1,8 +1,11 @@ use alloc::vec; use core::future; +use crate::card::model::Card; +use crate::card::{decoder::split_nfc_hex, mock::MOCK_PAYLOAD, mock::MOCK_PAYLOAD2}; use crate::display::primary_lcd::PrimaryLcdDisplay; +use crate::views::card_view::CardView; use crate::views::journal_view::JournalView; use crate::views::{menu_item, settings_menu::SettingsMenu, view::View}; @@ -33,6 +36,9 @@ impl Navigable for MainMenu { } fn handle_input(&self, input: Action) -> impl core::future::Future + Send { + let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD).unwrap()).unwrap(); + let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap(); + let new_menu = match input { Action::Up => { let new_selected = if (self.selected - 1) < 0 { @@ -51,8 +57,9 @@ impl Navigable for MainMenu { }) } Action::Ok => match self.selected { + 0 => View::Card(CardView { card: card_mock1 }), 1 => View::Journal(JournalView { - cards: vec![], + cards: vec![card_mock1, card_mock2], selected_card: 0, }), 2 => View::Settings(SettingsMenu { selected: 0 }), diff --git a/src/views/view.rs b/src/views/view.rs index bd0abc3..e60760b 100644 --- a/src/views/view.rs +++ b/src/views/view.rs @@ -1,3 +1,4 @@ +use crate::views::card_view::CardView; use crate::views::{ journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu, @@ -11,6 +12,7 @@ pub enum View { Scan(ScanMenu), Settings(SettingsMenu), Journal(JournalView), + Card(CardView), } impl Navigable for View { @@ -24,6 +26,7 @@ impl Navigable for View { View::Scan(scan_menu) => scan_menu.display(display).await, View::Settings(settings_menu) => settings_menu.display(display).await, View::Journal(journal_view) => journal_view.display(display).await, + View::Card(card_view) => card_view.display(display).await, } } } @@ -38,6 +41,7 @@ impl Navigable for View { View::Scan(scan_menu) => scan_menu.handle_input(input).await, View::Settings(settings_menu) => settings_menu.handle_input(input).await, View::Journal(journal_view) => journal_view.handle_input(input).await, + View::Card(card_view) => card_view.handle_input(input).await, } } } -- 2.39.5