Fixed color rendering issue

.cargo/config.toml

@@ -1,15 +1,16 @@
-[target.xtensa-esp32-none-elf]
+[target.xtensa-esp32s3-none-elf]
-runner = "espflash flash --monitor --chip esp32"
+runner = "espflash flash --monitor --chip esp32s3"
 
 [env]
 ESP_LOG="info"
+WM_CONN = '{"ssid": "Wokwi-GUEST", "psk": "", "data": {}}'
 
 [build]
 rustflags = [
   "-C", "link-arg=-nostartfiles",
 ]
 
-target = "xtensa-esp32-none-elf"
+target = "xtensa-esp32s3-none-elf"
 
 [unstable]
 build-std = ["alloc", "core"]

.envrc

@@ -1 +0,0 @@
-use nix;

.gitignore

@@ -24,3 +24,6 @@ target/
 
 # Ignore .DS_Store file in mac
 **/.DS_Store
+
+# Ignore checked out wiki
+creaturedex.wiki/

Cargo.toml

@@ -9,50 +9,40 @@ name = "creaturedex"
 path = "./src/bin/main.rs"
 
 [dependencies]
-esp-hal = { version = "~1.1.0", features = ["esp32", "log-04", "unstable"] }
+esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] }
 
 esp-rtos = { version = "0.3.0", features = [
+  "embassy",
   "esp-alloc",
   "esp-radio",
-  "esp32",
+  "esp32s3",
   "log-04",
 ] }
 
-esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32", "log-04"] }
+esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32s3", "log-04"] }
 log                    = "0.4.27"
 
 critical-section = "1.2.0"
 embedded-io = "0.7.1"
+embassy-executor = { version = "0.10.0", default-features = false }
+embassy-time = { version = "0.5.1", default-features = false }
 esp-alloc = "0.10.0"
-esp-println = { version = "0.17.0", features = ["esp32", "log-04"] }
+esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [
-esp-radio = { version = "0.18.0", features = [
+  "ap",
-  "esp-alloc",
+  "esp32s3",
-  "esp32",
-  "log-04",
-  "unstable",
-  "wifi",
-] }
-smoltcp = { version = "0.13.0", default-features = false, features = [
-  "log",
-  "medium-ethernet",
-  "multicast",
-  "proto-dhcpv4",
-  "proto-dns",
-  "proto-ipv4",
-  "socket-dns",
-  "socket-icmp",
-  "socket-raw",
-  "socket-tcp",
-  "socket-udp",
 ] }
+esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] }
 display-interface-spi = "0.5.0"
 ili9341 = "0.6.0"
 embedded-hal = "1.0.0"
 embedded-hal-bus = "0.3.0"
 embedded-graphics = "0.8.2"
 embedded-graphics-core = "0.4.1"
+base64 = { version = "0.22", default-features = false, features = ["alloc"] }
 pn532 = "0.5.0"
-ndef = { version = "0.5.0", path = "./ndef-rs" }
+ndef = "0.5.0"
+
+
 
 
 # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html
@@ -66,3 +56,7 @@ codegen-units = 1     # LLVM can perform better optimizations using a single thr
 debug         = 2     # prefer slower builds but better debugging experience
 lto           = 'fat'
 opt-level     = 's'
+
+[features]
+default = []
+wokwi = []

diagram.json

@@ -1,31 +1,27 @@
 {
   "version": 1,
+  "author": "CreatureDex",
   "editor": "wokwi",
   "parts": [
-    { "type": "board-esp32-s3-devkitc-1", "id": "esp1", "top": 67.2, "left": -263.96, "attrs": {} },
     {
-      "type": "board-ili9341-cap-touch",
+      "type": "board-esp32-s3-devkitc-1",
-      "id": "lcd1",
+      "id": "esp1",
-      "top": -191.24,
+      "top": 67.2,
-      "left": -0.38,
+      "left": -263.96,
       "attrs": {}
     },
+    { "type": "wokwi-ili9341", "id": "lcd1", "top": -191.24, "left": -0.38, "attrs": {} },
     {
-      "type": "wokwi-led",
+      "type": "wokwi-pushbutton",
-      "id": "led1",
+      "id": "btn1",
-      "top": -82.89,
+      "top": 131,
-      "left": 196.26,
+      "left": -124.8,
-      "attrs": { "color": "red" }
+      "attrs": { "color": "green", "xray": "1", "key": "1" }
-    },
-    {
-      "type": "wokwi-resistor",
-      "id": "r1",
-      "top": 183.86,
-      "left": 154.06,
-      "attrs": { "value": "220" }
     }
   ],
   "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" ] ],
@@ -34,11 +30,8 @@
     [ "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" ] ],
-    [ "esp1:22", "lcd1:SCL", "yellow", [ "h48", "v163.2", "h192" ] ],
+    [ "btn1:1.l", "esp1:GND.2", "green", [ "h-9.6", "v-48" ] ],
-    [ "esp1:21", "lcd1:SDA", "cyan", [ "h38.4", "v144", "h211.2" ] ],
+    [ "btn1:2.l", "esp1:38", "green", [ "h-9.6", "v19.4" ] ]
-    [ "r1:2", "led1:A", "green", [ "h8.4", "v-230.4" ] ],
+  ],
-    [ "esp1:GND.2", "led1:C", "black", [ "v0", "h86.4", "v76.8", "h278.4" ] ],
-    [ "esp1:17", "r1:1", "green", [ "h0" ] ]
-],
   "dependencies": {}
 }

model/right-half.scad

@@ -17,10 +17,10 @@ module right_half_door_only() {
 }
 // #right_half_door_only();
 
