Full working creature card scan

.cargo/config.toml

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

.envrc

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

.gitignore

@@ -24,11 +24,3 @@ target/
 
 # Ignore .DS_Store file in mac
 **/.DS_Store
-
-# Ignore checked out wiki
-creaturedex.wiki/
-
-# KiCad
-*.zip
-*.lck
-schematics/.history/

Cargo.toml

@@ -9,68 +9,60 @@ name = "creaturedex"
 path = "./src/bin/main.rs"
 
 [dependencies]
-esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] }
+esp-hal = { version = "~1.1.0", features = ["esp32", "log-04", "unstable"] }
 
 esp-rtos = { version = "0.3.0", features = [
-  "embassy",
   "esp-alloc",
   "esp-radio",
-  "esp32s3",
+  "esp32",
   "log-04",
 ] }
 
-esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32s3", "log-04"] }
+esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32", "log-04"] }
 log                    = "0.4.27"
 
 critical-section = "1.2.0"
 embedded-io = "0.7.1"
-embassy-executor = { version = "0.10.0", features = [
-] }
-embassy-time = { version = "0.5.1", default-features = false }
-embassy-futures = "0.1.2"
 esp-alloc = "0.10.0"
-esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [
+esp-println = { version = "0.17.0", features = ["esp32", "log-04"] }
-  "ap",
+esp-radio = { version = "0.18.0", features = [
-  "esp32s3",
+  "esp-alloc",
+  "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"
-display-interface = "*"
 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.23.1", default-features = false, features = ["alloc"] }
 pn532 = "0.5.0"
-num_enum = { version = "0.7.6", default-features = false }
+ndef = { version = "0.5.0", path = "./ndef-rs" }
-embassy-sync = "0.8.0"
-embedded-hal-async = "1.0.0"
-i2c-character-display = "0.5.1"
-ch1115 = { version = "0.1.2", features = ["graphics"] }
-ssd1306 = { version = "0.10.0", features = [] }
 
 
-[patch.crates-io]
-ch1115 = { git = "https://github.com/ede1998/ch1115.git", rev = "2d3a3ba38050efe012e6a210afe3e125ec280c37" }
-
 # For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html
 [profile.dev]
 # The default debug profile is too slow and too big for resource-constrained devices.
 # Always build with some optimizations enabled.
-opt-level = 0
+opt-level = "s"
-debug = 2
-
-[profile.dev.package."*"]
-opt-level = 3
-debug = 0
 
 [profile.release]
 codegen-units = 1     # LLVM can perform better optimizations using a single thread
 debug         = 2     # prefer slower builds but better debugging experience
 lto           = 'fat'
 opt-level     = 's'
-
-[features]
-default = []
-wokwi = []

diagram.json

@@ -1,69 +1,31 @@
 {
   "version": 1,
-  "author": "CreatureDex",
   "editor": "wokwi",
   "parts": [
+    { "type": "board-esp32-s3-devkitc-1", "id": "esp1", "top": 67.2, "left": -263.96, "attrs": {} },
     {
-      "type": "board-esp32-s3-devkitc-1",
+      "type": "board-ili9341-cap-touch",
-      "id": "esp1",
+      "id": "lcd1",
-      "top": 67.2,
+      "top": -191.24,
-      "left": -263.96,
+      "left": -0.38,
       "attrs": {}
     },
-    { "type": "wokwi-ili9341", "id": "lcd1", "top": -200.8, "left": 354.9, "attrs": {} },
     {
-      "type": "wokwi-pushbutton",
+      "type": "wokwi-led",
-      "id": "btn-up",
+      "id": "led1",
-      "top": -99.4,
+      "top": -82.89,
-      "left": -76.8,
+      "left": 196.26,
-      "attrs": { "color": "RebeccaPurple", "xray": "1", "key": "1", "label": "Up" }
+      "attrs": { "color": "red" }
     },
     {
-      "type": "wokwi-pushbutton",
+      "type": "wokwi-resistor",
-      "id": "btn-down",
+      "id": "r1",
-      "top": 25.4,
+      "top": 183.86,
-      "left": -76.8,
+      "left": 154.06,
-      "attrs": { "color": "green", "xray": "1", "key": "1", "label": "Down" }
+      "attrs": { "value": "220" }
-    },
-    {
-      "type": "wokwi-pushbutton",
-      "id": "btn-left",
-      "top": -32.2,
-      "left": -163.2,
-      "attrs": { "color": "yellow", "xray": "1", "key": "1", "label": "Left" }
-    },
-    {
-      "type": "wokwi-pushbutton",
-      "id": "btn-right",
-      "top": -32.2,
-      "left": 19.2,
-      "attrs": { "color": "red", "xray": "1", "key": "1", "label": "Right" }
-    },
-    {
-      "type": "wokwi-pushbutton",
-      "id": "btn-back",
-      "top": -99.4,
-      "left": 115.2,
-      "attrs": { "color": "Magenta", "xray": "1", "key": "1", "label": "Back" }
-    },
-    {
-      "type": "wokwi-pushbutton",
-      "id": "btn-ok",
-      "top": 25.4,
-      "left": 115.2,
-      "attrs": { "color": "Lime", "xray": "1", "key": "1", "label": "Ok" }
-    },
-    {
-      "type": "wokwi-lcd1602",
-      "id": "lcd2",
-      "top": -291.2,
-      "left": -167.2,
-      "attrs": { "pins": "i2c" }
     }
   ],
     "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" ] ],
@@ -72,22 +34,11 @@
     [ "lcd1:MOSI", "esp1:35", "violet", [ "v105.6", "h-124.8", "v-144" ] ],
     [ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ],
     [ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v105.6", "h172.8" ] ],
-    [ "btn-up:2.l", "esp1:38", "purple", [ "h-9.6", "v19.4" ] ],
+    [ "esp1:22", "lcd1:SCL", "yellow", [ "h48", "v163.2", "h192" ] ],
-    [ "btn-up:1.l", "esp1:GND.2", "black", [ "h0" ] ],
+    [ "esp1:21", "lcd1:SDA", "cyan", [ "h38.4", "v144", "h211.2" ] ],
-    [ "btn-down:1.l", "esp1:GND.2", "black", [ "h0" ] ],
+    [ "r1:2", "led1:A", "green", [ "h8.4", "v-230.4" ] ],
-    [ "btn-down:2.l", "esp1:39", "green", [ "h-19.2", "v115.4" ] ],
+    [ "esp1:GND.2", "led1:C", "black", [ "v0", "h86.4", "v76.8", "h278.4" ] ],
-    [ "btn-left:2.l", "esp1:40", "yellow", [ "h0", "v173" ] ],
+    [ "esp1:17", "r1:1", "green", [ "h0" ] ]
-    [ "btn-left:1.l", "esp1:GND.2", "black", [ "h0" ] ],
-    [ "btn-right:2.l", "esp1:41", "red", [ "h-19.2", "v153.8" ] ],
-    [ "btn-right:1.l", "btn-left:1.r", "black", [ "h-96", "v28.8" ] ],
-    [ "btn-back:2.l", "esp1:42", "Magenta", [ "h-19.2", "v211.58" ] ],
-    [ "btn-back:1.l", "btn-up:1.r", "black", [ "h0" ] ],
-    [ "btn-ok:1.l", "btn-down:1.r", "black", [ "h0" ] ],
-    [ "btn-ok:2.l", "esp1:45", "Lime", [ "h-9.6", "v173" ] ],
-    [ "lcd2:GND", "esp1:GND.2", "black", [ "h0" ] ],
-    [ "lcd2:VCC", "esp1:3V3.1", "red", [ "h0" ] ],
-    [ "lcd2:SDA", "esp1:17", "green", [ "h-134.4", "v413" ] ],
-    [ "lcd2:SCL", "esp1:18", "green", [ "h-124.8", "v38.7" ] ]
 ],
   "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, cable_cube = 8.25) {
+module battery_spacer(cable_cube_additional_length=0) {
     length = 106;
-    battery_d = 18;
+    rotate([0, 90, 90]) cylinder(d=18.5, h=length);
-    rotate([0, 90, 90]) cylinder(d=battery_d+1.9, h=length);
+    cable_cube = 8.25;
     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, cable_cube = 8.25) {
 module battery_contact()
 {
     base_height = 4;
-    silver_wire_d = 1.7;
+    silver_wire_d = 1.15;
 
     module base_body() {
         rotate([90, 0, 0])
             resize([0, base_height, 0], auto=[false, true, false])
-                scale(0.92)
+                scale(0.99)
-                    battery_spacer(cable_cube=0);
+                    battery_spacer();
     }
 
     module contact_spring()
@@ -42,24 +42,24 @@ module battery_contact()
         spring_width = 11;
         translate([-2, -spring_width/2, 0])
             difference() {
-                scale([1.5, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width);
+                scale([1.75, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width);
-                scale([0.95, 1, 0.87]) 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);
-                translate([-101, 0, -50]) cube(100);
+                translate([-100, 0, -50]) cube(100);
                 translate([-50, 0, -100]) cube(100);
-                translate([-1, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]);
+                translate([0, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]);
-                translate([-1, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]);
+                translate([0, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]);
             }
     }
-
     module silver_wire_channels()
     {
-        translate([6.5, -2.5, -7])
+        translate([7.3, 0, -6])
-                #cylinder(d=silver_wire_d, h=15);
+            rotate([-15, 0, 0])
+                cylinder(d=silver_wire_d, h=15);
 
-        translate([6.5, 2.5, -7])
+        translate([7.3, 0, -6])
-                #cylinder(d=silver_wire_d, h=15);
+            rotate([15, 0, 0])
+                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();

schematics/creaturedex.kicad_pcb

@@ -1,2 +0,0 @@
-(kicad_pcb (version 20241229) (generator "pcbnew") (generator_version "9.0")
-)

schematics/creaturedex.kicad_prl

@@ -1,103 +0,0 @@
-{
-  "board": {
-    "active_layer": 0,
-    "active_layer_preset": "",
-    "auto_track_width": true,
-    "hidden_netclasses": [],
-    "hidden_nets": [],
-    "high_contrast_mode": 0,
-    "net_color_mode": 1,
-    "opacity": {
-      "images": 0.6,
-      "pads": 1.0,
-      "shapes": 1.0,
-      "tracks": 1.0,
-      "vias": 1.0,
-      "zones": 0.6
-    },
-    "prototype_zone_fills": false,
-    "selection_filter": {
-      "dimensions": true,
-      "footprints": true,
-      "graphics": true,
-      "keepouts": true,
-      "lockedItems": false,
-      "otherItems": true,
-      "pads": true,
-      "text": true,
-      "tracks": true,
-      "vias": true,
-      "zones": true
-    },
-    "visible_items": [
-      "vias",
-      "footprint_text",
-      "footprint_anchors",
-      "ratsnest",
-      "grid",
-      "footprints_front",
-      "footprints_back",
-      "footprint_values",
-      "footprint_references",
-      "tracks",
-      "drc_errors",
-      "drawing_sheet",
-      "bitmaps",
-      "pads",
-      "zones",
-      "drc_warnings",
-      "drc_exclusions",
-      "locked_item_shadows",
-      "conflict_shadows",
-      "shapes"
-    ],
-    "visible_layers": "ffffffff_ffffffff_ffffffff_ffffffff",
-    "zone_display_mode": 0
-  },
-  "git": {
-    "integration_disabled": false,
-    "repo_type": "",
-    "repo_username": "",
-    "ssh_key": ""
-  },
-  "meta": {
-    "filename": "creaturedex.kicad_prl",
-    "version": 5
-  },
-  "net_inspector_panel": {
-    "col_hidden": [],
-    "col_order": [],
-    "col_widths": [],
-    "custom_group_rules": [],
-    "expanded_rows": [],
-    "filter_by_net_name": true,
-    "filter_by_netclass": true,
-    "filter_text": "",
-    "group_by_constraint": false,
-    "group_by_netclass": false,
-    "show_time_domain_details": false,
-    "show_unconnected_nets": false,
-    "show_zero_pad_nets": false,
-    "sort_ascending": true,
-    "sorting_column": -1
-  },
-  "open_jobsets": [],
-  "project": {
-    "files": []
-  },
-  "schematic": {
-    "hierarchy_collapsed": [],
-    "selection_filter": {
-      "graphics": true,
-      "images": true,
-      "labels": true,
-      "lockedItems": false,
-      "otherItems": true,
-      "pins": true,
-      "ruleAreas": true,
-      "symbols": true,
-      "text": true,
-      "wires": true
-    }
-  }
-}

schematics/creaturedex.kicad_pro

@@ -1,456 +0,0 @@
-{
-  "board": {
-    "3dviewports": [],
-    "design_settings": {
-      "defaults": {},
-      "diff_pair_dimensions": [],
-      "drc_exclusions": [],
-      "rules": {},
-      "track_widths": [],
-      "via_dimensions": []
-    },
-    "ipc2581": {
-      "bom_rev": "",
-      "dist": "",
-      "distpn": "",
-      "internal_id": "",
-      "mfg": "",
-      "mpn": "",
-      "sch_revision": ""
-    },
-    "layer_pairs": [],
-    "layer_presets": [],
-    "viewports": []
-  },
-  "boards": [],
-  "component_class_settings": {
-    "assignments": [],
-    "meta": {
-      "version": 0
-    },
-    "sheet_component_classes": {
-      "enabled": false
-    }
-  },
-  "cvpcb": {
-    "equivalence_files": []
-  },
-  "erc": {
-    "erc_exclusions": [],
-    "meta": {
-      "version": 0
-    },
-    "pin_map": [
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        1,
-        0,
-        1,
-        2
-      ],
-      [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        2,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        1,
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        2,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2
-      ]
-    ],
-    "rule_severities": {
-      "bus_definition_conflict": "error",
-      "bus_entry_needed": "error",
-      "bus_to_bus_conflict": "error",
-      "bus_to_net_conflict": "error",
-      "different_unit_footprint": "error",
-      "different_unit_net": "error",
-      "duplicate_reference": "error",
-      "duplicate_sheet_names": "error",
-      "endpoint_off_grid": "warning",
-      "extra_units": "error",
-      "field_name_whitespace": "warning",
-      "footprint_filter": "ignore",
-      "footprint_link_issues": "warning",
-      "four_way_junction": "ignore",
-      "global_label_dangling": "warning",
-      "ground_pin_not_ground": "warning",
-      "hier_label_mismatch": "error",
-      "isolated_pin_label": "warning",
-      "label_dangling": "error",
-      "label_multiple_wires": "warning",
-      "lib_symbol_issues": "warning",
-      "lib_symbol_mismatch": "warning",
-      "missing_bidi_pin": "warning",
-      "missing_input_pin": "warning",
-      "missing_power_pin": "error",
-      "missing_unit": "warning",
-      "multiple_net_names": "warning",
-      "net_not_bus_member": "warning",
-      "no_connect_connected": "warning",
-      "no_connect_dangling": "warning",
-      "pin_not_connected": "error",
-      "pin_not_driven": "error",
-      "pin_to_pin": "warning",
-      "power_pin_not_driven": "error",
-      "same_local_global_label": "warning",
-      "similar_label_and_power": "warning",
-      "similar_labels": "warning",
-      "similar_power": "warning",
-      "simulation_model_issue": "ignore",
-      "single_global_label": "ignore",
-      "stacked_pin_name": "warning",
-      "unannotated": "error",
-      "unconnected_wire_endpoint": "warning",
-      "undefined_netclass": "error",
-      "unit_value_mismatch": "error",
-      "unresolved_variable": "error",
-      "wire_dangling": "error"
-    }
-  },
-  "libraries": {
-    "pinned_footprint_libs": [],
-    "pinned_symbol_libs": []
-  },
-  "meta": {
-    "filename": "creaturedex.kicad_pro",
-    "version": 3
-  },
-  "net_settings": {
-    "classes": [
-      {
-        "bus_width": 12,
-        "clearance": 0.2,
-        "diff_pair_gap": 0.25,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.2,
-        "line_style": 0,
-        "microvia_diameter": 0.3,
-        "microvia_drill": 0.1,
-        "name": "Default",
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "priority": 2147483647,
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.2,
-        "tuning_profile": "",
-        "via_diameter": 0.6,
-        "via_drill": 0.3,
-        "wire_width": 6
-      }
-    ],
-    "meta": {
-      "version": 5
-    },
-    "net_colors": null,
-    "netclass_assignments": null,
-    "netclass_patterns": []
-  },
-  "pcbnew": {
-    "last_paths": {
-      "gencad": "",
-      "idf": "",
-      "netlist": "",
-      "plot": "",
-      "pos_files": "",
-      "specctra_dsn": "",
-      "step": "",
-      "svg": "",
-      "vrml": ""
-    },
-    "page_layout_descr_file": ""
-  },
-  "schematic": {
-    "annotate_start_num": 0,
-    "annotation": {
-      "method": 0,
-      "sort_order": 0
-    },
-    "bom_export_filename": "${PROJECTNAME}.csv",
-    "bom_fmt_presets": [],
-    "bom_fmt_settings": {
-      "field_delimiter": ",",
-      "keep_line_breaks": false,
-      "keep_tabs": false,
-      "name": "CSV",
-      "ref_delimiter": ",",
-      "ref_range_delimiter": "",
-      "string_delimiter": "\""
-    },
-    "bom_presets": [],
-    "bom_settings": {
-      "exclude_dnp": false,
-      "fields_ordered": [
-        {
-          "group_by": false,
-          "label": "Reference",
-          "name": "Reference",
-          "show": true
-        },
-        {
-          "group_by": false,
-          "label": "Qty",
-          "name": "${QUANTITY}",
-          "show": true
-        },
-        {
-          "group_by": true,
-          "label": "Value",
-          "name": "Value",
-          "show": true
-        },
-        {
-          "group_by": true,
-          "label": "DNP",
-          "name": "${DNP}",
-          "show": true
-        },
-        {
-          "group_by": true,
-          "label": "Exclude from BOM",
-          "name": "${EXCLUDE_FROM_BOM}",
-          "show": true
-        },
-        {
-          "group_by": true,
-          "label": "Exclude from Board",
-          "name": "${EXCLUDE_FROM_BOARD}",
-          "show": true
-        },
-        {
-          "group_by": true,
-          "label": "Footprint",
-          "name": "Footprint",
-          "show": true
-        },
-        {
-          "group_by": false,
-          "label": "Datasheet",
-          "name": "Datasheet",
-          "show": true
-        }
-      ],
-      "filter_string": "",
-      "group_symbols": true,
-      "include_excluded_from_bom": true,
-      "name": "Default Editing",
-      "sort_asc": true,
-      "sort_field": "Reference"
-    },
-    "bus_aliases": {},
-    "connection_grid_size": 50.0,
-    "drawing": {
-      "dashed_lines_dash_length_ratio": 12.0,
-      "dashed_lines_gap_length_ratio": 3.0,
-      "default_line_thickness": 6.0,
-      "default_text_size": 50.0,
-      "field_names": [],
-      "hop_over_size_choice": 0,
-      "intersheets_ref_own_page": false,
-      "intersheets_ref_prefix": "",
-      "intersheets_ref_short": false,
-      "intersheets_ref_show": false,
-      "intersheets_ref_suffix": "",
-      "junction_size_choice": 3,
-      "label_size_ratio": 0.375,
-      "operating_point_overlay_i_precision": 3,
-      "operating_point_overlay_i_range": "~A",
-      "operating_point_overlay_v_precision": 3,
-      "operating_point_overlay_v_range": "~V",
-      "overbar_offset_ratio": 1.23,
-      "pin_symbol_size": 25.0,
-      "text_offset_ratio": 0.15
-    },
-    "legacy_lib_dir": "",
-    "legacy_lib_list": [],
-    "meta": {
-      "version": 1
-    },
-    "net_format_name": "",
-    "page_layout_descr_file": "",
-    "plot_directory": "",
-    "reuse_designators": true,
-    "space_save_all_events": true,
-    "spice_current_sheet_as_root": false,
-    "spice_external_command": "spice \"%I\"",
-    "spice_model_current_sheet_as_root": true,
-    "spice_save_all_currents": false,
-    "spice_save_all_dissipations": false,
-    "spice_save_all_voltages": false,
-    "subpart_first_id": 65,
-    "subpart_id_separator": 0,
-    "top_level_sheets": [
-      {
-        "filename": "creaturedex.kicad_sch",
-        "name": "creaturedex",
-        "uuid": "f0cf9cac-01dc-4071-b72f-ebf42dbd12d6"
-      }
-    ],
-    "used_designators": "",
-    "variants": []
-  },
-  "sheets": [
-    [
-      "f0cf9cac-01dc-4071-b72f-ebf42dbd12d6",
-      "creaturedex"
-    ]
-  ],
-  "text_variables": {},
-  "tuning_profiles": {
-    "meta": {
-      "version": 0
-    },
-    "tuning_profiles_impedance_geometric": []
-  }
-}

schematics/sym-lib-table

@@ -1,8 +0,0 @@
-(sym_lib_table
-  (version 7)
-  (lib (name "t-energy-s3")(type "KiCad")(uri "${KIPRJMOD}/symbols/t-energy-s3.kicad_sym")(options "")(descr ""))
-  (lib (name "oled-main-display")(type "KiCad")(uri "${KIPRJMOD}/symbols/oled-main-display.kicad_sym")(options "")(descr ""))
-  (lib (name "elechouse_nfc_module_v3")(type "KiCad")(uri "${KIPRJMOD}/symbols/elechouse_nfc_module_v3.kicad_sym")(options "")(descr ""))
-  (lib (name "dot-secondary-display")(type "KiCad")(uri "${KIPRJMOD}/symbols/dot-secondary-display.kicad_sym")(options "")(descr ""))
-  (lib (name "lcd-tertiary-display")(type "KiCad")(uri "${KIPRJMOD}/symbols/lcd-tertiary-display.kicad_sym")(options "")(descr ""))
-)

schematics/symbols/dot-secondary-display.kicad_sym

@@ -1,52 +0,0 @@
-(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
-  (symbol "CH1115_OLED_7Pin" (in_bom yes) (on_board yes)
-    (property "Reference" "U" (id 0) (at -7.62 11.43 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "CH1115_OLED_7Pin" (id 1) (at 7.62 11.43 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (symbol "CH1115_OLED_7Pin_0_1"
-      (rectangle (start -10.16 10.16) (end 10.16 -10.16)
-        (stroke (width 0.254) (type default) (color 0 0 0 0))
-        (fill (type background))
-      )
-    )
-    (symbol "CH1115_OLED_7Pin_1_1"
-      (pin power_in line (at -12.7 7.62 0) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "1" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -12.7 5.08 0) (length 2.54)
-        (name "VCC" (effects (font (size 1.27 1.27))))
-        (number "2" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -12.7 2.54 0) (length 2.54)
-        (name "SCL" (effects (font (size 1.27 1.27))))
-        (number "3" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -12.7 0 0) (length 2.54)
-        (name "SDA" (effects (font (size 1.27 1.27))))
-        (number "4" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -12.7 -2.54 0) (length 2.54)
-        (name "RES" (effects (font (size 1.27 1.27))))
-        (number "5" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -12.7 -5.08 0) (length 2.54)
-        (name "DC" (effects (font (size 1.27 1.27))))
-        (number "6" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -12.7 -7.62 0) (length 2.54)
-        (name "CS" (effects (font (size 1.27 1.27))))
-        (number "7" (effects (font (size 1.27 1.27))))
-      )
-    )
-  )
-)

schematics/symbols/elechouse_nfc_module_v3.kicad_sym

@@ -1,72 +0,0 @@
-(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
-  (symbol "NFC_MODULE_V3" (in_bom yes) (on_board yes)
-    (property "Reference" "U" (id 0) (at -10.16 12.7 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "NFC_MODULE_V3" (id 1) (at 10.16 12.7 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (symbol "NFC_MODULE_V3_0_1"
-      (rectangle (start -12.7 11.43) (end 12.7 -11.43)
-        (stroke (width 0.254) (type default) (color 0 0 0 0))
-        (fill (type background))
-      )
-    )
-    (symbol "NFC_MODULE_V3_1_1"
-      (pin input line (at -15.24 8.89 0) (length 2.54)
-        (name "SCK" (effects (font (size 1.27 1.27))))
-        (number "1" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 6.35 0) (length 2.54)
-        (name "MISO" (effects (font (size 1.27 1.27))))
-        (number "2" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 3.81 0) (length 2.54)
-        (name "MOSI" (effects (font (size 1.27 1.27))))
-        (number "3" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 1.27 0) (length 2.54)
-        (name "SS" (effects (font (size 1.27 1.27))))
-        (number "4" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -15.24 -1.27 0) (length 2.54)
-        (name "VCC" (effects (font (size 1.27 1.27))))
-        (number "5" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -15.24 -3.81 0) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "6" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 -6.35 0) (length 2.54)
-        (name "IRQ" (effects (font (size 1.27 1.27))))
-        (number "7" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 -8.89 0) (length 2.54)
-        (name "RSTO" (effects (font (size 1.27 1.27))))
-        (number "8" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at 15.24 3.81 180) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "9" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at 15.24 1.27 180) (length 2.54)
-        (name "VCC" (effects (font (size 1.27 1.27))))
-        (number "10" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 15.24 -1.27 180) (length 2.54)
-        (name "SDA/TXD" (effects (font (size 1.27 1.27))))
-        (number "11" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 15.24 -3.81 180) (length 2.54)
-        (name "SCL/RXD" (effects (font (size 1.27 1.27))))
-        (number "12" (effects (font (size 1.27 1.27))))
-      )
-    )
-  )
-)

schematics/symbols/lcd-tertiary-display.kicad_sym

@@ -1,52 +0,0 @@
-(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
-  (symbol "lcd_tertiary_display" (in_bom yes) (on_board yes)
-    (property "Reference" "U" (id 0) (at -7.62 11.43 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "lcd_tertiary_display" (id 1) (at 7.62 11.43 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (symbol "lcd_tertiary_display_0_1"
-      (rectangle (start -10.16 10.16) (end 10.16 -5.08)
-        (stroke (width 0.254) (type default) (color 0 0 0 0))
-        (fill (type background))
-      )
-    )
-    (symbol "lcd_tertiary_display_1_1"
-      (pin power_in line (at -12.7 7.62 0) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "1" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -12.7 5.08 0) (length 2.54)
-        (name "VCC" (effects (font (size 1.27 1.27))))
-        (number "2" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -12.7 2.54 0) (length 2.54)
-        (name "SDA" (effects (font (size 1.27 1.27))))
-        (number "3" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -12.7 0 0) (length 2.54)
-        (name "SCL" (effects (font (size 1.27 1.27))))
-        (number "4" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 12.7 7.62 180) (length 2.54)
-        (name "A0" (effects (font (size 1.27 1.27))))
-        (number "5" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 12.7 5.08 180) (length 2.54)
-        (name "A1" (effects (font (size 1.27 1.27))))
-        (number "6" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 12.7 2.54 180) (length 2.54)
-        (name "A2" (effects (font (size 1.27 1.27))))
-        (number "7" (effects (font (size 1.27 1.27))))
-      )
-    )
-  )
-)

schematics/symbols/oled-main-display.kicad_sym

@@ -1,96 +0,0 @@
-(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
-  (symbol "3.2_TFT_SPI_Touch_SD" (in_bom yes) (on_board yes)
-    (property "Reference" "U" (id 0) (at -10.16 21.59 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "3.2_TFT_SPI_Touch_SD" (id 1) (at 10.16 21.59 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (symbol "3.2_TFT_SPI_Touch_SD_0_1"
-      (rectangle (start -12.7 20.32) (end 12.7 -17.78)
-        (stroke (width 0.254) (type default) (color 0 0 0 0))
-        (fill (type background))
-      )
-    )
-    (symbol "3.2_TFT_SPI_Touch_SD_1_1"
-      (pin power_in line (at -15.24 17.78 0) (length 2.54)
-        (name "VCC" (effects (font (size 1.27 1.27))))
-        (number "1" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -15.24 15.24 0) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "2" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 12.7 0) (length 2.54)
-        (name "CS" (effects (font (size 1.27 1.27))))
-        (number "3" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 10.16 0) (length 2.54)
-        (name "RESET" (effects (font (size 1.27 1.27))))
-        (number "4" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 7.62 0) (length 2.54)
-        (name "DC/RS" (effects (font (size 1.27 1.27))))
-        (number "5" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 5.08 0) (length 2.54)
-        (name "SDI(MOSI)" (effects (font (size 1.27 1.27))))
-        (number "6" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 2.54 0) (length 2.54)
-        (name "SCK" (effects (font (size 1.27 1.27))))
-        (number "7" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 0 0) (length 2.54)
-        (name "LED" (effects (font (size 1.27 1.27))))
-        (number "8" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 -2.54 0) (length 2.54)
-        (name "SDO(MISO)" (effects (font (size 1.27 1.27))))
-        (number "9" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 -5.08 0) (length 2.54)
-        (name "T_CLK" (effects (font (size 1.27 1.27))))
-        (number "10" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 -7.62 0) (length 2.54)
-        (name "T_CS" (effects (font (size 1.27 1.27))))
-        (number "11" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -15.24 -10.16 0) (length 2.54)
-        (name "T_DIN" (effects (font (size 1.27 1.27))))
-        (number "12" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 -12.7 0) (length 2.54)
-        (name "T_DO" (effects (font (size 1.27 1.27))))
-        (number "13" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at -15.24 -15.24 0) (length 2.54)
-        (name "T_IRQ" (effects (font (size 1.27 1.27))))
-        (number "14" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 15.24 5.08 180) (length 2.54)
-        (name "SD_CS" (effects (font (size 1.27 1.27))))
-        (number "15" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 15.24 2.54 180) (length 2.54)
-        (name "SD_MOSI" (effects (font (size 1.27 1.27))))
-        (number "16" (effects (font (size 1.27 1.27))))
-      )
-      (pin output line (at 15.24 0 180) (length 2.54)
-        (name "SD_MISO" (effects (font (size 1.27 1.27))))
-        (number "17" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at 15.24 -2.54 180) (length 2.54)
-        (name "SD_SCK" (effects (font (size 1.27 1.27))))
-        (number "18" (effects (font (size 1.27 1.27))))
-      )
-    )
-  )
-)

schematics/symbols/t-energy-s3.kicad_sym

@@ -1,184 +0,0 @@
-(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
-  (symbol "LILYGO_T-Energy-S3" (in_bom yes) (on_board yes)
-    (property "Reference" "U" (id 0) (at -12.7 26.67 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "LILYGO_T-Energy-S3" (id 1) (at 12.7 26.67 0)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 0 0 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (symbol "LILYGO_T-Energy-S3_0_1"
-      (rectangle (start -15.24 25.4) (end 15.24 -27.94)
-        (stroke (width 0.254) (type default) (color 0 0 0 0))
-        (fill (type background))
-      )
-    )
-    (symbol "LILYGO_T-Energy-S3_1_1"
-      (pin power_in line (at -17.78 22.86 0) (length 2.54)
-        (name "3V" (effects (font (size 1.27 1.27))))
-        (number "1" (effects (font (size 1.27 1.27))))
-      )
-      (pin input line (at -17.78 20.32 0) (length 2.54)
-        (name "RST" (effects (font (size 1.27 1.27))))
-        (number "2" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 17.78 0) (length 2.54)
-        (name "IO37" (effects (font (size 1.27 1.27))))
-        (number "3" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 15.24 0) (length 2.54)
-        (name "IO35" (effects (font (size 1.27 1.27))))
-        (number "4" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 12.7 0) (length 2.54)
-        (name "IO36" (effects (font (size 1.27 1.27))))
-        (number "5" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 10.16 0) (length 2.54)
-        (name "IO45" (effects (font (size 1.27 1.27))))
-        (number "6" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 7.62 0) (length 2.54)
-        (name "IO48" (effects (font (size 1.27 1.27))))
-        (number "7" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 5.08 0) (length 2.54)
-        (name "IO47" (effects (font (size 1.27 1.27))))
-        (number "8" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 2.54 0) (length 2.54)
-        (name "IO21" (effects (font (size 1.27 1.27))))
-        (number "9" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 0 0) (length 2.54)
-        (name "IO14" (effects (font (size 1.27 1.27))))
-        (number "10" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -2.54 0) (length 2.54)
-        (name "IO13" (effects (font (size 1.27 1.27))))
-        (number "11" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -5.08 0) (length 2.54)
-        (name "IO12" (effects (font (size 1.27 1.27))))
-        (number "12" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -7.62 0) (length 2.54)
-        (name "IO11" (effects (font (size 1.27 1.27))))
-        (number "13" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -17.78 -10.16 0) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "14" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -12.7 0) (length 2.54)
-        (name "IO10" (effects (font (size 1.27 1.27))))
-        (number "15" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -15.24 0) (length 2.54)
-        (name "IO9" (effects (font (size 1.27 1.27))))
-        (number "16" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at -17.78 -17.78 0) (length 2.54)
-        (name "IO46" (effects (font (size 1.27 1.27))))
-        (number "17" (effects (font (size 1.27 1.27))))
-      )
-      (pin no_connect line (at -17.78 -20.32 0) (length 2.54)
-        (name "NC" (effects (font (size 1.27 1.27))))
-        (number "18" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at -17.78 -22.86 0) (length 2.54)
-        (name "5V" (effects (font (size 1.27 1.27))))
-        (number "19" (effects (font (size 1.27 1.27))))
-      )
-      (pin no_connect line (at -17.78 -25.4 0) (length 2.54)
-        (name "NC" (effects (font (size 1.27 1.27))))
-        (number "20" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at 17.78 22.86 180) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "21" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 20.32 180) (length 2.54)
-        (name "IO1" (effects (font (size 1.27 1.27))))
-        (number "22" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 17.78 180) (length 2.54)
-        (name "IO2" (effects (font (size 1.27 1.27))))
-        (number "23" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 15.24 180) (length 2.54)
-        (name "TXD" (effects (font (size 1.27 1.27))))
-        (number "24" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 12.7 180) (length 2.54)
-        (name "RXD" (effects (font (size 1.27 1.27))))
-        (number "25" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 10.16 180) (length 2.54)
-        (name "IO42" (effects (font (size 1.27 1.27))))
-        (number "26" (effects (font (size 1.27 1.27))))
-      )
-      (pin power_in line (at 17.78 7.62 180) (length 2.54)
-        (name "GND" (effects (font (size 1.27 1.27))))
-        (number "27" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 5.08 180) (length 2.54)
-        (name "IO4" (effects (font (size 1.27 1.27))))
-        (number "28" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 2.54 180) (length 2.54)
-        (name "IO5" (effects (font (size 1.27 1.27))))
-        (number "29" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 0 180) (length 2.54)
-        (name "IO6" (effects (font (size 1.27 1.27))))
-        (number "30" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -2.54 180) (length 2.54)
-        (name "IO7" (effects (font (size 1.27 1.27))))
-        (number "31" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -5.08 180) (length 2.54)
-        (name "IO17" (effects (font (size 1.27 1.27))))
-        (number "32" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -7.62 180) (length 2.54)
-        (name "IO18" (effects (font (size 1.27 1.27))))
-        (number "33" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -10.16 180) (length 2.54)
-        (name "IO0" (effects (font (size 1.27 1.27))))
-        (number "34" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -12.7 180) (length 2.54)
-        (name "IO8" (effects (font (size 1.27 1.27))))
-        (number "35" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -15.24 180) (length 2.54)
-        (name "IO41" (effects (font (size 1.27 1.27))))
-        (number "36" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -17.78 180) (length 2.54)
-        (name "IO40" (effects (font (size 1.27 1.27))))
-        (number "37" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -20.32 180) (length 2.54)
-        (name "IO39" (effects (font (size 1.27 1.27))))
-        (number "38" (effects (font (size 1.27 1.27))))
-      )
-      (pin bidirectional line (at 17.78 -22.86 180) (length 2.54)
-        (name "IO38" (effects (font (size 1.27 1.27))))
-        (number "39" (effects (font (size 1.27 1.27))))
-      )
-      (pin no_connect line (at 17.78 -25.4 180) (length 2.54)
-        (name "NC" (effects (font (size 1.27 1.27))))
-        (number "40" (effects (font (size 1.27 1.27))))
-      )
-    )
-  )
-)

src/background_tasks.rs

@@ -1,3 +0,0 @@
-mod nfc;
-
-pub use nfc::nfc_scanner;

src/background_tasks/nfc.rs

@@ -1,45 +0,0 @@
-use embedded_hal_bus::i2c::AtomicDevice;
-use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
-
-use crate::{
-    card::{decoder::split_nfc_hex, model::Card},
-    drivers::nfc_pn532::NfcPn532Driver,
-    navigation::navigation::CARD_DATA,
-};
-
-#[embassy_executor::task]
-#[allow(
-    clippy::large_stack_frames,
-    reason = "ignoring this for now because it still works"
-)]
-pub async fn nfc_scanner(
-    mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>,
-) {
-    loop {
-        while CARD_DATA.lock().await.is_none() {
-            let start = Instant::now();
-            match nfc_driver.read_card_data().await {
-                Ok(card_data) => {
-                    let Some(split_data) = split_nfc_hex(&card_data) else {
-                        log::error!("Failed to split NFC card data");
-                        continue;
-                    };
-                    CARD_DATA
-                        .lock()
-                        .await
-                        .replace(Card::try_from(split_data).unwrap());
-                    let elapsed_ms = start.elapsed().as_millis();
-                    log::info!(
-                        "NFC read duration: {} ms, card data length: {}",
-                        elapsed_ms,
-                        card_data.len()
-                    );
-                }
-                Err(e) => {
-                    log::error!("NFC read failed: {e}");
-                }
-            }
-        }
-        embassy_time::Timer::after(embassy_time::Duration::from_millis(1000)).await;
-    }
-}

src/bin/main.rs

@@ -7,30 +7,37 @@
 )]
 #![deny(clippy::large_stack_frames)]
 
-use creaturedex::background_tasks;
+use core::convert::Infallible;
-use creaturedex::drivers::i2c_bus::I2cBusPinConfiguration;
+
-use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
+use alloc::vec::Vec;
-use creaturedex::drivers::secondary_oled::SecondaryDisplay;
+use display_interface_spi::SPIInterface;
-use creaturedex::drivers::spi_bus;
+use embedded_graphics::Drawable;
-use creaturedex::drivers::tertiary_lcd::{
+use embedded_graphics::mono_font::MonoTextStyle;
-    BOX, EMPTY, EXAMPLE, HEART, TertiaryDisplay, TertiaryDisplayPinConfiguration,
+use embedded_graphics::mono_font::ascii::FONT_6X10;
-};
+use embedded_graphics::pixelcolor::Rgb565;
-use creaturedex::navigation::inputs::Inputs;
+use embedded_graphics::prelude::Point;
-use creaturedex::navigation::navigation::{self};
+use embedded_graphics::prelude::RgbColor;
-use creaturedex::navigation::outputs::Outputs;
+use embedded_graphics::text::Text;
-use creaturedex::network::wifi::setup_wifi;
+use embedded_graphics_core::draw_target::DrawTarget;
-use embassy_executor::Spawner;
+use embedded_hal_bus::spi::ExclusiveDevice;
-use embedded_graphics::pixelcolor::BinaryColor;
-use embedded_graphics::{
-    mono_font::{MonoTextStyle, ascii::FONT_6X10},
-    prelude::*,
-    text::Text,
-};
-use embedded_hal_bus::i2c::AtomicDevice;
 use esp_hal::clock::CpuClock;
-use esp_hal::gpio::{Input, InputConfig, Pull};
+use esp_hal::delay::Delay;
+use esp_hal::gpio::Level;
+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 log::error;
+use esp_println::dbg;
+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) -> ! {
@@ -40,8 +47,6 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
 
 extern crate alloc;
 
-const HEAP_SIZE: usize = 73744;
-
 // This creates a default app-descriptor required by the esp-idf bootloader.
 // For more information see: <https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/app_image_format.html#application-description>
 esp_bootloader_esp_idf::esp_app_desc!();
@@ -50,102 +55,230 @@ esp_bootloader_esp_idf::esp_app_desc!();
     clippy::large_stack_frames,
     reason = "it's not unusual to allocate larger buffers etc. in main"
 )]
-#[esp_rtos::main]
+#[main]
-async fn main(spawner: Spawner) {
+fn main() -> ! {
+    // 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);
 
-    esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE);
+    let sck = peripherals.GPIO18;
+    let mosi = peripherals.GPIO23;
+    let miso = peripherals.GPIO19;
+    let cs_main = peripherals.GPIO5;
+    let dc = peripherals.GPIO17;
+    let reset_main = peripherals.GPIO16;
 
+    let sda = peripherals.GPIO21;
+    let scl = peripherals.GPIO22;
+
+    esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744);
+
+    let timg0 = TimerGroup::new(peripherals.TIMG0);
     let sw_interrupt =
         esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
-    let timg0 = TimerGroup::new(peripherals.TIMG0);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
+    let (mut _wifi_controller, _interfaces) =
+        esp_radio::wifi::new(peripherals.WIFI, Default::default())
+            .expect("Failed to initialize Wi-Fi controller");
 
-    let (primary, mut secondaries) = spi_bus::DisplayPinConfiguration {
+    let spi_bus = Spi::new(
-        spi_peripheral: peripherals.SPI2,
+        peripherals.SPI2,
-        sck: peripherals.GPIO36,
+        Config::default()
-        mosi: peripherals.GPIO35,
+            .with_frequency(Rate::from_khz(100))
-        miso: peripherals.GPIO37,
+            .with_mode(Mode::_0),
-        cs_primary: peripherals.GPIO11,
+    )
-        cs_secondary_1: peripherals.GPIO13,
+    .unwrap()
-        cs_secondary_2: peripherals.GPIO14,
+    .with_sck(sck)
-        cs_secondary_3: peripherals.GPIO21,
+    .with_mosi(mosi)
-        reset_primary: peripherals.GPIO10,
+    .with_miso(miso);
-        reset_secondary: peripherals.GPIO47,
-        dc_pin: peripherals.GPIO12,
-    }
-    .build();
 
-    // Initialize the shared I2C bus using the refactored i2c_bus module.
+    let cs_main = Output::new(cs_main, Level::High, OutputConfig::default());
-    let shared_i2c = {
-        let config = I2cBusPinConfiguration {
-            i2c_peripheral: peripherals.I2C0,
-            scl: peripherals.GPIO18,
-            sda: peripherals.GPIO17,
-        };
-        config.build()
-    };
 
-    let mut lcd: TertiaryDisplay = TertiaryDisplayPinConfiguration { i2c: shared_i2c }.build();
+    let mut delay = Delay::new();
-    lcd.load_charset(EXAMPLE).unwrap();
+    let spi_dev = ExclusiveDevice::new(spi_bus, cs_main, delay).unwrap();
-    let h = EXAMPLE[HEART];
+    let reset_main = Output::new(reset_main, Level::High, OutputConfig::default());
-    let e = EXAMPLE[EMPTY];
+    let spi_dc = Output::new(dc, Level::High, OutputConfig::default());
-    let b = EXAMPLE[BOX];
+    let iface = SPIInterface::new(spi_dev, spi_dc);
-    if let Err(e) = lcd.write(&alloc::format!("Custom symbols: {h}{e}{b} And more stuff to wrap and cut off please.")) {
-        log::error!(
-            "Tertiary LCD startup text write failed over shared I2C bus; check the shared bus, wiring, and device responses: {e}"
-        );
-    }
 
-    setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
+    let mut display = Ili9341::new(
-
+        iface,
-    let mut nfc_driver = NfcPn532Driver::new(AtomicDevice::new(shared_i2c));
+        reset_main,
-    if nfc_driver.configure_sam().await.is_ok() {
+        &mut delay,
-        log::info!("NFC SAM configuration successful on the shared I2C bus");
+        Orientation::Landscape,
-    } else {
+        ili9341::DisplaySize240x320,
-        log::error!("NFC SAM configuration failed on the shared I2C bus");
+    )
-    }
-
-    let button_config = InputConfig::default().with_pull(Pull::Up);
-    let inputs = Inputs {
-        up: Input::new(peripherals.GPIO38, button_config),
-        down: Input::new(peripherals.GPIO39, button_config),
-        left: Input::new(peripherals.GPIO40, button_config),
-        right: Input::new(peripherals.GPIO41, button_config),
-        back: Input::new(peripherals.GPIO8, button_config),
-        ok: Input::new(peripherals.GPIO0, button_config),
-    };
-
-    display_shit(&mut secondaries[0], "foo 1");
-    display_shit(&mut secondaries[1], "bar 1");
-    display_shit(&mut secondaries[2], "baz 1");
-
-    let outputs = {
-        let [sec_1, sec_2, sec_3] = secondaries;
-        Outputs {
-            primary_display: primary,
-            secondary_display_1: sec_1,
-            secondary_display_2: sec_2,
-            secondary_display_3: sec_3,
-            tertiary_display: lcd,
-            _led_a: (),
-        }
-    };
-
-    log::info!("Setup complete, entering main loop");
-    spawner.spawn(navigation::run(inputs, outputs).expect("run task failed"));
-    spawner.spawn(background_tasks::nfc_scanner(nfc_driver).expect("nfc scanner task failed"));
-}
-
-fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
-    oled.clear(BinaryColor::Off).unwrap();
-
-    let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
-    Text::new(text, Point::new(10, 20), text_style)
-        .draw(oled)
     .unwrap();
-    oled.flush().unwrap();
+
+    // display.clear(Rgb565::BLACK).unwrap();
+
+    let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
+    Text::new("Hello, ESP32!", Point::new(20, 100), style)
+        .draw(&mut display)
+        .unwrap();
+
+    use pn532::{Pn532, Request, requests::SAMMode};
+
+    // spi is a struct implementing embedded_hal::spi::SpiDevice
+    // timer is a struct implementing pn532::CountDown
+
+    use esp_hal::{
+        i2c::master::{Config as I2cConfig, I2c},
+        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");
     }
+
+    loop {
+        info!("Hello world!");
+
+        match pn532.process(
+            &Request::INLIST_ONE_ISO_A_TARGET,
+            23,
+            Duration::from_secs(10),
+        ) {
+            Ok(uid) => {
+                info!("uid = {uid:?}");
+                for i in (0x04..=230) {
+                    let mut parse_result = Err(());
+                    while parse_result.is_err() {
+                        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();
+        while delay_start.elapsed() < Duration::from_millis(500) {}
+    }
+
+    // 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

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

src/card/decoder.rs

@@ -1,95 +0,0 @@
-use core::fmt::Display;
-
-use crate::card::model::NfcPayload;
-use alloc::string::{String, ToString};
-
-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],
-    })
-}
-
-#[derive(Debug, Clone)]
-pub enum Events {
-    CCC39,
-    CCC40,
-    GPN24,
-    GPN25,
-    Unknown,
-}
-
-impl Display for Events {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match *self {
-            Events::CCC39 => write!(f, "39C3"),
-            Events::CCC40 => write!(f, "40C3"),
-            Events::GPN24 => write!(f, "GPN24"),
-            Events::GPN25 => write!(f, "GPN25"),
-            Events::Unknown => write!(f, "Unknown"),
-        }
-    }
-}
-
-pub fn decode_known_event(event_encoding: &[u8]) -> Events {
-    match event_encoding {
-        [0x39, 0xC3] => Events::CCC39,
-        [0x40, 0xC3] => Events::CCC40, // future proofing :)
-        [0xE9, 0x24] => Events::GPN24,
-        [0xE9, 0x25] => Events::GPN25, // future proofing :)
-        _ => Events::Unknown,
-    }
-}
-
-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

@@ -1,173 +0,0 @@
-/// GlaDos
-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,
-];
-
-/// Blue Portal
-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,
-];
-
-/// Orange Portal
-pub const MOCK_PAYLOAD3: [u8; 858] = [
-    0xE9, 0x24, 0x01, 0x0A, 0x4B, 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, 0x55, 0x55, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x55, 0x55, 0x55, 0x5F, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x55, 0xFF, 0xFF, 0x55, 0x55, 0xF5, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x5F, 0xFF, 0xFF, 0xFF, 0xF5,
-    0x55, 0x5F, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x50, 0x00,
-    0xFF, 0xFF, 0xF5, 0x55, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0x55, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xF5, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x55, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x50, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xF5, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xF5, 0xFF, 0xFF,
-    0xFF, 0x0F, 0xFF, 0xF5, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55,
-    0xF5, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xF5, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xF5, 0x55, 0xFF, 0x50, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xF5, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xFF, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xF5, 0x5F, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF,
-    0xF5, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0xF0, 0x00, 0x00, 0x00,
-    0x0F, 0xFF, 0xFF, 0xF5, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0xF0,
-    0x0F, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0x50, 0x00, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xFF,
-    0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0xFF, 0xFF, 0xFF, 0xF0, 0x0F,
-    0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x55, 0xFF, 0xFF,
-    0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xF5, 0x55, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xFF, 0x55,
-    0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x5F, 0xFF, 0x00, 0x0F, 0xFF,
-    0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x50, 0x00,
-    0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xF5, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0xFF, 0x55, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5,
-    0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x05, 0x5F,
-    0xFF, 0xF5, 0x5F, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xF0, 0x00, 0x55, 0x55, 0x55, 0xF5, 0x55, 0x5F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x55, 0x5F, 0xFF, 0x55, 0x55, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0x55, 0x55, 0x55, 0x5F, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0x55, 0x55, 0x55, 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, 0x0F, 0xBB, 0xA1, 0xE1, 0x07,
-    0x40, 0x29, 0xEB, 0x6E, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD3, 0xD7, 0xA5,
-    0xA8, 0xB7, 0xB1, 0x33, 0x00, 0xA5, 0xAC, 0xBB, 0x99, 0xD1, 0xBB, 0xA1, 0xEE, 0x7B, 0x02, 0xCC,
-    0x88, 0x96, 0x9F, 0x07, 0x00, 0x86, 0x39, 0xA2, 0x61, 0x0B, 0x4C, 0x2F, 0x47, 0x7E, 0x9D, 0x0B,
-    0x00, 0x53, 0x70, 0x65, 0x65, 0x64, 0x79, 0x20, 0x74, 0x68, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x6F,
-    0x6D, 0x65, 0x73, 0x20, 0x6F, 0x75, 0x74, 0x00, 0x00, 0x74, 0xEE, 0xAF, 0x55, 0x52, 0x98, 0x43,
-    0x71, 0xC1, 0x71, 0xDB, 0xBC, 0xAD, 0x32, 0x89, 0x8A, 0x60, 0x82, 0x68, 0x28, 0x48, 0xBD, 0x2B,
-    0x3F, 0x48, 0x49, 0x65, 0x78, 0x88, 0xA8, 0x10, 0x39, 0x5A, 0x77, 0x64, 0xBB, 0x4F, 0x7E, 0x6F,
-    0xC3, 0xBD, 0x28, 0x43, 0xC4, 0x24, 0xB0, 0xF3, 0x2D, 0x00,
-];

src/card/model.rs

@@ -1,262 +0,0 @@
-use core::fmt::Display;
-
-use alloc::{string::String, vec::Vec};
-use num_enum::FromPrimitive;
-
-use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
-use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
-
-#[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],
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
-#[repr(u8)]
-pub enum CardType {
-    #[num_enum(default)]
-    Default = 1,
-    Blueprint = 2,
-    CYBER = 3,
-    Nature = 4,
-    Fossil = 5,
-    Ghost = 6,
-    Daemon = 7,
-    Fairy = 8,
-}
-
-impl Display for CardType {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match *self {
-            CardType::Default => write!(f, "Default"),
-            CardType::Blueprint => write!(f, "Blueprint"),
-            CardType::CYBER => write!(f, "CYBER"),
-            CardType::Nature => write!(f, "Nature"),
-            CardType::Fossil => write!(f, "Fossil"),
-            CardType::Ghost => write!(f, "Ghost"),
-            CardType::Daemon => write!(f, "Daemon"),
-            CardType::Fairy => write!(f, "Fairy"),
-        }
-    }
-}
-
-pub type PrimaryColor = Rgb565;
-impl From<CardType> for PrimaryColor {
-    fn from(val: CardType) -> Self {
-        match val {
-            CardType::Default => Rgb888::new(0xD8, 0x68, 0x30).into(),
-            CardType::Blueprint => Rgb888::new(0x6D, 0x81, 0xFF).into(),
-            CardType::CYBER => Rgb888::new(0xFF, 0xFF, 0x04).into(),
-            CardType::Nature => Rgb888::new(0x55, 0xA0, 0x58).into(),
-            CardType::Fossil => Rgb888::new(0xB9, 0x7A, 0x60).into(),
-            CardType::Ghost => Rgb888::new(0xAB, 0xAB, 0xAB).into(),
-            CardType::Daemon => Rgb888::new(0x60, 0x00, 0x88).into(),
-            CardType::Fairy => Rgb888::new(0xB0, 0xA9, 0xE4).into(),
-        }
-    }
-}
-
-pub type Palette = [Rgb565; 16];
-impl From<CardType> for Palette {
-    fn from(val: CardType) -> Self {
-        match val {
-            CardType::Default => [
-                Rgb888::new(31, 23, 35).into(),
-                Rgb888::new(60, 47, 82).into(),
-                Rgb888::new(178, 39, 65).into(),
-                Rgb888::new(70, 86, 165).into(),
-                Rgb888::new(245, 70, 76).into(),
-                Rgb888::new(216, 104, 48).into(),
-                Rgb888::new(140, 127, 144).into(),
-                Rgb888::new(73, 149, 243).into(),
-                Rgb888::new(62, 197, 75).into(),
-                Rgb888::new(240, 149, 72).into(),
-                Rgb888::new(188, 176, 179).into(),
-                Rgb888::new(247, 156, 136).into(),
-                Rgb888::new(114, 222, 235).into(),
-                Rgb888::new(180, 230, 86).into(),
-                Rgb888::new(239, 208, 129).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Blueprint => [
-                Rgb888::new(83, 67, 127).into(),
-                Rgb888::new(44, 111, 153).into(),
-                Rgb888::new(142, 88, 111).into(),
-                Rgb888::new(0, 188, 170).into(),
-                Rgb888::new(153, 104, 226).into(),
-                Rgb888::new(109, 129, 255).into(),
-                Rgb888::new(255, 84, 112).into(),
-                Rgb888::new(196, 143, 158).into(),
-                Rgb888::new(168, 159, 204).into(),
-                Rgb888::new(190, 155, 255).into(),
-                Rgb888::new(255, 155, 113).into(),
-                Rgb888::new(127, 206, 255).into(),
-                Rgb888::new(255, 155, 182).into(),
-                Rgb888::new(255, 217, 174).into(),
-                Rgb888::new(255, 217, 232).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::CYBER => [
-                Rgb888::new(0, 0, 0).into(),
-                Rgb888::new(0, 0, 126).into(),
-                Rgb888::new(0, 0, 255).into(),
-                Rgb888::new(126, 0, 0).into(),
-                Rgb888::new(126, 0, 126).into(),
-                Rgb888::new(4, 126, 0).into(),
-                Rgb888::new(254, 0, 0).into(),
-                Rgb888::new(4, 126, 126).into(),
-                Rgb888::new(254, 0, 255).into(),
-                Rgb888::new(126, 126, 0).into(),
-                Rgb888::new(126, 126, 126).into(),
-                Rgb888::new(6, 255, 4).into(),
-                Rgb888::new(6, 255, 255).into(),
-                Rgb888::new(190, 190, 190).into(),
-                Rgb888::new(255, 255, 4).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Nature => [
-                Rgb888::new(35, 34, 40).into(),
-                Rgb888::new(40, 66, 97).into(),
-                Rgb888::new(30, 116, 83).into(),
-                Rgb888::new(117, 77, 69).into(),
-                Rgb888::new(95, 88, 84).into(),
-                Rgb888::new(36, 133, 166).into(),
-                Rgb888::new(198, 80, 70).into(),
-                Rgb888::new(85, 160, 88).into(),
-                Rgb888::new(135, 133, 115).into(),
-                Rgb888::new(84, 186, 210).into(),
-                Rgb888::new(161, 191, 65).into(),
-                Rgb888::new(230, 146, 138).into(),
-                Rgb888::new(184, 176, 149).into(),
-                Rgb888::new(227, 192, 84).into(),
-                Rgb888::new(195, 213, 199).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Fossil => [
-                Rgb888::new(75, 61, 68).into(),
-                Rgb888::new(119, 66, 81).into(),
-                Rgb888::new(78, 84, 99).into(),
-                Rgb888::new(100, 83, 85).into(),
-                Rgb888::new(156, 82, 78).into(),
-                Rgb888::new(132, 109, 89).into(),
-                Rgb888::new(91, 125, 115).into(),
-                Rgb888::new(125, 123, 98).into(),
-                Rgb888::new(140, 124, 121).into(),
-                Rgb888::new(185, 122, 96).into(),
-                Rgb888::new(168, 138, 94).into(),
-                Rgb888::new(142, 159, 125).into(),
-                Rgb888::new(170, 162, 93).into(),
-                Rgb888::new(169, 156, 141).into(),
-                Rgb888::new(204, 168, 123).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Ghost => [
-                Rgb888::new(0, 0, 0).into(),
-                Rgb888::new(24, 24, 24).into(),
-                Rgb888::new(40, 40, 40).into(),
-                Rgb888::new(56, 56, 56).into(),
-                Rgb888::new(71, 71, 71).into(),
-                Rgb888::new(86, 86, 86).into(),
-                Rgb888::new(100, 100, 100).into(),
-                Rgb888::new(113, 113, 113).into(),
-                Rgb888::new(126, 126, 126).into(),
-                Rgb888::new(140, 140, 140).into(),
-                Rgb888::new(155, 155, 155).into(),
-                Rgb888::new(171, 171, 171).into(),
-                Rgb888::new(189, 189, 189).into(),
-                Rgb888::new(209, 209, 209).into(),
-                Rgb888::new(231, 231, 231).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Daemon => [
-                Rgb888::new(0, 3, 60).into(),
-                Rgb888::new(96, 0, 136).into(),
-                Rgb888::new(0, 56, 132).into(),
-                Rgb888::new(42, 46, 121).into(),
-                Rgb888::new(0, 82, 96).into(),
-                Rgb888::new(177, 5, 133).into(),
-                Rgb888::new(255, 0, 78).into(),
-                Rgb888::new(172, 41, 206).into(),
-                Rgb888::new(0, 157, 74).into(),
-                Rgb888::new(0, 138, 197).into(),
-                Rgb888::new(78, 110, 168).into(),
-                Rgb888::new(255, 92, 255).into(),
-                Rgb888::new(10, 255, 82).into(),
-                Rgb888::new(0, 247, 255).into(),
-                Rgb888::new(173, 212, 250).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-            CardType::Fairy => [
-                Rgb888::new(40, 40, 46).into(),
-                Rgb888::new(108, 86, 113).into(),
-                Rgb888::new(135, 168, 137).into(),
-                Rgb888::new(249, 130, 132).into(),
-                Rgb888::new(176, 169, 228).into(),
-                Rgb888::new(222, 163, 139).into(),
-                Rgb888::new(172, 204, 228).into(),
-                Rgb888::new(254, 170, 228).into(),
-                Rgb888::new(217, 200, 191).into(),
-                Rgb888::new(255, 195, 132).into(),
-                Rgb888::new(176, 235, 147).into(),
-                Rgb888::new(179, 227, 218).into(),
-                Rgb888::new(233, 245, 157).into(),
-                Rgb888::new(255, 230, 198).into(),
-                Rgb888::new(255, 247, 160).into(),
-                Rgb888::new(255, 255, 255).into(),
-            ],
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Sprite {
-    pub data: Vec<u8>,
-}
-
-#[derive(Debug, Clone)]
-pub struct Card {
-    pub uuid: String,
-    pub event: Events,
-    pub cardtype: CardType,
-    pub name: String,
-
-    pub trait1: String,
-    pub trait2: String,
-    pub trait3: String,
-    pub secret: String,
-
-    pub sprite: Sprite,
-}
-
-impl<'a> TryFrom<NfcPayload<'a>> for Card {
-    type Error = &'static str;
-
-    fn try_from(payload: NfcPayload<'a>) -> Result<Self, Self::Error> {
-        let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
-        let event = decode_known_event(payload.event_encoding);
-        let cardtype = CardType::from(payload.card_type);
-        let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
-        let secret = decode_secret(payload.secret);
-        let sprite = Sprite {
-            data: payload.sprite.to_vec(),
-        };
-        Ok(Self {
-            uuid,
-            event,
-            cardtype,
-            name,
-            trait1,
-            trait2,
-            trait3,
-            secret,
-            sprite,
-        })
-    }
-}

src/display.rs

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

src/display/sprite.rs

@@ -1,55 +0,0 @@
-use crate::card::model::Palette;
-use embedded_graphics::{
-    geometry::Size, pixelcolor::Rgb565, prelude::Point, primitives::Rectangle,
-};
-use embedded_graphics_core::draw_target::DrawTarget;
-
-pub fn render_sprite_onto_ili9341<D>(ili9341: &mut D, sprite: &[u8], palette: &Palette)
-where
-    D: DrawTarget<Color = Rgb565>,
-{
-    let pixel_count = sprite.len() * 2;
-    if pixel_count == 0 {
-        return;
-    }
-
-    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 = palette[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, start_y), Size::new(width, height));
-
-            let _ = ili9341.fill_solid(&area, color);
-        }
-    }
-}

src/drivers.rs

@@ -1,6 +0,0 @@
-pub mod i2c_bus;
-pub mod nfc_pn532;
-pub mod primary_lcd;
-pub mod secondary_oled;
-pub mod spi_bus;
-pub mod tertiary_lcd;

src/drivers/i2c_bus.rs

@@ -1,38 +0,0 @@
-use alloc::boxed::Box;
-use embedded_hal_bus::i2c::AtomicDevice;
-use embedded_hal_bus::util::AtomicCell;
-use esp_hal::gpio::interconnect::PeripheralInput;
-use esp_hal::i2c::master::Config;
-use esp_hal::{gpio::interconnect::PeripheralOutput, i2c::master::I2c};
-
-type InnerI2cBus<'a> = esp_hal::i2c::master::I2c<'a, esp_hal::Blocking>;
-pub type I2cBus<'a> = &'a AtomicCell<InnerI2cBus<'a>>;
-pub type I2cDevice<'a> = AtomicDevice<'a, esp_hal::i2c::master::I2c<'a, esp_hal::Blocking>>;
-
-pub struct I2cBusPinConfiguration<I2C, SCL, SDA> {
-    pub i2c_peripheral: I2C,
-    pub scl: SCL,
-    pub sda: SDA,
-}
-
-impl<'a, I2C, SCL, SDA> I2cBusPinConfiguration<I2C, SCL, SDA>
-where
-    I2C: esp_hal::i2c::master::Instance + 'a,
-    SCL: PeripheralOutput<'a> + PeripheralInput<'a>,
-    SDA: PeripheralOutput<'a> + PeripheralInput<'a>,
-{
-    pub fn build(self) -> I2cBus<'a> {
-        let config = Config::default().with_frequency(esp_hal::time::Rate::from_khz(400));
-        let i2c = match I2c::new(self.i2c_peripheral, config) {
-            Ok(bus) => bus.with_sda(self.sda).with_scl(self.scl),
-            Err(e) => {
-                log::error!("Shared I2C bus initialization failed for GPIO17/GPIO18: {e:?}");
-                panic!("Shared I2C bus initialization failed");
-            }
-        };
-        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/nfc_pn532.rs

@@ -1,261 +0,0 @@
-use alloc::vec::Vec;
-use core::error::Error;
-use embedded_hal::i2c::I2c;
-use log::{error, info};
-use pn532::i2c::I2CInterface;
-use pn532::requests::SAMMode;
-use pn532::{Pn532, Request};
-
-pub type Pn532Device<I2C> = Pn532<I2CInterface<I2C>, (), 34>;
-
-pub const PAGES_PER_READ: usize = 4;
-pub const BYTES_PER_READ: usize = PAGES_PER_READ * 4;
-
-/// PN532 NFC reader driver.
-pub struct NfcPn532Driver<I2C>
-where
-    I2C: I2c,
-{
-    pn532: Pn532Device<I2C>,
-}
-
-#[derive(Debug, Clone)]
-struct PageParseError<const N: usize> {
-    iteration: u8,
-    bytes: [u8; N],
-    status_code: Option<CommandResult>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-struct CommandResult {
-    /// # WrErr
-    /// Set to logic 1, when data is written into the FIFO by the 80C51 during the AutoColl command or MFAuthent command or
-    /// if data is written into the FIFO by the 80C51 during the time between sending the last bit on the RF interface and
-    /// receiving the last bit on the RF interface.
-    write_error: bool,
-    /// # TempErr
-    /// Set to logic 1, if the internal temperature sensor detects overheating. In this case the antenna drivers are switched off automatically.
-    overheating: bool,
-    /// # RFErr
-    /// Set to logic 1, if in active communication mode the counterpart does not switch on the RF field in time as defined in NFCIP-1 standard.
-    /// Note: RFErr is only used in active communication mode. The bit RxFraming or the bit TxFraming has to be set to 01h to enable
-    /// this functionality.
-    rf_timeout: bool,
-    /// # BufferOvfl
-    /// Set to logic 1, if the 80C51 or if the internal state machine (e.g. receiver) tries to write data into the FIFO buffer
-    /// although the FIFO buffer is already full.
-    buffer_overflow: bool,
-    /// # CollErr
-    /// Set to logic 1, if a bit-collision is detected. It is set to logic 0 automatically at receiver start phase.
-    /// This flag is only valid during the bitwise anticollision at 106 kbit/s. During communication schemes at 212 and 424 kbit/s
-    /// this flag is always set to logic 0.
-    bit_collision: bool,
-    /// # CRCErr
-    /// Set to logic 1, if RxCRCEn in CIU_RxMode register is set to logic 1 and the CRC calculation fails. It is set to logic 0 automatically
-    /// at receiver start-up phase.
-    crc_error: bool,
-    /// # ParityErr
-    /// Set to logic 1, if the parity check has failed. It is set to logic 0 automatically at receiver start-up phase.
-    /// Only valid for ISO/IEC 14443A/MIFARE or NFCIP-1 communication at 106 kbit/s.
-    parity_error: bool,
-    /// # ProtocollErr
-    /// Set to logic 1, if one out of the following cases occurs:
-    /// - Set to logic 1 if the SOF is incorrect. It is set to logic 0 automatically at receiver start-up phase.
-    ///   The bit is only valid for 106 kbit in Active and Passive Communication mode.
-    /// - If bit DetectSync in CIU_Mode register is set to logic 1 during FeliCa communication or Active Communication
-    ///   with transfer speeds higher than 106 kbit, ProtocolErr is set to logic 1 in case of a byte length violation.
-    /// - During the AutoColl command, ProtocolErr is set to logic 1, if the Initiator bit in CIU_Control register is set to logic 1.
-    /// - During the MFAuthent Command, ProtocolErr is set to logic 1, if the number of bytes received in one data stream is incorrect.
-    /// - Set to logic 1, if the Miller Decoder detects 2 pauses below the minimum time according to the ISO/IEC 14443A definitions.
-    protocol_error: bool,
-}
-
-impl CommandResult {
-    pub fn is_error(&self) -> bool {
-        self.write_error
-            || self.overheating
-            || self.rf_timeout
-            || self.buffer_overflow
-            || self.bit_collision
-            || self.crc_error
-            || self.parity_error
-            || self.protocol_error
-    }
-}
-
-impl From<u8> for CommandResult {
-    fn from(value: u8) -> Self {
-        let mask = |bit| 1u8 << bit;
-        let take_bit = |bit| (value & mask(bit)) != 0u8;
-
-        Self {
-            write_error: take_bit(7),
-            overheating: take_bit(6),
-            rf_timeout: take_bit(5),
-            buffer_overflow: take_bit(4),
-            bit_collision: take_bit(3),
-            crc_error: take_bit(2),
-            parity_error: take_bit(1),
-            protocol_error: take_bit(0),
-        }
-    }
-}
-
-impl core::fmt::Display for CommandResult {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        if !self.is_error() {
-            return write!(f, "ok");
-        }
-
-        write!(f, "error: ")?;
-
-        let errors = [
-            (self.write_error, "write_error(7)"),
-            (self.overheating, "overheating(6)"),
-            (self.rf_timeout, "rf_timeout(5)"),
-            (self.buffer_overflow, "buffer_overflow(4)"),
-            (self.bit_collision, "bit_collision(3)"),
-            (self.crc_error, "crc_error(2)"),
-            (self.parity_error, "parity_error(1)"),
-            (self.protocol_error, "protocol_error(0)"),
-        ]
-        .into_iter()
-        .filter_map(|(active, name)| active.then_some(name));
-
-        let mut first = true;
-        for error in errors {
-            let separator = if !first { ", " } else { "" };
-            write!(f, "{separator}{error}")?;
-            first = false;
-        }
-
-        Ok(())
-    }
-}
-
-impl Error for CommandResult {}
-
-impl<const N: usize> Error for PageParseError<N> {}
-
-impl<const N: usize> core::fmt::Display for PageParseError<N> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        let PageParseError {
-            iteration,
-            bytes,
-            status_code,
-        } = self;
-        match status_code {
-            Some(code) => write!(
-                f,
-                "NFC pages parse error in iteration {iteration} with {code}: {bytes:02x?}"
-            ),
-            None => write!(
-                f,
-                "No data available for NFC page in iteration {iteration}: {bytes:02x?}"
-            ),
-        }
-    }
-}
-
-impl<I2C> NfcPn532Driver<I2C>
-where
-    I2C: I2c,
-{
-    pub fn new(i2c: I2C) -> Self {
-        let pn532 = Pn532::new_async(I2CInterface { i2c });
-        Self { pn532 }
-    }
-
-    pub async fn configure_sam(&mut self) -> Result<(), ()> {
-        if let Err(e) = self
-            .pn532
-            .process_async(&Request::sam_configuration(SAMMode::Normal, false), 0)
-            .await
-        {
-            error!("PN532 SAM configuration failed over I2C: {e:?}");
-            Err(())
-        } else {
-            info!("PN532 SAM configuration successful on shared I2C bus");
-            Ok(())
-        }
-    }
-
-    pub async fn poll_target(&mut self) -> Result<(), &'static str> {
-        match self
-            .pn532
-            .process_async(&Request::INLIST_ONE_ISO_A_TARGET, 23)
-            .await
-        {
-            Ok(uid) => {
-                info!("PN532 detected NFC target UID: {uid:?}");
-                Ok(())
-            }
-            Err(e) => {
-                info!("Failed to poll NFC target: {e:?}");
-                Err("Failed to poll NFC target")
-            }
-        }
-    }
-
-    fn parse_nfc_page(
-        iteration: u8,
-        bytes: &[u8],
-    ) -> Result<[u8; BYTES_PER_READ], PageParseError<BYTES_PER_READ>> {
-        let slice_len = bytes.len().min(BYTES_PER_READ + 1);
-        let mut arr = [0; BYTES_PER_READ];
-        arr[..slice_len - 1].copy_from_slice(&bytes[1..slice_len]);
-
-        match bytes.first() {
-            Some(0x00) => Ok(arr),
-            error => Err(PageParseError {
-                iteration,
-                bytes: arr,
-                status_code: error.copied().map(Into::into),
-            }),
-        }
-    }
-
-    pub async fn read_card_data(&mut self) -> Result<Vec<u8>, &'static str> {
-        if let Err(e) = self.poll_target().await {
-            error!("PN532 I2C target poll failed before reading card data: {e:?}");
-            return Err(e);
-        }
-
-        let mut data: Vec<u8> = Vec::with_capacity(858);
-
-        for i in (0x0B..=230).step_by(PAGES_PER_READ) {
-            let bytes = loop {
-                let read = self
-                    .pn532
-                    .process_async(&Request::ntag_read(i), BYTES_PER_READ + 1)
-                    .await;
-
-                let bytes = match read {
-                    Ok(bytes) => bytes,
-                    Err(e) => {
-                        error!("Reading page {i} failed: {e:?}");
-                        continue;
-                    }
-                };
-
-                match Self::parse_nfc_page(i, bytes) {
-                    Ok(data) => break data,
-                    Err(e) => {
-                        error!("Parsing page failed: {e}");
-                        if e.status_code.is_some_and(|e| e.protocol_error) {
-                            // After protocol error, all subsequent reads will fail, so we can stop trying to read more pages.
-                            return Err("Failed to parse NFC page");
-                        }
-                    }
-                }
-            };
-            let bytes = if i == 0x0B { &bytes[1..] } else { &bytes };
-            data.extend(bytes);
-        }
-        Ok(data)
-    }
-
-    pub fn device_mut(&mut self) -> &mut Pn532Device<I2C> {
-        &mut self.pn532
-    }
-}

src/drivers/primary_lcd.rs

@@ -1,42 +0,0 @@
-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::AtomicDevice;
-use embedded_hal_bus::util::AtomicCell;
-use esp_hal::delay::Delay;
-use esp_hal::gpio::Output;
-use ili9341::{DisplaySize240x320, Ili9341, Orientation};
-
-use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput};
-
-type GenericPrimaryDisplay<'a, BUS, DC, RES> =
-    Ili9341<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RES>;
-pub type PrimaryDisplay<'a> =
-    GenericPrimaryDisplay<'a, DisplaySpiBus, SharedOutput<'a>, Output<'a>>;
-
-pub struct PrimaryDisplayPinConfiguration<'a> {
-    pub spi_bus: &'a AtomicCell<DisplaySpiBus>,
-    pub cs: Output<'a>,
-    pub reset: Output<'a>,
-    pub dc: SharedOutput<'a>,
-}
-
-impl<'a> PrimaryDisplayPinConfiguration<'a> {
-    pub fn build(self) -> PrimaryDisplay<'a> {
-        let spi_dev = AtomicDevice::new(self.spi_bus, self.cs, Delay::new()).unwrap();
-        let iface = SPIInterface::new(spi_dev, self.dc);
-
-        let mut display = Ili9341::new(
-            iface,
-            self.reset,
-            &mut Delay::new(),
-            Orientation::Portrait,
-            DisplaySize240x320,
-        )
-        .unwrap();
-
-        display.clear(Rgb565::BLACK).unwrap();
-        display
-    }
-}

src/drivers/secondary_oled.rs

@@ -1,194 +0,0 @@
-use alloc::{format, string::String};
-use display_interface_spi::SPIInterface;
-use embedded_graphics::pixelcolor::BinaryColor;
-use embedded_hal_bus::spi::AtomicDevice;
-use embedded_hal_bus::util::AtomicCell;
-use esp_hal::delay::Delay;
-use esp_hal::gpio::Output;
-
-use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput, SharedReset};
-
-pub struct SecondaryDisplay<'a>(
-    #[cfg(feature = "wokwi")] ssd1306_aliases::SecondaryDisplay<'a>,
-    #[cfg(not(feature = "wokwi"))] ch1115_aliases::SecondaryDisplay<'a>,
-);
-
-impl<'a> SecondaryDisplay<'a> {
-    pub fn flush(&mut self) -> Result<(), String> {
-        #[cfg(not(feature = "wokwi"))]
-        return self.0.flush().map_err(|e| format!("{e:?}"));
-        #[cfg(feature = "wokwi")]
-        return Ok(());
-    }
-}
-
-impl<'a> embedded_graphics::geometry::Dimensions for SecondaryDisplay<'a> {
-    fn bounding_box(&self) -> embedded_graphics::primitives::Rectangle {
-        self.0.bounding_box()
-    }
-}
-
-impl<'a> embedded_graphics::draw_target::DrawTarget for SecondaryDisplay<'a> {
-    type Color = BinaryColor;
-
-    type Error = String;
-
-    fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
-    where
-        I: IntoIterator<Item = embedded_graphics::prelude::Pixel<Self::Color>>,
-    {
-        self.0.draw_iter(pixels).map_err(|e| format!("{e:?}"))
-    }
-
-    fn fill_contiguous<I>(
-        &mut self,
-        area: &embedded_graphics::primitives::Rectangle,
-        colors: I,
-    ) -> Result<(), Self::Error>
-    where
-        I: IntoIterator<Item = Self::Color>,
-    {
-        self.0
-            .fill_contiguous(area, colors)
-            .map_err(|e| format!("{e:?}"))
-    }
-
-    fn fill_solid(
-        &mut self,
-        area: &embedded_graphics::primitives::Rectangle,
-        color: Self::Color,
-    ) -> Result<(), Self::Error> {
-        self.0.fill_solid(area, color).map_err(|e| format!("{e:?}"))
-    }
-
-    fn clear(&mut self, color: Self::Color) -> Result<(), Self::Error> {
-        #[cfg(feature = "wokwi")]
-        return self.0.clear(color).map_err(|e| format!("{e:?}"));
-
-        #[cfg(not(feature = "wokwi"))]
-        {
-            let _ = color;
-            self.0.clear().map_err(|e| format!("{e:?}"))
-        }
-    }
-}
-
-pub const SECONDARY_DISPLAY_COUNT: usize = 3;
-
-pub struct SecondaryDisplayPinConfiguration<'a> {
-    pub spi_bus: &'a AtomicCell<DisplaySpiBus>,
-    pub cs_pins: [Output<'a>; 3],
-    pub res: SharedReset<'a>,
-    pub dc: SharedOutput<'a>,
-}
-
-impl<'a> SecondaryDisplayPinConfiguration<'a> {
-    pub fn build(self) -> [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
-        #[cfg(feature = "wokwi")]
-        type Displays<'b> = [ssd1306_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
-        #[cfg(not(feature = "wokwi"))]
-        type Displays<'b> = [ch1115_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
-
-        let reset_pin = self.res.clone();
-        let mut displays = Displays::new(self);
-        displays.reset(reset_pin);
-
-        displays.map(SecondaryDisplay)
-    }
-}
-
-trait MultiDisplay<'a> {
-    fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self;
-    fn reset(&mut self, shared_reset: SharedReset<'a>);
-}
-
-mod ch1115_aliases {
-    use super::*;
-    use ch1115::{Ch1115, Size128x64};
-
-    type GenericSecondaryDisplay<'a, BUS, RST, DC> =
-        Ch1115<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RST, Size128x64>;
-    pub type SecondaryDisplay<'a> =
-        GenericSecondaryDisplay<'a, DisplaySpiBus, SharedReset<'a>, SharedOutput<'a>>;
-
-    impl<'a> MultiDisplay<'a> for [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
-        fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self {
-            config.cs_pins.map(|cs| {
-                let spi_dev = AtomicDevice::new(config.spi_bus, cs, Delay::new()).unwrap();
-                let interface = SPIInterface::new(spi_dev, config.dc.clone());
-
-                SecondaryDisplay::new(interface, config.res.clone(), Size128x64)
-            })
-        }
-
-        fn reset(&mut self, shared_reset: SharedReset<'a>) {
-            let mut displays = self.iter_mut().peekable();
-
-            // Reset all secondaries via shared reset
-            let Some(any_display) = displays.peek_mut() else {
-                // no display to initialize
-                return;
-            };
-            any_display.hard_reset(&mut Delay::new()).unwrap();
-
-            shared_reset.disable(true);
-
-            for (i, display) in displays.enumerate() {
-                display
-                    .init(&mut Delay::new())
-                    .map_err(|e| format!("Failed to init secondary display {}: {e:?}", i + 1))
-                    .unwrap();
-            }
-        }
-    }
-}
-
-mod ssd1306_aliases {
-    use super::*;
-    use ssd1306::{
-        Ssd1306, mode::BufferedGraphicsMode, rotation::DisplayRotation, size::DisplaySize128x64,
-    };
-
-    type GenericSecondaryDisplay<'a, BUS, DC> = Ssd1306<
-        SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>,
-        DisplaySize128x64,
-        BufferedGraphicsMode<DisplaySize128x64>,
-    >;
-    pub type SecondaryDisplay<'a> = GenericSecondaryDisplay<'a, DisplaySpiBus, SharedOutput<'a>>;
-
-    impl<'a> MultiDisplay<'a> for [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
-        fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self {
-            config.cs_pins.map(|cs| {
-                let spi_dev = AtomicDevice::new(config.spi_bus, cs, Delay::new()).unwrap();
-                let interface = SPIInterface::new(spi_dev, config.dc.clone());
-
-                Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate0)
-                    .into_buffered_graphics_mode()
-            })
-        }
-
-        fn reset(&mut self, mut shared_reset: SharedReset<'a>) {
-            use ssd1306::mode::DisplayConfig as _;
-
-            let mut displays = self.iter_mut().peekable();
-
-            // Reset all secondaries via shared reset
-            let Some(any_display) = displays.peek_mut() else {
-                // no display to initialize
-                return;
-            };
-            any_display
-                .reset(&mut shared_reset, &mut Delay::new())
-                .unwrap();
-
-            shared_reset.disable(true);
-
-            for (i, display) in displays.enumerate() {
-                display
-                    .init()
-                    .map_err(|e| format!("Failed to init secondary display {}: {e:?}", i + 1))
-                    .unwrap();
-            }
-        }
-    }
-}

