Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ede1998
|
bd124bf9c2
|
Generated
+81
-77
@@ -53,12 +53,6 @@ version = "0.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
|
checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "array-init"
|
|
||||||
version = "2.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.5.1"
|
version = "1.5.1"
|
||||||
@@ -102,29 +96,6 @@ dependencies = [
|
|||||||
"vsimd",
|
"vsimd",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "binary_serde"
|
|
||||||
version = "1.0.25"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c4b2fe974c561ed04fb89673dd221bed36fc4794b71ca6ae96ffe19949045686"
|
|
||||||
dependencies = [
|
|
||||||
"array-init",
|
|
||||||
"binary_serde_macros",
|
|
||||||
"recursive_array",
|
|
||||||
"thiserror-no-std",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "binary_serde_macros"
|
|
||||||
version = "1.0.25"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4790b8dbcfa9d3adf2020ebf5fd36c6bc89a77d434131615ea349bc9620e8831"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.119",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitfield"
|
name = "bitfield"
|
||||||
version = "0.17.0"
|
version = "0.17.0"
|
||||||
@@ -348,9 +319,9 @@ name = "creaturedex"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.23.1",
|
"base64 0.23.1",
|
||||||
"binary_serde",
|
|
||||||
"ch1115",
|
"ch1115",
|
||||||
"critical-section",
|
"critical-section",
|
||||||
|
"display-interface",
|
||||||
"display-interface-spi",
|
"display-interface-spi",
|
||||||
"embassy-executor",
|
"embassy-executor",
|
||||||
"embassy-futures",
|
"embassy-futures",
|
||||||
@@ -362,21 +333,18 @@ dependencies = [
|
|||||||
"embedded-hal-async",
|
"embedded-hal-async",
|
||||||
"embedded-hal-bus",
|
"embedded-hal-bus",
|
||||||
"embedded-io 0.7.1",
|
"embedded-io 0.7.1",
|
||||||
"embedded-storage",
|
|
||||||
"embedded-text",
|
|
||||||
"esp-alloc",
|
"esp-alloc",
|
||||||
"esp-bootloader-esp-idf",
|
"esp-bootloader-esp-idf",
|
||||||
"esp-hal",
|
"esp-hal",
|
||||||
"esp-hal-wifimanager",
|
"esp-hal-wifimanager",
|
||||||
"esp-println",
|
"esp-println",
|
||||||
"esp-rtos",
|
"esp-rtos",
|
||||||
"esp-storage",
|
|
||||||
"i2c-character-display",
|
"i2c-character-display",
|
||||||
"ili9341",
|
"ili9341",
|
||||||
"log",
|
"log",
|
||||||
"num_enum",
|
"num_enum",
|
||||||
"pn532",
|
"pn532",
|
||||||
"static_assertions",
|
"ssd1306",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -641,6 +609,17 @@ version = "0.5.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7ba2aab1ef3793e6f7804162debb5ac5edb93b3d650fbcc5aeb72fcd0e6c03a0"
|
checksum = "7ba2aab1ef3793e6f7804162debb5ac5edb93b3d650fbcc5aeb72fcd0e6c03a0"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "display-interface-i2c"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0d964fa85bbbb5a6ecd06e58699407ac5dc3e3ad72dac0ab7e6b0d00a1cd262d"
|
||||||
|
dependencies = [
|
||||||
|
"display-interface",
|
||||||
|
"embedded-hal 1.0.0",
|
||||||
|
"embedded-hal-async",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "display-interface-spi"
|
name = "display-interface-spi"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@@ -1050,17 +1029,6 @@ 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"
|
||||||
@@ -1987,6 +1955,19 @@ version = "0.1.10"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
|
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "maybe-async-cfg"
|
||||||
|
version = "0.2.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a1e083394889336bc66a4eaf1011ffbfa74893e910f902a9f271fa624c61e1b2"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro-error",
|
||||||
|
"proc-macro2",
|
||||||
|
"pulldown-cmark",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.8.3"
|
version = "2.8.3"
|
||||||
@@ -2142,12 +2123,6 @@ 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"
|
||||||
@@ -2741,6 +2716,30 @@ dependencies = [
|
|||||||
"toml_edit",
|
"toml_edit",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro-error"
|
||||||
|
version = "1.0.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro-error-attr",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro-error-attr"
|
||||||
|
version = "1.0.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.107"
|
version = "1.0.107"
|
||||||
@@ -2770,6 +2769,17 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pulldown-cmark"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "679341d22c78c6c649893cbd6c3278dcbe9fc4faa62fea3a9296ae2b50c14625"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.1",
|
||||||
|
"memchr",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.47"
|
version = "1.0.47"
|
||||||
@@ -2847,12 +2857,6 @@ dependencies = [
|
|||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "recursive_array"
|
|
||||||
version = "0.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "69bad83913c3b39011ad9d43b7ac0cae139cec5d7e7288fbea5bb4b4e3cc78f6"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.5.18"
|
version = "0.5.18"
|
||||||
@@ -3190,6 +3194,20 @@ version = "0.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c"
|
checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ssd1306"
|
||||||
|
version = "0.10.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3ea6aac2d078bbc71d9b8ac3f657335311f3b6625e9a1a96ccc29f5abfa77c56"
|
||||||
|
dependencies = [
|
||||||
|
"display-interface",
|
||||||
|
"display-interface-i2c",
|
||||||
|
"display-interface-spi",
|
||||||
|
"embedded-graphics-core",
|
||||||
|
"embedded-hal 1.0.0",
|
||||||
|
"maybe-async-cfg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stable_deref_trait"
|
name = "stable_deref_trait"
|
||||||
version = "1.2.1"
|
version = "1.2.1"
|
||||||
@@ -3330,26 +3348,6 @@ dependencies = [
|
|||||||
"syn 3.0.3",
|
"syn 3.0.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thiserror-impl-no-std"
|
|
||||||
version = "2.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thiserror-no-std"
|
|
||||||
version = "2.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea"
|
|
||||||
dependencies = [
|
|
||||||
"thiserror-impl-no-std",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thread_local"
|
name = "thread_local"
|
||||||
version = "1.1.10"
|
version = "1.1.10"
|
||||||
@@ -3477,6 +3475,12 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
|
checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicase"
|
||||||
|
version = "2.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-id-start"
|
name = "unicode-id-start"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
|
|||||||
+5
-14
@@ -9,11 +9,7 @@ name = "creaturedex"
|
|||||||
path = "./src/bin/main.rs"
|
path = "./src/bin/main.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
esp-hal = { version = "~1.1.0", features = [
|
esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] }
|
||||||
"esp32s3",
|
|
||||||
"log-04",
|
|
||||||
"unstable",
|
|
||||||
] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] }
|
|
||||||
|
|
||||||
esp-rtos = { version = "0.3.0", features = [
|
esp-rtos = { version = "0.3.0", features = [
|
||||||
"embassy",
|
"embassy",
|
||||||
@@ -28,7 +24,8 @@ log = "0.4.27"
|
|||||||
|
|
||||||
critical-section = "1.2.0"
|
critical-section = "1.2.0"
|
||||||
embedded-io = "0.7.1"
|
embedded-io = "0.7.1"
|
||||||
embassy-executor = { version = "0.10.0", features = [] }
|
embassy-executor = { version = "0.10.0", features = [
|
||||||
|
] }
|
||||||
embassy-time = { version = "0.5.1", default-features = false }
|
embassy-time = { version = "0.5.1", default-features = false }
|
||||||
embassy-futures = "0.1.2"
|
embassy-futures = "0.1.2"
|
||||||
esp-alloc = "0.10.0"
|
esp-alloc = "0.10.0"
|
||||||
@@ -38,6 +35,7 @@ esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanag
|
|||||||
] }
|
] }
|
||||||
esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] }
|
esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] }
|
||||||
display-interface-spi = "0.5.0"
|
display-interface-spi = "0.5.0"
|
||||||
|
display-interface = "*"
|
||||||
ili9341 = "0.6.0"
|
ili9341 = "0.6.0"
|
||||||
embedded-hal = "1.0.0"
|
embedded-hal = "1.0.0"
|
||||||
embedded-hal-bus = "0.3.0"
|
embedded-hal-bus = "0.3.0"
|
||||||
@@ -50,14 +48,7 @@ embassy-sync = "0.8.0"
|
|||||||
embedded-hal-async = "1.0.0"
|
embedded-hal-async = "1.0.0"
|
||||||
i2c-character-display = "0.5.1"
|
i2c-character-display = "0.5.1"
|
||||||
ch1115 = { version = "0.1.2", features = ["graphics"] }
|
ch1115 = { version = "0.1.2", features = ["graphics"] }
|
||||||
esp-storage = "0.9.0"
|
ssd1306 = { version = "0.10.0", features = [] }
|
||||||
embedded-storage = "0.3.1"
|
|
||||||
binary_serde = "1.0.25"
|
|
||||||
static_assertions = { version = "1.1.0", default-features = false }
|
|
||||||
embedded-text = "0.7.3"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
log = "0.4.27"
|
|
||||||
|
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
fn main() {
|
fn main() {
|
||||||
generate_filter_snippet();
|
|
||||||
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");
|
||||||
@@ -69,165 +68,3 @@ fn linker_be_nice() {
|
|||||||
std::env::current_exe().unwrap().display()
|
std::env::current_exe().unwrap().display()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
|
||||||
fn generate_filter_snippet() {
|
|
||||||
use log::LevelFilter;
|
|
||||||
use std::{env, path::Path};
|
|
||||||
|
|
||||||
let out_dir = env::var_os("OUT_DIR").unwrap();
|
|
||||||
let dest_path = Path::new(&out_dir).join("log_filter.rs");
|
|
||||||
|
|
||||||
let filter = env::var("ESP_LOG");
|
|
||||||
let snippet = if let Ok(filter) = filter {
|
|
||||||
let res = parse_spec(&filter);
|
|
||||||
|
|
||||||
if !res.errors.is_empty() {
|
|
||||||
panic!("Error parsing `ESP_LOG`: {:?}", res.errors);
|
|
||||||
} else {
|
|
||||||
let max = res
|
|
||||||
.directives
|
|
||||||
.iter()
|
|
||||||
.map(|v| v.level)
|
|
||||||
.max()
|
|
||||||
.unwrap_or(LevelFilter::Off);
|
|
||||||
let max = match max {
|
|
||||||
LevelFilter::Off => "Off",
|
|
||||||
LevelFilter::Error => "Error",
|
|
||||||
LevelFilter::Warn => "Warn",
|
|
||||||
LevelFilter::Info => "Info",
|
|
||||||
LevelFilter::Debug => "Debug",
|
|
||||||
LevelFilter::Trace => "Trace",
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut snippet = String::new();
|
|
||||||
|
|
||||||
snippet.push_str(&format!(
|
|
||||||
"pub(crate) const FILTER_MAX: log::LevelFilter = log::LevelFilter::{max};"
|
|
||||||
));
|
|
||||||
|
|
||||||
snippet
|
|
||||||
.push_str("pub(crate) fn is_enabled(level: log::Level, _target: &str) -> bool {");
|
|
||||||
|
|
||||||
let mut global_level = None;
|
|
||||||
for directive in res.directives {
|
|
||||||
let level = match directive.level {
|
|
||||||
LevelFilter::Off => "Off",
|
|
||||||
LevelFilter::Error => "Error",
|
|
||||||
LevelFilter::Warn => "Warn",
|
|
||||||
LevelFilter::Info => "Info",
|
|
||||||
LevelFilter::Debug => "Debug",
|
|
||||||
LevelFilter::Trace => "Trace",
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(name) = directive.name {
|
|
||||||
// If a prefix matches, don't continue to the next directive
|
|
||||||
snippet.push_str(&format!(
|
|
||||||
"if _target.starts_with(\"{name}\") {{ return level <= log::LevelFilter::{level}; }}"
|
|
||||||
));
|
|
||||||
} else {
|
|
||||||
if global_level.is_some() {
|
|
||||||
panic!("Multiple global log levels specified in `ESP_LOG`");
|
|
||||||
}
|
|
||||||
global_level = Some(level);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Place the fallback rule at the end
|
|
||||||
if let Some(level) = global_level {
|
|
||||||
snippet.push_str(&format!("level <= log::LevelFilter::{level}"));
|
|
||||||
} else {
|
|
||||||
snippet.push_str(" false");
|
|
||||||
}
|
|
||||||
snippet.push('}');
|
|
||||||
snippet
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"pub(crate) const FILTER_MAX: log::LevelFilter = log::LevelFilter::Off; pub(crate) fn is_enabled(_level: log::Level, _target: &str) -> bool { true }".to_string()
|
|
||||||
};
|
|
||||||
|
|
||||||
std::fs::write(&dest_path, &snippet).unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
|
||||||
struct ParseResult {
|
|
||||||
pub(crate) directives: Vec<Directive>,
|
|
||||||
pub(crate) errors: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ParseResult {
|
|
||||||
fn add_directive(&mut self, directive: Directive) {
|
|
||||||
self.directives.push(directive);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn add_error(&mut self, message: String) {
|
|
||||||
self.errors.push(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct Directive {
|
|
||||||
pub(crate) name: Option<String>,
|
|
||||||
pub(crate) level: log::LevelFilter,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse a logging specification string (e.g:
|
|
||||||
/// `crate1,crate2::mod3,crate3::x=error/foo`) and return a vector with log
|
|
||||||
/// directives.
|
|
||||||
fn parse_spec(spec: &str) -> ParseResult {
|
|
||||||
use log::LevelFilter;
|
|
||||||
|
|
||||||
let mut result = ParseResult::default();
|
|
||||||
|
|
||||||
let mut parts = spec.split('/');
|
|
||||||
let mods = parts.next();
|
|
||||||
|
|
||||||
if let Some(m) = mods {
|
|
||||||
for s in m.split(',').map(|ss| ss.trim()) {
|
|
||||||
if s.is_empty() {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let mut parts = s.split('=');
|
|
||||||
let (log_level, name) =
|
|
||||||
match (parts.next(), parts.next().map(|s| s.trim()), parts.next()) {
|
|
||||||
(Some(part0), None, None) => {
|
|
||||||
// if the single argument is a log-level string or number,
|
|
||||||
// treat that as a global fallback
|
|
||||||
match part0.parse() {
|
|
||||||
Ok(num) => (num, None),
|
|
||||||
Err(_) => (LevelFilter::max(), Some(part0)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(Some(part0), Some(""), None) => (LevelFilter::max(), Some(part0)),
|
|
||||||
(Some(part0), Some(part1), None) => {
|
|
||||||
if let Ok(num) = part1.parse() {
|
|
||||||
(num, Some(part0))
|
|
||||||
} else {
|
|
||||||
result.add_error(format!("invalid logging spec '{part1}'"));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
result.add_error(format!("invalid logging spec '{s}'"));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
result.add_directive(Directive {
|
|
||||||
name: name.map(|s| s.to_owned()),
|
|
||||||
level: log_level,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort by length so that the most specific prefixes come first
|
|
||||||
result
|
|
||||||
.directives
|
|
||||||
.sort_by(|a, b| match (a.name.as_ref(), b.name.as_ref()) {
|
|
||||||
(Some(a), Some(b)) => b.len().cmp(&a.len()),
|
|
||||||
_ => std::cmp::Ordering::Equal,
|
|
||||||
});
|
|
||||||
|
|
||||||
result
|
|
||||||
}
|
|
||||||
|
|||||||
+22
-239
@@ -1,77 +1,9 @@
|
|||||||
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 pin_header(cols = 4, rows = 1, anchor = BOTTOM, spin = 0, orient = UP) {
|
module main_display(){
|
||||||
// Standard pin header dimensions (in mm)
|
// Outer dimensions, height currently unknown
|
||||||
base_height = 2.54; // Height of the plastic base
|
cube([55.04, 89.3, 10]);
|
||||||
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 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(TOP + LEFT)
|
|
||||||
pin_header(14, spin=90, anchor=BOTTOM + BACK);
|
|
||||||
// pin_header();
|
|
||||||
}
|
|
||||||
|
|
||||||
xcopies(length - (2 * hole_inset) - hole_diameter) {
|
|
||||||
ycopies(width - (2 * hole_inset) - hole_diameter) {
|
|
||||||
zcyl(d=hole_diameter, h=height + EPS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module pad(){
|
module pad(){
|
||||||
@@ -79,184 +11,35 @@ module pad() {
|
|||||||
cube([20, 20, 10]);
|
cube([20, 20, 10]);
|
||||||
}
|
}
|
||||||
|
|
||||||
module secondary_display(pin_header = false) {
|
module small_display_below_main()
|
||||||
|
{
|
||||||
// https://de.aliexpress.com/item/1005003753680706.html
|
// https://de.aliexpress.com/item/1005003753680706.html
|
||||||
length = 45.8;
|
cube([45.8, 20, 11.3]);
|
||||||
width = 20;
|
// old i2c variant:
|
||||||
height = 3.7;
|
//cube([43.5, 19.44, 4.5]);
|
||||||
|
|
||||||
hole_diameter = 2;
|
// initial dimension ideas
|
||||||
hole_inset = 1.5;
|
// cube([38,16,4]);
|
||||||
|
// 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) {
|
module tertiary_display()
|
||||||
ycopies(width - (2 * hole_inset) - hole_diameter) {
|
{
|
||||||
zcyl(d=hole_diameter, h=height + EPS, anchor=RIGHT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module tertiary_display() {
|
|
||||||
// https://de.aliexpress.com/item/1005006034531826.html
|
// https://de.aliexpress.com/item/1005006034531826.html
|
||||||
cube([80, 36, 10]);
|
cube([80, 36, 10]);
|
||||||
}
|
}
|
||||||
|
|
||||||
module battery(anchor = BOTTOM) {
|
module battery() {
|
||||||
// 18650
|
// 18650
|
||||||
rotate([0, 90, 0]) cylinder(d=18, h=65, anchor=anchor);
|
rotate([0,90,0]) cylinder(d=18, h=65);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// USB-C port and switch not 100% dimensionally accurate, take care!
|
module microcontroller() {
|
||||||
module micro_controller(battery_holder = false, battery = false) {
|
// width 32 including USB-C port
|
||||||
pcb_length = 91.5;
|
length = 91.5;
|
||||||
pcb_height = 6.5; // including components, highest point: jst connector, followed by uC
|
height = 20;
|
||||||
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;
|
||||||
battery_protrusion = 4.5;
|
delta = length - battery_length;
|
||||||
|
cube([length, 32, height]);
|
||||||
difference() {
|
translate([delta / 2,16, 15]) battery();
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
include <BOSL2/std.scad>
|
|
||||||
|
|
||||||
module tertiary_display(pin_headers = true) {
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
use crate::peripherals::Peripherals;
|
|
||||||
use embedded_hal_bus::i2c::AtomicDevice;
|
use embedded_hal_bus::i2c::AtomicDevice;
|
||||||
use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
|
use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
|
||||||
|
|
||||||
@@ -15,7 +14,6 @@ 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>>>,
|
||||||
peripherals: &'static Peripherals,
|
|
||||||
) {
|
) {
|
||||||
loop {
|
loop {
|
||||||
while CARD_DATA.lock().await.is_none() {
|
while CARD_DATA.lock().await.is_none() {
|
||||||
@@ -26,29 +24,10 @@ pub async fn nfc_scanner(
|
|||||||
log::error!("Failed to split NFC card data");
|
log::error!("Failed to split NFC card data");
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
let card = match Card::try_from(split_data) {
|
CARD_DATA
|
||||||
Ok(card) => card,
|
|
||||||
Err(err) => {
|
|
||||||
log::error!("Invalid card data: {err}");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
CARD_DATA.lock().await.replace(card);
|
|
||||||
|
|
||||||
match peripherals
|
|
||||||
.store
|
|
||||||
.lock()
|
.lock()
|
||||||
.await
|
.await
|
||||||
.card_store
|
.replace(Card::try_from(split_data).unwrap());
|
||||||
.save_raw_card(split_data, peripherals.rtc.current_time_us())
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Ok(()) => {}
|
|
||||||
Err(error) => {
|
|
||||||
log::error!("Error storing card in flash: {:?}", error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let elapsed_ms = start.elapsed().as_millis();
|
let elapsed_ms = start.elapsed().as_millis();
|
||||||
log::info!(
|
log::info!(
|
||||||
"NFC read duration: {} ms, card data length: {}",
|
"NFC read duration: {} ms, card data length: {}",
|
||||||
@@ -56,8 +35,8 @@ pub async fn nfc_scanner(
|
|||||||
card_data.len()
|
card_data.len()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(e) => {
|
||||||
log::info!("No NFC card found");
|
log::error!("NFC read failed: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-92
@@ -7,7 +7,6 @@
|
|||||||
)]
|
)]
|
||||||
#![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;
|
||||||
@@ -16,14 +15,10 @@ 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::outputs::Outputs;
|
use creaturedex::navigation::outputs::Outputs;
|
||||||
use creaturedex::peripherals::Peripherals;
|
use creaturedex::network::wifi::setup_wifi;
|
||||||
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::{
|
||||||
@@ -37,8 +32,6 @@ use esp_hal::gpio::{Input, InputConfig, Pull};
|
|||||||
use esp_hal::timer::timg::TimerGroup;
|
use esp_hal::timer::timg::TimerGroup;
|
||||||
use log::error;
|
use log::error;
|
||||||
|
|
||||||
use esp_hal::rtc_cntl::Rtc;
|
|
||||||
|
|
||||||
#[panic_handler]
|
#[panic_handler]
|
||||||
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||||
error!("{}", panic_info);
|
error!("{}", panic_info);
|
||||||
@@ -59,86 +52,55 @@ esp_bootloader_esp_idf::esp_app_desc!();
|
|||||||
)]
|
)]
|
||||||
#[esp_rtos::main]
|
#[esp_rtos::main]
|
||||||
async fn main(spawner: Spawner) {
|
async fn main(spawner: Spawner) {
|
||||||
creaturedex::logging::init();
|
esp_println::logger::init_logger_from_env();
|
||||||
|
|
||||||
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
||||||
let esp_peripherals = esp_hal::init(config);
|
let 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(esp_peripherals.SW_INTERRUPT);
|
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||||
let timg0 = TimerGroup::new(esp_peripherals.TIMG0);
|
let timg0 = TimerGroup::new(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 (primary, mut secondaries) = spi_bus::DisplayPinConfiguration {
|
||||||
5,
|
spi_peripheral: peripherals.SPI2,
|
||||||
spi_bus::DisplayPinConfiguration {
|
sck: peripherals.GPIO36,
|
||||||
spi_peripheral: esp_peripherals.SPI2,
|
mosi: peripherals.GPIO35,
|
||||||
sck: esp_peripherals.GPIO36,
|
miso: peripherals.GPIO37,
|
||||||
mosi: esp_peripherals.GPIO35,
|
cs_primary: peripherals.GPIO11,
|
||||||
miso: esp_peripherals.GPIO37,
|
cs_secondary_1: peripherals.GPIO13,
|
||||||
cs_primary: esp_peripherals.GPIO11,
|
cs_secondary_2: peripherals.GPIO14,
|
||||||
cs_secondary_1: esp_peripherals.GPIO13,
|
cs_secondary_3: peripherals.GPIO21,
|
||||||
cs_secondary_2: esp_peripherals.GPIO14,
|
reset_primary: peripherals.GPIO10,
|
||||||
cs_secondary_3: esp_peripherals.GPIO21,
|
reset_secondary: peripherals.GPIO47,
|
||||||
reset_primary: esp_peripherals.GPIO10,
|
dc_pin: peripherals.GPIO12,
|
||||||
reset_secondary: esp_peripherals.GPIO47,
|
}
|
||||||
dc_pin: esp_peripherals.GPIO12,
|
.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 = {
|
||||||
let bus = retry(
|
let config = I2cBusPinConfiguration {
|
||||||
5,
|
i2c_peripheral: peripherals.I2C0,
|
||||||
I2cBusPinConfiguration {
|
scl: peripherals.GPIO18,
|
||||||
i2c_peripheral: esp_peripherals.I2C0,
|
sda: peripherals.GPIO17,
|
||||||
scl: esp_peripherals.GPIO18,
|
};
|
||||||
sda: esp_peripherals.GPIO17,
|
config.build()
|
||||||
},
|
|
||||||
I2cBusPinConfiguration::build,
|
|
||||||
);
|
|
||||||
Box::leak(Box::new(bus))
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut lcd: TertiaryDisplay = retry(
|
let mut lcd: TertiaryDisplay = TertiaryDisplayPinConfiguration { i2c: shared_i2c }.build();
|
||||||
5,
|
|
||||||
TertiaryDisplayPinConfiguration { i2c: shared_i2c },
|
|
||||||
TertiaryDisplayPinConfiguration::build,
|
|
||||||
);
|
|
||||||
lcd.load_charset(EXAMPLE).unwrap();
|
lcd.load_charset(EXAMPLE).unwrap();
|
||||||
let h = EXAMPLE[HEART];
|
let h = EXAMPLE[HEART];
|
||||||
let e = EXAMPLE[EMPTY];
|
let e = EXAMPLE[EMPTY];
|
||||||
let b = EXAMPLE[BOX];
|
let b = EXAMPLE[BOX];
|
||||||
if let Err(e) = lcd.write(&alloc::format!(
|
if let Err(e) = lcd.write(&alloc::format!("Custom symbols: {h}{e}{b} And more stuff to wrap and cut off please.")) {
|
||||||
"Custom symbols: {h}{e}{b} And more stuff to wrap and cut off please."
|
|
||||||
)) {
|
|
||||||
log::error!(
|
log::error!(
|
||||||
"Tertiary LCD startup text write failed over shared I2C bus; check the shared bus, wiring, and device responses: {e}"
|
"Tertiary LCD startup text write failed over shared I2C bus; check the shared bus, wiring, and device responses: {e}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let flash_store = Box::leak(Box::new(
|
setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
|
||||||
FlashStore::new(esp_peripherals.FLASH).expect("Could not initialize Flash Store"),
|
|
||||||
));
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
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() {
|
||||||
@@ -149,12 +111,12 @@ 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(esp_peripherals.GPIO38, button_config),
|
up: Input::new(peripherals.GPIO38, button_config),
|
||||||
down: Input::new(esp_peripherals.GPIO39, button_config),
|
down: Input::new(peripherals.GPIO39, button_config),
|
||||||
left: Input::new(esp_peripherals.GPIO40, button_config),
|
left: Input::new(peripherals.GPIO40, button_config),
|
||||||
right: Input::new(esp_peripherals.GPIO41, button_config),
|
right: Input::new(peripherals.GPIO41, button_config),
|
||||||
back: Input::new(esp_peripherals.GPIO8, button_config),
|
back: Input::new(peripherals.GPIO8, button_config),
|
||||||
ok: Input::new(esp_peripherals.GPIO0, button_config),
|
ok: Input::new(peripherals.GPIO0, button_config),
|
||||||
};
|
};
|
||||||
|
|
||||||
display_shit(&mut secondaries[0], "foo 1");
|
display_shit(&mut secondaries[0], "foo 1");
|
||||||
@@ -174,15 +136,12 @@ async fn main(spawner: Spawner) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
log::info!("Setup complete, entering main loop");
|
log::info!("Setup complete, entering main loop");
|
||||||
spawner.spawn(navigation::run(inputs, outputs, peripherals).expect("run task failed"));
|
spawner.spawn(navigation::run(inputs, outputs).expect("run task failed"));
|
||||||
spawner.spawn(
|
spawner.spawn(background_tasks::nfc_scanner(nfc_driver).expect("nfc scanner task failed"));
|
||||||
background_tasks::nfc_scanner(nfc_driver, peripherals).expect("nfc scanner task failed"),
|
|
||||||
);
|
|
||||||
core::future::pending::<()>().await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
|
fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
|
||||||
oled.clear().unwrap();
|
oled.clear(BinaryColor::Off).unwrap();
|
||||||
|
|
||||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||||
Text::new(text, Point::new(10, 20), text_style)
|
Text::new(text, Point::new(10, 20), text_style)
|
||||||
@@ -190,17 +149,3 @@ fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
oled.flush().unwrap();
|
oled.flush().unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U {
|
|
||||||
let mut initial_state = input;
|
|
||||||
for iteration in 0..repetitions {
|
|
||||||
log::debug!("Trying to initialize. Retries: {iteration}");
|
|
||||||
|
|
||||||
match action(initial_state) {
|
|
||||||
Ok(success) => return success,
|
|
||||||
Err(recovered_input) => initial_state = recovered_input,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
panic!("Init failed after {repetitions} retries.")
|
|
||||||
}
|
|
||||||
|
|||||||
+10
-11
@@ -1,23 +1,22 @@
|
|||||||
use core::fmt::Display;
|
use core::fmt::Display;
|
||||||
|
|
||||||
use crate::card::model::RawCard;
|
use crate::card::model::NfcPayload;
|
||||||
use alloc::string::{String, ToString};
|
use alloc::string::{String, ToString};
|
||||||
|
|
||||||
pub fn split_nfc_hex(payload: &[u8]) -> Option<RawCard> {
|
pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
|
||||||
if payload.len() < 0x35A {
|
if payload.len() < 0x35A {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(RawCard {
|
Some(NfcPayload {
|
||||||
event_encoding: payload[0..2].try_into().ok()?,
|
event_encoding: &payload[0..2],
|
||||||
card_type: payload[2],
|
card_type: payload[2],
|
||||||
card_uuid: payload[3..5].try_into().ok()?,
|
card_uuid: &payload[3..5],
|
||||||
_reserved: payload[5..9].try_into().ok()?,
|
_reserved: &payload[5..9],
|
||||||
sprite: payload[9..0x2DB].try_into().ok()?,
|
sprite: &payload[9..0x2DB],
|
||||||
packed_card_text: payload[0x2DB..0x311].try_into().ok()?,
|
packed_card_text: &payload[0x2DB..0x311],
|
||||||
secret: payload[0x311..0x329].try_into().ok()?,
|
secret: &payload[0x311..0x329],
|
||||||
_opaque_trailer: payload[0x329..0x35A].try_into().ok()?,
|
_opaque_trailer: &payload[0x329..0x35A],
|
||||||
_padding: Default::default(),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+18
-26
@@ -6,24 +6,18 @@ use num_enum::FromPrimitive;
|
|||||||
use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
|
use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
|
||||||
use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
|
use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
|
||||||
|
|
||||||
use binary_serde::BinarySerde;
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct NfcPayload<'a> {
|
||||||
#[derive(Debug, BinarySerde, PartialEq, Eq, Clone, Copy)]
|
pub event_encoding: &'a [u8],
|
||||||
#[repr(C)]
|
|
||||||
pub struct RawCard {
|
|
||||||
pub event_encoding: [u8; 2],
|
|
||||||
pub card_type: u8,
|
pub card_type: u8,
|
||||||
pub card_uuid: [u8; 2],
|
pub card_uuid: &'a [u8],
|
||||||
pub _reserved: [u8; 4],
|
pub _reserved: &'a [u8],
|
||||||
pub sprite: [u8; 722],
|
pub sprite: &'a [u8],
|
||||||
pub packed_card_text: [u8; 54],
|
pub packed_card_text: &'a [u8],
|
||||||
pub secret: [u8; 24],
|
pub secret: &'a [u8],
|
||||||
pub _opaque_trailer: [u8; 49],
|
pub _opaque_trailer: &'a [u8],
|
||||||
pub _padding: [u8; 2],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static_assertions::const_assert!(RawCard::SERIALIZED_SIZE.is_multiple_of(4));
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
|
#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
|
||||||
#[repr(u8)]
|
#[repr(u8)]
|
||||||
pub enum CardType {
|
pub enum CardType {
|
||||||
@@ -228,7 +222,7 @@ pub struct Sprite {
|
|||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct Card {
|
pub struct Card {
|
||||||
pub uuid: u32,
|
pub uuid: String,
|
||||||
pub event: Events,
|
pub event: Events,
|
||||||
pub cardtype: CardType,
|
pub cardtype: CardType,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
@@ -241,19 +235,17 @@ pub struct Card {
|
|||||||
pub sprite: Sprite,
|
pub sprite: Sprite,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<RawCard> for Card {
|
impl<'a> TryFrom<NfcPayload<'a>> for Card {
|
||||||
type Error = &'static str;
|
type Error = &'static str;
|
||||||
|
|
||||||
fn try_from(raw_card: RawCard) -> Result<Self, Self::Error> {
|
fn try_from(payload: NfcPayload<'a>) -> Result<Self, Self::Error> {
|
||||||
let uuid: u32 = (u16::from_ne_bytes(raw_card.event_encoding) as u32) << 16
|
let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
|
||||||
| (u16::from_ne_bytes(raw_card.card_uuid) as u32);
|
let event = decode_known_event(payload.event_encoding);
|
||||||
|
let cardtype = CardType::from(payload.card_type);
|
||||||
let event = decode_known_event(&raw_card.event_encoding);
|
let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
|
||||||
let cardtype = CardType::from(raw_card.card_type);
|
let secret = decode_secret(payload.secret);
|
||||||
let (name, trait1, trait2, trait3) = decode_packed_card_text(&raw_card.packed_card_text);
|
|
||||||
let secret = decode_secret(&raw_card.secret);
|
|
||||||
let sprite = Sprite {
|
let sprite = Sprite {
|
||||||
data: raw_card.sprite.to_vec(),
|
data: payload.sprite.to_vec(),
|
||||||
};
|
};
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
uuid,
|
uuid,
|
||||||
|
|||||||
+11
-11
@@ -1,3 +1,4 @@
|
|||||||
|
use alloc::boxed::Box;
|
||||||
use embedded_hal_bus::i2c::AtomicDevice;
|
use embedded_hal_bus::i2c::AtomicDevice;
|
||||||
use embedded_hal_bus::util::AtomicCell;
|
use embedded_hal_bus::util::AtomicCell;
|
||||||
use esp_hal::gpio::interconnect::PeripheralInput;
|
use esp_hal::gpio::interconnect::PeripheralInput;
|
||||||
@@ -20,19 +21,18 @@ where
|
|||||||
SCL: PeripheralOutput<'a> + PeripheralInput<'a>,
|
SCL: PeripheralOutput<'a> + PeripheralInput<'a>,
|
||||||
SDA: PeripheralOutput<'a> + PeripheralInput<'a>,
|
SDA: PeripheralOutput<'a> + PeripheralInput<'a>,
|
||||||
{
|
{
|
||||||
pub fn build(self) -> Result<AtomicCell<InnerI2cBus<'a>>, Self> {
|
pub fn build(self) -> I2cBus<'a> {
|
||||||
let config = Config::default().with_frequency(esp_hal::time::Rate::from_khz(400));
|
let config = Config::default().with_frequency(esp_hal::time::Rate::from_khz(400));
|
||||||
match I2c::new(self.i2c_peripheral, config) {
|
let i2c = match I2c::new(self.i2c_peripheral, config) {
|
||||||
Ok(bus) => {
|
Ok(bus) => bus.with_sda(self.sda).with_scl(self.scl),
|
||||||
let i2c = bus.with_sda(self.sda).with_scl(self.scl);
|
|
||||||
log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
|
|
||||||
Ok(AtomicCell::new(i2c))
|
|
||||||
}
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Shared I2C bus initialization failed for GPIO17/GPIO18: {e:?}");
|
log::error!("Shared I2C bus initialization failed for GPIO17/GPIO18: {e:?}");
|
||||||
unimplemented!("Partial move makes it impossible to retry.");
|
panic!("Shared I2C bus initialization failed");
|
||||||
// Err(self)
|
}
|
||||||
}
|
};
|
||||||
}
|
let shared_i2c = Box::leak(Box::new(AtomicCell::new(i2c)));
|
||||||
|
log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
|
||||||
|
|
||||||
|
shared_i2c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
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;
|
||||||
@@ -9,27 +6,10 @@ 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::{DisplayError, DisplaySize240x320, Ili9341, Orientation};
|
use ili9341::{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> =
|
||||||
|
|||||||
+155
-20
@@ -1,6 +1,6 @@
|
|||||||
use alloc::format;
|
use alloc::{format, string::String};
|
||||||
use ch1115::{Ch1115, Size128x64};
|
|
||||||
use display_interface_spi::SPIInterface;
|
use display_interface_spi::SPIInterface;
|
||||||
|
use embedded_graphics::pixelcolor::BinaryColor;
|
||||||
use embedded_hal_bus::spi::AtomicDevice;
|
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;
|
||||||
@@ -8,10 +8,72 @@ use esp_hal::gpio::Output;
|
|||||||
|
|
||||||
use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput, SharedReset};
|
use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput, SharedReset};
|
||||||
|
|
||||||
pub type GenericSecondaryDisplay<'a, BUS, RST, DC> =
|
pub struct SecondaryDisplay<'a>(
|
||||||
Ch1115<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RST, Size128x64>;
|
#[cfg(feature = "wokwi")] ssd1306_aliases::SecondaryDisplay<'a>,
|
||||||
pub type SecondaryDisplay<'a> =
|
#[cfg(not(feature = "wokwi"))] ch1115_aliases::SecondaryDisplay<'a>,
|
||||||
GenericSecondaryDisplay<'a, DisplaySpiBus, SharedReset<'a>, SharedOutput<'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 struct SecondaryDisplayPinConfiguration<'a> {
|
||||||
pub spi_bus: &'a AtomicCell<DisplaySpiBus>,
|
pub spi_bus: &'a AtomicCell<DisplaySpiBus>,
|
||||||
@@ -21,25 +83,46 @@ pub struct SecondaryDisplayPinConfiguration<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> SecondaryDisplayPinConfiguration<'a> {
|
impl<'a> SecondaryDisplayPinConfiguration<'a> {
|
||||||
pub fn build(self) -> [SecondaryDisplay<'a>; 3] {
|
pub fn build(self) -> [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
|
||||||
let mut displays = self.cs_pins.map(|cs| {
|
#[cfg(feature = "wokwi")]
|
||||||
let spi_dev = AtomicDevice::new(self.spi_bus, cs, Delay::new()).unwrap();
|
type Displays<'b> = [ssd1306_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
|
||||||
let interface = SPIInterface::new(spi_dev, self.dc.clone());
|
#[cfg(not(feature = "wokwi"))]
|
||||||
|
type Displays<'b> = [ch1115_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
|
||||||
|
|
||||||
Ch1115::new(interface, self.res.clone(), Size128x64)
|
let reset_pin = self.res.clone();
|
||||||
});
|
let mut displays = Displays::new(self);
|
||||||
|
displays.reset(reset_pin);
|
||||||
|
|
||||||
init_single_reset(&mut displays, self.res);
|
displays.map(SecondaryDisplay)
|
||||||
|
|
||||||
displays
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn init_single_reset<'a: 'b, 'b>(
|
trait MultiDisplay<'a> {
|
||||||
displays: impl IntoIterator<Item = &'b mut SecondaryDisplay<'a>>,
|
fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self;
|
||||||
shared_reset: SharedReset<'a>,
|
fn reset(&mut self, shared_reset: SharedReset<'a>);
|
||||||
) {
|
}
|
||||||
let mut displays = displays.into_iter().peekable();
|
|
||||||
|
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
|
// Reset all secondaries via shared reset
|
||||||
let Some(any_display) = displays.peek_mut() else {
|
let Some(any_display) = displays.peek_mut() else {
|
||||||
@@ -57,3 +140,55 @@ fn init_single_reset<'a: 'b, 'b>(
|
|||||||
.unwrap();
|
.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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ where
|
|||||||
RES2: OutputPin + 'static,
|
RES2: OutputPin + 'static,
|
||||||
DC: OutputPin + 'static,
|
DC: OutputPin + 'static,
|
||||||
{
|
{
|
||||||
pub fn build(self) -> Result<(PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]), Self> {
|
pub fn build(self) -> (PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]) {
|
||||||
let spi = Spi::new(
|
let spi = Spi::new(
|
||||||
self.spi_peripheral,
|
self.spi_peripheral,
|
||||||
SpiConfig::default()
|
SpiConfig::default()
|
||||||
@@ -178,7 +178,7 @@ where
|
|||||||
}
|
}
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
Ok((primary, secondaries))
|
(primary, secondaries)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,20 +15,19 @@ pub struct TertiaryDisplayPinConfiguration<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> TertiaryDisplayPinConfiguration<'a> {
|
impl<'a> TertiaryDisplayPinConfiguration<'a> {
|
||||||
pub fn build(self) -> Result<TertiaryDisplay<'a>, Self> {
|
pub fn build(self) -> TertiaryDisplay<'a> {
|
||||||
let device = AtomicDevice::new(self.i2c);
|
let device = AtomicDevice::new(self.i2c);
|
||||||
let mut lcd = CharacterDisplayPCF8574T::new(device, LcdDisplayType::Lcd16x2, Delay::new());
|
let mut lcd = CharacterDisplayPCF8574T::new(device, LcdDisplayType::Lcd16x2, Delay::new());
|
||||||
match lcd.init() {
|
match lcd.init() {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
log::info!("I2C tertiary LCD initialized on PCF8574T at address 0x27");
|
log::info!("I2C tertiary LCD initialized on PCF8574T at address 0x27");
|
||||||
Ok(TertiaryDisplay {
|
TertiaryDisplay {
|
||||||
display: lcd,
|
display: lcd,
|
||||||
charset: create_custom_char_set!(),
|
charset: create_custom_char_set!(),
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
|
panic!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
|
||||||
Err(self)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -408,3 +407,4 @@ pub const BOX: CharMap = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
pub const EXAMPLE: CustomCharset = create_custom_char_set!(HEART, BOX, EMPTY);
|
pub const EXAMPLE: CustomCharset = create_custom_char_set!(HEART, BOX, EMPTY);
|
||||||
|
|
||||||
|
|||||||
+1
-3
@@ -1,5 +1,4 @@
|
|||||||
#![no_std]
|
#![no_std]
|
||||||
#![feature(vec_into_chunks)]
|
|
||||||
|
|
||||||
extern crate alloc;
|
extern crate alloc;
|
||||||
|
|
||||||
@@ -7,8 +6,7 @@ pub mod background_tasks;
|
|||||||
pub mod card;
|
pub mod card;
|
||||||
pub mod display;
|
pub mod display;
|
||||||
pub mod drivers;
|
pub mod drivers;
|
||||||
pub mod logging;
|
|
||||||
pub mod navigation;
|
pub mod navigation;
|
||||||
pub mod network;
|
pub mod network;
|
||||||
pub mod peripherals;
|
pub mod storage;
|
||||||
pub mod views;
|
pub mod views;
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
mod logging_config {
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/log_filter.rs"));
|
|
||||||
}
|
|
||||||
|
|
||||||
struct EnvLogger;
|
|
||||||
|
|
||||||
impl log::Log for EnvLogger {
|
|
||||||
fn enabled(&self, metadata: &log::Metadata) -> bool {
|
|
||||||
let level = metadata.level();
|
|
||||||
let target = metadata.target();
|
|
||||||
logging_config::is_enabled(level, target)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn log(&self, record: &log::Record) {
|
|
||||||
if !self.enabled(record.metadata()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// print with color? default to true if env var unset or set but empty.
|
|
||||||
let with_color = 1
|
|
||||||
== option_env!("ESP_LOG_COLOR")
|
|
||||||
.unwrap_or("1")
|
|
||||||
.parse()
|
|
||||||
.unwrap_or(1);
|
|
||||||
let (color, reset) = if with_color {
|
|
||||||
const RESET: &str = "\u{001B}[0m";
|
|
||||||
const RED: &str = "\u{001B}[31m";
|
|
||||||
const GREEN: &str = "\u{001B}[32m";
|
|
||||||
const YELLOW: &str = "\u{001B}[33m";
|
|
||||||
const BLUE: &str = "\u{001B}[34m";
|
|
||||||
const CYAN: &str = "\u{001B}[35m";
|
|
||||||
|
|
||||||
let color = match record.level() {
|
|
||||||
log::Level::Error => RED,
|
|
||||||
log::Level::Warn => YELLOW,
|
|
||||||
log::Level::Info => GREEN,
|
|
||||||
log::Level::Debug => BLUE,
|
|
||||||
log::Level::Trace => CYAN,
|
|
||||||
};
|
|
||||||
let reset = RESET;
|
|
||||||
(color, reset)
|
|
||||||
} else {
|
|
||||||
("", "")
|
|
||||||
};
|
|
||||||
|
|
||||||
let [now_s, now_ms] = {
|
|
||||||
let now = esp_hal::time::Instant::now()
|
|
||||||
.duration_since_epoch()
|
|
||||||
.as_millis();
|
|
||||||
|
|
||||||
[now / 1000, now % 1000]
|
|
||||||
};
|
|
||||||
|
|
||||||
let level = match record.level() {
|
|
||||||
log::Level::Error => "E",
|
|
||||||
log::Level::Warn => "W",
|
|
||||||
log::Level::Info => "I",
|
|
||||||
log::Level::Debug => "D",
|
|
||||||
log::Level::Trace => "T",
|
|
||||||
};
|
|
||||||
let args = record.args();
|
|
||||||
let line = record.line().unwrap_or(0);
|
|
||||||
let target = record.target();
|
|
||||||
let module = record.module_path().unwrap_or("???");
|
|
||||||
|
|
||||||
let (module, divider) = if module == target {
|
|
||||||
("", "")
|
|
||||||
} else {
|
|
||||||
(module, " ")
|
|
||||||
};
|
|
||||||
|
|
||||||
esp_println::println!(
|
|
||||||
"{color}{now_s:>4}.{now_ms:03}s {level} {target}{divider}{module}:{line} - {args}{reset}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn flush(&self) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn init() {
|
|
||||||
log::set_logger(&EnvLogger).expect("Failed to init logger.");
|
|
||||||
log::set_max_level(logging_config::FILTER_MAX);
|
|
||||||
}
|
|
||||||
@@ -1,15 +1,9 @@
|
|||||||
use crate::alloc::string::ToString;
|
|
||||||
use crate::card::model::Card;
|
use crate::card::model::Card;
|
||||||
use crate::navigation::inputs::ButtonAction;
|
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 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;
|
||||||
@@ -33,49 +27,16 @@ pub struct NewState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub trait Navigable {
|
pub trait Navigable {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send;
|
||||||
&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;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[embassy_executor::task]
|
#[embassy_executor::task]
|
||||||
pub async fn run(mut inputs: Inputs, mut outputs: Outputs, peripherals: &'static Peripherals) {
|
pub async fn run(mut inputs: Inputs, mut outputs: Outputs) {
|
||||||
async fn display_error(
|
|
||||||
error: String,
|
|
||||||
state: &mut NavigationState,
|
|
||||||
outputs: &mut Outputs,
|
|
||||||
peripherals: &Peripherals,
|
|
||||||
) -> () {
|
|
||||||
let error_view = ErrorView {
|
|
||||||
error: error.to_string(),
|
|
||||||
};
|
|
||||||
state.screens.push(View::Error(error_view));
|
|
||||||
state
|
|
||||||
.screens
|
|
||||||
.last()
|
|
||||||
// Unwrap: we just pushed the state
|
|
||||||
.unwrap()
|
|
||||||
.display(outputs, peripherals)
|
|
||||||
.await
|
|
||||||
// Unwrap: display will panic on error in error view
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
log::info!("starting navigation");
|
log::info!("starting navigation");
|
||||||
|
|
||||||
let mut state = NavigationState::new();
|
let mut state = NavigationState::new();
|
||||||
if let Err(error) = state
|
state.screens.last().unwrap().display(&mut outputs).await;
|
||||||
.screens
|
|
||||||
.last()
|
|
||||||
.unwrap()
|
|
||||||
.display(&mut outputs, peripherals)
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
display_error(error.to_string(), &mut state, &mut outputs, &peripherals).await;
|
|
||||||
};
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let selection = select(
|
let selection = select(
|
||||||
@@ -121,15 +82,7 @@ pub async fn run(mut inputs: Inputs, mut outputs: Outputs, peripherals: &'static
|
|||||||
state.screens.push(new_state.view);
|
state.screens.push(new_state.view);
|
||||||
|
|
||||||
if action != Action::Timer || new_state.redraw {
|
if action != Action::Timer || new_state.redraw {
|
||||||
if let Err(error) = state
|
state.screens.last().unwrap().display(&mut outputs).await;
|
||||||
.screens
|
|
||||||
.last()
|
|
||||||
.unwrap()
|
|
||||||
.display(&mut outputs, peripherals)
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
display_error(error.to_string(), &mut state, &mut outputs, &peripherals).await;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
|
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use embedded_graphics::{
|
use embedded_graphics::{
|
||||||
draw_target::DrawTarget as _,
|
draw_target::DrawTarget as _, pixelcolor::{BinaryColor, Rgb565, RgbColor as _},
|
||||||
pixelcolor::{Rgb565, RgbColor as _},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::drivers::{
|
use crate::drivers::{
|
||||||
@@ -19,9 +18,9 @@ pub struct Outputs {
|
|||||||
impl Outputs {
|
impl Outputs {
|
||||||
pub fn clear_screens(&mut self) {
|
pub fn clear_screens(&mut self) {
|
||||||
self.primary_display.clear(Rgb565::BLACK).unwrap();
|
self.primary_display.clear(Rgb565::BLACK).unwrap();
|
||||||
self.secondary_display_1.clear().unwrap();
|
self.secondary_display_1.clear(BinaryColor::Off).unwrap();
|
||||||
// self.secondary_display_2.clear().unwrap();
|
self.secondary_display_2.clear(BinaryColor::Off).unwrap();
|
||||||
// self.secondary_display_3.clear().unwrap();
|
self.secondary_display_3.clear(BinaryColor::Off).unwrap();
|
||||||
self.tertiary_display.clear().unwrap();
|
self.tertiary_display.clear().unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
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,32 +0,0 @@
|
|||||||
pub struct MemoryRegion {
|
|
||||||
pub offset: u32,
|
|
||||||
pub size: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MemoryRegion {
|
|
||||||
pub const fn new(offset: u32, size: usize) -> Self {
|
|
||||||
assert!(offset.is_multiple_of(4), "Flash requires 4 bytes alignment");
|
|
||||||
assert!(size.is_multiple_of(4), "Flash requires 4 bytes alignment");
|
|
||||||
Self { offset, size }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub const fn end(&self) -> usize {
|
|
||||||
self.offset as usize + self.size
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub const MAX_FLASH: usize = 16 * 1024 * 1024;
|
|
||||||
|
|
||||||
pub const MAGIC_REGION: MemoryRegion = MemoryRegion::new(0, 4);
|
|
||||||
|
|
||||||
pub const SETTINGS_REGION: MemoryRegion = MemoryRegion::new(MAGIC_REGION.end() as u32, 1024);
|
|
||||||
|
|
||||||
pub const CARDSTORE_REGION: MemoryRegion = MemoryRegion::new(
|
|
||||||
SETTINGS_REGION.end() as u32,
|
|
||||||
MAX_FLASH - SETTINGS_REGION.end(),
|
|
||||||
);
|
|
||||||
|
|
||||||
pub mod cardstore;
|
|
||||||
pub mod flash_store;
|
|
||||||
pub mod settings;
|
|
||||||
pub mod store;
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
use alloc::collections::BTreeMap;
|
|
||||||
use alloc::vec::Vec;
|
|
||||||
use core::error::Error;
|
|
||||||
use core::fmt::Display;
|
|
||||||
|
|
||||||
use binary_serde::{BinarySerde, DeserializeError, Endianness};
|
|
||||||
|
|
||||||
//use crate::card::model::Nfcraw_card;
|
|
||||||
|
|
||||||
use crate::card::model::RawCard;
|
|
||||||
use crate::peripherals::storage::flash_store::{FlashStore, FlashStoreError};
|
|
||||||
|
|
||||||
use crate::peripherals::storage::{CARDSTORE_REGION, MemoryRegion};
|
|
||||||
|
|
||||||
const MAX_CARDS: usize = 20000;
|
|
||||||
|
|
||||||
pub const COUNT_REGION: MemoryRegion = MemoryRegion::new(CARDSTORE_REGION.offset, size_of::<u32>());
|
|
||||||
|
|
||||||
const ALLOCATION_TABLE_REGION: MemoryRegion = MemoryRegion::new(
|
|
||||||
COUNT_REGION.end() as u32,
|
|
||||||
MAX_CARDS * AllocationTableEntry::SERIALIZED_SIZE,
|
|
||||||
);
|
|
||||||
|
|
||||||
const CARDS_REGION: MemoryRegion = MemoryRegion::new(
|
|
||||||
ALLOCATION_TABLE_REGION.end() as u32,
|
|
||||||
CARDSTORE_REGION.size - ALLOCATION_TABLE_REGION.end(),
|
|
||||||
);
|
|
||||||
|
|
||||||
#[derive(Debug, BinarySerde, PartialEq, Eq, Clone)]
|
|
||||||
#[repr(C)]
|
|
||||||
pub struct AllocationTableEntry {
|
|
||||||
uuid: u32,
|
|
||||||
// this is the numeric offset of the AllocationTableEntry
|
|
||||||
// as well as the card entry in flash memory
|
|
||||||
// size_of::<AllocationTableEntry>() * offset
|
|
||||||
// size_of::<RawCard>() * offset
|
|
||||||
offset: u32,
|
|
||||||
|
|
||||||
creation_date: u64,
|
|
||||||
last_read_date: u64,
|
|
||||||
|
|
||||||
// how often a card has been read by nfc
|
|
||||||
read_count: u32,
|
|
||||||
|
|
||||||
deleted: bool,
|
|
||||||
|
|
||||||
reserved: [u64; 4],
|
|
||||||
_padding: [u8; 3],
|
|
||||||
}
|
|
||||||
|
|
||||||
static_assertions::const_assert!(AllocationTableEntry::SERIALIZED_SIZE.is_multiple_of(4));
|
|
||||||
|
|
||||||
impl AllocationTableEntry {
|
|
||||||
fn new(uuid: u32, offset: u32, timestamp: u64) -> Self {
|
|
||||||
Self {
|
|
||||||
uuid,
|
|
||||||
offset,
|
|
||||||
creation_date: timestamp,
|
|
||||||
last_read_date: timestamp,
|
|
||||||
read_count: 0,
|
|
||||||
deleted: true,
|
|
||||||
reserved: Default::default(),
|
|
||||||
_padding: Default::default(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum CardStoreError {
|
|
||||||
Store(FlashStoreError),
|
|
||||||
CorruptedEntry(DeserializeError),
|
|
||||||
NoEntry(u32),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<DeserializeError> for CardStoreError {
|
|
||||||
fn from(error: DeserializeError) -> CardStoreError {
|
|
||||||
CardStoreError::CorruptedEntry(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct CardStore {
|
|
||||||
store: &'static FlashStore,
|
|
||||||
count: u32,
|
|
||||||
pub allocation_table: BTreeMap<u32, AllocationTableEntry>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl CardStore {
|
|
||||||
pub async fn new(store: &'static FlashStore) -> Result<Self, CardStoreError> {
|
|
||||||
let mut count_bytes: [u8; COUNT_REGION.size] = [0; COUNT_REGION.size];
|
|
||||||
|
|
||||||
store.read(COUNT_REGION.offset, &mut count_bytes).await?;
|
|
||||||
|
|
||||||
let count: u32 = u32::from_ne_bytes(count_bytes);
|
|
||||||
|
|
||||||
log::info!("Found {count} cards in flash.");
|
|
||||||
|
|
||||||
let mut allocation_table_entries: Vec<u8> =
|
|
||||||
Vec::with_capacity(AllocationTableEntry::SERIALIZED_SIZE * count as usize);
|
|
||||||
|
|
||||||
store
|
|
||||||
.read(
|
|
||||||
ALLOCATION_TABLE_REGION.offset,
|
|
||||||
&mut allocation_table_entries,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let chunks =
|
|
||||||
allocation_table_entries.into_chunks::<{ AllocationTableEntry::SERIALIZED_SIZE }>();
|
|
||||||
|
|
||||||
let mut allocation_table = BTreeMap::<u32, AllocationTableEntry>::new();
|
|
||||||
for chunk in chunks {
|
|
||||||
let allocation_table_entry =
|
|
||||||
AllocationTableEntry::binary_deserialize(chunk.as_ref(), Endianness::Little)?;
|
|
||||||
allocation_table.insert(allocation_table_entry.uuid, allocation_table_entry);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
store,
|
|
||||||
count,
|
|
||||||
allocation_table,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_card_by_uuid(&self, uuid: u32) -> Result<RawCard, CardStoreError> {
|
|
||||||
let entry = self
|
|
||||||
.allocation_table
|
|
||||||
.get(&uuid)
|
|
||||||
.ok_or(CardStoreError::NoEntry(uuid))?;
|
|
||||||
|
|
||||||
let mut raw_card: [u8; size_of::<RawCard>()] = [0; size_of::<RawCard>()];
|
|
||||||
self.store.read(entry.offset, &mut raw_card).await?;
|
|
||||||
|
|
||||||
Ok(RawCard::binary_deserialize(
|
|
||||||
raw_card.as_ref(),
|
|
||||||
Endianness::Little,
|
|
||||||
)?)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn save_raw_card(
|
|
||||||
&mut self,
|
|
||||||
raw_card: RawCard,
|
|
||||||
timestamp: u64,
|
|
||||||
) -> Result<(), CardStoreError> {
|
|
||||||
let uuid: u32 = (u16::from_ne_bytes(raw_card.event_encoding) as u32) << 16
|
|
||||||
| (u16::from_ne_bytes(raw_card.card_uuid) as u32);
|
|
||||||
log::info!("Saving card with uuid {:x}", uuid);
|
|
||||||
|
|
||||||
// check if we already got the card
|
|
||||||
// if not find the next deleted entry,
|
|
||||||
// if none create a new one at the end
|
|
||||||
let (entry, is_new) = match self.allocation_table.get_mut(&uuid) {
|
|
||||||
Some(entry) => {
|
|
||||||
log::debug!("old entry");
|
|
||||||
(entry, false)
|
|
||||||
}
|
|
||||||
None => match self
|
|
||||||
.allocation_table
|
|
||||||
.values_mut()
|
|
||||||
.find(|entry| entry.deleted)
|
|
||||||
{
|
|
||||||
Some(entry) => {
|
|
||||||
log::debug!("deleted entry");
|
|
||||||
(entry, true)
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
log::debug!("new entry");
|
|
||||||
let entry = AllocationTableEntry::new(uuid, self.count + 1, timestamp);
|
|
||||||
self.allocation_table.insert(uuid, entry);
|
|
||||||
(
|
|
||||||
self.allocation_table
|
|
||||||
.get_mut(&uuid)
|
|
||||||
.expect("entry was just inserted"),
|
|
||||||
true,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
// only write card data if it is new. else it is already written in flash
|
|
||||||
if is_new {
|
|
||||||
log::debug!("writing RawCard to flash");
|
|
||||||
let mut serialized_card: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE];
|
|
||||||
raw_card.binary_serialize(&mut serialized_card, Endianness::Little);
|
|
||||||
self.store
|
|
||||||
.write_erase(
|
|
||||||
CARDS_REGION.offset + entry.offset * RawCard::SERIALIZED_SIZE as u32,
|
|
||||||
&mut serialized_card,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
} else {
|
|
||||||
entry.last_read_date = timestamp;
|
|
||||||
entry.read_count += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
entry.deleted = false;
|
|
||||||
|
|
||||||
log::debug!("writing AllocationTableEntry to flash");
|
|
||||||
let mut serialized_entry: [u8; AllocationTableEntry::SERIALIZED_SIZE] =
|
|
||||||
[0; AllocationTableEntry::SERIALIZED_SIZE];
|
|
||||||
entry.binary_serialize(&mut serialized_entry, Endianness::Little);
|
|
||||||
self.store
|
|
||||||
.write_erase(
|
|
||||||
ALLOCATION_TABLE_REGION.offset
|
|
||||||
+ entry.offset * AllocationTableEntry::SERIALIZED_SIZE as u32,
|
|
||||||
&mut serialized_entry,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
self.count += 1;
|
|
||||||
log::debug!("writing card count to flash");
|
|
||||||
let mut serialized_count: [u8; 4] = self.count.to_le_bytes();
|
|
||||||
self.store
|
|
||||||
.write(COUNT_REGION.offset, serialized_count.as_mut_slice())
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
use core::error::Error;
|
|
||||||
use core::fmt::Display;
|
|
||||||
|
|
||||||
use crate::navigation::navigation::Mutex;
|
|
||||||
use embedded_storage::nor_flash::NorFlash;
|
|
||||||
use embedded_storage::nor_flash::ReadNorFlash;
|
|
||||||
use esp_storage::{FlashStorage, FlashStorageError};
|
|
||||||
|
|
||||||
use crate::peripherals::storage::MAGIC_REGION;
|
|
||||||
|
|
||||||
#[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 {
|
|
||||||
use core::fmt::Debug;
|
|
||||||
self.0.fmt(f)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const FLASH_ADDR: u32 = 0x9000;
|
|
||||||
|
|
||||||
const INITIALIZATION_SIZE: usize = 0x1000;
|
|
||||||
const FLASH_INITIALIZE_MAGIC: u32 = 0xde6de6de;
|
|
||||||
|
|
||||||
pub struct FlashStore {
|
|
||||||
pub storage: Mutex<FlashStorage<'static>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FlashStore {
|
|
||||||
pub fn new(flash: esp_hal::peripherals::FLASH<'static>) -> Result<Self, FlashStoreError> {
|
|
||||||
let mut storage = FlashStorage::new(flash);
|
|
||||||
|
|
||||||
let mut magic: [u8; 4] = [0, 0, 0, 0];
|
|
||||||
storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?;
|
|
||||||
log::debug!("Magic bytes are {magic:?}");
|
|
||||||
|
|
||||||
if Self::has_magic_bytes(&mut storage)? {
|
|
||||||
log::info!("Skipped flash initialization, magic bytes already present.");
|
|
||||||
} else {
|
|
||||||
log::info!("Initializing flash because no magic bytes found.");
|
|
||||||
Self::initialize_flash(&mut storage)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
storage: Mutex::new(storage),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn read(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
|
|
||||||
self.storage.lock().await.read(FLASH_ADDR + offset, bytes)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn write(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
|
|
||||||
log::debug!("Writing {} bytes at offset 0x{offset:08x}", bytes.len());
|
|
||||||
self.storage
|
|
||||||
.lock()
|
|
||||||
.await
|
|
||||||
.write(FLASH_ADDR + offset, bytes)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn write_erase(&self, offset: u32, bytes: &mut [u8]) -> Result<(), FlashStoreError> {
|
|
||||||
log::debug!(
|
|
||||||
"Erasing and Writing {} bytes at offset 0x{offset:08x}",
|
|
||||||
bytes.len()
|
|
||||||
);
|
|
||||||
let mut lock = self.storage.lock().await;
|
|
||||||
lock.erase(FLASH_ADDR + offset, FLASH_ADDR + bytes.len() as u32)?;
|
|
||||||
lock.write(FLASH_ADDR + offset, bytes)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn has_magic_bytes(storage: &mut FlashStorage) -> Result<bool, FlashStoreError> {
|
|
||||||
let mut magic: [u8; 4] = [0, 0, 0, 0];
|
|
||||||
storage.read(FLASH_ADDR + MAGIC_REGION.offset, &mut magic)?;
|
|
||||||
log::debug!("Magic bytes are {magic:?}");
|
|
||||||
|
|
||||||
Ok(u32::from_ne_bytes(magic) == FLASH_INITIALIZE_MAGIC)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn initialize_flash(storage: &mut FlashStorage) -> Result<(), FlashStoreError> {
|
|
||||||
storage.erase(FLASH_ADDR, FLASH_ADDR + INITIALIZATION_SIZE as u32)?;
|
|
||||||
let zeros: [u8; INITIALIZATION_SIZE] = [0; INITIALIZATION_SIZE];
|
|
||||||
storage.write(FLASH_ADDR + MAGIC_REGION.end() as u32, &zeros)?;
|
|
||||||
storage.write(
|
|
||||||
FLASH_ADDR + MAGIC_REGION.offset,
|
|
||||||
&FLASH_INITIALIZE_MAGIC.to_ne_bytes(),
|
|
||||||
)?;
|
|
||||||
|
|
||||||
if Self::has_magic_bytes(storage)? {
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err(FlashStoreError(FlashStorageError::Other(
|
|
||||||
FLASH_INITIALIZE_MAGIC as i32,
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
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,
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
pub mod dex_db;
|
||||||
|
pub mod nvs;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
// Storage dex_db module
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
// Storage nvs module
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
pub mod card_view;
|
pub mod card_view;
|
||||||
pub mod error_view;
|
|
||||||
pub mod flash_info_view;
|
|
||||||
pub mod journal_view;
|
pub mod journal_view;
|
||||||
pub mod main_menu;
|
pub mod main_menu;
|
||||||
pub mod menu_item;
|
pub mod menu_item;
|
||||||
|
|||||||
+10
-21
@@ -1,11 +1,7 @@
|
|||||||
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;
|
||||||
@@ -29,16 +25,10 @@ pub struct CardView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for CardView {
|
impl Navigable for CardView {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&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
|
display.clear(Rgb565::BLACK).unwrap();
|
||||||
.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();
|
||||||
@@ -52,60 +42,59 @@ impl Navigable for CardView {
|
|||||||
style,
|
style,
|
||||||
)
|
)
|
||||||
.draw(display)
|
.draw(display)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
|
|
||||||
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(())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,94 +0,0 @@
|
|||||||
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::format;
|
|
||||||
use alloc::string::String;
|
|
||||||
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 {
|
|
||||||
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 error: {}",
|
|
||||||
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, 30), display_area.size);
|
|
||||||
|
|
||||||
TextBox::with_textbox_style(&format!("{}", self.error), bounds, style, textbox_style)
|
|
||||||
.draw(&mut outputs.primary_display)
|
|
||||||
.unwrap_or_else(|error| {
|
|
||||||
panic!(
|
|
||||||
"Error: {error:?}\nDraw error while rendering error: {}",
|
|
||||||
self.error
|
|
||||||
)
|
|
||||||
});
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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::Error(self.clone()),
|
|
||||||
replace_view: true,
|
|
||||||
redraw: false,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
let new_menu = match input {
|
|
||||||
_ => View::Error(self.clone()),
|
|
||||||
};
|
|
||||||
|
|
||||||
NewState {
|
|
||||||
replace_view: matches!(new_menu, View::FlashInfo(_)),
|
|
||||||
view: new_menu,
|
|
||||||
redraw: true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
use crate::drivers::primary_lcd::PrimaryDisplayError;
|
|
||||||
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::peripherals::storage::MAGIC_REGION;
|
|
||||||
use crate::peripherals::storage::cardstore::COUNT_REGION;
|
|
||||||
use crate::views::view::View;
|
|
||||||
use alloc::boxed::Box;
|
|
||||||
use core::error;
|
|
||||||
use embedded_graphics::prelude::Point;
|
|
||||||
use embedded_graphics::{
|
|
||||||
Drawable,
|
|
||||||
mono_font::{MonoTextStyle, ascii::FONT_10X20},
|
|
||||||
pixelcolor::Rgb565,
|
|
||||||
prelude::*,
|
|
||||||
primitives::Rectangle,
|
|
||||||
text::Text,
|
|
||||||
};
|
|
||||||
|
|
||||||
use alloc::format;
|
|
||||||
use embedded_text::{
|
|
||||||
TextBox,
|
|
||||||
alignment::HorizontalAlignment,
|
|
||||||
style::{HeightMode, TextBoxStyleBuilder},
|
|
||||||
};
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct FlashInfoView {}
|
|
||||||
|
|
||||||
impl Navigable for FlashInfoView {
|
|
||||||
fn display(
|
|
||||||
&self,
|
|
||||||
outputs: &mut Outputs,
|
|
||||||
peripherals: &Peripherals,
|
|
||||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
|
||||||
async move {
|
|
||||||
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?;
|
|
||||||
|
|
||||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
|
||||||
let textbox_style = TextBoxStyleBuilder::new()
|
|
||||||
.height_mode(HeightMode::FitToText)
|
|
||||||
.alignment(HorizontalAlignment::Center)
|
|
||||||
.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 {
|
|
||||||
async move {
|
|
||||||
let Action::Button(input) = input else {
|
|
||||||
// Skip timer inputs
|
|
||||||
return NewState {
|
|
||||||
view: View::FlashInfo(self.clone()),
|
|
||||||
replace_view: true,
|
|
||||||
redraw: false,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
let new_menu = match input {
|
|
||||||
_ => View::FlashInfo(self.clone()),
|
|
||||||
};
|
|
||||||
|
|
||||||
NewState {
|
|
||||||
replace_view: matches!(new_menu, View::FlashInfo(_)),
|
|
||||||
view: new_menu,
|
|
||||||
redraw: true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
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;
|
||||||
@@ -26,17 +22,9 @@ pub struct JournalView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for JournalView {
|
impl Navigable for JournalView {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&self,
|
|
||||||
outputs: &mut Outputs,
|
|
||||||
_: &Peripherals,
|
|
||||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
|
||||||
async move {
|
async move {
|
||||||
outputs
|
outputs.primary_display.clear(Rgb565::BLACK).unwrap();
|
||||||
.primary_display
|
|
||||||
.clear(Rgb565::BLACK)
|
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
-20
@@ -1,8 +1,4 @@
|
|||||||
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::*};
|
||||||
@@ -26,26 +22,16 @@ pub struct MainMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for MainMenu {
|
impl Navigable for MainMenu {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&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);
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
menu_item::show(display, "Last card", 1, self.selected);
|
||||||
menu_item::show(display, "Last card", 1, self.selected)
|
menu_item::show(display, "Journal", 2, self.selected);
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
menu_item::show(display, "Settings", 3, self.selected);
|
||||||
menu_item::show(display, "Journal", 2, self.selected)
|
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
|
||||||
menu_item::show(display, "Settings", 3, self.selected)
|
|
||||||
.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 {
|
||||||
|
|||||||
@@ -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) -> Result<(), D::Error>
|
pub fn show<D>(display: &mut D, name: &str, position: i32, selected: i32)
|
||||||
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)
|
||||||
Ok(())
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-18
@@ -1,11 +1,7 @@
|
|||||||
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;
|
||||||
@@ -37,23 +33,16 @@ pub struct ScanMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for ScanMenu {
|
impl Navigable for ScanMenu {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&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
|
display.clear(Rgb565::BLACK).unwrap();
|
||||||
.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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
|
|
||||||
// Create styles used by the drawing operations.
|
// Create styles used by the drawing operations.
|
||||||
let arc_stroke = PrimitiveStyleBuilder::new()
|
let arc_stroke = PrimitiveStyleBuilder::new()
|
||||||
@@ -83,15 +72,15 @@ impl Navigable for ScanMenu {
|
|||||||
)
|
)
|
||||||
.into_styled(arc_stroke)
|
.into_styled(arc_stroke)
|
||||||
.draw(display)
|
.draw(display)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
|
|
||||||
// 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)
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
.unwrap();
|
||||||
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 {
|
||||||
|
|||||||
+10
-59
@@ -1,18 +1,11 @@
|
|||||||
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::{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 embedded_graphics::pixelcolor::Rgb565;
|
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: i8 = 2;
|
||||||
pub const MAX_SELECTED: i32 = 2;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct SettingsMenu {
|
pub struct SettingsMenu {
|
||||||
@@ -20,63 +13,21 @@ pub struct SettingsMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for SettingsMenu {
|
impl Navigable for SettingsMenu {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&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, "System Inforation", 0, self.selected)
|
menu_item::show(display, "System Inforation", 0, self.selected);
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
menu_item::show(display, "Wifi Information", 1, self.selected);
|
||||||
menu_item::show(display, "Wifi Information", 1, self.selected)
|
|
||||||
.map_err(PrimaryDisplayError::from)?;
|
core::future::ready(())
|
||||||
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 {
|
||||||
async move {
|
async move {
|
||||||
let Action::Button(input) = input else {
|
|
||||||
// Skip timer inputs
|
|
||||||
return NewState {
|
|
||||||
view: View::Settings(self.clone()),
|
|
||||||
replace_view: true,
|
|
||||||
redraw: false,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
let new_menu = match input {
|
|
||||||
ButtonAction::Up => {
|
|
||||||
let new_selected = if (self.selected - 1) < 0 {
|
|
||||||
MAX_SELECTED - 1
|
|
||||||
} else {
|
|
||||||
self.selected - 1
|
|
||||||
};
|
|
||||||
View::Settings(SettingsMenu {
|
|
||||||
selected: new_selected,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
ButtonAction::Down => {
|
|
||||||
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
|
|
||||||
View::Settings(SettingsMenu {
|
|
||||||
selected: new_selected,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
ButtonAction::Ok => match self.selected {
|
|
||||||
2 => View::FlashInfo(FlashInfoView {}),
|
|
||||||
_ => View::Settings(self.clone()),
|
|
||||||
},
|
|
||||||
_ => View::Settings(self.clone()),
|
|
||||||
};
|
|
||||||
|
|
||||||
NewState {
|
NewState {
|
||||||
replace_view: matches!(new_menu, View::Settings(_)),
|
view: View::Settings(SettingsMenu { selected: 0 }),
|
||||||
view: new_menu,
|
replace_view: true,
|
||||||
redraw: true,
|
redraw: !matches!(input, Action::Timer),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-23
@@ -1,43 +1,30 @@
|
|||||||
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::{
|
||||||
error_view::ErrorView, flash_info_view::FlashInfoView, journal_view::JournalView,
|
journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
|
||||||
main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu,
|
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),
|
||||||
Journal(JournalView),
|
Journal(JournalView),
|
||||||
Card(CardView),
|
Card(CardView),
|
||||||
FlashInfo(FlashInfoView),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Navigable for View {
|
impl Navigable for View {
|
||||||
fn display(
|
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||||
&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::Error(error_view) => error_view.display(outputs, peripherals).await,
|
View::Main(main_menu) => main_menu.display(outputs).await,
|
||||||
View::Main(main_menu) => main_menu.display(outputs, peripherals).await,
|
View::Scan(scan_menu) => scan_menu.display(outputs).await,
|
||||||
View::Scan(scan_menu) => scan_menu.display(outputs, peripherals).await,
|
View::Settings(settings_menu) => settings_menu.display(outputs).await,
|
||||||
View::Settings(settings_menu) => settings_menu.display(outputs, peripherals).await,
|
View::Journal(journal_view) => journal_view.display(outputs).await,
|
||||||
View::Journal(journal_view) => journal_view.display(outputs, peripherals).await,
|
View::Card(card_view) => card_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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -48,13 +35,11 @@ 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,
|
||||||
View::Journal(journal_view) => journal_view.handle_input(input).await,
|
View::Journal(journal_view) => journal_view.handle_input(input).await,
|
||||||
View::Card(card_view) => card_view.handle_input(input).await,
|
View::Card(card_view) => card_view.handle_input(input).await,
|
||||||
View::FlashInfo(flash_info_view) => flash_info_view.handle_input(input).await,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user