-module battery_spacer(cable_cube_additional_length=0) {
+module battery_spacer(cable_cube_additional_length=0, cable_cube = 8.25) {
     length = 106;
-    rotate([0, 90, 90]) cylinder(d=18.5, h=length);
+    battery_d = 18;
-    cable_cube = 8.25;
+    rotate([0, 90, 90]) cylinder(d=battery_d+1.9, h=length);
     translate([0, 0, -cable_cube]) cube([cable_cube, length+cable_cube_additional_length, cable_cube]);
 }
 // !battery_spacer();
@@ -28,13 +28,13 @@ module battery_spacer(cable_cube_additional_length=0) {
 module battery_contact()
 {
     base_height = 4;
-    silver_wire_d = 1.15;
+    silver_wire_d = 1.7;
 
     module base_body() {
         rotate([90, 0, 0])
             resize([0, base_height, 0], auto=[false, true, false])
-                scale(0.99)
+                scale(0.92)
-                    battery_spacer();
+                    battery_spacer(cable_cube=0);
     }
 
     module contact_spring()
@@ -42,24 +42,24 @@ module battery_contact()
         spring_width = 11;
         translate([-2, -spring_width/2, 0])
             difference() {
-                scale([1.75, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width);
+                scale([1.5, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width);
-                scale([1.75, 1, 1.5]) rotate([-90, 0, 0]) cylinder(d=6, h=spring_width);
+                scale([0.95, 1, 0.87]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width);
-                translate([-100, 0, -50]) cube(100);
+                translate([-101, 0, -50]) cube(100);
                 translate([-50, 0, -100]) cube(100);
-                translate([0, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]);
+                translate([-1, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]);
-                translate([0, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]);
+                translate([-1, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]);
             }
     }
+
     module silver_wire_channels()
     {
-        translate([7.3, 0, -6])
+        translate([6.5, -2.5, -7])
-            rotate([-15, 0, 0])
+                #cylinder(d=silver_wire_d, h=15);
-                cylinder(d=silver_wire_d, h=15);
 
-        translate([7.3, 0, -6])
+        translate([6.5, 2.5, -7])
-            rotate([15, 0, 0])
+                #cylinder(d=silver_wire_d, h=15);
-                cylinder(d=silver_wire_d, h=15);
     }
+    // silver_wire_channels();
 
     translate([0, 0, base_height])
         rotate([0, 0, 45])
@@ -74,7 +74,7 @@ module battery_contact()
                 silver_wire_channels();
     }
 }
-// !battery_contact();
+battery_contact();
 
 module right_half_hinge_only() {
     module original() {
@@ -104,12 +104,12 @@ module right_half_hinge_only() {
     base_model();
     // translate([0, -40, 11]) rotate([0, 0, 90]) battery();
 }
-// right_half_hinge_only();
+// !right_half_hinge_only();
 
 module right_half() {
     right_half_door_only();
     right_half_hinge_only();
 }
 
-right_half();
+// right_half();
 // #right_half_components();

src/bin/main.rs

@@ -7,37 +7,23 @@
 )]
 #![deny(clippy::large_stack_frames)]
 
-use core::convert::Infallible;
+use creaturedex::card::mock::{MOCK_PAYLOAD, MOCK_PAYLOAD2};
-
+use creaturedex::display::primary_lcd::init_primary_lcd;
-use alloc::vec::Vec;
+use creaturedex::display::views::card_view::render_nfc_payload;
-use display_interface_spi::SPIInterface;
+use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
-use embedded_graphics::Drawable;
+use creaturedex::navigation::input::init_navigation_button;
-use embedded_graphics::mono_font::MonoTextStyle;
+use creaturedex::navigation::state::NavigationState;
-use embedded_graphics::mono_font::ascii::FONT_6X10;
+use creaturedex::network::wifi::setup_wifi;
+use embassy_executor::Spawner;
+use embassy_time::Timer;
+use embedded_graphics::draw_target::DrawTarget;
 use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::Point;
 use embedded_graphics::prelude::RgbColor;
-use embedded_graphics::text::Text;
-use embedded_graphics_core::draw_target::DrawTarget;
-use embedded_hal_bus::spi::ExclusiveDevice;
 use esp_hal::clock::CpuClock;
 use esp_hal::delay::Delay;
-use esp_hal::gpio::Level;
+use esp_hal::time::Duration;
-use esp_hal::gpio::Output;
-use esp_hal::gpio::OutputConfig;
-use esp_hal::main;
-use esp_hal::spi::{
-    Mode,
-    master::{Config, Spi},
-};
-use esp_hal::time::{Duration, Instant};
 use esp_hal::timer::timg::TimerGroup;
-use esp_println::dbg;
+use log::error;
-use ili9341::Ili9341;
-use ili9341::Orientation;
-use log::{error, info};
-use pn532::i2c::I2CInterface;
-use pn532::nb;
 
 #[panic_handler]
 fn panic(panic_info: &core::panic::PanicInfo) -> ! {
@@ -45,6 +31,54 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
     loop {}
 }
 
+const SCANNED_PAYLOAD: &[u8] = &[
+    3, 255, 3, 115, 196, 19, 0, 0, 3, 90, 109, 121, 115, 116, 101, 114, 121, 104, 97, 99, 107, 46,
+    99, 111, 109, 58, 99, 99, 49, 233, 36, 1, 10, 75, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 85, 85, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245,
+    85, 85, 85, 85, 95, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 85,
+    255, 255, 85, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 95, 255,
+    255, 255, 245, 85, 95, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 80, 0, 255,
+    255, 245, 85, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 85, 0, 0, 15, 255,
+    255, 245, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 85, 0, 0, 15, 255, 255,
+    255, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 80, 0, 255, 255, 255, 255,
+    245, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 255, 255, 255,
+    245, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 255, 15, 255,
+    245, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 0, 15, 255, 245,
+    85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 80, 0, 0, 15, 255, 255, 245, 95,
+    255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 0, 0, 0, 15, 255, 255, 245, 95, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 85, 255, 0, 0, 0, 15, 255, 255, 245, 85, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 85, 240, 0, 0, 0, 15, 255, 255, 245, 85, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 85, 240, 15, 0, 0, 15, 255, 255, 255, 85, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 80, 0, 255, 255, 0, 15, 255, 255, 255, 85, 255, 255, 255, 255, 255, 255, 255, 255,
+    240, 0, 0, 255, 255, 0, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 240, 0,
+    0, 255, 255, 240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 0, 5, 255, 255,
+    255, 240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 0, 85, 255, 255, 255,
+    240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240,
+    15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240, 15,
+    255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240, 15, 255,
+    255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 95, 255, 0, 15, 255, 255,
+    255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 80, 0, 0, 255, 255, 255, 255,
+    85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 0, 15, 255, 255, 255, 255, 255, 85,
+    95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 255, 255, 85, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 245, 255, 85, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 245, 255, 85, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 240, 5, 95, 255, 245, 95, 85, 85, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 240, 0, 85, 85, 85, 245, 85, 95, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 85, 95, 255, 85, 85, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 0, 5, 85, 85, 85, 95, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 0, 5, 85, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 187,
+    161, 225, 7, 64, 41, 235, 110, 38, 0, 0, 0, 0, 0, 0, 0, 0, 211, 215, 165, 168, 183, 177, 51, 0,
+    165, 172, 187, 153, 209, 187, 161, 238, 123, 2, 204, 136, 150, 159, 7, 0, 134, 57, 162, 97, 11,
+    76, 47, 71, 126, 157, 11, 0, 83, 112, 101, 101, 100, 121, 32, 116, 104, 105, 110, 103, 32, 99,
+    111, 109, 101, 115, 32, 111, 117, 116, 0, 0, 116, 238, 175, 85, 82, 152, 67, 113, 193, 113,
+    219, 188, 173, 50, 137, 138, 96, 130, 104, 40, 72, 189, 43, 63, 72, 73, 101, 120, 136, 168, 16,
+    57, 90, 119, 100, 187, 79, 126, 111, 195, 189, 40, 67, 196, 36, 176, 243, 45, 0, 254, 0, 0, 0,
+    189, 4, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
+
 extern crate alloc;
 
 // This creates a default app-descriptor required by the esp-idf bootloader.
@@ -55,230 +89,77 @@ esp_bootloader_esp_idf::esp_app_desc!();
     clippy::large_stack_frames,
     reason = "it's not unusual to allocate larger buffers etc. in main"
 )]
-#[main]
+#[esp_rtos::main]
-fn main() -> ! {
+async fn main(spawner: Spawner) {
-    // generator version: 1.3.0
-    // generator parameters: --chip esp32s3 -o esp32s3-wroom-1-octal-psram -o unstable-hal -o alloc -o wifi -o log -o wokwi -o neovim -o vscode -o esp
-
     esp_println::logger::init_logger_from_env();
 
     let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
     let peripherals = esp_hal::init(config);
 
-    let sck = peripherals.GPIO18;
+    // The following GPIO pins are in use by some feature of the module and should not be used.
-    let mosi = peripherals.GPIO23;
+    let _ = peripherals.GPIO27;
-    let miso = peripherals.GPIO19;
+    let _ = peripherals.GPIO28;
-    let cs_main = peripherals.GPIO5;
+    let _ = peripherals.GPIO29;
-    let dc = peripherals.GPIO17;
+    let _ = peripherals.GPIO30;
-    let reset_main = peripherals.GPIO16;
+    let _ = peripherals.GPIO31;
-
+    let _ = peripherals.GPIO32;
-    let sda = peripherals.GPIO21;
+    let _ = peripherals.GPIO33;
-    let scl = peripherals.GPIO22;
+    let _ = peripherals.GPIO34;
 
     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);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
-    let (mut _wifi_controller, _interfaces) =
-        esp_radio::wifi::new(peripherals.WIFI, Default::default())
-            .expect("Failed to initialize Wi-Fi controller");
 
-    let spi_bus = Spi::new(
+    let mut display = init_primary_lcd(
         peripherals.SPI2,
-        Config::default()
+        peripherals.GPIO36, // sck
-            .with_frequency(Rate::from_khz(100))
+        peripherals.GPIO35, // mosi
-            .with_mode(Mode::_0),
+        peripherals.GPIO37, // miso
-    )
+        peripherals.GPIO11, // primary cs
-    .unwrap()
+        peripherals.GPIO10, // shared reset
-    .with_sck(sck)
+        peripherals.GPIO12, // shared dc
-    .with_mosi(mosi)
-    .with_miso(miso);
-
-    let cs_main = Output::new(cs_main, Level::High, OutputConfig::default());
-
-    let mut delay = Delay::new();
-    let spi_dev = ExclusiveDevice::new(spi_bus, cs_main, delay).unwrap();
-    let reset_main = Output::new(reset_main, Level::High, OutputConfig::default());
-    let spi_dc = Output::new(dc, Level::High, OutputConfig::default());
-    let iface = SPIInterface::new(spi_dev, spi_dc);
-
-    let mut display = Ili9341::new(
-        iface,
-        reset_main,
         &mut delay,
-        Orientation::Landscape,
+    );
-        ili9341::DisplaySize240x320,
-    )
-    .unwrap();
 
-    // display.clear(Rgb565::BLACK).unwrap();
+    setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
 
-    let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
+    log::info!("Setup complete, entering main loop");
-    Text::new("Hello, ESP32!", Point::new(20, 100), style)
-        .draw(&mut display)
-        .unwrap();
 
-    use pn532::{Pn532, Request, requests::SAMMode};
+    let mut nav_state = NavigationState::new();
 
-    // spi is a struct implementing embedded_hal::spi::SpiDevice
+    let mut nfc_driver =
-    // timer is a struct implementing pn532::CountDown
+        NfcPn532Driver::new(peripherals.I2C0, peripherals.GPIO17, peripherals.GPIO18);
-
+    let timeout = Duration::from_millis(1000);
-    use esp_hal::{
+    if nfc_driver.configure_sam(timeout).is_ok() {
-        i2c::master::{Config as I2cConfig, I2c},
+        log::info!("NFC SAM configuration successful");
-        time::Rate,
-    };
-
-    let config = I2cConfig::default().with_frequency(Rate::from_khz(20));
-    let i2c = I2c::new(peripherals.I2C0, config)
-        .expect("Failed to init I2C")
-        .with_sda(sda)
-        .with_scl(scl);
-
-    let mut pn532: Pn532<_, _, 32> = Pn532::new(I2CInterface { i2c }, TimerWrapper::new());
-
-    let ms_50 = Duration::from_millis(50);
-    let ms_1000 = Duration::from_millis(1000);
-
-    let delay_start = Instant::now();
-    while delay_start.elapsed() < Duration::from_millis(500) {}
-
-    let mut data: Vec<u8> = Vec::with_capacity(858);
-
-    if let Err(e) = pn532.process(
-        &Request::sam_configuration(SAMMode::Normal, false),
-        0,
-        Duration::from_millis(5000),
-    ) {
-        error!("Could not initialize PN532: {e:?}")
     } else {
-        info!("Successfully init'ed PN532");
+        log::error!("NFC SAM configuration failed");
     }
 
     loop {
-        info!("Hello world!");
+        if let Ok(card_data) = nfc_driver.read_card_data() {
+            log::info!("NFC Card Read: {:?}", card_data);
 
-        match pn532.process(
+            render_nfc_payload(&mut display, &card_data[29..888]);
-            &Request::INLIST_ONE_ISO_A_TARGET,
+        }
-            23,
+
-            Duration::from_secs(10),
+        if button1.is_low() {
-        ) {
+            log::info!("Button pressed!");
-            Ok(uid) => {
+            display.clear(Rgb565::BLACK).unwrap();
-                info!("uid = {uid:?}");
+            let payload = if nav_state.toggle_payload() {
-                for i in (0x04..=230) {
+                &MOCK_PAYLOAD
-                    let mut parse_result = Err(());
+            } else {
-                    while parse_result.is_err() {
+                &MOCK_PAYLOAD2
-                        let Ok(result) = pn532.process(&Request::ntag_read(i), 17, ms_1000) else {
-                            continue;
             };
-                        parse_result = parse_nfc(i, result);
-                    }
-                    let bytes = parse_result.unwrap();
-                    data.extend(bytes);
-                }
-                info!("Full data: {data:02x?}");
-                match ndef::Message::try_from(&data[4..4 + 883]) {
-                    Ok(m) => info!("Parsed: {m:02x?}"),
-                    Err(e) => info!("Failed to parse: {e:?}"),
-                }
-                data.clear();
-            }
-            Err(e) => {
-                info!("No NFC card found: {e:?}");
-            }
-        }
 
-        let delay_start = Instant::now();
+            render_nfc_payload(&mut display, payload);
-        while delay_start.elapsed() < Duration::from_millis(500) {}
         }
-
+        Timer::after_millis(10).await;
-    // for inspiration have a look at the examples at https://github.com/esp-rs/esp-hal/tree/esp-hal-v1.1.0/examples
-}
-
-fn parse_nfc(iteration: u8, bytes: &[u8]) -> Result<[u8; 4], ()> {
-    let success = bytes.first().is_some_and(|x| *x == 0);
-    if success {
-        // info!("page {i}: {:02x?}", result);
-        let mut arr = [0; 4];
-        arr.copy_from_slice(&bytes[1..5]);
-        Ok(arr)
-    } else {
-        info!("err  {iteration}: {:02x?}", bytes);
-        Err(())
     }
 }
-
-struct TimerWrapper {
-    // TODO Is that timer accurate enough?
-    start: Instant,
-    duration: Duration,
-    counter: u32,
-}
-
-impl TimerWrapper {
-    pub fn new() -> Self {
-        Self {
-            start: Instant::now(),
-            duration: Duration::ZERO,
-            counter: 0,
-        }
-    }
-}
-
-impl pn532::CountDown for TimerWrapper {
-    type Time = Duration;
-
-    fn start<T>(&mut self, timeout: T)
-    where
-        T: Into<Self::Time>,
-    {
-        // without this debug log, it works worse: stuck in NFC card search without ever returning.
-        self.start = Instant::now();
-        self.duration = timeout.into();
-        self.counter = 0;
-    }
-
-    fn wait(&mut self) -> nb::Result<(), Infallible> {
-        let elapsed = self.start.elapsed();
-        self.counter += 1;
-        if self.counter.is_multiple_of(1) {
-            // info!("Elapsed: {elapsed}");
-        }
-        if elapsed >= self.duration {
-            Ok(())
-        } else {
-            Err(nb::Error::WouldBlock)
-        }
-    }
-}
-
-/*
-struct TimerWrapper<'a, T>
-where
-    T: esp_hal::DriverMode,
-{
-    timer: esp_hal::timer::PeriodicTimer<'a, T>,
-}
-
-impl<'a, TIM> pn532::CountDown for TimerWrapper<'a, TIM>
-where
-    TIM: esp_hal::DriverMode,
-{
-    type Time = Duration;
-    fn start<T>(&mut self, timeout: T)
-    where
-        T: Into<Self::Time>,
-    {
-        self.timer.start(timeout.into()).unwrap();
-    }
-
-    fn wait(&mut self) -> nb::Result<(), Infallible> {
-        // convert nb::Result<(), void::Void> to nb::Result<(), Infallible>
-        match self.timer.wait() {
-            Ok(_) => Ok(()),
-            Err(_) => Err(nb::Error::WouldBlock),
-        }
-    }
-}
- */

src/card.rs

@@ -0,0 +1,3 @@
+pub mod decoder;
+pub mod mock;
+pub mod model;

src/card/decoder.rs

@@ -0,0 +1,72 @@
+use alloc::string::{String, ToString};
+use crate::card::model::NfcPayload;
+
+pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
+    if payload.len() < 0x35A {
+        return None;
+    }
+
+    Some(NfcPayload {
+        event_encoding: &payload[0..2],
+        card_type: payload[2],
+        card_uuid: &payload[3..5],
+        _reserved: &payload[5..9],
+        sprite: &payload[9..0x2DB],
+        packed_card_text: &payload[0x2DB..0x311],
+        secret: &payload[0x311..0x329],
+        _opaque_trailer: &payload[0x329..0x35A],
+    })
+}
+
+pub fn decode_known_event(event_encoding: &[u8]) -> Option<&'static str> {
+    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,
+    }
+}
+
+pub fn decode_secret(hex: &[u8]) -> String {
+    let mut ascii_string = String::new();
+    for &byte in hex {
+        if byte == 0 {
+            break;
+        }
+
+        if byte.is_ascii_graphic() || byte == b' ' {
+            ascii_string.push(byte as char);
+        }
+    }
+    ascii_string
+}
+
+pub fn decode_packed_card_text(bytes: &[u8]) -> (String, String, String, String) {
+    let alphabet = b" ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-";
+    let mut full_text = String::with_capacity((bytes.len() * 8) / 6 + 1);
+
+    let mut accumulator: u32 = 0;
+    let mut bits_in_acc: u32 = 0;
+
+    for &byte in bytes {
+        accumulator |= (byte as u32) << bits_in_acc;
+        bits_in_acc += 8;
+
+        while bits_in_acc >= 6 {
+            let char_index = (accumulator & 0x3F) as usize;
+
+            full_text.push(alphabet[char_index] as char);
+
+            accumulator >>= 6;
+            bits_in_acc -= 6;
+        }
+    }
+
+    let name = full_text[0..24].trim().to_string();
+    let trait1 = full_text[24..40].trim().to_string();
+    let trait2 = full_text[40..56].trim().to_string();
+    let trait3 = full_text[56..72].trim().to_string();
+
+    (name, trait1, trait2, trait3)
+}

src/card/mock.rs

@@ -0,0 +1,115 @@
+/// Mock payload 2 acting as simulated NFC card read
+pub const MOCK_PAYLOAD2: [u8; 858] = [
+    0xE9, 0x24, 0x03, 0xDA, 0x45, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0xAA, 0xA0, 0xF0, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0xAA, 0xA0, 0xF0, 0xAA, 0x0F, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xAA, 0x00, 0xAA,
+    0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0xAA,
+    0xAA, 0x0A, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xF0, 0xAA, 0xAA, 0xAA, 0x0A, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xAA, 0xA0, 0xAA, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xAA, 0xA0, 0xAA, 0x0A, 0x0F, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xAA, 0xA0, 0x0A, 0x0A, 0x0F,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xAA, 0xAA,
+    0x00, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A,
+    0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0x0A, 0xAA, 0xAA, 0x6A, 0xAA, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xFA, 0xAA, 0xA6, 0xAA, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAF, 0xFF, 0xFA, 0xAA, 0xAA, 0xAA, 0x0F, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xAA, 0xFA, 0xAA, 0xAA, 0xAA,
+    0xFA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0xF0, 0xAA, 0xAA,
+    0xAA, 0xAA, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xDD, 0xDD, 0xDD, 0x0F,
+    0x0A, 0xAA, 0xAA, 0xA6, 0xAA, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0xDF,
+    0xFF, 0xFF, 0x00, 0xAA, 0xAA, 0xA0, 0xAA, 0xA0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0x0D, 0x00, 0x0F, 0xF0, 0xAA, 0xAA, 0xAA, 0x0F, 0x0A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0x0A, 0xAF, 0xF0, 0xAA, 0xAA, 0x0A, 0x0F, 0xFF, 0x0F, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0x00, 0x0F, 0xF0, 0xAA, 0xAA, 0xF0, 0xFF, 0xF0,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0x0E, 0x0F, 0xF0, 0xAA, 0xAA,
+    0xDD, 0xDD, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0x00, 0x0F,
+    0xF0, 0xAF, 0xAF, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0x0D, 0x0A, 0xAF, 0xF0, 0xAA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0x0D, 0x00, 0x0F, 0xF0, 0xAF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0D, 0xDF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xDD, 0xDD, 0xDF, 0x0F, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0xB3, 0x11, 0xCF, 0x04,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x3B, 0x9A,
+    0x26, 0x10, 0x98, 0x23, 0xFC, 0x01, 0x00, 0x00, 0x00, 0xCE, 0xF7, 0xB2, 0xA9, 0x9B, 0xCA, 0x23,
+    0x0A, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x86, 0xBA, 0xC0, 0x9C, 0xBE, 0x40, 0x98, 0xA2, 0x1F, 0x00,
+    0x00, 0x54, 0x68, 0x65, 0x20, 0x63, 0x61, 0x6B, 0x65, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x6C,
+    0x69, 0x65, 0x20, 0xF0, 0x9F, 0x8E, 0x82, 0x00, 0x00, 0x87, 0xF7, 0xB1, 0x44, 0xB0, 0x55, 0x5E,
+    0xF9, 0x22, 0xD6, 0x71, 0x45, 0xE9, 0xD5, 0xA7, 0xF8, 0x0F, 0xBE, 0x8F, 0xF6, 0xB9, 0x77, 0x62,
+    0x13, 0xF3, 0x84, 0x55, 0xD2, 0xBC, 0x4E, 0xCB, 0xDF, 0xDB, 0xC0, 0x91, 0x5F, 0x39, 0xE0, 0xF5,
+    0x95, 0x2D, 0x14, 0xBD, 0x43, 0xB2, 0x40, 0x76, 0x78, 0x00,
+];
+
+/// Mock payload 1 acting as simulated NFC card read
+pub const MOCK_PAYLOAD: [u8; 858] = [
+    0xE9, 0x24, 0x01, 0x47, 0xF2, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x77, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x77, 0x77, 0x77, 0x77, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xF7, 0x77, 0x77, 0x77,
+    0x77, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x77,
+    0x77, 0xFF, 0xFF, 0x77, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xF7, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xF7, 0xF7, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0x77, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x7F, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77,
+    0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, 0xFF,
+    0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x0F, 0xFF, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0xFF,
+    0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0x77, 0x7F, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0x00, 0x0F, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xF0, 0x00, 0x17, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x07,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+    0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF,
+    0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77,
+    0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, 0xF7, 0x7F, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF,
+    0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00,
+    0x0F, 0xFF, 0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x77, 0x7F,
+    0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xF7, 0x77, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xF7, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xF7, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0xF7, 0x7F, 0xFF, 0xF0, 0x00,
+    0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x07, 0x7F,
+    0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0x7F, 0xFF, 0xFF, 0x00,
+    0x00, 0x00, 0x0F, 0xF0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x7F,
+    0xFF, 0xFF, 0xFF, 0x77, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0x77, 0xF7, 0x7F, 0xFF, 0xF7, 0x77, 0x77, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x7F, 0x77, 0x77, 0x77, 0x77, 0x77, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0xFF, 0x77, 0x77, 0x77, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x77, 0x77, 0x77, 0x77, 0x77,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x82, 0xF9, 0x7E, 0x00, 0x94,
+    0xB2, 0xEE, 0x66, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3B, 0x9E,
+    0x1B, 0x3B, 0x03, 0x50, 0xCA, 0xBA, 0x9B, 0x09, 0x00, 0x81, 0xFA, 0xB1, 0xEE, 0xCB, 0x7E, 0xC0,
+    0xD4, 0x8D, 0x1F, 0xDA, 0x7D, 0x43, 0x8A, 0xB6, 0x1F, 0x0B, 0x7F, 0x2D, 0x30, 0xA9, 0xDF, 0xE7,
+    0x01, 0x53, 0x70, 0x65, 0x65, 0x64, 0x79, 0x20, 0x74, 0x68, 0x69, 0x6E, 0x67, 0x20, 0x67, 0x6F,
+    0x65, 0x73, 0x20, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x23, 0xC0, 0xD6, 0x5A, 0x9D, 0xA2, 0xAB,
+    0xC4, 0x80, 0xC3, 0x06, 0xDB, 0xE8, 0x88, 0x7A, 0x7E, 0xB2, 0x40, 0x10, 0xA2, 0xDF, 0xC0, 0x89,
+    0x03, 0x63, 0x8F, 0x4C, 0x2F, 0xBA, 0xCC, 0x17, 0x23, 0x51, 0x60, 0x27, 0x3B, 0x00, 0x1C, 0x6D,
+    0x1F, 0x8C, 0x6B, 0x3E, 0x32, 0xE2, 0x53, 0xD9, 0x8F, 0x00,
+];

src/card/model.rs

@@ -0,0 +1,11 @@
+#[derive(Debug, Clone, Copy)]
+pub struct NfcPayload<'a> {
+    pub event_encoding: &'a [u8],
+    pub card_type: u8,
+    pub card_uuid: &'a [u8],
+    pub _reserved: &'a [u8],
+    pub sprite: &'a [u8],
+    pub packed_card_text: &'a [u8],
+    pub secret: &'a [u8],
+    pub _opaque_trailer: &'a [u8],
+}