src/drivers/spi_bus.rs

@@ -1,187 +0,0 @@
-use alloc::boxed::Box;
-use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embedded_hal::digital::ErrorType;
-use embedded_hal::digital::OutputPin as EhOutputPin;
-use embedded_hal_bus::util::AtomicCell;
-use esp_hal::gpio::interconnect::{PeripheralInput, PeripheralOutput};
-use esp_hal::gpio::{Level, Output, OutputConfig, OutputPin};
-use esp_hal::spi::Mode;
-use esp_hal::spi::master::{Config as SpiConfig, Spi};
-use esp_hal::time::Rate;
-
-use crate::drivers::primary_lcd::PrimaryDisplay;
-use crate::drivers::primary_lcd::PrimaryDisplayPinConfiguration;
-use crate::drivers::secondary_oled::SecondaryDisplay;
-use crate::drivers::secondary_oled::SecondaryDisplayPinConfiguration;
-
-use core::cell::RefCell;
-use embassy_sync::blocking_mutex::Mutex as BlockingMutex;
-
-pub struct SharedPin<'a, P> {
-    mutex: &'a BlockingMutex<CriticalSectionRawMutex, RefCell<P>>,
-}
-
-impl<'a, P> Clone for SharedPin<'a, P> {
-    fn clone(&self) -> Self {
-        Self { mutex: self.mutex }
-    }
-}
-
-impl<'a, P> SharedPin<'a, P> {
-    pub fn new(pin: P) -> Self {
-        let mutexed = BlockingMutex::new(RefCell::new(pin));
-        let mutex = Box::leak(Box::new(mutexed));
-        Self { mutex }
-    }
-}
-
-impl<'a, P: EhOutputPin> ErrorType for SharedPin<'a, P> {
-    type Error = P::Error;
-}
-
-impl<'a, P: EhOutputPin> EhOutputPin for SharedPin<'a, P> {
-    fn set_low(&mut self) -> Result<(), Self::Error> {
-        self.mutex.lock(|p| p.borrow_mut().set_low())
-    }
-
-    fn set_high(&mut self) -> Result<(), Self::Error> {
-        self.mutex.lock(|p| p.borrow_mut().set_high())
-    }
-}
-
-pub struct SharedResetPin<'a, P> {
-    mutex: &'a BlockingMutex<CriticalSectionRawMutex, RefCell<(P, bool)>>,
-}
-
-impl<'a, P> SharedResetPin<'a, P> {
-    pub fn new(pin: P, disabled: bool) -> Self {
-        let mutexed = BlockingMutex::new(RefCell::new((pin, disabled)));
-        let mutex = Box::leak(Box::new(mutexed));
-        Self { mutex }
-    }
-
-    pub fn disable(&self, disabled: bool) {
-        self.mutex.lock(|p| {
-            p.borrow_mut().1 = disabled;
-        });
-        if disabled {
-            log::debug!("Reset pin disabled (masked). No more resets now.");
-        } else {
-            log::debug!("Reset pin enabled (unmasked). Reset now possible.");
-        }
-    }
-}
-
-impl<'a, P> Clone for SharedResetPin<'a, P> {
-    fn clone(&self) -> Self {
-        Self { mutex: self.mutex }
-    }
-}
-
-impl<'a, P: EhOutputPin> ErrorType for SharedResetPin<'a, P> {
-    type Error = P::Error;
-}
-
-impl<'a, P: EhOutputPin> EhOutputPin for SharedResetPin<'a, P> {
-    fn set_low(&mut self) -> Result<(), Self::Error> {
-        self.mutex.lock(|p| {
-            let mut guard = p.borrow_mut();
-            let disabled = guard.1;
-            let pin = &mut guard.0;
-            if !disabled { pin.set_low() } else { Ok(()) }
-        })
-    }
-
-    fn set_high(&mut self) -> Result<(), Self::Error> {
-        self.mutex.lock(|p| {
-            let mut guard = p.borrow_mut();
-            let disabled = guard.1;
-            let pin = &mut guard.0;
-            if !disabled { pin.set_high() } else { Ok(()) }
-        })
-    }
-}
-
-pub type SharedOutput<'a> = SharedPin<'a, Output<'a>>;
-pub type SharedReset<'a> = SharedResetPin<'a, Output<'a>>;
-pub type DisplaySpiBus = Spi<'static, esp_hal::Blocking>;
-
-pub struct DisplayPinConfiguration<SPI, SCK, MOSI, MISO, CS0, CS1, CS2, CS3, RES1, RES2, DC> {
-    pub spi_peripheral: SPI,
-    pub sck: SCK,
-    pub mosi: MOSI,
-    pub miso: MISO,
-    pub cs_primary: CS0,
-    pub cs_secondary_1: CS1,
-    pub cs_secondary_2: CS2,
-    pub cs_secondary_3: CS3,
-    pub reset_primary: RES1,
-    pub reset_secondary: RES2,
-    pub dc_pin: DC,
-}
-
-impl<SPI, SCK, MOSI, MISO, CS0, CS1, CS2, CS3, RES1, RES2, DC>
-    DisplayPinConfiguration<SPI, SCK, MOSI, MISO, CS0, CS1, CS2, CS3, RES1, RES2, DC>
-where
-    SPI: esp_hal::spi::master::Instance + 'static,
-    SCK: PeripheralOutput<'static>,
-    MOSI: PeripheralOutput<'static>,
-    MISO: PeripheralInput<'static>,
-    CS0: OutputPin + 'static,
-    CS1: OutputPin + 'static,
-    CS2: OutputPin + 'static,
-    CS3: OutputPin + 'static,
-    RES1: OutputPin + 'static,
-    RES2: OutputPin + 'static,
-    DC: OutputPin + 'static,
-{
-    pub fn build(self) -> (PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]) {
-        let spi = Spi::new(
-            self.spi_peripheral,
-            SpiConfig::default()
-                .with_frequency(Rate::from_khz(20_000))
-                .with_mode(Mode::_0),
-        )
-        .unwrap()
-        .with_sck(self.sck)
-        .with_mosi(self.mosi)
-        .with_miso(self.miso);
-
-        let bus_static: &'static AtomicCell<_> = Box::leak(Box::new(AtomicCell::new(spi)));
-        let reset_secondary = SharedResetPin::new(
-            Output::new(self.reset_secondary, Level::High, OutputConfig::default()),
-            false,
-        );
-        let dc = SharedPin::new(Output::new(
-            self.dc_pin,
-            Level::High,
-            OutputConfig::default(),
-        ));
-
-        let primary = PrimaryDisplayPinConfiguration {
-            spi_bus: bus_static,
-            cs: low_active(self.cs_primary),
-            reset: low_active(self.reset_primary),
-            dc: dc.clone(),
-        }
-        .build();
-
-        let secondaries = SecondaryDisplayPinConfiguration {
-            spi_bus: bus_static,
-            cs_pins: [
-                low_active(self.cs_secondary_1),
-                low_active(self.cs_secondary_2),
-                low_active(self.cs_secondary_3),
-            ],
-            res: reset_secondary,
-            dc,
-        }
-        .build();
-
-        (primary, secondaries)
-    }
-}
-
-fn low_active<'a, CS: OutputPin + 'a>(pin: CS) -> Output<'a> {
-    Output::new(pin, Level::High, OutputConfig::default())
-}

