minor component fixes

Cargo.lock

@@ -53,12 +53,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
 
-[[package]]
-name = "array-init"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
-
 [[package]]
 name = "autocfg"
 version = "1.5.1"
@@ -102,29 +96,6 @@ dependencies = [
  "vsimd",
 ]
 
-[[package]]
-name = "binary_serde"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b2fe974c561ed04fb89673dd221bed36fc4794b71ca6ae96ffe19949045686"
-dependencies = [
- "array-init",
- "binary_serde_macros",
- "recursive_array",
- "thiserror-no-std",
-]
-
-[[package]]
-name = "binary_serde_macros"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4790b8dbcfa9d3adf2020ebf5fd36c6bc89a77d434131615ea349bc9620e8831"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "bitfield"
 version = "0.17.0"
@@ -348,7 +319,6 @@ name = "creaturedex"
 version = "0.1.0"
 dependencies = [
  "base64 0.23.1",
- "binary_serde",
  "ch1115",
  "critical-section",
  "display-interface-spi",
@@ -362,20 +332,17 @@ dependencies = [
  "embedded-hal-async",
  "embedded-hal-bus",
  "embedded-io 0.7.1",
- "embedded-storage",
  "esp-alloc",
  "esp-bootloader-esp-idf",
  "esp-hal",
  "esp-hal-wifimanager",
  "esp-println",
  "esp-rtos",
- "esp-storage",
  "i2c-character-display",
  "ili9341",
  "log",
  "num_enum",
  "pn532",
- "static_assertions",
 ]
 
 [[package]]
@@ -2829,12 +2796,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "recursive_array"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69bad83913c3b39011ad9d43b7ac0cae139cec5d7e7288fbea5bb4b4e3cc78f6"
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -3312,26 +3273,6 @@ dependencies = [
  "syn 3.0.3",
 ]
 
-[[package]]
-name = "thiserror-impl-no-std"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "thiserror-no-std"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea"
-dependencies = [
- "thiserror-impl-no-std",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.10"

Cargo.toml

@@ -50,10 +50,6 @@ embassy-sync = "0.8.0"
 embedded-hal-async = "1.0.0"
 i2c-character-display = "0.5.1"
 ch1115 = { version = "0.1.2", features = ["graphics"] }
-esp-storage = "0.9.0"
-embedded-storage = "0.3.1"
-binary_serde = "1.0.25"
-static_assertions = { version = "1.1.0", default-features = false }
 
 [build-dependencies]
 log = "0.4.27"

model/common.scad

@@ -1,45 +1,266 @@
+include <BOSL2/std.scad>
+
 BASE_MODEL_SCALE = [1.1, 1, 1.1];
 BASE_MODEL_TRANSLATE = [-0.4, 0, 16.978];
+EPS = 0.01;
+$fn = 50;
 
-module main_display(){
+module pin_header(cols = 4, rows = 1, anchor = BOTTOM, spin = 0, orient = UP) {
-    // Outer dimensions, height currently unknown
+  // Standard pin header dimensions (in mm)
-    cube([55.04, 89.3, 10]);
+  base_height = 2.54; // Height of the plastic base
+  pin_width = 0.64; // Width/thickness of the square pin
+  pin_length = 6.0; // Length of pin sticking up
+  pitch = 2.54;
+
+  // 1. The Plastic Base is the Parent
+  // It directly receives your anchor, spin, and orient arguments.
+  color("darkgrey")
+    cuboid([cols * pitch, rows * pitch, base_height], anchor=anchor, spin=spin, orient=orient) {
+
+      // 2. Metal Pins are the Children
+      // Placed relative to the center of the plastic base
+      color("silver")
+        xcopies(spacing=pitch, n=cols) {
+          ycopies(spacing=pitch, n=rows) {
+            up(base_height / 2)
+              cuboid([pin_width, pin_width, pin_length], anchor=BOTTOM);
+          }
+        }
+
+      // Allows attaching other objects to this header if needed
+      children();
+    }
 }
 
-module pad(){
+module main_display(pin_header = false) {
-    // A button has 4.2 x 6 mm -> At least ~20x20 are required for the PCB
+  // Outer dimensions
-    cube([20, 20, 10]);
+  width = 55.04;
+  length = 89.35;
+  height = 2.7;
+
+  display_height = 3;
+  display_length = 77.6;
+  display_inset = 5.7;
+
+  sd_width = 26.6;
+  sd_height = 3;
+  sd_length = 16.6;
+  sd_inset = 29.4;
+
+  hole_diameter = 3;
+  hole_inset = 1.5;
+
+  difference() {
+    cuboid([length, width, height]) {
+      position(TOP + RIGHT)
+        left(display_inset)
+          color("black")
+            cuboid([display_length, width, display_height], anchor=BOTTOM + RIGHT);
+
+      position(BOTTOM + RIGHT + FRONT)
+        left(sd_inset)
+          cuboid([sd_width, sd_length, sd_height], anchor=TOP + RIGHT + FRONT);
+
+      position(BOTTOM + LEFT)
+        xrot(180)
+          pin_header(14, spin=90, anchor=BOTTOM + BACK);
+    }
+
+    xcopies(length - (2 * hole_inset) - hole_diameter) {
+      ycopies(width - (2 * hole_inset) - hole_diameter) {
+        zcyl(d=hole_diameter, h=height + EPS);
+      }
+    }
+  }
 }
 
-module small_display_below_main()
+module pad() {
-{
+  // A button has 4.2 x 6 mm -> At least ~20x20 are required for the PCB
-    // https://de.aliexpress.com/item/1005003753680706.html
+  cube([20, 20, 10]);
-    cube([45.8, 20, 11.3]);
-    // old i2c variant:
-    //cube([43.5, 19.44, 4.5]);
-
-    // initial dimension ideas
-    // cube([38,16,4]);
-    // translate([150,0,0]) cube([22,5.5,4]);
 }
 
-module tertiary_display()
+module secondary_display(pin_header = false) {
-{
+  // https://de.aliexpress.com/item/1005003753680706.html
-    // https://de.aliexpress.com/item/1005006034531826.html
+  length = 45.8;
-    cube([80, 36, 10]);
+  width = 20;
+  height = 3.7;
+
+  hole_diameter = 2;
+  hole_inset = 1.5;
+
+  difference() {
+    cuboid([length, width, height]) {
+      if (pin_header)
+        position(LEFT + TOP)
+          pin_header(7, spin=90, anchor=BACK + BOTTOM);
+    }
+
+    right(length / 2 - hole_inset) {
+      ycopies(width - (2 * hole_inset) - hole_diameter) {
+        zcyl(d=hole_diameter, h=height + EPS, anchor=RIGHT);
+      }
+    }
+  }
 }
 
-module battery() {
+module battery(anchor = BOTTOM) {
-    // 18650
+  // 18650
-    rotate([0,90,0]) cylinder(d=18, h=65);
+  rotate([0, 90, 0]) cylinder(d=18, h=65, anchor=anchor);
 }
 
-module microcontroller() {
+/// USB-C port and switch not 100% dimensionally accurate, take care!
-    // width 32 including USB-C port
+module micro_controller(battery_holder = false, battery = false) {
-    length = 91.5;
+  pcb_length = 91.5;
-    height = 20;
+  pcb_height = 6.5; // including components, highest point: jst connector, followed by uC
-    battery_length = 65;
+  pcb_height_no_components = 1.1;
-    delta = length - battery_length;
+  pcb_width = 28.8;
-    cube([length, 32, height]);
+
-    translate([delta / 2,16, 15]) battery();
+  hole_diameter = 2.5;
+  hole_inset = 1;
+  usb_protrusion = 1.7;
+  usb_width = 9;
+  usb_inset_from_pcb_end = 5;
+  power_switch_protrusion = 2.1;
+  power_switch_inset_from_pcb_end = 8.1;
+  power_switch_width = 4;
+
+  battery_holder_height = 15;
+  battery_holder_width = 21;
+  battery_holder_length = 77.3;
+
+  battery_length = 65;
+  battery_protrusion = 4.5;
+
+  difference() {
+    cuboid([pcb_length, pcb_width, pcb_height], rounding=2, edges="Z") {
+      if (battery_holder)
+        position(TOP)
+          cube([battery_holder_length, battery_holder_width, battery_holder_height], anchor=BOTTOM + CENTER) {
+            if (battery)
+              position(TOP)
+                up(battery_protrusion)
+                  battery(anchor=CENTER + LEFT);
+          }
+      position(RIGHT + BOTTOM) {
+        position(FRONT)
+          left(usb_inset_from_pcb_end)
+            cube([usb_width, usb_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + BOTTOM + FRONT);
+        position(BACK)
+          left(power_switch_inset_from_pcb_end)
+            cube([power_switch_width, power_switch_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + TOP + FRONT);
+      }
+    }
+
+    xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
+      ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
+        cyl(d=hole_diameter, h=pcb_height + EPS, orient=UP);
+      }
+    }
+  }
+}
+
+module nfc(pin_header = true) {
+  length = 43;
+  width = 40.5;
+  height = 4;
+
+  pin_protrusion = 2.2;
+
+  hole_diameter = 3;
+  hole_inset = 6;
+
+  x_span = length - (2 * hole_inset) - hole_diameter;
+  y_span = width - (2 * hole_inset) - hole_diameter;
+
+  color("red")
+    difference() {
+      cuboid([length, width, height], rounding=2, edges="Z") {
+        // pin header is lower than highest other component -> in the cube.
+        if (pin_header)
+          right(6 - pin_protrusion) // ugly: 6mm is the pin height
+            position(LEFT + TOP)
+              yrot(-90)
+                pin_header(7, spin=90, anchor=FRONT + TOP);
+      }
+
+      move_copies(
+        [
+          [x_span / 2, -y_span / 2], // Bottom-Left corner
+          [-x_span / 2, y_span / 2], // Top-Right corner
+        ]
+      ) {
+        zcyl(d=hole_diameter, h=height + EPS);
+      }
+    }
+}
+
+module tertiary_display(pin_headers = true) {
+  // https://de.aliexpress.com/item/1005006034531826.html
+
+  pcb_length = 81;
+  pcb_width = 36.1;
+  pcb_height = 3.7;
+
+  hole_diameter = 2.8;
+  hole_inset = 1;
+
+  display_length = 71.2;
+  display_width = 24.4;
+  display_height = 7;
+
+  piggy_length = 41.8;
+  piggy_width = 19.1;
+  piggy_height = 8.5 - 2.6;
+  piggy_inset = 6.2;
+
+  jumper_protrusion = 6.6;
+  pin_protrusion = 6.2;
+
+  color("green")
+    difference() {
+      cuboid([pcb_length, pcb_width, pcb_height]) {
+        position(TOP)
+          cuboid([display_length, display_width, display_height], anchor=BOTTOM);
+      }
+
+      xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
+        ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
+          zcyl(d=hole_diameter, h=pcb_height + 1);
+        }
+      }
+    }
+
+  // Replaces position(BOTTOM + BACK + LEFT) so that difference cannot mess with color.
+  translate([-pcb_length / 2 + piggy_inset, pcb_width / 2, -pcb_height / 2]) {
+    color("black")
+      cuboid([piggy_length, piggy_width, piggy_height], anchor=TOP + BACK + LEFT);
+
+    if (pin_headers) {
+      // Replaces position(LEFT + BOTTOM) so that parent child cannot mess with color.
+      translate([0, -piggy_width / 2, -piggy_height])
+        right(6 - pin_protrusion)
+          yrot(-90)
+            pin_header(4, spin=90, anchor=BACK + TOP);
+
+      // Replaces position(RIGHT + BOTTOM) so that parent child cannot mess with color.
+      translate([piggy_length, -piggy_width / 2, -piggy_height])
+        left(6 - pin_protrusion)
+          yrot(90)
+            back(1.6)
+              pin_header(2, spin=-90, anchor=BACK + TOP);
+
+      // Replaces position(BACK + TOP) so that parent child cannot mess with color.
+      translate([piggy_length / 2, -EPS, 0])
+        pin_header(16, anchor=BACK + TOP);
+    }
+  }
+}
+
+// show different components as overview
+if (false) {
+  back(30) tertiary_display(true);
+  back(80) yrot(180) secondary_display(true);
+  right(100) zrot(90) main_display(true);
+  fwd(20) micro_controller(true, true);
+  fwd(60) nfc(true);
 }

src/background_tasks/nfc.rs

@@ -1,6 +1,4 @@
-use crate::storage::cardstore::CardStore;
 use embedded_hal_bus::i2c::AtomicDevice;
-use esp_hal::rtc_cntl::Rtc;
 use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
 
 use crate::{
@@ -16,8 +14,6 @@ use crate::{
 )]
 pub async fn nfc_scanner(
     mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>,
-    mut card_store: CardStore,
-    rtc: Rtc<'static>,
 ) {
     loop {
         while CARD_DATA.lock().await.is_none() {
@@ -28,22 +24,10 @@ pub async fn nfc_scanner(
                         log::error!("Failed to split NFC card data");
                         continue;
                     };
-                    let card = match Card::try_from(split_data) {
+                    CARD_DATA
-                        Ok(card) => card,
+                        .lock()
-                        Err(err) => {
+                        .await
-                            log::error!("Invalid card data: {err}");
+                        .replace(Card::try_from(split_data).unwrap());
-                            continue;
-                        }
-                    };
-                    CARD_DATA.lock().await.replace(card);
-
-                    match card_store.save_raw_card(split_data, rtc.current_time_us()) {
-                        Ok(()) => {}
-                        Err(error) => {
-                            log::error!("Error storing card in flash: {:?}", error)
-                        }
-                    }
-
                     let elapsed_ms = start.elapsed().as_millis();
                     log::info!(
                         "NFC read duration: {} ms, card data length: {}",
@@ -51,8 +35,8 @@ pub async fn nfc_scanner(
                         card_data.len()
                     );
                 }
-                Err(_) => {
+                Err(e) => {
-                    log::info!("No NFC card found");
+                    log::error!("NFC read failed: {e}");
                 }
             }
         }

src/bin/main.rs

@@ -18,8 +18,7 @@ use creaturedex::drivers::tertiary_lcd::{
 use creaturedex::navigation::inputs::Inputs;
 use creaturedex::navigation::navigation::{self};
 use creaturedex::navigation::outputs::Outputs;
-use creaturedex::storage::cardstore::CardStore;
+use creaturedex::network::wifi::setup_wifi;
-use creaturedex::storage::store::Store;
 use embassy_executor::Spawner;
 use embedded_graphics::pixelcolor::BinaryColor;
 use embedded_graphics::{
@@ -33,8 +32,6 @@ use esp_hal::gpio::{Input, InputConfig, Pull};
 use esp_hal::timer::timg::TimerGroup;
 use log::error;
 
-use esp_hal::rtc_cntl::Rtc;
-
 #[panic_handler]
 fn panic(panic_info: &core::panic::PanicInfo) -> ! {
     error!("{}", panic_info);
@@ -67,40 +64,32 @@ async fn main(spawner: Spawner) {
     let timg0 = TimerGroup::new(peripherals.TIMG0);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
 
-    let (primary, mut secondaries) = retry(
+    let (primary, mut secondaries) = spi_bus::DisplayPinConfiguration {
-        5,
+        spi_peripheral: peripherals.SPI2,
-        spi_bus::DisplayPinConfiguration {
+        sck: peripherals.GPIO36,
-            spi_peripheral: peripherals.SPI2,
+        mosi: peripherals.GPIO35,
-            sck: peripherals.GPIO36,
+        miso: peripherals.GPIO37,
-            mosi: peripherals.GPIO35,
+        cs_primary: peripherals.GPIO11,
-            miso: peripherals.GPIO37,
+        cs_secondary_1: peripherals.GPIO13,
-            cs_primary: peripherals.GPIO11,
+        cs_secondary_2: peripherals.GPIO14,
-            cs_secondary_1: peripherals.GPIO13,
+        cs_secondary_3: peripherals.GPIO21,
-            cs_secondary_2: peripherals.GPIO14,
+        reset_primary: peripherals.GPIO10,
-            cs_secondary_3: peripherals.GPIO21,
+        reset_secondary: peripherals.GPIO47,
-            reset_primary: peripherals.GPIO10,
+        dc_pin: peripherals.GPIO12,
-            reset_secondary: peripherals.GPIO47,
+    }
-            dc_pin: peripherals.GPIO12,
+    .build();
-        },
-        spi_bus::DisplayPinConfiguration::build,
-    );
 
     // Initialize the shared I2C bus using the refactored i2c_bus module.
     let shared_i2c = {
-        use alloc::boxed::Box;
+        let config = I2cBusPinConfiguration {
-        let bus = retry(5, I2cBusPinConfiguration {
             i2c_peripheral: peripherals.I2C0,
             scl: peripherals.GPIO18,
             sda: peripherals.GPIO17,
-        }, I2cBusPinConfiguration::build);
+        };
-        Box::leak(Box::new(bus))
+        config.build()
     };
 
-    let mut lcd: TertiaryDisplay = retry(
+    let mut lcd: TertiaryDisplay = TertiaryDisplayPinConfiguration { i2c: shared_i2c }.build();
-        5,
-        TertiaryDisplayPinConfiguration { i2c: shared_i2c },
-        TertiaryDisplayPinConfiguration::build,
-    );
     lcd.load_charset(EXAMPLE).unwrap();
     let h = EXAMPLE[HEART];
     let e = EXAMPLE[EMPTY];
@@ -113,11 +102,7 @@ async fn main(spawner: Spawner) {
         );
     }
 
-    let store = Store::new(peripherals.FLASH).expect("Could not initialize Flash Store");
+    setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
-    let cardstore = CardStore::new(store).expect("Could not initialize Card Store");
-
-    let rtc = Rtc::new(peripherals.LPWR);
-    //setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
 
     let mut nfc_driver = NfcPn532Driver::new(AtomicDevice::new(shared_i2c));
     if nfc_driver.configure_sam().await.is_ok() {
@@ -154,10 +139,7 @@ async fn main(spawner: Spawner) {
 
     log::info!("Setup complete, entering main loop");
     spawner.spawn(navigation::run(inputs, outputs).expect("run task failed"));
-    spawner.spawn(
+    spawner.spawn(background_tasks::nfc_scanner(nfc_driver).expect("nfc scanner task failed"));
-        background_tasks::nfc_scanner(nfc_driver, cardstore, rtc).expect("nfc scanner task failed"),
-    );
-    core::future::pending::<()>().await
 }
 
 fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
@@ -169,17 +151,3 @@ fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
         .unwrap();
     oled.flush().unwrap();
 }
-
-fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U {
-    let mut initial_state = input;
-    for iteration in 0..repetitions {
-        log::debug!("Trying to initialize. Retries: {iteration}");
-
-        match action(initial_state) {
-            Ok(success) => return success,
-            Err(recovered_input) => initial_state = recovered_input,
-        }
-    }
-
-    panic!("Init failed after {repetitions} retries.")
-}

src/card/decoder.rs

@@ -1,23 +1,22 @@
 use core::fmt::Display;
 
-use crate::card::model::RawCard;
+use crate::card::model::NfcPayload;
 use alloc::string::{String, ToString};
 
-pub fn split_nfc_hex(payload: &[u8]) -> Option<RawCard> {
+pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
     if payload.len() < 0x35A {
         return None;
     }
 
-    Some(RawCard {
+    Some(NfcPayload {
-        event_encoding: payload[0..2].try_into().ok()?,
+        event_encoding: &payload[0..2],
         card_type: payload[2],
-        card_uuid: payload[3..5].try_into().ok()?,
+        card_uuid: &payload[3..5],
-        _reserved: payload[5..9].try_into().ok()?,
+        _reserved: &payload[5..9],
-        sprite: payload[9..0x2DB].try_into().ok()?,
+        sprite: &payload[9..0x2DB],
-        packed_card_text: payload[0x2DB..0x311].try_into().ok()?,
+        packed_card_text: &payload[0x2DB..0x311],
-        secret: payload[0x311..0x329].try_into().ok()?,
+        secret: &payload[0x311..0x329],
-        _opaque_trailer: payload[0x329..0x35A].try_into().ok()?,
+        _opaque_trailer: &payload[0x329..0x35A],
-        _padding: Default::default(),
     })
 }
 

src/card/model.rs

@@ -6,24 +6,18 @@ use num_enum::FromPrimitive;
 use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
 use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
 
-use binary_serde::BinarySerde;
+#[derive(Debug, Clone, Copy)]
-
+pub struct NfcPayload<'a> {
-#[derive(Debug, BinarySerde, PartialEq, Eq, Clone, Copy)]
+    pub event_encoding: &'a [u8],
-#[repr(C)]
-pub struct RawCard {
-    pub event_encoding: [u8; 2],
     pub card_type: u8,
-    pub card_uuid: [u8; 2],
+    pub card_uuid: &'a [u8],
-    pub _reserved: [u8; 4],
+    pub _reserved: &'a [u8],
-    pub sprite: [u8; 722],
+    pub sprite: &'a [u8],
-    pub packed_card_text: [u8; 54],
+    pub packed_card_text: &'a [u8],
-    pub secret: [u8; 24],
+    pub secret: &'a [u8],
-    pub _opaque_trailer: [u8; 49],
+    pub _opaque_trailer: &'a [u8],
-    pub _padding: [u8; 2],
 }
 
-static_assertions::const_assert!(RawCard::SERIALIZED_SIZE.is_multiple_of(4));
-
 #[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
 #[repr(u8)]
 pub enum CardType {
@@ -228,7 +222,7 @@ pub struct Sprite {
 
 #[derive(Debug, Clone)]
 pub struct Card {
-    pub uuid: u32,
+    pub uuid: String,
     pub event: Events,
     pub cardtype: CardType,
     pub name: String,
@@ -241,19 +235,17 @@ pub struct Card {
     pub sprite: Sprite,
 }
 
-impl TryFrom<RawCard> for Card {
+impl<'a> TryFrom<NfcPayload<'a>> for Card {
     type Error = &'static str;
 
-    fn try_from(raw_card: RawCard) -> Result<Self, Self::Error> {
+    fn try_from(payload: NfcPayload<'a>) -> Result<Self, Self::Error> {
-        let uuid: u32 = (u16::from_ne_bytes(raw_card.event_encoding) as u32) << 16
+        let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
-            | (u16::from_ne_bytes(raw_card.card_uuid) as u32);
+        let event = decode_known_event(payload.event_encoding);
-
+        let cardtype = CardType::from(payload.card_type);
-        let event = decode_known_event(&raw_card.event_encoding);
+        let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
-        let cardtype = CardType::from(raw_card.card_type);
+        let secret = decode_secret(payload.secret);
-        let (name, trait1, trait2, trait3) = decode_packed_card_text(&raw_card.packed_card_text);
-        let secret = decode_secret(&raw_card.secret);
         let sprite = Sprite {
-            data: raw_card.sprite.to_vec(),
+            data: payload.sprite.to_vec(),
         };
         Ok(Self {
             uuid,

src/drivers/i2c_bus.rs

@@ -1,3 +1,4 @@
+use alloc::boxed::Box;
 use embedded_hal_bus::i2c::AtomicDevice;
 use embedded_hal_bus::util::AtomicCell;
 use esp_hal::gpio::interconnect::PeripheralInput;
@@ -20,19 +21,18 @@ where
     SCL: PeripheralOutput<'a> + PeripheralInput<'a>,
     SDA: PeripheralOutput<'a> + PeripheralInput<'a>,
 {
-    pub fn build(self) -> Result<AtomicCell<InnerI2cBus<'a>>, Self> {
+    pub fn build(self) -> I2cBus<'a> {
         let config = Config::default().with_frequency(esp_hal::time::Rate::from_khz(400));
-        match I2c::new(self.i2c_peripheral, config) {
+        let i2c = match I2c::new(self.i2c_peripheral, config) {
-            Ok(bus) => {
+            Ok(bus) => bus.with_sda(self.sda).with_scl(self.scl),
-                let i2c = bus.with_sda(self.sda).with_scl(self.scl);
-                log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
-                Ok(AtomicCell::new(i2c))
-            }
             Err(e) => {
                 log::error!("Shared I2C bus initialization failed for GPIO17/GPIO18: {e:?}");
-                unimplemented!("Partial move makes it impossible to retry.");
+                panic!("Shared I2C bus initialization failed");
-                // Err(self)
             }
-        }
+        };
+        let shared_i2c = Box::leak(Box::new(AtomicCell::new(i2c)));
+        log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
+
+        shared_i2c
     }
 }

src/drivers/spi_bus.rs

@@ -135,7 +135,7 @@ where
     RES2: OutputPin + 'static,
     DC: OutputPin + 'static,
 {
-    pub fn build(self) -> Result<(PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]), Self> {
+    pub fn build(self) -> (PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]) {
         let spi = Spi::new(
             self.spi_peripheral,
             SpiConfig::default()
@@ -178,7 +178,7 @@ where
         }
         .build();
 
-        Ok((primary, secondaries))
+        (primary, secondaries)
     }
 }
 

src/drivers/tertiary_lcd.rs

@@ -15,20 +15,19 @@ pub struct TertiaryDisplayPinConfiguration<'a> {
 }
 
 impl<'a> TertiaryDisplayPinConfiguration<'a> {
-    pub fn build(self) -> Result<TertiaryDisplay<'a>, Self> {
+    pub fn build(self) -> TertiaryDisplay<'a> {
         let device = AtomicDevice::new(self.i2c);
         let mut lcd = CharacterDisplayPCF8574T::new(device, LcdDisplayType::Lcd16x2, Delay::new());
         match lcd.init() {
             Ok(()) => {
                 log::info!("I2C tertiary LCD initialized on PCF8574T at address 0x27");
-                Ok(TertiaryDisplay {
+                TertiaryDisplay {
                     display: lcd,
                     charset: create_custom_char_set!(),
-                })
+                }
             }
             Err(e) => {
-                log::error!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
+                panic!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
-                Err(self)
             }
         }
     }
@@ -408,3 +407,4 @@ pub const BOX: CharMap = [
 ];
 
 pub const EXAMPLE: CustomCharset = create_custom_char_set!(HEART, BOX, EMPTY);
+

src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(vec_into_chunks)]
 
 extern crate alloc;
 

src/storage.rs

@@ -1,31 +1,2 @@
-pub struct MemoryRegion {
+pub mod dex_db;
-    offset: u32,
+pub mod nvs;
-    size: usize,
-}
-
-impl MemoryRegion {
-    pub const fn new(offset: u32, size: usize) -> Self {
-        assert!(offset.is_multiple_of(4), "Flash requires 4 bytes alignment");
-        assert!(size.is_multiple_of(4), "Flash requires 4 bytes alignment");
-        Self { offset, size }
-    }
-
-    pub const fn end(&self) -> usize {
-        self.offset as usize + self.size
-    }
-}
-
-const MAX_FLASH: usize = 16 * 1024 * 1024;
-
-const MAGIC_REGION: MemoryRegion = MemoryRegion::new(0, 4);
-
-const SETTINGS_REGION: MemoryRegion = MemoryRegion::new(MAGIC_REGION.end() as u32, 1024);
-
-const CARDSTORE_REGION: MemoryRegion = MemoryRegion::new(
-    SETTINGS_REGION.end() as u32,
-    MAX_FLASH - SETTINGS_REGION.end(),
-);
-
-pub mod cardstore;
-pub mod settings;
-pub mod store;

src/storage/cardstore.rs

@@ -1,214 +0,0 @@
-use alloc::collections::BTreeMap;
-use alloc::vec::Vec;
-
-use binary_serde::{BinarySerde, DeserializeError, Endianness};
-
-//use crate::card::model::Nfcraw_card;
-
-use crate::card::model::RawCard;
-use crate::storage::store::{Store, StoreError};
-
-use crate::storage::{CARDSTORE_REGION, MemoryRegion};
-
-const MAX_CARDS: usize = 20000;
-
-pub const COUNT_REGION: MemoryRegion = MemoryRegion::new(CARDSTORE_REGION.offset, size_of::<u32>());
-
-const ALLOCATION_TABLE_REGION: MemoryRegion = MemoryRegion::new(
-    COUNT_REGION.end() as u32,
-    MAX_CARDS * AllocationTableEntry::SERIALIZED_SIZE,
-);
-
-const CARDS_REGION: MemoryRegion = MemoryRegion::new(
-    ALLOCATION_TABLE_REGION.end() as u32,
-    CARDSTORE_REGION.size - ALLOCATION_TABLE_REGION.end(),
-);
-
-#[derive(Debug, BinarySerde, PartialEq, Eq, Clone)]
-#[repr(C)]
-pub struct AllocationTableEntry {
-    uuid: u32,
-    // this is the numeric offset of the AllocationTableEntry
-    // as well as the card entry in flash memory
-    // size_of::<AllocationTableEntry>() * offset
-    // size_of::<RawCard>() * offset
-    offset: u32,
-
-    creation_date: u64,
-    last_read_date: u64,
-
-    // how often a card has been read by nfc
-    read_count: u32,
-
-    deleted: bool,
-
-    reserved: [u64; 4],
-    _padding: [u8; 3],
-}
-
-static_assertions::const_assert!(AllocationTableEntry::SERIALIZED_SIZE.is_multiple_of(4));
-
-impl AllocationTableEntry {
-    fn new(uuid: u32, offset: u32, timestamp: u64) -> Self {
-        Self {
-            uuid,
-            offset,
-            creation_date: timestamp,
-            last_read_date: timestamp,
-            read_count: 0,
-            deleted: true,
-            reserved: Default::default(),
-            _padding: Default::default(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum CardStoreError {
-    Store(StoreError),
-    CorruptedEntry(DeserializeError),
-    NoEntry,
-}
-
-impl From<StoreError> for CardStoreError {
-    fn from(error: StoreError) -> CardStoreError {
-        CardStoreError::Store(error)
-    }
-}
-
-impl From<DeserializeError> for CardStoreError {
-    fn from(error: DeserializeError) -> CardStoreError {
-        CardStoreError::CorruptedEntry(error)
-    }
-}
-
-pub struct CardStore {
-    store: Store,
-    count: u32,
-    pub allocation_table: BTreeMap<u32, AllocationTableEntry>,
-}
-
-impl CardStore {
-    pub fn new(mut store: Store) -> Result<Self, CardStoreError> {
-        let mut count_bytes: [u8; COUNT_REGION.size] = [0; COUNT_REGION.size];
-
-        store.read(COUNT_REGION.offset, &mut count_bytes)?;
-
-        let count: u32 = u32::from_ne_bytes(count_bytes);
-
-        log::info!("Found {count} cards in flash.");
-
-        let mut allocation_table_entries: Vec<u8> =
-            Vec::with_capacity(AllocationTableEntry::SERIALIZED_SIZE * count as usize);
-
-        store.read(
-            ALLOCATION_TABLE_REGION.offset,
-            &mut allocation_table_entries,
-        )?;
-
-        let chunks =
-            allocation_table_entries.into_chunks::<{ AllocationTableEntry::SERIALIZED_SIZE }>();
-
-        let mut allocation_table = BTreeMap::<u32, AllocationTableEntry>::new();
-        for chunk in chunks {
-            let allocation_table_entry =
-                AllocationTableEntry::binary_deserialize(chunk.as_ref(), Endianness::Little)?;
-            allocation_table.insert(allocation_table_entry.uuid, allocation_table_entry);
-        }
-
-        Ok(Self {
-            store,
-            count,
-            allocation_table,
-        })
-    }
-
-    pub fn get_card_by_uuid(&mut self, uuid: u32) -> Result<RawCard, CardStoreError> {
-        let entry = self
-            .allocation_table
-            .get(&uuid)
-            .ok_or(CardStoreError::NoEntry)?;
-
-        let mut raw_card: [u8; size_of::<RawCard>()] = [0; size_of::<RawCard>()];
-        self.store.read(entry.offset, &mut raw_card)?;
-
-        Ok(RawCard::binary_deserialize(
-            raw_card.as_ref(),
-            Endianness::Little,
-        )?)
-    }
-
-    pub fn save_raw_card(
-        &mut self,
-        raw_card: RawCard,
-        timestamp: u64,
-    ) -> Result<(), CardStoreError> {
-        let uuid: u32 = (u16::from_ne_bytes(raw_card.event_encoding) as u32) << 16
-            | (u16::from_ne_bytes(raw_card.card_uuid) as u32);
-        log::info!("Saving card with uuid {:x}", uuid);
-
-        // check if we already got the card
-        // if not find the next deleted entry,
-        // if none create a new one at the end
-        let (entry, is_new) = match self.allocation_table.get_mut(&uuid) {
-            Some(entry) => {
-                log::debug!("old entry");
-                (entry, false)
-            }
-            None => match self
-                .allocation_table
-                .values_mut()
-                .find(|entry| entry.deleted)
-            {
-                Some(entry) => {
-                    log::debug!("deleted entry");
-                    (entry, true)
-                }
-                None => {
-                    log::debug!("new entry");
-                    let entry = AllocationTableEntry::new(uuid, self.count + 1, timestamp);
-                    self.allocation_table.insert(uuid, entry);
-                    (
-                        self.allocation_table
-                            .get_mut(&uuid)
-                            .expect("entry was just inserted"),
-                        true,
-                    )
-                }
-            },
-        };
-
-        // only write card data if it is new. else it is already written in flash
-        if is_new {
-            log::debug!("writing RawCard to flash");
-            let mut serialized_card: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE];
-            raw_card.binary_serialize(&mut serialized_card, Endianness::Little);
-            self.store.write_erase(
-                CARDS_REGION.offset + entry.offset * RawCard::SERIALIZED_SIZE as u32,
-                &mut serialized_card,
-            )?;
-        } else {
-            entry.last_read_date = timestamp;
-            entry.read_count += 1;
-        }
-
-        entry.deleted = false;
-
-        log::debug!("writing AllocationTableEntry to flash");
-        let mut serialized_entry: [u8; AllocationTableEntry::SERIALIZED_SIZE] =
-            [0; AllocationTableEntry::SERIALIZED_SIZE];
-        entry.binary_serialize(&mut serialized_entry, Endianness::Little);
-        self.store.write_erase(
-            ALLOCATION_TABLE_REGION.offset
-                + entry.offset * AllocationTableEntry::SERIALIZED_SIZE as u32,
-            &mut serialized_entry,
-        )?;
-
-        self.count += 1;
-        log::debug!("writing card count to flash");
-        let mut serialized_count: [u8; 4] = self.count.to_le_bytes();
-        self.store
-            .write(COUNT_REGION.offset, serialized_count.as_mut_slice())?;
-        Ok(())
-    }
-}

src/storage/dex_db.rs

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

src/storage/nvs.rs

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

src/storage/store.rs

@@ -1,78 +0,0 @@
-use embedded_storage::nor_flash::NorFlash;
-use embedded_storage::nor_flash::ReadNorFlash;
-use esp_storage::{FlashStorage, FlashStorageError};
-
-use crate::storage::MAGIC_REGION;
-
-pub type StoreError = FlashStorageError;
-
-const FLASH_ADDR: u32 = 0x9000;
-
-const INITIALIZATION_SIZE: usize = 0x1000;
-const FLASH_INITIALIZE_MAGIC: u32 = 0xde6de6de;
-
-pub struct Store {
-    pub storage: FlashStorage<'static>,
-}
-
-impl Store {
-    pub fn new(flash: esp_hal::peripherals::FLASH<'static>) -> Result<Self, StoreError> {
-        let mut storage = FlashStorage::new(flash);
-
-        let mut magic: [u8; 4] = [0, 0, 0, 0];
-        storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?;
-        log::debug!("Magic bytes are {magic:?}");
-
-        if Self::has_magic_bytes(&mut storage)? {
-            log::info!("Skipped flash initialization, magic bytes already present.");
-        } else {
-            log::info!("Initializing flash because no magic bytes found.");
-            Self::initialize_flash(&mut storage)?;
-        }
-
-        Ok(Self { storage })
-    }
-
-    pub fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> {
-        self.storage.read(FLASH_ADDR + offset, bytes)
-    }
-
-    pub fn write(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> {
-        log::debug!("Writing {} bytes at offset 0x{offset:08x}", bytes.len());
-        self.storage.write(FLASH_ADDR + offset, bytes)
-    }
-
-    pub fn write_erase(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> {
-        log::debug!(
-            "Erasing and Writing {} bytes at offset 0x{offset:08x}",
-            bytes.len()
-        );
-        self.storage
-            .erase(FLASH_ADDR + offset, FLASH_ADDR + bytes.len() as u32)?;
-        self.storage.write(FLASH_ADDR + offset, bytes)
-    }
-
-    pub fn has_magic_bytes(storage: &mut FlashStorage) -> Result<bool, StoreError> {
-        let mut magic: [u8; 4] = [0, 0, 0, 0];
-        storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?;
-        log::debug!("Magic bytes are {magic:?}");
-
-        Ok(u32::from_ne_bytes(magic) == FLASH_INITIALIZE_MAGIC)
-    }
-
-    pub fn initialize_flash(storage: &mut FlashStorage) -> Result<(), StoreError> {
-        storage.erase(FLASH_ADDR, FLASH_ADDR + INITIALIZATION_SIZE as u32)?;
-        let zeros: [u8; INITIALIZATION_SIZE] = [0; INITIALIZATION_SIZE];
-        storage.write(FLASH_ADDR + MAGIC_REGION.end() as u32, &zeros)?;
-        storage.write(
-            FLASH_ADDR + MAGIC_REGION.offset,
-            &FLASH_INITIALIZE_MAGIC.to_ne_bytes(),
-        )?;
-
-        if Self::has_magic_bytes(storage)? {
-            Ok(())
-        } else {
-            Err(StoreError::Other(FLASH_INITIALIZE_MAGIC as i32))
-        }
-    }
-}

src/views.rs

@@ -1,5 +1,4 @@
 pub mod card_view;
-pub mod flash_info_view;
 pub mod journal_view;
 pub mod main_menu;
 pub mod menu_item;

src/views/flash_info_view.rs

@@ -1,49 +0,0 @@
-use crate::navigation::inputs::ButtonAction;
-use crate::navigation::navigation::Action;
-use crate::navigation::navigation::Navigable;
-use crate::navigation::navigation::NewState;
-use crate::navigation::outputs::Outputs;
-use crate::views::view::View;
-use embedded_graphics::mono_font::MonoTextStyle;
-use embedded_graphics::mono_font::ascii::FONT_10X20;
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::DrawTarget;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics::text::Text;
-
-use embedded_graphics::prelude::Point;
-
-#[derive(Debug, Clone)]
-pub struct FlashInfoView {}
-
-impl Navigable for FlashInfoView {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
-        Text::new("Flash Initialized: {:?}", Point::new(40, 40), style);
-
-        core::future::ready(())
-    }
-
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
-        async move {
-            let Action::Button(input) = input else {
-                // Skip timer inputs
-                return NewState {
-                    view: View::FlashInfo(self.clone()),
-                    replace_view: true,
-                    redraw: false,
-                };
-            };
-
-            let new_menu = match input {
-                _ => View::FlashInfo(self.clone()),
-            };
-
-            NewState {
-                replace_view: matches!(new_menu, View::FlashInfo(_)),
-                view: new_menu,
-                redraw: true,
-            }
-        }
-    }
-}

src/views/settings_menu.rs

@@ -1,14 +1,11 @@
 use crate::navigation::navigation::{Action, Navigable, NewState};
 use crate::navigation::outputs::Outputs;
-use crate::views::{flash_info_view::FlashInfoView, menu_item, view::View};
+use crate::views::{menu_item, view::View};
-
-use crate::navigation::inputs::ButtonAction;
 
 use embedded_graphics::pixelcolor::Rgb565;
 use embedded_graphics::prelude::RgbColor;
 use embedded_graphics_core::draw_target::DrawTarget;
-
+pub const MAX_SELECTED: i8 = 2;
-pub const MAX_SELECTED: i32 = 2;
 
 #[derive(Debug, Clone)]
 pub struct SettingsMenu {
@@ -21,50 +18,16 @@ impl Navigable for SettingsMenu {
         display.clear(Rgb565::BLACK).unwrap();
         menu_item::show(display, "System Inforation", 0, self.selected);
         menu_item::show(display, "Wifi Information", 1, self.selected);
-        menu_item::show(display, "Flash Information", 2, self.selected);
 
         core::future::ready(())
     }
 
     fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
         async move {
-            let Action::Button(input) = input else {
-                // Skip timer inputs
-                return NewState {
-                    view: View::Settings(self.clone()),
-                    replace_view: true,
-                    redraw: false,
-                };
-            };
-
-            let new_menu = match input {
-                ButtonAction::Up => {
-                    let new_selected = if (self.selected - 1) < 0 {
-                        MAX_SELECTED - 1
-                    } else {
-                        self.selected - 1
-                    };
-                    View::Settings(SettingsMenu {
-                        selected: new_selected,
-                    })
-                }
-                ButtonAction::Down => {
-                    let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
-                    View::Settings(SettingsMenu {
-                        selected: new_selected,
-                    })
-                }
-                ButtonAction::Ok => match self.selected {
-                    2 => View::FlashInfo(FlashInfoView {}),
-                    _ => View::Settings(self.clone()),
-                },
-                _ => View::Settings(self.clone()),
-            };
-
             NewState {
-                replace_view: matches!(new_menu, View::Settings(_)),
+                view: View::Settings(SettingsMenu { selected: 0 }),
-                view: new_menu,
+                replace_view: true,
-                redraw: true,
+                redraw: !matches!(input, Action::Timer),
             }
         }
     }

src/views/view.rs

@@ -1,8 +1,8 @@
 use crate::navigation::outputs::Outputs;
 use crate::views::card_view::CardView;
 use crate::views::{
-    flash_info_view::FlashInfoView, journal_view::JournalView, main_menu::MainMenu,
+    journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
-    scan_menu::ScanMenu, settings_menu::SettingsMenu,
+    settings_menu::SettingsMenu,
 };
 
 use crate::navigation::navigation::{Navigable, NewState};
@@ -14,7 +14,6 @@ pub enum View {
     Settings(SettingsMenu),
     Journal(JournalView),
     Card(CardView),
-    FlashInfo(FlashInfoView),
 }
 
 impl Navigable for View {
@@ -26,7 +25,6 @@ impl Navigable for View {
                 View::Settings(settings_menu) => settings_menu.display(outputs).await,
                 View::Journal(journal_view) => journal_view.display(outputs).await,
                 View::Card(card_view) => card_view.display(outputs).await,
-                View::FlashInfo(flash_info_view) => flash_info_view.display(outputs).await,
             }
         }
     }
@@ -42,7 +40,6 @@ impl Navigable for View {
                 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,
-                View::FlashInfo(flash_info_view) => flash_info_view.handle_input(input).await,
             }
         }
     }