src/display.rs

@@ -0,0 +1,6 @@
+pub mod palette;
+pub mod primary_lcd;
+pub mod secondary_oled;
+pub mod sprite;
+pub mod tertiary_lcd;
+pub mod views;

src/display/palette.rs

@@ -0,0 +1,215 @@
+use embedded_graphics::pixelcolor::Rgb565;
+use embedded_graphics::pixelcolor::Rgb888;
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Rgb(pub u8, pub u8, pub u8);
+
+impl Rgb {
+    pub fn into_rgb565(self) -> Rgb565 {            
+        Rgb888::new(self.0, self.1, self.2).into()
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TypeStyle {
+    pub name: &'static str,
+    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),
+    },
+];

src/display/primary_lcd.rs

@@ -0,0 +1,60 @@
+use display_interface_spi::SPIInterface;
+use embedded_graphics::draw_target::DrawTarget;
+use embedded_graphics::pixelcolor::Rgb565;
+use embedded_graphics::prelude::RgbColor;
+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::time::Rate;
+use ili9341::{DisplaySize240x320, Ili9341, Orientation};
+
+pub type PrimaryLcdDisplay<'a> = Ili9341<
+    SPIInterface<
+        ExclusiveDevice<Spi<'a, esp_hal::Blocking>, Output<'a>, Delay>,
+        Output<'a>,
+    >,
+    Output<'a>,
+>;
+
+pub fn init_primary_lcd(
+    spi2: SPI2<'static>,
+    sck: GPIO36<'static>,
+    mosi: GPIO35<'static>,
+    miso: GPIO37<'static>,
+    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}");
+
+    let spi_bus = Spi::new(
+        spi2,
+        Config::default().with_frequency(freq).with_mode(Mode::_0),
+    )
+    .unwrap()
+    .with_sck(sck)
+    .with_mosi(mosi)
+    .with_miso(miso);
+
+    let cs_main = Output::new(cs, Level::High, OutputConfig::default());
+    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);
+
+    let mut display = Ili9341::new(
+        iface,
+        reset_main,
+        delay,
+        Orientation::Portrait,
+        DisplaySize240x320,
+    )
+    .unwrap();
+
+    display.clear(Rgb565::BLACK).unwrap();
+    display
+}