src/drivers/tertiary_lcd.rs

@@ -1,410 +0,0 @@
-use embedded_hal_bus::i2c::AtomicDevice;
-use esp_hal::delay::Delay;
-use i2c_character_display::{CharacterDisplayPCF8574T, LcdDisplayType};
-use log::error;
-
-use crate::create_custom_char_set;
-use crate::drivers::i2c_bus::{I2cBus, I2cDevice};
-
-type GenericTertiaryDisplay<I2C> = CharacterDisplayPCF8574T<I2C, Delay>;
-type TertiaryDisplayRaw<'a> = GenericTertiaryDisplay<I2cDevice<'a>>;
-pub type TertiaryDisplayError<'a> = i2c_character_display::CharacterDisplayError<I2cDevice<'a>>;
-
-pub struct TertiaryDisplayPinConfiguration<'a> {
-    pub i2c: I2cBus<'a>,
-}
-
-impl<'a> TertiaryDisplayPinConfiguration<'a> {
-    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");
-                TertiaryDisplay {
-                    display: lcd,
-                    charset: create_custom_char_set!(),
-                }
-            }
-            Err(e) => {
-                panic!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum TertiaryDisplayWriteError<'a> {
-    Display(TertiaryDisplayError<'a>),
-    Format(LinesError),
-}
-
-impl<'a> From<TertiaryDisplayError<'a>> for TertiaryDisplayWriteError<'a> {
-    fn from(value: TertiaryDisplayError<'a>) -> Self {
-        Self::Display(value)
-    }
-}
-
-impl From<LinesError> for TertiaryDisplayWriteError<'_> {
-    fn from(value: LinesError) -> Self {
-        Self::Format(value)
-    }
-}
-
-impl<'a> core::fmt::Display for TertiaryDisplayWriteError<'a> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match self {
-            Self::Display(e) => write!(f, "display error: {e}"),
-            Self::Format(e) => write!(f, "format error: {e}"),
-        }
-    }
-}
-
-pub struct TertiaryDisplay<'a> {
-    display: TertiaryDisplayRaw<'a>,
-    charset: CustomCharset,
-}
-
-impl<'a> TertiaryDisplay<'a> {
-    pub const WIDTH: usize = 16;
-    pub const ROWS: usize = 2;
-
-    pub fn inner_mut(&mut self) -> &mut TertiaryDisplayRaw<'a> {
-        &mut self.display
-    }
-
-    pub fn load_charset(&mut self, charset: CustomCharset) -> Result<(), TertiaryDisplayError<'a>> {
-        self.charset = charset;
-        for (index, charmap) in self
-            .charset
-            .set
-            .into_iter()
-            .enumerate()
-            .take(self.charset.len)
-        {
-            self.display
-                .create_char(index as u8, charmap)
-                .inspect_err(|e| error!("I2C Custom character {index} init failed: {e}"))?;
-        }
-        Ok(())
-    }
-
-    pub fn clear(&mut self) -> Result<(), TertiaryDisplayError<'a>> {
-        if let Err(e) = self.display.clear() {
-            error!("I2C LCD clear failed; bus may be busy or device unresponsive");
-            return Err(e);
-        }
-        Ok(())
-    }
-
-    /// Writes text to the LCD. Normal strings wrap by default but this can be controlled
-    /// via explicit [`Lines::checked`].
-    pub fn write<'b, L: Into<Lines<'b>>>(
-        &mut self,
-        text: L,
-    ) -> Result<(), TertiaryDisplayWriteError<'a>> {
-        let lines = text.into();
-
-        // Use original to get correct position in original string
-        lines
-            .original
-            .iter()
-            .try_for_each(|text| Lines::invalid_chars(text, Some(&self.charset)))?;
-
-        let lines = lines.into_result()?;
-
-        self.display
-            .clear()
-            .inspect_err(|e| error!("I2C LCD clear failed before wrapped write: {e}"))?;
-
-        for (row, line) in lines.into_iter().enumerate() {
-            self.display.set_cursor(0, row as u8).inspect_err(|e| {
-                error!("I2C LCD cursor move failed while writing wrapped row {row}: {e}")
-            })?;
-
-            self.display
-                .print(line)
-                .inspect_err(|e| error!("I2C LCD wrapped write failed on row {row}: {e}"))?;
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum LinesError {
-    ColumnOverflow { line: u8, columns: usize },
-    LineOverflow,
-    InvalidChar { position: usize, symbol: char },
-}
-
-impl core::fmt::Display for LinesError {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match self {
-            Self::ColumnOverflow { line, columns } => {
-                write!(
-                    f,
-                    "text too long for line {line}: {columns} > {}",
-                    TertiaryDisplay::WIDTH
-                )
-            }
-            Self::LineOverflow => write!(f, "text has too many lines"),
-            Self::InvalidChar { position, symbol } => {
-                write!(f, "Invalid character {symbol} at offset {position}")
-            }
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct Lines<'a> {
-    pub lines: Result<[&'a str; TertiaryDisplay::ROWS], LinesError>,
-    /// Unmodified original string. Only first entry is populated unless constructed with [`by_line`]
-    pub original: [&'a str; TertiaryDisplay::ROWS],
-}
-
-impl<'a> Lines<'a> {
-    pub fn into_result(self) -> Result<[&'a str; TertiaryDisplay::ROWS], LinesError> {
-        self.lines
-    }
-
-    /// Validates that the text contains only non-control ASCII characters,
-    /// newlines, and contiguous custom characters up to `charset.len`.
-    /// If `charset` is `None`, allow any custom char up to and including maximum.
-    pub fn invalid_chars(text: &str, charset: Option<&CustomCharset>) -> Result<(), LinesError> {
-        for (pos, c) in text.char_indices() {
-            let is_standard_valid = c == '\n' || (' '..='~').contains(&c);
-
-            if is_standard_valid {
-                continue;
-            }
-
-            let first_invalid_custom_char =
-                charset.map(|c| c.len).unwrap_or(CUSTOM_CHAR_COUNT.into());
-
-            if (c as usize) >= first_invalid_custom_char {
-                return Err(LinesError::InvalidChar {
-                    position: pos,
-                    symbol: c,
-                });
-            }
-        }
-        Ok(())
-    }
-
-    /// Checks pre-split lines strictly for length and valid characters.
-    pub fn by_line(lines: [&'a str; TertiaryDisplay::ROWS]) -> Self {
-        let this = |res| Self {
-            lines: res,
-            original: lines,
-        };
-
-        for line in lines.iter() {
-            if let Err(e) = Self::invalid_chars(line, None) {
-                return this(Err(e));
-            }
-        }
-
-        for (i, line) in lines.iter().enumerate() {
-            if line.len() > TertiaryDisplay::WIDTH {
-                return this(Err(LinesError::ColumnOverflow {
-                    line: i as u8,
-                    columns: line.len(),
-                }));
-            }
-        }
-
-        this(Ok(lines))
-    }
-
-    /// Strictly checks an input string.
-    /// Fails if there are invalid chars, too many newlines, or if any segment exceeds WIDTH.
-    pub fn checked(input: &'a str) -> Self {
-        let this = |res| Self {
-            lines: res,
-            original: [input, ""],
-        };
-
-        if let Err(e) = Self::invalid_chars(input, None) {
-            return this(Err(e));
-        }
-
-        let mut out = [""; TertiaryDisplay::ROWS];
-        let mut parts = input.split('\n');
-
-        for (i, out) in out.iter_mut().enumerate() {
-            if let Some(part) = parts.next() {
-                if part.len() > TertiaryDisplay::WIDTH {
-                    return this(Err(LinesError::ColumnOverflow {
-                        line: i as u8,
-                        columns: part.len(),
-                    }));
-                }
-                *out = part;
-            }
-        }
-
-        if parts.next().is_some() {
-            return this(Err(LinesError::LineOverflow));
-        }
-
-        this(Ok(out))
-    }
-
-    /// Wraps text automatically at `WIDTH` or at newlines.
-    /// Discards (clamps) any leftover text that exceeds `ROWS`.
-    /// Fails immediately if invalid characters are present.
-    pub fn clamped(input: &'a str) -> Self {
-        let this = |res| Self {
-            lines: res,
-            original: [input, ""],
-        };
-        if let Err(e) = Self::invalid_chars(input, None) {
-            return this(Err(e));
-        }
-
-        let mut out = [""; TertiaryDisplay::ROWS];
-        let mut remaining = input;
-
-        for out in out.iter_mut() {
-            if remaining.is_empty() {
-                break;
-            }
-
-            let (segment, rest) = Self::next_segment(remaining, TertiaryDisplay::WIDTH);
-            *out = segment;
-            remaining = rest;
-        }
-
-        this(Ok(out))
-    }
-
-    /// Helper function to slice an ASCII string up to `max_width`
-    /// or until the next newline, whichever comes first.
-    fn next_segment(s: &str, max_width: usize) -> (&str, &str) {
-        let nl_pos = s.find('\n');
-
-        let split_pos = match nl_pos {
-            Some(pos) if pos <= max_width => pos,
-            _ => core::cmp::min(s.len(), max_width),
-        };
-
-        let segment = &s[..split_pos];
-        let mut rest = &s[split_pos..];
-
-        if let Some(stripped) = rest.strip_prefix('\n') {
-            rest = stripped;
-        }
-
-        (segment, rest)
-    }
-}
-
-impl<'a> From<&'a str> for Lines<'a> {
-    fn from(value: &'a str) -> Self {
-        Self::clamped(value)
-    }
-}
-
-impl<'a> From<&'a alloc::string::String> for Lines<'a> {
-    fn from(value: &'a alloc::string::String) -> Self {
-        Self::clamped(value)
-    }
-}
-
-/// 5x8 pixel charmap. Each set bit is a black pixel.
-pub type CharMap = [u8; 8];
-pub struct CustomCharset {
-    set: [CharMap; CUSTOM_CHAR_COUNT as usize],
-    len: usize,
-}
-
-impl core::ops::Index<CharMap> for CustomCharset {
-    type Output = &'static str;
-
-    fn index(&self, map: CharMap) -> &Self::Output {
-        let encoded = self.set[..self.len]
-            .iter()
-            .position(|&m| m == map)
-            .expect("Unknown char map in this set.");
-
-        match encoded {
-            0 => &"\x00",
-            1 => &"\x01",
-            2 => &"\x02",
-            3 => &"\x03",
-            4 => &"\x04",
-            5 => &"\x05",
-            6 => &"\x06",
-            7 => &"\x07",
-            8 => &"\x08",
-            9 => &"\x09",
-            10 => &"\x0A",
-            11 => &"\x0B",
-            12 => &"\x0C",
-            13 => &"\x0D",
-            14 => &"\x0E",
-            15 => &"\x0F",
-            pos => unreachable!(
-                "More than {CUSTOM_CHAR_COUNT} (=max) elements in array? Found element at {pos}."
-            ),
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! create_custom_char_set {
-    () => {{
-        CustomCharset { set: [EMPTY; CUSTOM_CHAR_COUNT as usize], len: 0 }
-    }};
-    ($($char:expr),+ $(,)?) => {{
-        // Count how many characters were passed using macro repetition length
-        const LEN: usize = [$(stringify!($char)),+].len();
-
-        // Ensure we don't exceed the defined maximum capacity
-        const _: () = assert!(
-            LEN <= CUSTOM_CHAR_COUNT as usize,
-            "Too many characters provided for CUSTOM_CHAR_COUNT"
-        );
-
-        // Build a fixed-size array populated with the provided characters,
-        // and pad the rest with empty CharMaps (zeros) to fit CUSTOM_CHAR_COUNT.
-        const SET: [CharMap; CUSTOM_CHAR_COUNT as usize] = {
-            let mut buffer = [[0u8; 8]; CUSTOM_CHAR_COUNT as usize];
-            let input = [$($char),*];
-            let mut i = 0;
-            while i < input.len() {
-                buffer[i] = input[i];
-                i += 1;
-            }
-            buffer
-        };
-
-        CustomCharset {
-            set: SET,
-            len: LEN,
-        }
-    }};
-}
-
-pub const CUSTOM_CHAR_COUNT: u8 = 16;
-
-pub const HEART: CharMap = [
-    0b00000, // Top row
-    0b01010, //  * *
-    0b11111, // *****
-    0b11111, // *****
-    0b01110, //  ***
-    0b00100, //   *
-    0b00000, // Bottom row
-    0b00000, // Cursor line (usually left blank)
-];
-
-pub const EMPTY: CharMap = [0; 8];
-pub const BOX: CharMap = [
-    0b11111, 0b11111, 0b11111, 0b11111, 0b11111, 0b11111, 0b11111,
-    0b00000, // Cursor line (usually left blank)
-];
-
-pub const EXAMPLE: CustomCharset = create_custom_char_set!(HEART, BOX, EMPTY);
-

src/lib.rs

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

src/navigation.rs

@@ -1,4 +0,0 @@
-pub mod inputs;
-pub mod navigation;
-pub mod outputs;
-pub mod state;

src/navigation/inputs.rs

@@ -1,81 +0,0 @@
-use embassy_futures::select::select_array;
-use embassy_time::{Duration, Timer};
-use embedded_hal::digital::InputPin;
-use embedded_hal_async::digital::Wait;
-use esp_hal::gpio::Input;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum NavCommand {
-    NextCard,
-    PrevCard,
-    Select,
-    ScanTag,
-}
-
-pub struct Inputs {
-    pub up: Input<'static>,
-    pub down: Input<'static>,
-    pub left: Input<'static>,
-    pub right: Input<'static>,
-    pub back: Input<'static>,
-    pub ok: Input<'static>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ButtonAction {
-    Up = 0,
-    Down = 1,
-    Left = 2,
-    Right = 3,
-    Ok = 4,
-    Back = 5,
-}
-
-impl Inputs {
-    pub async fn wait_for_press(&mut self) -> ButtonAction {
-        let (_, index) = select_array([
-            wait_for_button(&mut self.up),
-            wait_for_button(&mut self.down),
-            wait_for_button(&mut self.left),
-            wait_for_button(&mut self.right),
-            wait_for_button(&mut self.ok),
-            wait_for_button(&mut self.back),
-        ])
-        .await;
-
-        match index {
-            0 => ButtonAction::Up,
-            1 => ButtonAction::Down,
-            2 => ButtonAction::Left,
-            3 => ButtonAction::Right,
-            4 => ButtonAction::Ok,
-            5 => ButtonAction::Back,
-            id => panic!("Unknown button {id} pressed"),
-        }
-    }
-}
-
-/// Waits for a button press, filtering out fast transients and mechanical bounce.
-async fn wait_for_button<P>(pin: &mut P)
-where
-    P: Wait + InputPin,
-{
-    loop {
-        // 1. Wait for the hardware interrupt (could be a real press or crosstalk)
-        let _ = pin.wait_for_falling_edge().await;
-
-        // 2. Debounce window: let the noise settle
-        Timer::after(Duration::from_millis(30)).await;
-
-        // 3. Verify the pin is still held down
-        // (Adapt unwrap() based on your specific HAL's Error type)
-        if pin.is_low().unwrap_or(false) {
-            // OPTIONAL: Wait for the button to be released before returning
-            // so holding it down doesn't spam triggers.
-            // let _ = pin.wait_for_rising_edge().await;
-            // Timer::after(Duration::from_millis(30)).await;
-
-            return;
-        }
-    }
-}

src/navigation/navigation.rs

@@ -1,90 +0,0 @@
-use crate::card::model::Card;
-use crate::navigation::inputs::ButtonAction;
-use crate::navigation::inputs::Inputs;
-use crate::navigation::outputs::Outputs;
-use crate::navigation::state::NavigationState;
-use crate::views::view::View;
-
-use embassy_futures::select::{Either, select};
-use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embassy_time::{Duration, Timer};
-
-pub type Mutex<T> = embassy_sync::mutex::Mutex<CriticalSectionRawMutex, T>;
-pub type Signal<T> = embassy_sync::signal::Signal<CriticalSectionRawMutex, T>;
-pub static CARD_DATA: Mutex<Option<Card>> = Mutex::new(None);
-const DEBOUNCE_DURATION_MILLIS: u64 = 100;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Action {
-    Button(ButtonAction),
-    Timer,
-}
-
-pub struct NewState {
-    pub view: View,
-    pub replace_view: bool,
-    pub redraw: bool,
-}
-
-pub trait Navigable {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send;
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send;
-}
-
-#[embassy_executor::task]
-pub async fn run(mut inputs: Inputs, mut outputs: Outputs) {
-    log::info!("starting navigation");
-
-    let mut state = NavigationState::new();
-    state.screens.last().unwrap().display(&mut outputs).await;
-
-    loop {
-        let selection = select(
-            inputs.wait_for_press(),
-            Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)),
-        )
-        .await;
-
-        let action = match selection {
-            Either::First(button) => Action::Button(button),
-            Either::Second(_) => Action::Timer,
-        };
-
-        if Action::Timer != action {
-            log::info!("Action: {:?}", action);
-        }
-
-        let new_state = if action == Action::Button(ButtonAction::Back) {
-            if state.screens.len() > 1 {
-                state.screens.pop();
-            }
-            NewState {
-                view: state.screens.last().expect("no screen on stack").clone(),
-                replace_view: false,
-                redraw: true,
-            }
-        } else {
-            let new_state = state
-                .screens
-                .last()
-                .expect("no screen on stack")
-                .handle_input(action)
-                .await;
-            if action == Action::Timer && !new_state.redraw {
-                continue;
-            }
-            new_state
-        };
-
-        if new_state.replace_view {
-            state.screens.pop();
-        }
-        state.screens.push(new_state.view);
-
-        if action != Action::Timer || new_state.redraw {
-            state.screens.last().unwrap().display(&mut outputs).await;
-        }
-
-        Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
-    }
-}

src/navigation/outputs.rs

@@ -1,26 +0,0 @@
-use embedded_graphics::{
-    draw_target::DrawTarget as _, pixelcolor::{BinaryColor, Rgb565, RgbColor as _},
-};
-
-use crate::drivers::{
-    primary_lcd::PrimaryDisplay, secondary_oled::SecondaryDisplay, tertiary_lcd::TertiaryDisplay,
-};
-
-pub struct Outputs {
-    pub primary_display: PrimaryDisplay<'static>,
-    pub secondary_display_1: SecondaryDisplay<'static>,
-    pub secondary_display_2: SecondaryDisplay<'static>,
-    pub secondary_display_3: SecondaryDisplay<'static>,
-    pub tertiary_display: TertiaryDisplay<'static>,
-    pub _led_a: (),
-}
-
-impl Outputs {
-    pub fn clear_screens(&mut self) {
-        self.primary_display.clear(Rgb565::BLACK).unwrap();
-        self.secondary_display_1.clear(BinaryColor::Off).unwrap();
-        self.secondary_display_2.clear(BinaryColor::Off).unwrap();
-        self.secondary_display_3.clear(BinaryColor::Off).unwrap();
-        self.tertiary_display.clear().unwrap();
-    }
-}

src/navigation/state.rs

@@ -1,40 +0,0 @@
-use crate::views::{main_menu::MainMenu, view::View};
-use alloc::vec;
-use alloc::vec::Vec;
-
-#[derive(Debug, Clone)]
-pub struct NavigationState {
-    pub screens: Vec<View>,
-}
-
-impl Default for NavigationState {
-    fn default() -> Self {
-        Self {
-            screens: vec![View::Main(MainMenu { selected: 0 })],
-        }
-    }
-}
-
-impl NavigationState {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn back(&mut self) -> &View {
-        match &self.screens.len() {
-            0 => {
-                log::info!("No screens to go back to");
-                self.screens.last().unwrap()
-            }
-            1 => {
-                log::info!("Only one screen on stack, cannot go back");
-                self.screens.last().unwrap()
-            }
-            _ => {
-                log::info!("Going back to previous screen");
-                self.screens.pop();
-                self.screens.last().unwrap()
-            }
-        }
-    }
-}

src/network.rs

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

src/network/api_client.rs

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

src/network/wifi.rs

@@ -1,67 +0,0 @@
-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

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

src/storage/dex_db.rs

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

src/storage/nvs.rs

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

src/views.rs

@@ -1,8 +0,0 @@
-pub mod card_view;
-pub mod journal_view;
-pub mod main_menu;
-pub mod menu_item;
-pub mod scan_menu;
-pub mod settings_menu;
-pub mod status_bar;
-pub mod view;

src/views/card_view.rs

@@ -1,110 +0,0 @@
-use crate::display::sprite::render_sprite_onto_ili9341;
-use crate::navigation::navigation::NewState;
-use crate::navigation::outputs::Outputs;
-use alloc::format;
-use embedded_graphics::mono_font::MonoTextStyle;
-use embedded_graphics::mono_font::ascii::FONT_6X10;
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::Point;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics::text::Text;
-use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
-use embedded_graphics_core::draw_target::DrawTarget;
-
-use core::future;
-
-use crate::{
-    card::model::{Card, Palette},
-    navigation::navigation::{Action, Navigable},
-    views::view::View,
-};
-
-#[derive(Debug, Clone)]
-pub struct CardView {
-    pub card: Card,
-}
-
-impl Navigable for CardView {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        async move {
-            let display = &mut outputs.primary_display;
-            display.clear(Rgb565::BLACK).unwrap();
-
-            let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320));
-            let bg_color = self.card.cardtype.clone().into();
-
-            let _ = display.fill_solid(&background, bg_color);
-
-            let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
-            Text::new(
-                &format!("Name: {}", self.card.name),
-                Point::new(20, 240),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Type: {}", self.card.cardtype),
-                Point::new(20, 250),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Event: {}", self.card.event),
-                Point::new(20, 260),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("UUID: {}", self.card.uuid),
-                Point::new(20, 270),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Trait1: {}", self.card.trait1),
-                Point::new(20, 280),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Trait2: {}", self.card.trait2),
-                Point::new(20, 290),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Trait3: {}", self.card.trait3),
-                Point::new(20, 300),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-            Text::new(
-                &format!("Secret: {}", self.card.secret),
-                Point::new(20, 310),
-                style,
-            )
-            .draw(display)
-            .unwrap();
-
-            let palette: Palette = self.card.cardtype.clone().into();
-            render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette);
-        }
-    }
-
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
-        let new_state = NewState {
-            view: View::Card(self.clone()),
-            replace_view: true,
-            redraw: !matches!(input, Action::Timer),
-        };
-
-        future::ready(new_state)
-    }
-}

