18 Commits
Author SHA1 Message Date
ede1998 a77b7761cd add custom flash partitions 2026-08-30 17:15:09 +02:00
rhetenor 91948bdcf5 fix clippy warnings 2026-08-30 09:25:49 +00:00
rhetenor 3c657045ca pass outputs and state to nfc task so that they can show errors on their own 2026-08-30 09:18:53 +00:00
rhetenor 3d36885e11 flash_info_view: align content justified 2026-08-30 08:17:22 +00:00
rhetenor af964bcc37 default to debug log for now 2026-08-30 08:15:52 +00:00
rhetenor ccf16522bb flash_store: forgot to add offset when erasing before write 2026-08-30 08:15:52 +00:00
rhetenor 5ac8fe9610 error view: clear display 2026-08-30 08:15:52 +00:00
ede1998 9ee4b68306 vibe-code wokwi display ch1115 integration 2026-08-30 01:57:18 +02:00
ede1998 aa7fc94068 clippy fixes 2026-08-29 23:40:22 +02:00
ede1998 e2853bc9ab minor component fixes 2026-08-29 23:26:24 +02:00
ede1998andede1998 65fcda98ad model character display 2026-08-29 23:13:54 +02:00
ede1998andede1998 2f358075e6 model nfc reader 2026-08-29 23:13:54 +02:00
ede1998andede1998 056d1a414e re-model primary display 2026-08-29 23:13:54 +02:00
ede1998andede1998 6ce0b23f94 more accurate secondary display model 2026-08-29 23:13:54 +02:00
ede1998andede1998 12a91a7478 more accurate uC model 2026-08-29 23:13:54 +02:00
rhetenor 153acffb86 display views: return error instead of unwrapping 2026-08-29 21:09:09 +00:00
rhetenor ef10eec216 implement error view which displays all error on the display 2026-08-29 20:19:14 +00:00
rhetenor a31c818b37 add peripherals module which has shared state of all peripherals 2026-08-29 17:57:08 +00:00
35 changed files with 1147 additions and 266 deletions
+2 -4
View File
@@ -2,13 +2,11 @@
runner = "espflash flash --monitor --chip esp32s3" runner = "espflash flash --monitor --chip esp32s3"
[env] [env]
ESP_LOG="info" ESP_LOG = "debug"
WM_CONN = '{"ssid": "Wokwi-GUEST", "psk": "", "data": {}}' WM_CONN = '{"ssid": "Wokwi-GUEST", "psk": "", "data": {}}'
[build] [build]
rustflags = [ rustflags = ["-C", "link-arg=-nostartfiles"]
"-C", "link-arg=-nostartfiles",
]
target = "xtensa-esp32s3-none-elf" target = "xtensa-esp32s3-none-elf"
+3
View File
@@ -32,3 +32,6 @@ creaturedex.wiki/
*.zip *.zip
*.lck *.lck
schematics/.history/ schematics/.history/
wokwi/wokwi-api.h
wokwi/ch1115.chip.wasm
Generated
+18
View File
@@ -363,6 +363,7 @@ dependencies = [
"embedded-hal-bus", "embedded-hal-bus",
"embedded-io 0.7.1", "embedded-io 0.7.1",
"embedded-storage", "embedded-storage",
"embedded-text",
"esp-alloc", "esp-alloc",
"esp-bootloader-esp-idf", "esp-bootloader-esp-idf",
"esp-hal", "esp-hal",
@@ -1049,6 +1050,17 @@ dependencies = [
"embedded-storage", "embedded-storage",
] ]
[[package]]
name = "embedded-text"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cf5c72c52db2f7dbe4a9c1ed81cd21301e8d66311b194fa41c04fb4f71843ba"
dependencies = [
"az",
"embedded-graphics",
"object-chain",
]
[[package]] [[package]]
name = "enumset" name = "enumset"
version = "1.1.14" version = "1.1.14"
@@ -2130,6 +2142,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "object-chain"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41af26158b0f5530f7b79955006c2727cd23d0d8e7c3109dc316db0a919784dd"
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.21.4" version = "1.21.4"
+4
View File
@@ -54,6 +54,7 @@ esp-storage = "0.9.0"
embedded-storage = "0.3.1" embedded-storage = "0.3.1"
binary_serde = "1.0.25" binary_serde = "1.0.25"
static_assertions = { version = "1.1.0", default-features = false } static_assertions = { version = "1.1.0", default-features = false }
embedded-text = "0.7.3"
[build-dependencies] [build-dependencies]
log = "0.4.27" log = "0.4.27"
@@ -82,3 +83,6 @@ opt-level = 's'
[features] [features]
default = [] default = []
wokwi = [] wokwi = []
[lints.clippy]
manual_async_fn = "allow"
+23
View File
@@ -1,5 +1,6 @@
fn main() { fn main() {
generate_filter_snippet(); generate_filter_snippet();
compile_custom_wokwi_components();
linker_be_nice(); linker_be_nice();
// make sure linkall.x is the last linker script (otherwise might cause problems with flip-link) // make sure linkall.x is the last linker script (otherwise might cause problems with flip-link)
println!("cargo:rustc-link-arg=-Tlinkall.x"); println!("cargo:rustc-link-arg=-Tlinkall.x");
@@ -70,6 +71,28 @@ fn linker_be_nice() {
); );
} }
fn compile_custom_wokwi_components() {
use std::process::Command;
if std::env::var("CARGO_FEATURE_WOKWI").is_ok() {
println!("cargo:rerun-if-changed=wokwi/ch1115.chip.c");
println!("cargo:rerun-if-changed=wokwi/ch1115.chip.json");
println!("cargo:rerun-if-changed=wokwi/Makefile");
let status = Command::new("make")
.current_dir("wokwi")
.status()
.expect("Failed to execute make command. Is 'make' installed?");
if !status.success() {
panic!(
"Wokwi custom chip compilation failed with status: {}",
status
);
}
}
}
// Taken over from esp_println because impossible to just extend their existing env logger. // Taken over from esp_println because impossible to just extend their existing env logger.
// https://github.com/esp-rs/esp-hal/blob/8fa6d7e985e724d6ad998e34307429b0920da370/esp-println/build.rs // https://github.com/esp-rs/esp-hal/blob/8fa6d7e985e724d6ad998e34307429b0920da370/esp-println/build.rs
fn generate_filter_snippet() { fn generate_filter_snippet() {
+34 -6
View File
@@ -59,19 +59,23 @@
"top": -291.2, "top": -291.2,
"left": -167.2, "left": -167.2,
"attrs": { "pins": "i2c" } "attrs": { "pins": "i2c" }
} },
{ "type": "chip-ch1115", "id": "chip1", "top": 509.82, "left": -4.8, "attrs": {} },
{ "type": "chip-ch1115", "id": "chip2", "top": 625.02, "left": -4.8, "attrs": {} },
{ "type": "chip-ch1115", "id": "chip3", "top": 394.62, "left": -4.8, "attrs": {} },
{ "type": "wokwi-vcc", "id": "vcc1", "top": 39.16, "left": 316.8, "attrs": {} }
], ],
"connections": [ "connections": [
[ "esp1:TX", "$serialMonitor:RX", "", [] ], [ "esp1:TX", "$serialMonitor:RX", "", [] ],
[ "esp1:RX", "$serialMonitor:TX", "", [] ], [ "esp1:RX", "$serialMonitor:TX", "", [] ],
[ "lcd1:VCC", "esp1:3V3", "red", [ "v19.2", "h-57.6", "v-105.6", "h-124.95" ] ], [ "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:GND", "esp1:GND.2", "black", [ "v28.8", "h-76.8", "v-76.8" ] ],
[ "lcd1:CS", "esp1:11", "orange", [ "v0" ] ], [ "lcd1:CS", "esp1:11", "orange", [ "v259.2", "h-729.6", "v-95.82" ] ],
[ "lcd1:D/C", "esp1:12", "gold", [ "v0" ] ], [ "lcd1:D/C", "esp1:12", "gold", [ "v278.4", "h-729.6", "v-105.42" ] ],
[ "lcd1:RESET", "esp1:10", "brown", [ "v0" ] ], [ "lcd1:RESET", "esp1:10", "brown", [ "v0" ] ],
[ "lcd1:MOSI", "esp1:35", "violet", [ "v105.6", "h-124.8", "v-144" ] ], [ "lcd1:MOSI", "esp1:35", "violet", [ "v124.8", "h-124.8", "v0.18" ] ],
[ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ], [ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ],
[ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v105.6", "h172.8" ] ], [ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v-0.18", "h594.94" ] ],
[ "btn-up:2.l", "esp1:38", "purple", [ "h-9.6", "v19.4" ] ], [ "btn-up:2.l", "esp1:38", "purple", [ "h-9.6", "v19.4" ] ],
[ "btn-up:1.l", "esp1:GND.2", "black", [ "h0" ] ], [ "btn-up:1.l", "esp1:GND.2", "black", [ "h0" ] ],
[ "btn-down:1.l", "esp1:GND.2", "black", [ "h0" ] ], [ "btn-down:1.l", "esp1:GND.2", "black", [ "h0" ] ],
@@ -87,7 +91,31 @@
[ "lcd2:GND", "esp1:GND.2", "black", [ "h0" ] ], [ "lcd2:GND", "esp1:GND.2", "black", [ "h0" ] ],
[ "lcd2:VCC", "esp1:3V3.1", "red", [ "h0" ] ], [ "lcd2:VCC", "esp1:3V3.1", "red", [ "h0" ] ],
[ "lcd2:SDA", "esp1:17", "green", [ "h-134.4", "v413" ] ], [ "lcd2:SDA", "esp1:17", "green", [ "h-134.4", "v413" ] ],
[ "lcd2:SCL", "esp1:18", "green", [ "h-124.8", "v38.7" ] ] [ "lcd2:SCL", "esp1:18", "green", [ "h-124.8", "v38.7" ] ],
[ "chip2:RES", "chip1:RES", "gray", [ "h-28.8", "v-115.2" ] ],
[ "chip1:RES", "chip3:RES", "gray", [ "h-28.8", "v-67.2" ] ],
[ "chip2:GND", "chip1:GND", "black", [ "h-48", "v-115.2" ] ],
[ "chip1:GND", "chip3:GND", "black", [ "h-48", "v-115.2" ] ],
[ "chip2:VCC", "chip1:VCC", "red", [ "h-38.4", "v-115.2" ] ],
[ "chip3:VCC", "chip1:VCC", "red", [ "h-38.4", "v115.2" ] ],
[ "chip2:DC", "chip1:DC", "gold", [ "h46.84", "v-115.2" ] ],
[ "chip1:DC", "chip3:DC", "gold", [ "h46.84", "v-115.2" ] ],
[ "chip2:SCL", "chip1:SCL", "white", [ "h56.44", "v-115.2" ] ],
[ "chip1:SCL", "chip3:SCL", "white", [ "h56.44", "v-115.2" ] ],
[ "chip3:SDA", "chip1:SDA", "violet", [ "h-1.16", "h67.2", "v57.6" ] ],
[ "chip1:SDA", "chip2:SDA", "violet", [ "h66.04", "v115.2" ] ],
[ "esp1:35", "chip3:SDA", "violet", [ "h364.53", "v153.42" ] ],
[ "chip3:SCL", "esp1:36", "white", [ "h56.44", "v-172.62" ] ],
[ "esp1:12", "chip3:DC", "gold", [ "h-29.12", "v105.42", "h460.8", "v67.2" ] ],
[ "esp1:GND.4", "chip3:GND", "black", [ "h18.93", "v19.02", "h105.6", "v48" ] ],
[ "esp1:3V3.1", "chip3:VCC", "red", [ "h-57.92", "v259.02" ] ],
[ "lcd1:VCC", "vcc1:VCC", "red", [ "v67.2", "h-48" ] ],
[ "lcd1:LED", "vcc1:VCC", "red", [ "v67.2", "h-144.01" ] ],
[ "lcd1:RST", "esp1:10", "gray", [ "v268.8", "h-729.6", "v-115.02" ] ],
[ "esp1:47", "chip3:RES", "gray", [ "h28.53", "v182.22" ] ],
[ "chip3:CS", "esp1:13", "blue", [ "h-278.4", "v-153.42" ] ],
[ "esp1:14", "chip1:CS", "magenta", [ "h-9.92", "v259.02" ] ],
[ "esp1:21", "chip2:CS", "#8f4814", [ "h95.73", "v316.62" ] ]
], ],
"dependencies": {} "dependencies": {}
} }
+2
View File
@@ -0,0 +1,2 @@
[idf_format_args]
partition_table = "partitions.csv"
+248 -27
View File
@@ -1,45 +1,266 @@
include <BOSL2/std.scad>
BASE_MODEL_SCALE = [1.1, 1, 1.1]; BASE_MODEL_SCALE = [1.1, 1, 1.1];
BASE_MODEL_TRANSLATE = [-0.4, 0, 16.978]; BASE_MODEL_TRANSLATE = [-0.4, 0, 16.978];
EPS = 0.01;
$fn = 50;
module main_display(){ module pin_header(cols = 4, rows = 1, anchor = BOTTOM, spin = 0, orient = UP) {
// Outer dimensions, height currently unknown // Standard pin header dimensions (in mm)
cube([55.04, 89.3, 10]); base_height = 2.54; // Height of the plastic base
pin_width = 0.64; // Width/thickness of the square pin
pin_length = 6.0; // Length of pin sticking up
pitch = 2.54;
// 1. The Plastic Base is the Parent
// It directly receives your anchor, spin, and orient arguments.
color("darkgrey")
cuboid([cols * pitch, rows * pitch, base_height], anchor=anchor, spin=spin, orient=orient) {
// 2. Metal Pins are the Children
// Placed relative to the center of the plastic base
color("silver")
xcopies(spacing=pitch, n=cols) {
ycopies(spacing=pitch, n=rows) {
up(base_height / 2)
cuboid([pin_width, pin_width, pin_length], anchor=BOTTOM);
}
}
// Allows attaching other objects to this header if needed
children();
}
} }
module pad(){ module main_display(pin_header = false) {
// Outer dimensions
width = 55.04;
length = 89.35;
height = 2.7;
display_height = 3;
display_length = 77.6;
display_inset = 5.7;
sd_width = 26.6;
sd_height = 3;
sd_length = 16.6;
sd_inset = 29.4;
hole_diameter = 3;
hole_inset = 1.5;
difference() {
cuboid([length, width, height]) {
position(TOP + RIGHT)
left(display_inset)
color("black")
cuboid([display_length, width, display_height], anchor=BOTTOM + RIGHT);
position(BOTTOM + RIGHT + FRONT)
left(sd_inset)
cuboid([sd_width, sd_length, sd_height], anchor=TOP + RIGHT + FRONT);
position(BOTTOM + LEFT)
xrot(180)
pin_header(14, spin=90, anchor=BOTTOM + BACK);
}
xcopies(length - (2 * hole_inset) - hole_diameter) {
ycopies(width - (2 * hole_inset) - hole_diameter) {
zcyl(d=hole_diameter, h=height + EPS);
}
}
}
}
module pad() {
// A button has 4.2 x 6 mm -> At least ~20x20 are required for the PCB // A button has 4.2 x 6 mm -> At least ~20x20 are required for the PCB
cube([20, 20, 10]); cube([20, 20, 10]);
} }
module small_display_below_main() module secondary_display(pin_header = false) {
{
// https://de.aliexpress.com/item/1005003753680706.html // https://de.aliexpress.com/item/1005003753680706.html
cube([45.8, 20, 11.3]); length = 45.8;
// old i2c variant: width = 20;
//cube([43.5, 19.44, 4.5]); height = 3.7;
// initial dimension ideas hole_diameter = 2;
// cube([38,16,4]); hole_inset = 1.5;
// translate([150,0,0]) cube([22,5.5,4]);
difference() {
cuboid([length, width, height]) {
if (pin_header)
position(LEFT + TOP)
pin_header(7, spin=90, anchor=BACK + BOTTOM);
}
right(length / 2 - hole_inset) {
ycopies(width - (2 * hole_inset) - hole_diameter) {
zcyl(d=hole_diameter, h=height + EPS, anchor=RIGHT);
}
}
}
} }
module tertiary_display() module battery(anchor = BOTTOM) {
{
// https://de.aliexpress.com/item/1005006034531826.html
cube([80, 36, 10]);
}
module battery() {
// 18650 // 18650
rotate([0,90,0]) cylinder(d=18, h=65); rotate([0, 90, 0]) cylinder(d=18, h=65, anchor=anchor);
} }
module microcontroller() { /// USB-C port and switch not 100% dimensionally accurate, take care!
// width 32 including USB-C port module micro_controller(battery_holder = false, battery = false) {
length = 91.5; pcb_length = 91.5;
height = 20; pcb_height = 6.5; // including components, highest point: jst connector, followed by uC
pcb_height_no_components = 1.1;
pcb_width = 28.8;
hole_diameter = 2.5;
hole_inset = 1;
usb_protrusion = 1.7;
usb_width = 9;
usb_inset_from_pcb_end = 5;
power_switch_protrusion = 2.1;
power_switch_inset_from_pcb_end = 8.1;
power_switch_width = 4;
battery_holder_height = 15;
battery_holder_width = 21;
battery_holder_length = 77.3;
battery_length = 65; battery_length = 65;
delta = length - battery_length; battery_protrusion = 4.5;
cube([length, 32, height]);
translate([delta / 2,16, 15]) battery(); difference() {
cuboid([pcb_length, pcb_width, pcb_height], rounding=2, edges="Z") {
if (battery_holder)
position(TOP)
cube([battery_holder_length, battery_holder_width, battery_holder_height], anchor=BOTTOM + CENTER) {
if (battery)
position(TOP)
up(battery_protrusion)
battery(anchor=CENTER + LEFT);
}
position(RIGHT + BOTTOM) {
position(FRONT)
left(usb_inset_from_pcb_end)
cube([usb_width, usb_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + BOTTOM + FRONT);
position(BACK)
left(power_switch_inset_from_pcb_end)
cube([power_switch_width, power_switch_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + TOP + FRONT);
}
}
xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
cyl(d=hole_diameter, h=pcb_height + EPS, orient=UP);
}
}
}
}
module nfc(pin_header = true) {
length = 43;
width = 40.5;
height = 4;
pin_protrusion = 2.2;
hole_diameter = 3;
hole_inset = 6;
x_span = length - (2 * hole_inset) - hole_diameter;
y_span = width - (2 * hole_inset) - hole_diameter;
color("red")
difference() {
cuboid([length, width, height], rounding=2, edges="Z") {
// pin header is lower than highest other component -> in the cube.
if (pin_header)
right(6 - pin_protrusion) // ugly: 6mm is the pin height
position(LEFT + TOP)
yrot(-90)
pin_header(7, spin=90, anchor=FRONT + TOP);
}
move_copies(
[
[x_span / 2, -y_span / 2], // Bottom-Left corner
[-x_span / 2, y_span / 2], // Top-Right corner
]
) {
zcyl(d=hole_diameter, h=height + EPS);
}
}
}
module tertiary_display(pin_headers = true) {
// https://de.aliexpress.com/item/1005006034531826.html
pcb_length = 81;
pcb_width = 36.1;
pcb_height = 3.7;
hole_diameter = 2.8;
hole_inset = 1;
display_length = 71.2;
display_width = 24.4;
display_height = 7;
piggy_length = 41.8;
piggy_width = 19.1;
piggy_height = 8.5 - 2.6;
piggy_inset = 6.2;
jumper_protrusion = 6.6;
pin_protrusion = 6.2;
color("green")
difference() {
cuboid([pcb_length, pcb_width, pcb_height]) {
position(TOP)
cuboid([display_length, display_width, display_height], anchor=BOTTOM);
}
xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
zcyl(d=hole_diameter, h=pcb_height + 1);
}
}
}
// Replaces position(BOTTOM + BACK + LEFT) so that difference cannot mess with color.
translate([-pcb_length / 2 + piggy_inset, pcb_width / 2, -pcb_height / 2]) {
color("black")
cuboid([piggy_length, piggy_width, piggy_height], anchor=TOP + BACK + LEFT);
if (pin_headers) {
// Replaces position(LEFT + BOTTOM) so that parent child cannot mess with color.
translate([0, -piggy_width / 2, -piggy_height])
right(6 - pin_protrusion)
yrot(-90)
pin_header(4, spin=90, anchor=BACK + TOP);
// Replaces position(RIGHT + BOTTOM) so that parent child cannot mess with color.
translate([piggy_length, -piggy_width / 2, -piggy_height])
left(6 - pin_protrusion)
yrot(90)
back(1.6)
pin_header(2, spin=-90, anchor=BACK + TOP);
// Replaces position(BACK + TOP) so that parent child cannot mess with color.
translate([piggy_length / 2, -EPS, 0])
pin_header(16, anchor=BACK + TOP);
}
}
}
// show different components as overview
if (false) {
back(30) tertiary_display(true);
back(80) yrot(180) secondary_display(true);
right(100) zrot(90) main_display(true);
fwd(20) micro_controller(true, true);
fwd(60) nfc(true);
} }
+9
View File
@@ -0,0 +1,9 @@
# ESP-IDF Partition Table
# Name,Type,SubType,Offset,Size,Flags
nvs,data,nvs,0x9000,0x6000,
phy_init,data,phy,0xf000,0x1000,
# We keep the default layout more or less. But here we add a partition for more data before our application
more_nvs,data,nvs,0x10000,0xfa000,
# no offset given -> tool infers it for us
factory,app,factory, ,0xea6000,
1 # ESP-IDF Partition Table
2 # Name,Type,SubType,Offset,Size,Flags
3 nvs,data,nvs,0x9000,0x6000,
4 phy_init,data,phy,0xf000,0x1000,
5 # We keep the default layout more or less. But here we add a partition for more data before our application
6 more_nvs,data,nvs,0x10000,0xfa000,
7 # no offset given -> tool infers it for us
8 factory,app,factory, ,0xea6000,
+25 -6
View File
@@ -1,6 +1,10 @@
use crate::storage::cardstore::CardStore; use crate::navigation::navigation::display_error;
use crate::{
navigation::{navigation::Mutex, outputs::Outputs, state::NavigationState},
peripherals::Peripherals,
};
use alloc::string::ToString;
use embedded_hal_bus::i2c::AtomicDevice; use embedded_hal_bus::i2c::AtomicDevice;
use esp_hal::rtc_cntl::Rtc;
use esp_hal::{Blocking, i2c::master::I2c, time::Instant}; use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
use crate::{ use crate::{
@@ -16,8 +20,9 @@ use crate::{
)] )]
pub async fn nfc_scanner( pub async fn nfc_scanner(
mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>, mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>,
mut card_store: CardStore, outputs: &'static Mutex<Outputs>,
rtc: Rtc<'static>, peripherals: &'static Peripherals,
navigation_state: &'static Mutex<NavigationState>,
) { ) {
loop { loop {
while CARD_DATA.lock().await.is_none() { while CARD_DATA.lock().await.is_none() {
@@ -37,10 +42,24 @@ pub async fn nfc_scanner(
}; };
CARD_DATA.lock().await.replace(card); CARD_DATA.lock().await.replace(card);
match card_store.save_raw_card(split_data, rtc.current_time_us()) { match peripherals
.store
.lock()
.await
.card_store
.save_raw_card(split_data, peripherals.rtc.current_time_us())
.await
{
Ok(()) => {} Ok(()) => {}
Err(error) => { Err(error) => {
log::error!("Error storing card in flash: {:?}", error) log::error!("Error storing card in flash: {:?}", error);
display_error(
error.to_string(),
navigation_state,
outputs,
peripherals,
)
.await;
} }
} }
+72 -36
View File
@@ -7,19 +7,25 @@
)] )]
#![deny(clippy::large_stack_frames)] #![deny(clippy::large_stack_frames)]
use alloc::boxed::Box;
use creaturedex::background_tasks; use creaturedex::background_tasks;
use creaturedex::drivers::i2c_bus::I2cBusPinConfiguration; use creaturedex::drivers::i2c_bus::I2cBusPinConfiguration;
use creaturedex::drivers::nfc_pn532::NfcPn532Driver; use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
use creaturedex::drivers::primary_lcd::PrimaryDisplay;
use creaturedex::drivers::secondary_oled::SecondaryDisplay; use creaturedex::drivers::secondary_oled::SecondaryDisplay;
use creaturedex::drivers::spi_bus; use creaturedex::drivers::spi_bus;
use creaturedex::drivers::tertiary_lcd::{ use creaturedex::drivers::tertiary_lcd::{
BOX, EMPTY, EXAMPLE, HEART, TertiaryDisplay, TertiaryDisplayPinConfiguration, BOX, EMPTY, EXAMPLE, HEART, TertiaryDisplay, TertiaryDisplayPinConfiguration,
}; };
use creaturedex::navigation::navigation::Mutex;
use creaturedex::navigation::inputs::Inputs; use creaturedex::navigation::inputs::Inputs;
use creaturedex::navigation::navigation::{self}; use creaturedex::navigation::navigation::{self};
use creaturedex::navigation::state::NavigationState;
use creaturedex::navigation::outputs::Outputs; use creaturedex::navigation::outputs::Outputs;
use creaturedex::storage::cardstore::CardStore; use creaturedex::peripherals::Peripherals;
use creaturedex::storage::store::Store; use creaturedex::peripherals::storage::cardstore::CardStore;
use creaturedex::peripherals::storage::flash_store::FlashStore;
use creaturedex::peripherals::storage::store::Store;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embedded_graphics::pixelcolor::BinaryColor; use embedded_graphics::pixelcolor::BinaryColor;
use embedded_graphics::{ use embedded_graphics::{
@@ -58,41 +64,44 @@ async fn main(spawner: Spawner) {
creaturedex::logging::init(); creaturedex::logging::init();
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max()); let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
let peripherals = esp_hal::init(config); let esp_peripherals = esp_hal::init(config);
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE); esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE);
let sw_interrupt = let sw_interrupt =
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT); esp_hal::interrupt::software::SoftwareInterruptControl::new(esp_peripherals.SW_INTERRUPT);
let timg0 = TimerGroup::new(peripherals.TIMG0); let timg0 = TimerGroup::new(esp_peripherals.TIMG0);
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0); esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
let (primary, mut secondaries) = retry( let (mut primary, mut secondaries) = retry(
5, 5,
spi_bus::DisplayPinConfiguration { spi_bus::DisplayPinConfiguration {
spi_peripheral: peripherals.SPI2, spi_peripheral: esp_peripherals.SPI2,
sck: peripherals.GPIO36, sck: esp_peripherals.GPIO36,
mosi: peripherals.GPIO35, mosi: esp_peripherals.GPIO35,
miso: peripherals.GPIO37, miso: esp_peripherals.GPIO37,
cs_primary: peripherals.GPIO11, cs_primary: esp_peripherals.GPIO11,
cs_secondary_1: peripherals.GPIO13, cs_secondary_1: esp_peripherals.GPIO13,
cs_secondary_2: peripherals.GPIO14, cs_secondary_2: esp_peripherals.GPIO14,
cs_secondary_3: peripherals.GPIO21, cs_secondary_3: esp_peripherals.GPIO21,
reset_primary: peripherals.GPIO10, reset_primary: esp_peripherals.GPIO10,
reset_secondary: peripherals.GPIO47, reset_secondary: esp_peripherals.GPIO47,
dc_pin: peripherals.GPIO12, dc_pin: esp_peripherals.GPIO12,
}, },
spi_bus::DisplayPinConfiguration::build, spi_bus::DisplayPinConfiguration::build,
); );
// Initialize the shared I2C bus using the refactored i2c_bus module. // Initialize the shared I2C bus using the refactored i2c_bus module.
let shared_i2c = { let shared_i2c = {
use alloc::boxed::Box; let bus = retry(
let bus = retry(5, I2cBusPinConfiguration { 5,
i2c_peripheral: peripherals.I2C0, I2cBusPinConfiguration {
scl: peripherals.GPIO18, i2c_peripheral: esp_peripherals.I2C0,
sda: peripherals.GPIO17, scl: esp_peripherals.GPIO18,
}, I2cBusPinConfiguration::build); sda: esp_peripherals.GPIO17,
},
I2cBusPinConfiguration::build,
);
Box::leak(Box::new(bus)) Box::leak(Box::new(bus))
}; };
@@ -113,12 +122,26 @@ async fn main(spawner: Spawner) {
); );
} }
let store = Store::new(peripherals.FLASH).expect("Could not initialize Flash Store"); let flash_store = Box::leak(Box::new(
let cardstore = CardStore::new(store).expect("Could not initialize Card Store"); FlashStore::new(esp_peripherals.FLASH).expect("Could not initialize Flash Store"),
));
let rtc = Rtc::new(peripherals.LPWR); let card_store = CardStore::new(flash_store)
.await
.expect("Could not initialize Card Store");
let store = Store {
flash_store,
card_store,
};
let rtc = Rtc::new(esp_peripherals.LPWR);
//setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await; //setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
let peripherals = Box::leak(Box::new(Peripherals {
store: Mutex::new(store),
rtc,
}));
let mut nfc_driver = NfcPn532Driver::new(AtomicDevice::new(shared_i2c)); let mut nfc_driver = NfcPn532Driver::new(AtomicDevice::new(shared_i2c));
if nfc_driver.configure_sam().await.is_ok() { if nfc_driver.configure_sam().await.is_ok() {
log::info!("NFC SAM configuration successful on the shared I2C bus"); log::info!("NFC SAM configuration successful on the shared I2C bus");
@@ -128,19 +151,20 @@ async fn main(spawner: Spawner) {
let button_config = InputConfig::default().with_pull(Pull::Up); let button_config = InputConfig::default().with_pull(Pull::Up);
let inputs = Inputs { let inputs = Inputs {
up: Input::new(peripherals.GPIO38, button_config), up: Input::new(esp_peripherals.GPIO38, button_config),
down: Input::new(peripherals.GPIO39, button_config), down: Input::new(esp_peripherals.GPIO39, button_config),
left: Input::new(peripherals.GPIO40, button_config), left: Input::new(esp_peripherals.GPIO40, button_config),
right: Input::new(peripherals.GPIO41, button_config), right: Input::new(esp_peripherals.GPIO41, button_config),
back: Input::new(peripherals.GPIO8, button_config), back: Input::new(esp_peripherals.GPIO8, button_config),
ok: Input::new(peripherals.GPIO0, button_config), ok: Input::new(esp_peripherals.GPIO0, button_config),
}; };
display_shit(&mut secondaries[0], "foo 1"); display_shit(&mut secondaries[0], "foo 1");
display_shit(&mut secondaries[1], "bar 1"); display_shit(&mut secondaries[1], "bar 1");
display_shit(&mut secondaries[2], "baz 1"); display_shit(&mut secondaries[2], "baz 1");
display_shit_prim(&mut primary, "Hello World");
let outputs = { let outputs = Box::leak(Box::new(Mutex::new({
let [sec_1, sec_2, sec_3] = secondaries; let [sec_1, sec_2, sec_3] = secondaries;
Outputs { Outputs {
primary_display: primary, primary_display: primary,
@@ -150,12 +174,14 @@ async fn main(spawner: Spawner) {
tertiary_display: lcd, tertiary_display: lcd,
_led_a: (), _led_a: (),
} }
}; })));
let navigation_state = Box::leak(Box::new(Mutex::new(NavigationState::new())));
log::info!("Setup complete, entering main loop"); log::info!("Setup complete, entering main loop");
spawner.spawn(navigation::run(inputs, outputs).expect("run task failed")); spawner.spawn(navigation::run(inputs, outputs, peripherals, navigation_state).expect("run task failed"));
spawner.spawn( spawner.spawn(
background_tasks::nfc_scanner(nfc_driver, cardstore, rtc).expect("nfc scanner task failed"), background_tasks::nfc_scanner(nfc_driver, outputs, peripherals, navigation_state).expect("nfc scanner task failed"),
); );
core::future::pending::<()>().await core::future::pending::<()>().await
} }
@@ -170,6 +196,16 @@ fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
oled.flush().unwrap(); oled.flush().unwrap();
} }
fn display_shit_prim(main: &mut PrimaryDisplay<'static>, text: &str) {
use embedded_graphics::pixelcolor::Rgb565;
main.clear(Rgb565::BLACK).unwrap();
let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
Text::new(text, Point::new(10, 20), text_style)
.draw(main)
.unwrap();
}
fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U { fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U {
let mut initial_state = input; let mut initial_state = input;
for iteration in 0..repetitions { for iteration in 0..repetitions {
+21 -1
View File
@@ -1,3 +1,6 @@
use core::error::Error;
use core::fmt::Debug;
use core::fmt::Display;
use display_interface_spi::SPIInterface; use display_interface_spi::SPIInterface;
use embedded_graphics::draw_target::DrawTarget; use embedded_graphics::draw_target::DrawTarget;
use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::pixelcolor::Rgb565;
@@ -6,10 +9,27 @@ use embedded_hal_bus::spi::AtomicDevice;
use embedded_hal_bus::util::AtomicCell; use embedded_hal_bus::util::AtomicCell;
use esp_hal::delay::Delay; use esp_hal::delay::Delay;
use esp_hal::gpio::Output; use esp_hal::gpio::Output;
use ili9341::{DisplaySize240x320, Ili9341, Orientation}; use ili9341::{DisplayError, DisplaySize240x320, Ili9341, Orientation};
use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput}; use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput};
#[derive(Debug)]
pub struct PrimaryDisplayError(DisplayError);
impl Display for PrimaryDisplayError {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
self.0.fmt(f)
}
}
impl Error for PrimaryDisplayError {}
impl From<DisplayError> for PrimaryDisplayError {
fn from(value: DisplayError) -> Self {
Self(value)
}
}
type GenericPrimaryDisplay<'a, BUS, DC, RES> = type GenericPrimaryDisplay<'a, BUS, DC, RES> =
Ili9341<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RES>; Ili9341<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RES>;
pub type PrimaryDisplay<'a> = pub type PrimaryDisplay<'a> =
+9 -8
View File
@@ -158,14 +158,7 @@ where
OutputConfig::default(), OutputConfig::default(),
)); ));
let primary = PrimaryDisplayPinConfiguration { // Secondary displays must come first or they don't work in wokwi for some reason.
spi_bus: bus_static,
cs: low_active(self.cs_primary),
reset: low_active(self.reset_primary),
dc: dc.clone(),
}
.build();
let secondaries = SecondaryDisplayPinConfiguration { let secondaries = SecondaryDisplayPinConfiguration {
spi_bus: bus_static, spi_bus: bus_static,
cs_pins: [ cs_pins: [
@@ -174,6 +167,14 @@ where
low_active(self.cs_secondary_3), low_active(self.cs_secondary_3),
], ],
res: reset_secondary, res: reset_secondary,
dc: dc.clone(),
}
.build();
let primary = PrimaryDisplayPinConfiguration {
spi_bus: bus_static,
cs: low_active(self.cs_primary),
reset: low_active(self.reset_primary),
dc, dc,
} }
.build(); .build();
+1 -1
View File
@@ -10,5 +10,5 @@ pub mod drivers;
pub mod logging; pub mod logging;
pub mod navigation; pub mod navigation;
pub mod network; pub mod network;
pub mod storage; pub mod peripherals;
pub mod views; pub mod views;
+66 -8
View File
@@ -3,7 +3,13 @@ use crate::navigation::inputs::ButtonAction;
use crate::navigation::inputs::Inputs; use crate::navigation::inputs::Inputs;
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::navigation::state::NavigationState; use crate::navigation::state::NavigationState;
use crate::peripherals::Peripherals;
use crate::views::error_view::ErrorView;
use crate::views::view::View; use crate::views::view::View;
use alloc::boxed::Box;
use alloc::string::String;
use alloc::string::ToString;
use core::error;
use embassy_futures::select::{Either, select}; use embassy_futures::select::{Either, select};
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
@@ -27,18 +33,64 @@ pub struct NewState {
} }
pub trait Navigable { pub trait Navigable {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send; fn display(
&self,
outputs: &mut Outputs,
peripherals: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send;
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send; fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send;
} }
pub async fn display_error(
error: String,
navigation_state: &Mutex<NavigationState>,
outputs: &Mutex<Outputs>,
peripherals: &Peripherals,
) -> () {
let error_view = ErrorView {
error: error.to_string(),
};
let mut state = navigation_state.lock().await;
state.screens.push(View::Error(error_view));
let mut outs = outputs.lock().await;
state
.screens
.last()
// Unwrap: we just pushed the state
.unwrap()
.display(&mut outs, peripherals)
.await
// Unwrap: display will panic on error in error view
.unwrap();
}
#[embassy_executor::task] #[embassy_executor::task]
pub async fn run(mut inputs: Inputs, mut outputs: Outputs) { pub async fn run(
mut inputs: Inputs,
outputs: &'static Mutex<Outputs>,
peripherals: &'static Peripherals,
navigation_state: &'static Mutex<NavigationState>,
) {
log::info!("starting navigation"); log::info!("starting navigation");
let mut state = NavigationState::new(); {
state.screens.last().unwrap().display(&mut outputs).await; let mut outs = outputs.lock().await;
if let Err(error) = navigation_state
.lock()
.await
.screens
.last()
.unwrap()
.display(&mut outs, peripherals)
.await
{
display_error(error.to_string(), navigation_state, outputs, peripherals).await;
};
}
loop { loop {
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
let mut state = navigation_state.lock().await;
let selection = select( let selection = select(
inputs.wait_for_press(), inputs.wait_for_press(),
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)), Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)),
@@ -81,10 +133,16 @@ pub async fn run(mut inputs: Inputs, mut outputs: Outputs) {
} }
state.screens.push(new_state.view); state.screens.push(new_state.view);
if action != Action::Timer || new_state.redraw { let mut outs = outputs.lock().await;
state.screens.last().unwrap().display(&mut outputs).await; if (action != Action::Timer || new_state.redraw)
&& let Err(error) = state
.screens
.last()
.unwrap()
.display(&mut outs, peripherals)
.await
{
display_error(error.to_string(), navigation_state, outputs, peripherals).await;
} }
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
} }
} }
+11
View File
@@ -0,0 +1,11 @@
pub mod storage;
use crate::navigation::navigation::Mutex;
use crate::peripherals::storage::store::Store;
use esp_hal::rtc_cntl::Rtc;
pub struct Peripherals {
pub store: Mutex<Store>,
pub rtc: Rtc<'static>,
}
@@ -1,6 +1,6 @@
pub struct MemoryRegion { pub struct MemoryRegion {
offset: u32, pub offset: u32,
size: usize, pub size: usize,
} }
impl MemoryRegion { impl MemoryRegion {
@@ -15,17 +15,18 @@ impl MemoryRegion {
} }
} }
const MAX_FLASH: usize = 16 * 1024 * 1024; pub const MAX_FLASH: usize = 16 * 1024 * 1024;
const MAGIC_REGION: MemoryRegion = MemoryRegion::new(0, 4); pub const MAGIC_REGION: MemoryRegion = MemoryRegion::new(0, 4);
const SETTINGS_REGION: MemoryRegion = MemoryRegion::new(MAGIC_REGION.end() as u32, 1024); pub const SETTINGS_REGION: MemoryRegion = MemoryRegion::new(MAGIC_REGION.end() as u32, 1024);
const CARDSTORE_REGION: MemoryRegion = MemoryRegion::new( pub const CARDSTORE_REGION: MemoryRegion = MemoryRegion::new(
SETTINGS_REGION.end() as u32, SETTINGS_REGION.end() as u32,
MAX_FLASH - SETTINGS_REGION.end(), MAX_FLASH - SETTINGS_REGION.end(),
); );
pub mod cardstore; pub mod cardstore;
pub mod flash_store;
pub mod settings; pub mod settings;
pub mod store; pub mod store;
@@ -1,14 +1,16 @@
use alloc::collections::BTreeMap; use alloc::collections::BTreeMap;
use alloc::vec::Vec; use alloc::vec::Vec;
use core::error::Error;
use core::fmt::Display;
use binary_serde::{BinarySerde, DeserializeError, Endianness}; use binary_serde::{BinarySerde, DeserializeError, Endianness};
//use crate::card::model::Nfcraw_card; //use crate::card::model::Nfcraw_card;
use crate::card::model::RawCard; use crate::card::model::RawCard;
use crate::storage::store::{Store, StoreError}; use crate::peripherals::storage::flash_store::{FlashStore, FlashStoreError};
use crate::storage::{CARDSTORE_REGION, MemoryRegion}; use crate::peripherals::storage::{CARDSTORE_REGION, MemoryRegion};
const MAX_CARDS: usize = 20000; const MAX_CARDS: usize = 20000;
@@ -65,13 +67,25 @@ impl AllocationTableEntry {
#[derive(Debug)] #[derive(Debug)]
pub enum CardStoreError { pub enum CardStoreError {
Store(StoreError), Store(FlashStoreError),
CorruptedEntry(DeserializeError), CorruptedEntry(DeserializeError),
NoEntry, NoEntry(u32),
} }
impl From<StoreError> for CardStoreError { impl Error for CardStoreError {}
fn from(error: StoreError) -> CardStoreError {
impl Display for CardStoreError {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match self {
CardStoreError::Store(e) => e.fmt(f),
CardStoreError::CorruptedEntry(e) => e.fmt(f),
CardStoreError::NoEntry(uuid) => write!(f, "No Card Entry\nuuid: 0x{uuid:x}"),
}
}
}
impl From<FlashStoreError> for CardStoreError {
fn from(error: FlashStoreError) -> CardStoreError {
CardStoreError::Store(error) CardStoreError::Store(error)
} }
} }
@@ -83,16 +97,16 @@ impl From<DeserializeError> for CardStoreError {
} }
pub struct CardStore { pub struct CardStore {
store: Store, store: &'static FlashStore,
count: u32, count: u32,
pub allocation_table: BTreeMap<u32, AllocationTableEntry>, pub allocation_table: BTreeMap<u32, AllocationTableEntry>,
} }
impl CardStore { impl CardStore {
pub fn new(mut store: Store) -> Result<Self, CardStoreError> { pub async fn new(store: &'static FlashStore) -> Result<Self, CardStoreError> {
let mut count_bytes: [u8; COUNT_REGION.size] = [0; COUNT_REGION.size]; let mut count_bytes: [u8; COUNT_REGION.size] = [0; COUNT_REGION.size];
store.read(COUNT_REGION.offset, &mut count_bytes)?; store.read(COUNT_REGION.offset, &mut count_bytes).await?;
let count: u32 = u32::from_ne_bytes(count_bytes); let count: u32 = u32::from_ne_bytes(count_bytes);
@@ -101,10 +115,12 @@ impl CardStore {
let mut allocation_table_entries: Vec<u8> = let mut allocation_table_entries: Vec<u8> =
Vec::with_capacity(AllocationTableEntry::SERIALIZED_SIZE * count as usize); Vec::with_capacity(AllocationTableEntry::SERIALIZED_SIZE * count as usize);
store.read( store
.read(
ALLOCATION_TABLE_REGION.offset, ALLOCATION_TABLE_REGION.offset,
&mut allocation_table_entries, &mut allocation_table_entries,
)?; )
.await?;
let chunks = let chunks =
allocation_table_entries.into_chunks::<{ AllocationTableEntry::SERIALIZED_SIZE }>(); allocation_table_entries.into_chunks::<{ AllocationTableEntry::SERIALIZED_SIZE }>();
@@ -123,14 +139,14 @@ impl CardStore {
}) })
} }
pub fn get_card_by_uuid(&mut self, uuid: u32) -> Result<RawCard, CardStoreError> { pub async fn get_card_by_uuid(&self, uuid: u32) -> Result<RawCard, CardStoreError> {
let entry = self let entry = self
.allocation_table .allocation_table
.get(&uuid) .get(&uuid)
.ok_or(CardStoreError::NoEntry)?; .ok_or(CardStoreError::NoEntry(uuid))?;
let mut raw_card: [u8; size_of::<RawCard>()] = [0; size_of::<RawCard>()]; let mut raw_card: [u8; size_of::<RawCard>()] = [0; size_of::<RawCard>()];
self.store.read(entry.offset, &mut raw_card)?; self.store.read(entry.offset, &mut raw_card).await?;
Ok(RawCard::binary_deserialize( Ok(RawCard::binary_deserialize(
raw_card.as_ref(), raw_card.as_ref(),
@@ -138,7 +154,7 @@ impl CardStore {
)?) )?)
} }
pub fn save_raw_card( pub async fn save_raw_card(
&mut self, &mut self,
raw_card: RawCard, raw_card: RawCard,
timestamp: u64, timestamp: u64,
@@ -183,10 +199,12 @@ impl CardStore {
log::debug!("writing RawCard to flash"); log::debug!("writing RawCard to flash");
let mut serialized_card: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE]; let mut serialized_card: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE];
raw_card.binary_serialize(&mut serialized_card, Endianness::Little); raw_card.binary_serialize(&mut serialized_card, Endianness::Little);
self.store.write_erase( self.store
.write_erase(
CARDS_REGION.offset + entry.offset * RawCard::SERIALIZED_SIZE as u32, CARDS_REGION.offset + entry.offset * RawCard::SERIALIZED_SIZE as u32,
&mut serialized_card, &mut serialized_card,
)?; )
.await?;
} else { } else {
entry.last_read_date = timestamp; entry.last_read_date = timestamp;
entry.read_count += 1; entry.read_count += 1;
@@ -198,17 +216,20 @@ impl CardStore {
let mut serialized_entry: [u8; AllocationTableEntry::SERIALIZED_SIZE] = let mut serialized_entry: [u8; AllocationTableEntry::SERIALIZED_SIZE] =
[0; AllocationTableEntry::SERIALIZED_SIZE]; [0; AllocationTableEntry::SERIALIZED_SIZE];
entry.binary_serialize(&mut serialized_entry, Endianness::Little); entry.binary_serialize(&mut serialized_entry, Endianness::Little);
self.store.write_erase( self.store
.write_erase(
ALLOCATION_TABLE_REGION.offset ALLOCATION_TABLE_REGION.offset
+ entry.offset * AllocationTableEntry::SERIALIZED_SIZE as u32, + entry.offset * AllocationTableEntry::SERIALIZED_SIZE as u32,
&mut serialized_entry, &mut serialized_entry,
)?; )
.await?;
self.count += 1; self.count += 1;
log::debug!("writing card count to flash"); log::debug!("writing card count to flash");
let mut serialized_count: [u8; 4] = self.count.to_le_bytes(); let mut serialized_count: [u8; 4] = self.count.to_le_bytes();
self.store self.store
.write(COUNT_REGION.offset, serialized_count.as_mut_slice())?; .write(COUNT_REGION.offset, serialized_count.as_mut_slice())
.await?;
Ok(()) Ok(())
} }
} }
@@ -1,22 +1,41 @@
use core::error::Error;
use core::fmt::Display;
use crate::navigation::navigation::Mutex;
use embedded_storage::nor_flash::NorFlash; use embedded_storage::nor_flash::NorFlash;
use embedded_storage::nor_flash::ReadNorFlash; use embedded_storage::nor_flash::ReadNorFlash;
use esp_storage::{FlashStorage, FlashStorageError}; use esp_storage::{FlashStorage, FlashStorageError};
use crate::storage::MAGIC_REGION; use crate::peripherals::storage::MAGIC_REGION;
pub type StoreError = FlashStorageError; #[derive(Debug)]
pub struct FlashStoreError(FlashStorageError);
impl From<FlashStorageError> for FlashStoreError {
fn from(value: FlashStorageError) -> Self {
Self(value)
}
}
impl Error for FlashStoreError {}
impl Display for FlashStoreError {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
write!(f, "FlashStoreError:\n{:?}", self.0)
}
}
const FLASH_ADDR: u32 = 0x9000; const FLASH_ADDR: u32 = 0x9000;
const INITIALIZATION_SIZE: usize = 0x1000; const INITIALIZATION_SIZE: usize = 0x1000;
const FLASH_INITIALIZE_MAGIC: u32 = 0xde6de6de; const FLASH_INITIALIZE_MAGIC: u32 = 0xde6de6de;
pub struct Store { pub struct FlashStore {
pub storage: FlashStorage<'static>, pub storage: Mutex<FlashStorage<'static>>,
} }
impl Store { impl FlashStore {
pub fn new(flash: esp_hal::peripherals::FLASH<'static>) -> Result<Self, StoreError> { pub fn new(flash: esp_hal::peripherals::FLASH<'static>) -> Result<Self, FlashStoreError> {
let mut storage = FlashStorage::new(flash); let mut storage = FlashStorage::new(flash);
let mut magic: [u8; 4] = [0, 0, 0, 0]; let mut magic: [u8; 4] = [0, 0, 0, 0];
@@ -30,29 +49,40 @@ impl Store {
Self::initialize_flash(&mut storage)?; Self::initialize_flash(&mut storage)?;
} }
Ok(Self { storage }) Ok(Self {
storage: Mutex::new(storage),
})
} }
pub fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> { pub async fn read(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
self.storage.read(FLASH_ADDR + offset, bytes) self.storage.lock().await.read(FLASH_ADDR + offset, bytes)?;
Ok(())
} }
pub fn write(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> { pub async fn write(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
log::debug!("Writing {} bytes at offset 0x{offset:08x}", bytes.len()); log::debug!("Writing {} bytes at offset 0x{offset:08x}", bytes.len());
self.storage.write(FLASH_ADDR + offset, bytes) self.storage
.lock()
.await
.write(FLASH_ADDR + offset, bytes)?;
Ok(())
} }
pub fn write_erase(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), StoreError> { pub async fn write_erase(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
log::debug!( log::debug!(
"Erasing and Writing {} bytes at offset 0x{offset:08x}", "Erasing and Writing {} bytes at offset 0x{offset:08x}",
bytes.len() bytes.len()
); );
self.storage let mut lock = self.storage.lock().await;
.erase(FLASH_ADDR + offset, FLASH_ADDR + bytes.len() as u32)?; lock.erase(
self.storage.write(FLASH_ADDR + offset, bytes) FLASH_ADDR + offset,
FLASH_ADDR + offset + bytes.len() as u32,
)?;
lock.write(FLASH_ADDR + offset, bytes)?;
Ok(())
} }
pub fn has_magic_bytes(storage: &mut FlashStorage) -> Result<bool, StoreError> { pub fn has_magic_bytes(storage: &mut FlashStorage) -> Result<bool, FlashStoreError> {
let mut magic: [u8; 4] = [0, 0, 0, 0]; let mut magic: [u8; 4] = [0, 0, 0, 0];
storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?; storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?;
log::debug!("Magic bytes are {magic:?}"); log::debug!("Magic bytes are {magic:?}");
@@ -60,7 +90,7 @@ impl Store {
Ok(u32::from_ne_bytes(magic) == FLASH_INITIALIZE_MAGIC) Ok(u32::from_ne_bytes(magic) == FLASH_INITIALIZE_MAGIC)
} }
pub fn initialize_flash(storage: &mut FlashStorage) -> Result<(), StoreError> { pub fn initialize_flash(storage: &mut FlashStorage) -> Result<(), FlashStoreError> {
storage.erase(FLASH_ADDR, FLASH_ADDR + INITIALIZATION_SIZE as u32)?; storage.erase(FLASH_ADDR, FLASH_ADDR + INITIALIZATION_SIZE as u32)?;
let zeros: [u8; INITIALIZATION_SIZE] = [0; INITIALIZATION_SIZE]; let zeros: [u8; INITIALIZATION_SIZE] = [0; INITIALIZATION_SIZE];
storage.write(FLASH_ADDR + MAGIC_REGION.end() as u32, &zeros)?; storage.write(FLASH_ADDR + MAGIC_REGION.end() as u32, &zeros)?;
@@ -72,7 +102,9 @@ impl Store {
if Self::has_magic_bytes(storage)? { if Self::has_magic_bytes(storage)? {
Ok(()) Ok(())
} else { } else {
Err(StoreError::Other(FLASH_INITIALIZE_MAGIC as i32)) Err(FlashStoreError(FlashStorageError::Other(
FLASH_INITIALIZE_MAGIC as i32,
)))
} }
} }
} }
+7
View File
@@ -0,0 +1,7 @@
use crate::peripherals::storage::cardstore::CardStore;
use crate::peripherals::storage::flash_store::FlashStore;
pub struct Store {
pub flash_store: &'static FlashStore,
pub card_store: CardStore,
}
+1
View File
@@ -1,4 +1,5 @@
pub mod card_view; pub mod card_view;
pub mod error_view;
pub mod flash_info_view; pub mod flash_info_view;
pub mod journal_view; pub mod journal_view;
pub mod main_menu; pub mod main_menu;
+21 -10
View File
@@ -1,7 +1,11 @@
use crate::display::sprite::render_sprite_onto_ili9341; use crate::display::sprite::render_sprite_onto_ili9341;
use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::navigation::navigation::NewState; use crate::navigation::navigation::NewState;
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use alloc::boxed::Box;
use alloc::format; use alloc::format;
use core::error;
use embedded_graphics::mono_font::MonoTextStyle; use embedded_graphics::mono_font::MonoTextStyle;
use embedded_graphics::mono_font::ascii::FONT_6X10; use embedded_graphics::mono_font::ascii::FONT_6X10;
use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::pixelcolor::Rgb565;
@@ -25,10 +29,16 @@ pub struct CardView {
} }
impl Navigable for CardView { impl Navigable for CardView {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move { async move {
let display = &mut outputs.primary_display; let display = &mut outputs.primary_display;
display.clear(Rgb565::BLACK).unwrap(); display
.clear(Rgb565::BLACK)
.map_err(PrimaryDisplayError::from)?;
let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320)); let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320));
let bg_color = self.card.cardtype.clone().into(); let bg_color = self.card.cardtype.clone().into();
@@ -42,59 +52,60 @@ impl Navigable for CardView {
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Type: {}", self.card.cardtype), &format!("Type: {}", self.card.cardtype),
Point::new(20, 250), Point::new(20, 250),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Event: {}", self.card.event), &format!("Event: {}", self.card.event),
Point::new(20, 260), Point::new(20, 260),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("UUID: {}", self.card.uuid), &format!("UUID: {}", self.card.uuid),
Point::new(20, 270), Point::new(20, 270),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Trait1: {}", self.card.trait1), &format!("Trait1: {}", self.card.trait1),
Point::new(20, 280), Point::new(20, 280),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Trait2: {}", self.card.trait2), &format!("Trait2: {}", self.card.trait2),
Point::new(20, 290), Point::new(20, 290),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Trait3: {}", self.card.trait3), &format!("Trait3: {}", self.card.trait3),
Point::new(20, 300), Point::new(20, 300),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Text::new( Text::new(
&format!("Secret: {}", self.card.secret), &format!("Secret: {}", self.card.secret),
Point::new(20, 310), Point::new(20, 310),
style, style,
) )
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
let palette: Palette = self.card.cardtype.clone().into(); let palette: Palette = self.card.cardtype.clone().into();
render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette); render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette);
Ok(())
} }
} }
+101
View File
@@ -0,0 +1,101 @@
use crate::navigation::navigation::Action;
use crate::navigation::navigation::Navigable;
use crate::navigation::navigation::NewState;
use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use crate::views::view::View;
use alloc::boxed::Box;
use alloc::string::String;
use alloc::string::ToString;
use core::error;
use embedded_graphics::{
Drawable,
mono_font::{MonoTextStyle, ascii::FONT_10X20},
pixelcolor::Rgb565,
prelude::*,
primitives::Rectangle,
text::Text,
};
use embedded_text::{
TextBox,
alignment::HorizontalAlignment,
style::{HeightMode, TextBoxStyleBuilder},
};
#[derive(Debug, Clone)]
pub struct ErrorView {
pub error: String,
}
impl Navigable for ErrorView {
fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move {
outputs
.primary_display
.clear(Rgb565::BLACK)
.unwrap_or_else(|error| {
panic!(
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
self.error
)
});
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::RED);
let display_area = outputs.primary_display.bounding_box();
Text::new(
"Error",
Point::new((display_area.size.width / 2 - 25) as i32, 30),
style,
)
.draw(&mut outputs.primary_display)
.unwrap_or_else(|error| {
panic!(
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
self.error
)
});
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let textbox_style = TextBoxStyleBuilder::new()
.height_mode(HeightMode::FitToText)
.alignment(HorizontalAlignment::Center)
.build();
let bounds = Rectangle::new(Point::new(0, 50), display_area.size);
TextBox::with_textbox_style(&self.error.to_string(), bounds, style, textbox_style)
.draw(&mut outputs.primary_display)
.unwrap_or_else(|error| {
panic!(
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
self.error
)
});
Ok(())
}
}
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
async move {
let new_menu = View::Error(self.clone());
match input {
Action::Button(_) => NewState {
replace_view: matches!(new_menu, View::FlashInfo(_)),
view: new_menu,
redraw: true,
},
Action::Timer => {
// Skip timer inputs
NewState {
view: new_menu,
replace_view: true,
redraw: false,
}
}
}
}
}
}
+84 -26
View File
@@ -1,48 +1,106 @@
use crate::navigation::inputs::ButtonAction; use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::navigation::navigation::Action; use crate::navigation::navigation::Action;
use crate::navigation::navigation::Navigable; use crate::navigation::navigation::Navigable;
use crate::navigation::navigation::NewState; use crate::navigation::navigation::NewState;
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use crate::peripherals::storage::MAGIC_REGION;
use crate::peripherals::storage::cardstore::COUNT_REGION;
use crate::views::view::View; use crate::views::view::View;
use embedded_graphics::mono_font::MonoTextStyle; use alloc::boxed::Box;
use embedded_graphics::mono_font::ascii::FONT_10X20; use core::error;
use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::DrawTarget;
use embedded_graphics::prelude::RgbColor;
use embedded_graphics::text::Text;
use embedded_graphics::prelude::Point; use embedded_graphics::prelude::Point;
use embedded_graphics::{
Drawable,
mono_font::{MonoTextStyle, ascii::FONT_10X20},
pixelcolor::Rgb565,
prelude::*,
primitives::Rectangle,
};
use alloc::format;
use embedded_text::{
TextBox,
alignment::HorizontalAlignment,
style::{HeightMode, TextBoxStyleBuilder},
};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct FlashInfoView {} pub struct FlashInfoView {}
impl Navigable for FlashInfoView { impl Navigable for FlashInfoView {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); &self,
Text::new("Flash Initialized: {:?}", Point::new(40, 40), style); outputs: &mut Outputs,
peripherals: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move {
outputs
.primary_display
.clear(Rgb565::BLACK)
.map_err(PrimaryDisplayError::from)?;
let _style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let mut magic_bytes: [u8; MAGIC_REGION.size] = [0; MAGIC_REGION.size];
peripherals
.store
.lock()
.await
.flash_store
.read(MAGIC_REGION.offset, &mut magic_bytes)
.await?;
let mut card_count_bytes: [u8; COUNT_REGION.size] = [0; COUNT_REGION.size];
peripherals
.store
.lock()
.await
.flash_store
.read(COUNT_REGION.offset, &mut card_count_bytes)
.await?;
core::future::ready(()) let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
let textbox_style = TextBoxStyleBuilder::new()
.height_mode(HeightMode::FitToText)
.alignment(HorizontalAlignment::Justified)
.build();
let display_area = outputs.primary_display.bounding_box();
let bounds = Rectangle::new(Point::new(0, 30), display_area.size);
TextBox::with_textbox_style(
&format!(
"
Flash Init Magic: 0x{:x}\n
Card Count: {}\n
",
u32::from_le_bytes(magic_bytes),
u32::from_le_bytes(card_count_bytes)
),
bounds,
style,
textbox_style,
)
.draw(&mut outputs.primary_display)
.map_err(PrimaryDisplayError::from)?;
Ok(())
}
} }
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send { fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
async move { async move {
let Action::Button(input) = input else { let new_menu = View::FlashInfo(self.clone());
// Skip timer inputs match input {
return NewState { Action::Button(_) => NewState {
view: View::FlashInfo(self.clone()),
replace_view: true,
redraw: false,
};
};
let new_menu = match input {
_ => View::FlashInfo(self.clone()),
};
NewState {
replace_view: matches!(new_menu, View::FlashInfo(_)), replace_view: matches!(new_menu, View::FlashInfo(_)),
view: new_menu, view: new_menu,
redraw: true, redraw: true,
},
Action::Timer => {
// Skip timer inputs
NewState {
view: new_menu,
replace_view: true,
redraw: false,
}
}
} }
} }
} }
+14 -2
View File
@@ -1,3 +1,7 @@
use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::peripherals::Peripherals;
use alloc::boxed::Box;
use core::error;
use core::future; use core::future;
use alloc::vec::Vec; use alloc::vec::Vec;
@@ -22,9 +26,17 @@ pub struct JournalView {
} }
impl Navigable for JournalView { impl Navigable for JournalView {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move { async move {
outputs.primary_display.clear(Rgb565::BLACK).unwrap(); outputs
.primary_display
.clear(Rgb565::BLACK)
.map_err(PrimaryDisplayError::from)?;
Ok(())
} }
} }
+20 -6
View File
@@ -1,4 +1,8 @@
use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::peripherals::Peripherals;
use alloc::boxed::Box;
use alloc::vec; use alloc::vec;
use core::error;
use crate::card::model::Card; use crate::card::model::Card;
use crate::card::{decoder::split_nfc_hex, mock::*}; use crate::card::{decoder::split_nfc_hex, mock::*};
@@ -22,16 +26,26 @@ pub struct MainMenu {
} }
impl Navigable for MainMenu { impl Navigable for MainMenu {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move {
let display = &mut outputs.primary_display; let display = &mut outputs.primary_display;
display.clear(Rgb565::BLACK).unwrap(); display.clear(Rgb565::BLACK).unwrap();
menu_item::show(display, "Scan card", 0, self.selected); menu_item::show(display, "Scan card", 0, self.selected)
menu_item::show(display, "Last card", 1, self.selected); .map_err(PrimaryDisplayError::from)?;
menu_item::show(display, "Journal", 2, self.selected); menu_item::show(display, "Last card", 1, self.selected)
menu_item::show(display, "Settings", 3, self.selected); .map_err(PrimaryDisplayError::from)?;
menu_item::show(display, "Journal", 2, self.selected)
.map_err(PrimaryDisplayError::from)?;
menu_item::show(display, "Settings", 3, self.selected)
.map_err(PrimaryDisplayError::from)?;
core::future::ready(()) Ok(())
}
} }
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send { fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
+3 -3
View File
@@ -7,7 +7,7 @@ use embedded_graphics::prelude::Point;
use embedded_graphics::prelude::RgbColor; use embedded_graphics::prelude::RgbColor;
use embedded_graphics::text::Text; use embedded_graphics::text::Text;
pub fn show<D>(display: &mut D, name: &str, position: i32, selected: i32) pub fn show<D>(display: &mut D, name: &str, position: i32, selected: i32) -> Result<(), D::Error>
where where
D: DrawTarget<Color = Rgb565>, D: DrawTarget<Color = Rgb565>,
D::Error: core::fmt::Debug, D::Error: core::fmt::Debug,
@@ -24,6 +24,6 @@ where
style style
}, },
) )
.draw(display) .draw(display)?;
.unwrap(); Ok(())
} }
+18 -7
View File
@@ -1,7 +1,11 @@
use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::navigation::inputs::ButtonAction; use crate::navigation::inputs::ButtonAction;
use crate::navigation::navigation::CARD_DATA; use crate::navigation::navigation::CARD_DATA;
use crate::navigation::navigation::NewState; use crate::navigation::navigation::NewState;
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use alloc::boxed::Box;
use core::error;
use alloc::format; use alloc::format;
use embedded_graphics::Drawable; use embedded_graphics::Drawable;
@@ -33,16 +37,23 @@ pub struct ScanMenu {
} }
impl Navigable for ScanMenu { impl Navigable for ScanMenu {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move {
let display = &mut outputs.primary_display; let display = &mut outputs.primary_display;
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE); let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
display.clear(Rgb565::BLACK).unwrap(); display
.clear(Rgb565::BLACK)
.map_err(PrimaryDisplayError::from)?;
let display_area = display.bounding_box(); let display_area = display.bounding_box();
Text::new("Scanning...", Point::new(20, 30), style) Text::new("Scanning...", Point::new(20, 30), style)
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
// Create styles used by the drawing operations. // Create styles used by the drawing operations.
let arc_stroke = PrimitiveStyleBuilder::new() let arc_stroke = PrimitiveStyleBuilder::new()
@@ -72,15 +83,15 @@ impl Navigable for ScanMenu {
) )
.into_styled(arc_stroke) .into_styled(arc_stroke)
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
// Draw centered text. // Draw centered text.
let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.); let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.);
Text::with_text_style(&text, display_area.center(), character_style, text_style) Text::with_text_style(&text, display_area.center(), character_style, text_style)
.draw(display) .draw(display)
.unwrap(); .map_err(PrimaryDisplayError::from)?;
Ok(())
core::future::ready(()) }
} }
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send { fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
+22 -8
View File
@@ -1,6 +1,10 @@
use crate::drivers::primary_lcd::PrimaryDisplayError;
use crate::navigation::navigation::{Action, Navigable, NewState}; use crate::navigation::navigation::{Action, Navigable, NewState};
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use crate::views::{flash_info_view::FlashInfoView, menu_item, view::View}; use crate::views::{flash_info_view::FlashInfoView, menu_item, view::View};
use alloc::boxed::Box;
use core::error;
use crate::navigation::inputs::ButtonAction; use crate::navigation::inputs::ButtonAction;
@@ -8,7 +12,7 @@ use embedded_graphics::pixelcolor::Rgb565;
use embedded_graphics::prelude::RgbColor; use embedded_graphics::prelude::RgbColor;
use embedded_graphics_core::draw_target::DrawTarget; use embedded_graphics_core::draw_target::DrawTarget;
pub const MAX_SELECTED: i32 = 2; pub const MAX_SELECTED: i32 = 3;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct SettingsMenu { pub struct SettingsMenu {
@@ -16,14 +20,24 @@ pub struct SettingsMenu {
} }
impl Navigable for SettingsMenu { impl Navigable for SettingsMenu {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
_: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move {
let display = &mut outputs.primary_display; let display = &mut outputs.primary_display;
display.clear(Rgb565::BLACK).unwrap(); display
menu_item::show(display, "System Inforation", 0, self.selected); .clear(Rgb565::BLACK)
menu_item::show(display, "Wifi Information", 1, self.selected); .map_err(PrimaryDisplayError::from)?;
menu_item::show(display, "Flash Information", 2, self.selected); menu_item::show(display, "System Inforation", 0, self.selected)
.map_err(PrimaryDisplayError::from)?;
core::future::ready(()) menu_item::show(display, "Wifi Information", 1, self.selected)
.map_err(PrimaryDisplayError::from)?;
menu_item::show(display, "Flash Information", 2, self.selected)
.map_err(PrimaryDisplayError::from)?;
Ok(())
}
} }
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send { fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
+21 -9
View File
@@ -1,14 +1,18 @@
use crate::navigation::outputs::Outputs; use crate::navigation::outputs::Outputs;
use crate::peripherals::Peripherals;
use crate::views::card_view::CardView; use crate::views::card_view::CardView;
use crate::views::{ use crate::views::{
flash_info_view::FlashInfoView, journal_view::JournalView, main_menu::MainMenu, error_view::ErrorView, flash_info_view::FlashInfoView, journal_view::JournalView,
scan_menu::ScanMenu, settings_menu::SettingsMenu, main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu,
}; };
use alloc::boxed::Box;
use core::error;
use crate::navigation::navigation::{Navigable, NewState}; use crate::navigation::navigation::{Navigable, NewState};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum View { pub enum View {
Error(ErrorView),
Main(MainMenu), Main(MainMenu),
Scan(ScanMenu), Scan(ScanMenu),
Settings(SettingsMenu), Settings(SettingsMenu),
@@ -18,15 +22,22 @@ pub enum View {
} }
impl Navigable for View { impl Navigable for View {
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send { fn display(
&self,
outputs: &mut Outputs,
peripherals: &Peripherals,
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
async move { async move {
match self { match self {
View::Main(main_menu) => main_menu.display(outputs).await, View::Error(error_view) => error_view.display(outputs, peripherals).await,
View::Scan(scan_menu) => scan_menu.display(outputs).await, View::Main(main_menu) => main_menu.display(outputs, peripherals).await,
View::Settings(settings_menu) => settings_menu.display(outputs).await, View::Scan(scan_menu) => scan_menu.display(outputs, peripherals).await,
View::Journal(journal_view) => journal_view.display(outputs).await, View::Settings(settings_menu) => settings_menu.display(outputs, peripherals).await,
View::Card(card_view) => card_view.display(outputs).await, View::Journal(journal_view) => journal_view.display(outputs, peripherals).await,
View::FlashInfo(flash_info_view) => flash_info_view.display(outputs).await, View::Card(card_view) => card_view.display(outputs, peripherals).await,
View::FlashInfo(flash_info_view) => {
flash_info_view.display(outputs, peripherals).await
}
} }
} }
} }
@@ -37,6 +48,7 @@ impl Navigable for View {
) -> impl core::future::Future<Output = NewState> + Send { ) -> impl core::future::Future<Output = NewState> + Send {
async move { async move {
match self { match self {
View::Error(error_view) => error_view.handle_input(input).await,
View::Main(main_menu) => main_menu.handle_input(input).await, View::Main(main_menu) => main_menu.handle_input(input).await,
View::Scan(scan_menu) => scan_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::Settings(settings_menu) => settings_menu.handle_input(input).await,
+4
View File
@@ -3,3 +3,7 @@ version = 1
gdbServerPort = 3333 gdbServerPort = 3333
elf = "target/xtensa-esp32s3-none-elf/debug/creaturedex" elf = "target/xtensa-esp32s3-none-elf/debug/creaturedex"
firmware = "target/xtensa-esp32s3-none-elf/debug/creaturedex" firmware = "target/xtensa-esp32s3-none-elf/debug/creaturedex"
[[chip]]
name = 'ch1115'
binary = 'wokwi/ch1115.chip.wasm'
+36
View File
@@ -0,0 +1,36 @@
.PHONY: all auto native docker clean
# Configuration
SRC = ch1115.chip.c
OUT = ch1115.chip.wasm
# Check if wokwi-cli exists in PATH
WOKWI_CLI := $(shell command -v wokwi-cli 2> /dev/null)
HOST_UID := $(shell id -u)
HOST_GID := $(shell id -g)
# Default target runs the auto-detection
all: auto
auto:
ifeq ($(WOKWI_CLI),)
@echo "wokwi-cli not found in PATH. Falling back to Docker build..."
$(MAKE) docker
else
@echo "Found wokwi-cli at $(WOKWI_CLI). Using native build..."
$(MAKE) native
endif
native:
wokwi-cli chip compile $(SRC) -o $(OUT)
docker:
docker run --rm -v $(CURDIR):/workspace -w /workspace ubuntu:latest \
bash -c "apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \
curl -L https://wokwi.com/ci/install.sh | sh && \
~/.wokwi/bin/wokwi-cli chip compile $(SRC) -o $(OUT) && \
chown $(HOST_UID):$(HOST_GID) $(OUT)"
clean:
rm -f $(OUT)
+86
View File
@@ -0,0 +1,86 @@
#include "wokwi-api.h"
#include <stdlib.h>
#include <stdio.h>
typedef struct {
pin_t cs, dc, res;
spi_dev_t spi;
buffer_t fb;
uint32_t width, height;
uint8_t spi_buffer[1];
uint8_t page;
uint8_t col;
} chip_state_t;
// Forward declarations
static void on_cs_change(void *user_data, pin_t pin, uint32_t value);
static void chip_spi_done(void *user_data, uint8_t *buffer, uint32_t count);
void chip_init(void) {
printf("Initing CH1115 chip\n");
fflush(stdout);
chip_state_t *chip = malloc(sizeof(chip_state_t));
chip->fb = framebuffer_init(&chip->width, &chip->height);
chip->cs = pin_init("CS", INPUT_PULLUP);
chip->dc = pin_init("DC", INPUT);
chip->res = pin_init("RES", INPUT_PULLUP);
const spi_config_t spi_cfg = {
.sck = pin_init("SCL", INPUT),
.mosi = pin_init("SDA", INPUT),
.miso = NO_PIN,
.mode = 0,
.done = chip_spi_done,
.user_data = chip,
};
chip->spi = spi_init(&spi_cfg);
const pin_watch_config_t cs_watch = {
.edge = BOTH,
.pin_change = on_cs_change,
.user_data = chip,
};
pin_watch(chip->cs, &cs_watch);
}
static void on_cs_change(void *user_data, pin_t pin, uint32_t value) {
chip_state_t *chip = (chip_state_t*)user_data;
if (value == LOW) {
// Start receiving 1 byte at a time
spi_start(chip->spi, chip->spi_buffer, 1);
} else {
spi_stop(chip->spi);
}
}
static void chip_spi_done(void *user_data, uint8_t *buffer, uint32_t count) {
chip_state_t *chip = (chip_state_t*)user_data;
if (!count) return;
uint8_t val = buffer[0];
bool is_data = pin_read(chip->dc) == HIGH;
if (is_data) {
// Write 8 vertical pixels to the Wokwi RGBA Framebuffer
for (int i = 0; i < 8; i++) {
// 0xFFFFFFFF = White, 0x000000FF = Black
uint32_t color = (val & (1 << i)) ? 0xFFFFFFFF : 0x000000FF;
uint32_t y = (chip->page * 8) + i;
uint32_t offset = (y * chip->width + chip->col) * 4;
buffer_write(chip->fb, offset, &color, 4);
}
chip->col++; // Auto-increment column
} else {
// CH1115 Core Commands
if ((val & 0xB0) == 0xB0) chip->page = val & 0x0F; // Set Page Start
else if ((val & 0xF0) == 0x00) chip->col = (chip->col & 0xF0) | (val & 0x0F); // Lower Col
else if ((val & 0xF0) == 0x10) chip->col = (chip->col & 0x0F) | ((val & 0x0F) << 4); // Upper Col
}
// Continue receiving if CS is still active
if (pin_read(chip->cs) == LOW) {
spi_start(chip->spi, chip->spi_buffer, 1);
}
}
+9
View File
@@ -0,0 +1,9 @@
{
"name": "CH1115 OLED",
"author": "ede1998",
"pins": ["VCC", "GND", "CS", "RES", "DC", "SCL", "SDA"],
"display": {
"width": 128,
"height": 64
}
}