src/display/secondary_oled.rs

@@ -0,0 +1 @@
+// Secondary OLED module

src/display/sprite.rs

@@ -0,0 +1,62 @@
+use embedded_graphics::{geometry::Size, pixelcolor::Rgb565, primitives::Rectangle, prelude::Point};
+use embedded_graphics_core::draw_target::DrawTarget;
+use crate::display::palette::Rgb;
+
+pub fn render_sprite_onto_ili9341<D>(ili9341: &mut D, sprite: &[u8], palette: &[Rgb; 16])
+where
+    D: DrawTarget<Color = Rgb565>,
+{
+    let pixel_count = sprite.len() * 2;
+    if pixel_count == 0 {
+        return;
+    }
+
+    // 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);
+    }
+
+    let mut src_width = 1usize;
+    while src_width * src_width < pixel_count {
+        src_width += 1;
+    }
+
+    let target_width = 240usize;
+    let scale = core::cmp::max(1, target_width / src_width);
+
+    for y in 0..src_width {
+        for x in 0..src_width {
+            let pixel_index = y * src_width + x;
+            if pixel_index >= pixel_count {
+                break;
+            }
+
+            // Bitwise operations are slightly faster than division/modulo
+            let byte_index = pixel_index >> 1;
+            let pixel_byte = sprite[byte_index];
+            let color_index = if pixel_index.is_multiple_of(2) {
+                (pixel_byte >> 4) & 0x0F
+            } else {
+                pixel_byte & 0x0F
+            };
+
+            let color = palette565[color_index as usize];
+
+            let start_x = (x * scale) as i32;
+            let start_y = (y * scale) as i32;
+            let end_x = core::cmp::min(start_x + scale as i32, target_width as i32);
+            let end_y = core::cmp::min(start_y + scale as i32, target_width as i32);
+
+            let width = u32::try_from(end_x - start_x).unwrap();
+            let height = u32::try_from(end_y - start_y).unwrap();
+
+            let area = Rectangle::new(
+                Point::new(start_x.try_into().unwrap(), start_y.try_into().unwrap()),
+                Size::new(width, height),
+            );
+
+            let _ = ili9341.fill_solid(&area, color);
+        }
+    }
+}