src/views/journal_view.rs

@@ -1,40 +0,0 @@
-use core::future;
-
-use alloc::vec::Vec;
-
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics_core::draw_target::DrawTarget;
-
-use crate::{
-    card::model::Card,
-    navigation::{
-        navigation::{Action, Navigable, NewState},
-        outputs::Outputs,
-    },
-    views::view::View,
-};
-
-#[derive(Debug, Clone)]
-pub struct JournalView {
-    pub cards: Vec<Card>,
-    pub selected_card: usize,
-}
-
-impl Navigable for JournalView {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        async move {
-            outputs.primary_display.clear(Rgb565::BLACK).unwrap();
-        }
-    }
-
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
-        let new_state = NewState {
-            view: View::Journal(self.clone()),
-            replace_view: true,
-            redraw: !matches!(input, Action::Timer),
-        };
-
-        future::ready(new_state)
-    }
-}

src/views/main_menu.rs

@@ -1,88 +0,0 @@
-use alloc::vec;
-
-use crate::card::model::Card;
-use crate::card::{decoder::split_nfc_hex, mock::*};
-
-use crate::navigation::inputs::ButtonAction;
-use crate::navigation::outputs::Outputs;
-use crate::views::card_view::CardView;
-use crate::views::journal_view::JournalView;
-use crate::views::{menu_item, settings_menu::SettingsMenu, view::View};
-
-use crate::navigation::navigation::{Action, Navigable, NewState};
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics_core::draw_target::DrawTarget;
-
-pub const MAX_SELECTED: i32 = 4;
-
-#[derive(Debug, Clone)]
-pub struct MainMenu {
-    pub selected: i32,
-}
-
-impl Navigable for MainMenu {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        let display = &mut outputs.primary_display;
-        display.clear(Rgb565::BLACK).unwrap();
-
-        menu_item::show(display, "Scan card", 0, self.selected);
-        menu_item::show(display, "Last card", 1, self.selected);
-        menu_item::show(display, "Journal", 2, self.selected);
-        menu_item::show(display, "Settings", 3, 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::Main(self.clone()),
-                    replace_view: true,
-                    redraw: false,
-                };
-            };
-
-            let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD3).unwrap()).unwrap();
-            let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap();
-
-            let new_menu = match input {
-                ButtonAction::Up => {
-                    let new_selected = if (self.selected - 1) < 0 {
-                        MAX_SELECTED - 1
-                    } else {
-                        self.selected - 1
-                    };
-                    View::Main(MainMenu {
-                        selected: new_selected,
-                    })
-                }
-                ButtonAction::Down => {
-                    let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
-                    View::Main(MainMenu {
-                        selected: new_selected,
-                    })
-                }
-                ButtonAction::Ok => match self.selected {
-                    0 => View::Scan(crate::views::scan_menu::ScanMenu { progress: 0 }),
-                    1 => View::Card(CardView { card: card_mock1 }),
-                    2 => View::Journal(JournalView {
-                        cards: vec![card_mock1, card_mock2],
-                        selected_card: 0,
-                    }),
-                    3 => View::Settings(SettingsMenu { selected: 0 }),
-                    _ => View::Main(self.clone()),
-                },
-                _ => View::Main(self.clone()),
-            };
-
-            NewState {
-                replace_view: matches!(new_menu, View::Main(_)),
-                view: new_menu,
-                redraw: true,
-            }
-        }
-    }
-}