src/display/tertiary_lcd.rs

@@ -0,0 +1 @@
+// Tertiary LCD module

src/display/views.rs

@@ -0,0 +1,3 @@
+pub mod card_view;
+pub mod menu_view;
+pub mod status_bar;

src/display/views/card_view.rs

@@ -0,0 +1,98 @@
+use alloc::{format, string::String};
+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;
+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<D>(display: &mut D, payload: &[u8])
+where
+    D: DrawTarget<Color = Rgb565>,
+    D::Error: core::fmt::Debug,
+{
+    let nfc_payload: Option<NfcPayload<'_>> = split_nfc_hex(payload);
+
+    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);
+
+        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 _ = 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
+            ),
+            Point::new(20, 250),
+            style,
+        )
+        .draw(display)
+        .unwrap();
+        Text::new(
+            &format!(
+                "Event: {}",
+                decode_known_event(nfc_payload.event_encoding).unwrap_or("Unknown")
+            ),
+            Point::new(20, 260),
+            style,
+        )
+        .draw(display)
+        .unwrap();
+        Text::new(
+            &format!(
+                "UUID: {}",
+                nfc_payload
+                    .card_uuid
+                    .iter()
+                    .map(|b| format!("{:02X}", b))
+                    .collect::<String>()
+            ),
+            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();
+
+        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()
+        );
+    }
+}

src/display/views/menu_view.rs

@@ -0,0 +1 @@
+// Menu view module

src/display/views/status_bar.rs

@@ -0,0 +1 @@
+// Status bar view module

src/drivers.rs

@@ -0,0 +1 @@
+pub mod nfc_pn532;

src/drivers/nfc_pn532.rs

@@ -0,0 +1,146 @@
+use alloc::vec::Vec;
+use core::convert::Infallible;
+use esp_hal::gpio::interconnect::{PeripheralInput, PeripheralOutput};
+use esp_hal::i2c::master::{Config as I2cConfig, I2c};
+use esp_hal::peripherals::I2C0;
+use esp_hal::time::{Duration, Instant, Rate};
+use log::{error, info};
+use pn532::i2c::I2CInterface;
+use pn532::requests::SAMMode;
+use pn532::{nb, Pn532, Request};
+
+/// Timer implementation required by `pn532::CountDown`.
+pub struct TimerWrapper {
+    start: Instant,
+    duration: Duration,
+    counter: u32,
+}
+
+impl TimerWrapper {
+    pub fn new() -> Self {
+        Self {
+            start: Instant::now(),
+            duration: Duration::ZERO,
+            counter: 0,
+        }
+    }
+}
+
+impl Default for TimerWrapper {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl pn532::CountDown for TimerWrapper {
+    type Time = Duration;
+
+    fn start<T>(&mut self, timeout: T)
+    where
+        T: Into<Self::Time>,
+    {
+        self.start = Instant::now();
+        self.duration = timeout.into();
+        self.counter = 0;
+    }
+
+    fn wait(&mut self) -> nb::Result<(), Infallible> {
+        let elapsed = self.start.elapsed();
+        self.counter += 1;
+        if elapsed >= self.duration {
+            Ok(())
+        } else {
+            Err(nb::Error::WouldBlock)
+        }
+    }
+}
+
+pub type Pn532Device<'a> = Pn532<I2CInterface<I2c<'a, esp_hal::Blocking>>, TimerWrapper, 32>;
+
+/// PN532 NFC reader driver.
+pub struct NfcPn532Driver<'a> {
+    pn532: Pn532Device<'a>,
+}
+
+impl<'a> NfcPn532Driver<'a> {
+    pub fn new<SDA, SCL>(i2c0: I2C0<'static>, sda: SDA, scl: SCL) -> Self
+    where
+        SDA: PeripheralInput<'static> + PeripheralOutput<'static>,
+        SCL: PeripheralInput<'static> + PeripheralOutput<'static>,
+    {
+        let config = I2cConfig::default().with_frequency(Rate::from_khz(20));
+        let i2c = I2c::new(i2c0, config)
+            .expect("Failed to init I2C")
+            .with_sda(sda)
+            .with_scl(scl);
+
+        let pn532 = Pn532::new(I2CInterface { i2c }, TimerWrapper::new());
+        Self { pn532 }
+    }
+
+    pub fn configure_sam(&mut self, timeout: Duration) -> Result<(), ()> {
+        if let Err(e) = self.pn532.process(
+            &Request::sam_configuration(SAMMode::Normal, false),
+            0,
+            timeout,
+        ) {
+            error!("Could not initialize PN532: {e:?}");
+            Err(())
+        } else {
+            info!("Successfully init'ed PN532");
+            Ok(())
+        }
+    }
+
+    pub fn poll_target(&mut self, timeout: Duration) -> Result<(), ()> {
+        match self.pn532.process(&Request::INLIST_ONE_ISO_A_TARGET, 23, timeout) {
+            Ok(uid) => {
+                info!("uid = {uid:?}");
+                Ok(())
+            }
+            Err(e) => {
+                info!("No NFC card found: {e:?}");
+                Err(())
+            }
+        }
+    }
+
+    pub fn parse_nfc_page(iteration: u8, bytes: &[u8]) -> Result<[u8; 4], ()> {
+        let success = bytes.first().is_some_and(|x| *x == 0);
+        if success {
+            let mut arr = [0; 4];
+            arr.copy_from_slice(&bytes[1..5]);
+            Ok(arr)
+        } else {
+            info!("err  {iteration}: {:02x?}", bytes);
+            Err(())
+        }
+    }
+
+    pub fn read_card_data(&mut self) -> Result<Vec<u8>, ()> {
+        let ms_1000 = Duration::from_millis(1000);
+        self.poll_target(Duration::from_secs(10))?;
+
+        let mut data: Vec<u8> = Vec::with_capacity(858);
+
+        for i in 0x04..=230 {
+            let mut parse_result = Err(());
+            while parse_result.is_err() {
+                let Ok(result) = self.pn532.process(&Request::ntag_read(i), 17, ms_1000) else {
+                    continue;
+                };
+                parse_result = Self::parse_nfc_page(i, result);
+            }
+            let bytes = parse_result.unwrap();
+            data.extend(bytes);
+        }
+
+        info!("Full data: {data:02x?}");
+        Ok(data)
+    }
+    
+    pub fn device_mut(&mut self) -> &mut Pn532Device<'a> {
+        &mut self.pn532
+    }
+}
+