src/views/menu_item.rs

@@ -1,29 +0,0 @@
-use embedded_graphics::Drawable;
-use embedded_graphics::draw_target::DrawTarget;
-use embedded_graphics::mono_font::MonoTextStyle;
-use embedded_graphics::mono_font::ascii::FONT_10X20;
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::Point;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics::text::Text;
-
-pub fn show<D>(display: &mut D, name: &str, position: i32, selected: i32)
-where
-    D: DrawTarget<Color = Rgb565>,
-    D::Error: core::fmt::Debug,
-{
-    let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
-    let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE);
-
-    Text::new(
-        name,
-        Point::new(40, 40 + position * 40),
-        if position == selected {
-            selected_style
-        } else {
-            style
-        },
-    )
-    .draw(display)
-    .unwrap();
-}

src/views/scan_menu.rs

@@ -1,109 +0,0 @@
-use crate::navigation::inputs::ButtonAction;
-use crate::navigation::navigation::CARD_DATA;
-use crate::navigation::navigation::NewState;
-use crate::navigation::outputs::Outputs;
-
-use alloc::format;
-use embedded_graphics::Drawable;
-use embedded_graphics::geometry::AngleUnit as _;
-use embedded_graphics::geometry::Dimensions as _;
-use embedded_graphics::geometry::Size;
-use embedded_graphics::mono_font::MonoTextStyle;
-use embedded_graphics::mono_font::ascii::FONT_10X20;
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::Point;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics::primitives::Arc;
-use embedded_graphics::primitives::Primitive as _;
-use embedded_graphics::primitives::PrimitiveStyleBuilder;
-use embedded_graphics::primitives::Rectangle;
-use embedded_graphics::primitives::StrokeAlignment;
-use embedded_graphics::text::Alignment;
-use embedded_graphics::text::Baseline;
-use embedded_graphics::text::Text;
-use embedded_graphics::text::TextStyleBuilder;
-use embedded_graphics_core::draw_target::DrawTarget;
-
-use crate::navigation::navigation::{Action, Navigable};
-use crate::views::view::View;
-
-#[derive(Debug, Clone)]
-pub struct ScanMenu {
-    pub progress: u8, // 0..255
-}
-
-impl Navigable for ScanMenu {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        let display = &mut outputs.primary_display;
-        let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
-        display.clear(Rgb565::BLACK).unwrap();
-
-        let display_area = display.bounding_box();
-
-        Text::new("Scanning...", Point::new(20, 30), style)
-            .draw(display)
-            .unwrap();
-
-        // Create styles used by the drawing operations.
-        let arc_stroke = PrimitiveStyleBuilder::new()
-            .stroke_color(Rgb565::WHITE)
-            .stroke_width(5)
-            .stroke_alignment(StrokeAlignment::Inside)
-            .build();
-        let character_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
-        let text_style = TextStyleBuilder::new()
-            .baseline(Baseline::Middle)
-            .alignment(Alignment::Center)
-            .build();
-
-        let sweep = self.progress as f32 * 360.0 / 255.0;
-
-        let width = display_area.size.width;
-        let bounding_box =
-            Rectangle::with_center(display_area.center(), Size::new_equal(4 * width / 5));
-        // log::info!("bounding_box: {:?}", bounding_box);
-        // log::info!("display_area: {:?}", display_area);
-        // Draw an arc with a 5px wide stroke.
-        Arc::new(
-            bounding_box.top_left,
-            bounding_box.size.width,
-            90.0.deg(),
-            sweep.deg(),
-        )
-        .into_styled(arc_stroke)
-        .draw(display)
-        .unwrap();
-
-        // Draw centered text.
-        let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.);
-        Text::with_text_style(&text, display_area.center(), character_style, text_style)
-            .draw(display)
-            .unwrap();
-
-        core::future::ready(())
-    }
-
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
-        async move {
-            if let Some(card_data) = CARD_DATA.lock().await.take() {
-                NewState {
-                    view: View::Card(crate::views::card_view::CardView { card: card_data }),
-                    replace_view: true,
-                    redraw: true,
-                }
-            } else {
-                let new_progress = match input {
-                    Action::Button(ButtonAction::Up) => self.progress.wrapping_add(5),
-                    _ => self.progress,
-                };
-                NewState {
-                    view: View::Scan(ScanMenu {
-                        progress: new_progress,
-                    }),
-                    replace_view: true,
-                    redraw: matches!(input, Action::Button(ButtonAction::Up) | Action::Timer),
-                }
-            }
-        }
-    }
-}