src/lib.rs

@@ -1 +1,10 @@
 #![no_std]
+
+extern crate alloc;
+
+pub mod card;
+pub mod display;
+pub mod drivers;
+pub mod navigation;
+pub mod network;
+pub mod storage;

src/navigation.rs

@@ -0,0 +1,2 @@
+pub mod input;
+pub mod state;

src/navigation/input.rs

@@ -0,0 +1,15 @@
+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)
+}

src/navigation/state.rs

@@ -0,0 +1,35 @@
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ScreenMode {
+    CardDetail,
+    DexGrid,
+    Settings,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct NavigationState {
+    pub current_screen: ScreenMode,
+    pub card_index: usize,
+    pub use_first_payload: bool,
+}
+
+impl Default for NavigationState {
+    fn default() -> Self {
+        Self {
+            current_screen: ScreenMode::CardDetail,
+            card_index: 0,
+            use_first_payload: true,
+        }
+    }
+}
+
+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
+    }
+}

src/network.rs

@@ -0,0 +1,2 @@
+pub mod api_client;
+pub mod wifi;

src/network/api_client.rs

@@ -0,0 +1 @@
+// Network api_client module

src/network/wifi.rs

@@ -0,0 +1,67 @@
+use embassy_executor::Spawner;
+
+#[cfg(not(feature = "wokwi"))]
+pub async fn setup_wifi(
+    wifi: esp_hal::peripherals::WIFI<'static>,
+    flash: esp_hal::peripherals::FLASH<'static>,
+    spawner: &Spawner,
+) {
+    let nvs = esp_hal_wifimanager::Nvs::new(0x9000, 0x6000, flash).unwrap();
+
+    let mut wm_settings = esp_hal_wifimanager::WmSettings::default();
+
+    wm_settings.ssid.clear();
+    _ = core::fmt::write(
+        &mut wm_settings.ssid,
+        format_args!("CreatureDex-{:X}", esp_hal_wifimanager::get_efuse_mac()),
+    );
+
+    wm_settings.wifi_conn_timeout = 30000;
+    wm_settings.esp_reset_timeout = Some(300000); // 5min
+
+    let wifi_res = esp_hal_wifimanager::init_wm(wm_settings, spawner, Some(&nvs), wifi, None).await;
+
+    log::info!("wifi_res: {wifi_res:?}");
+}
+
+#[cfg(feature = "wokwi")]
+pub async fn setup_wifi(
+    wifi: esp_hal::peripherals::WIFI<'static>,
+    flash: esp_hal::peripherals::FLASH<'static>,
+    spawner: &Spawner,
+) {
+    log::info!("Wokwi mode active: pre-seeding WiFi Manager with Wokwi credentials");
+
+    // Preload connection data so init_wm can connect immediately without AP setup.
+    let nvs = match esp_hal_wifimanager::Nvs::new(0x9000, 0x6000, flash) {
+        Ok(nvs) => nvs,
+        Err(e) => {
+            log::error!("Failed to initialize NVS for Wokwi: {e:?}");
+            return;
+        }
+    };
+
+    if let Err(e) = nvs
+        .set(
+            esp_hal_wifimanager::WIFI_NVS_KEY,
+            "{\"ssid\":\"Wokwi-GUEST\",\"psk\":\"\",\"data\":{}}",
+        )
+        .await
+    {
+        log::error!("Failed to store Wokwi WiFi config in NVS: {e:?}");
+        return;
+    }
+
+    let mut wm_settings = esp_hal_wifimanager::WmSettings::default();
+
+    // Wokwi simulation uses a default open network called "Wokwi-GUEST"
+    wm_settings.ssid.clear();
+    _ = core::fmt::write(&mut wm_settings.ssid, format_args!("Wokwi-GUEST"));
+
+    wm_settings.wifi_conn_timeout = 30000;
+
+    // Initialize Wi-Fi connection through WiFi Manager using the pre-seeded NVS data.
+    let wifi_res = esp_hal_wifimanager::init_wm(wm_settings, spawner, Some(&nvs), wifi, None).await;
+
+    log::info!("Wokwi wifi_res: {wifi_res:?}");
+}

src/storage.rs

@@ -0,0 +1,2 @@
+pub mod dex_db;
+pub mod nvs;

src/storage/dex_db.rs

@@ -0,0 +1 @@
+// Storage dex_db module

src/storage/nvs.rs

@@ -0,0 +1 @@
+// Storage nvs module

wokwi.toml

@@ -1,5 +1,5 @@
 [wokwi]
 version = 1
 gdbServerPort = 3333
-elf = "target/xtensa-esp32-none-elf/debug/creaturedex"
+elf = "target/xtensa-esp32s3-none-elf/debug/creaturedex"
-firmware = "target/xtensa-esp32-none-elf/debug/creaturedex"
+firmware = "target/xtensa-esp32s3-none-elf/debug/creaturedex"