src/views/settings_menu.rs

@@ -1,34 +0,0 @@
-use crate::navigation::navigation::{Action, Navigable, NewState};
-use crate::navigation::outputs::Outputs;
-use crate::views::{menu_item, view::View};
-
-use embedded_graphics::pixelcolor::Rgb565;
-use embedded_graphics::prelude::RgbColor;
-use embedded_graphics_core::draw_target::DrawTarget;
-pub const MAX_SELECTED: i8 = 2;
-
-#[derive(Debug, Clone)]
-pub struct SettingsMenu {
-    pub selected: i32,
-}
-
-impl Navigable for SettingsMenu {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        let display = &mut outputs.primary_display;
-        display.clear(Rgb565::BLACK).unwrap();
-        menu_item::show(display, "System Inforation", 0, self.selected);
-        menu_item::show(display, "Wifi Information", 1, self.selected);
-
-        core::future::ready(())
-    }
-
-    fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
-        async move {
-            NewState {
-                view: View::Settings(SettingsMenu { selected: 0 }),
-                replace_view: true,
-                redraw: !matches!(input, Action::Timer),
-            }
-        }
-    }
-}

src/views/status_bar.rs

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

src/views/view.rs

@@ -1,46 +0,0 @@
-use crate::navigation::outputs::Outputs;
-use crate::views::card_view::CardView;
-use crate::views::{
-    journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
-    settings_menu::SettingsMenu,
-};
-
-use crate::navigation::navigation::{Navigable, NewState};
-
-#[derive(Debug, Clone)]
-pub enum View {
-    Main(MainMenu),
-    Scan(ScanMenu),
-    Settings(SettingsMenu),
-    Journal(JournalView),
-    Card(CardView),
-}
-
-impl Navigable for View {
-    fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
-        async move {
-            match self {
-                View::Main(main_menu) => main_menu.display(outputs).await,
-                View::Scan(scan_menu) => scan_menu.display(outputs).await,
-                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,
-            }
-        }
-    }
-
-    fn handle_input(
-        &self,
-        input: crate::navigation::navigation::Action,
-    ) -> impl core::future::Future<Output = NewState> + Send {
-        async move {
-            match self {
-                View::Main(main_menu) => main_menu.handle_input(input).await,
-                View::Scan(scan_menu) => scan_menu.handle_input(input).await,
-                View::Settings(settings_menu) => settings_menu.handle_input(input).await,
-                View::Journal(journal_view) => journal_view.handle_input(input).await,
-                View::Card(card_view) => card_view.handle_input(input).await,
-            }
-        }
-    }
-}

wokwi.toml

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