Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ede1998
|
cfe1c6b11a
|
||
|
ede1998
|
e477462783
|
||
 lukas
|
020ca5cd4b |
Generated
+133
-10
@@ -229,6 +229,16 @@ version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "ch1115"
|
||||
version = "0.1.2"
|
||||
source = "git+https://github.com/ede1998/ch1115.git?rev=2d3a3ba38050efe012e6a210afe3e125ec280c37#2d3a3ba38050efe012e6a210afe3e125ec280c37"
|
||||
dependencies = [
|
||||
"display-interface",
|
||||
"embedded-graphics-core",
|
||||
"embedded-hal 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cobs"
|
||||
version = "0.3.0"
|
||||
@@ -303,15 +313,16 @@ name = "creaturedex"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"ch1115",
|
||||
"critical-section",
|
||||
"display-interface-spi",
|
||||
"embassy-executor",
|
||||
"embassy-futures",
|
||||
"embassy-time",
|
||||
"embedded-graphics",
|
||||
"embedded-graphics-core",
|
||||
"embedded-hal 1.0.0",
|
||||
"embedded-hal-bus",
|
||||
"embedded-hal-compat",
|
||||
"embedded-io 0.7.1",
|
||||
"esp-alloc",
|
||||
"esp-bootloader-esp-idf",
|
||||
@@ -322,8 +333,9 @@ dependencies = [
|
||||
"ili9341",
|
||||
"log",
|
||||
"ndef",
|
||||
"num_enum",
|
||||
"pn532",
|
||||
"sh1106",
|
||||
"ssd1306",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -608,6 +620,17 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "display-interface-spi"
|
||||
version = "0.5.0"
|
||||
@@ -947,6 +970,17 @@ dependencies = [
|
||||
"embedded-hal 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "embedded-hal-compat"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08ecac72f6be75ad2d4809c9f07d45502e2e5c9a4e9579077f28d7135de81df3"
|
||||
dependencies = [
|
||||
"embedded-hal 0.2.7",
|
||||
"embedded-hal 1.0.0",
|
||||
"nb 1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "embedded-io"
|
||||
version = "0.4.0"
|
||||
@@ -1532,27 +1566,27 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.34"
|
||||
version = "0.3.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
|
||||
checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
|
||||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.34"
|
||||
version = "0.3.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
|
||||
checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.34"
|
||||
version = "0.3.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
|
||||
checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.34"
|
||||
version = "0.3.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
|
||||
checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
@@ -1918,6 +1952,30 @@ version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d"
|
||||
|
||||
[[package]]
|
||||
name = "manyhow"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587"
|
||||
dependencies = [
|
||||
"manyhow-macros",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "manyhow-macros"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495"
|
||||
dependencies = [
|
||||
"proc-macro-utils",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "matchers"
|
||||
version = "0.2.0"
|
||||
@@ -1933,6 +1991,19 @@ version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
|
||||
|
||||
[[package]]
|
||||
name = "maybe-async-cfg"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8dbfaa67a76e2623580df07d6bb5e7956c0a4bae4b418314083a9c619bd66627"
|
||||
dependencies = [
|
||||
"manyhow",
|
||||
"proc-macro2",
|
||||
"pulldown-cmark",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.8.3"
|
||||
@@ -2692,6 +2763,17 @@ dependencies = [
|
||||
"toml_edit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-utils"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eeaf08a13de400bc215877b5bdc088f241b12eb42f0a548d3390dc1c56bb7071"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.107"
|
||||
@@ -2721,6 +2803,17 @@ dependencies = [
|
||||
"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]]
|
||||
name = "quote"
|
||||
version = "1.0.47"
|
||||
@@ -3047,6 +3140,16 @@ dependencies = [
|
||||
"unsafe-libyaml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sh1106"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc12a0563ec9b3b1f99b1f64613581ebbade1347416a34766564f406c15d1bf3"
|
||||
dependencies = [
|
||||
"embedded-graphics-core",
|
||||
"embedded-hal 0.2.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sharded-slab"
|
||||
version = "0.1.7"
|
||||
@@ -3135,6 +3238,20 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c"
|
||||
|
||||
[[package]]
|
||||
name = "ssd1306"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ed51935bdc6e9e976d3d9a747e768589eaea0cf26f483213bfededc947c8624"
|
||||
dependencies = [
|
||||
"display-interface",
|
||||
"display-interface-i2c",
|
||||
"display-interface-spi",
|
||||
"embedded-graphics-core",
|
||||
"embedded-hal 1.0.0",
|
||||
"maybe-async-cfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.1"
|
||||
@@ -3402,6 +3519,12 @@ version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
|
||||
|
||||
[[package]]
|
||||
name = "unicase"
|
||||
version = "2.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-id-start"
|
||||
version = "1.4.0"
|
||||
|
||||
+10
-5
@@ -9,7 +9,7 @@ name = "creaturedex"
|
||||
path = "./src/bin/main.rs"
|
||||
|
||||
[dependencies]
|
||||
esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] }
|
||||
esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] }
|
||||
|
||||
esp-rtos = { version = "0.3.0", features = [
|
||||
"embassy",
|
||||
@@ -24,10 +24,8 @@ log = "0.4.27"
|
||||
|
||||
critical-section = "1.2.0"
|
||||
embedded-io = "0.7.1"
|
||||
embassy-executor = { version = "0.10.0", features = [
|
||||
] }
|
||||
embassy-executor = { version = "0.10.0", default-features = false }
|
||||
embassy-time = { version = "0.5.1", default-features = false }
|
||||
embassy-futures = "0.1.2"
|
||||
esp-alloc = "0.10.0"
|
||||
esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [
|
||||
"ap",
|
||||
@@ -36,6 +34,7 @@ esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanag
|
||||
esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] }
|
||||
display-interface-spi = "0.5.0"
|
||||
ili9341 = "0.6.0"
|
||||
ssd1306 = "0.9.0"
|
||||
embedded-hal = "1.0.0"
|
||||
embedded-hal-bus = "0.3.0"
|
||||
embedded-graphics = "0.8.2"
|
||||
@@ -43,7 +42,13 @@ embedded-graphics-core = "0.4.1"
|
||||
base64 = { version = "0.22", default-features = false, features = ["alloc"] }
|
||||
pn532 = "0.5.0"
|
||||
ndef = "0.5.0"
|
||||
num_enum = { version = "0.7.6", default-features = false }
|
||||
ch1115 = { version = "0.1.2", features = ["graphics"] }
|
||||
sh1106 = "0.5.0"
|
||||
embedded-hal-compat = "0.13.0"
|
||||
|
||||
|
||||
[patch.crates-io]
|
||||
ch1115 = { git = "https://github.com/ede1998/ch1115.git", rev = "2d3a3ba38050efe012e6a210afe3e125ec280c37" }
|
||||
|
||||
# For fine tuning these settings, please refer to https://doc.rust-lang.org/cargo/reference/profiles.html
|
||||
[profile.dev]
|
||||
|
||||
+7
-52
@@ -10,48 +10,13 @@
|
||||
"left": -263.96,
|
||||
"attrs": {}
|
||||
},
|
||||
{ "type": "wokwi-ili9341", "id": "lcd1", "top": -200.8, "left": 354.9, "attrs": {} },
|
||||
{ "type": "wokwi-ili9341", "id": "lcd1", "top": -191.24, "left": -0.38, "attrs": {} },
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-up",
|
||||
"top": -99.4,
|
||||
"left": -76.8,
|
||||
"attrs": { "color": "RebeccaPurple", "xray": "1", "key": "1", "label": "Up" }
|
||||
},
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-down",
|
||||
"top": 25.4,
|
||||
"left": -76.8,
|
||||
"attrs": { "color": "green", "xray": "1", "key": "1", "label": "Down" }
|
||||
},
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-left",
|
||||
"top": -32.2,
|
||||
"left": -163.2,
|
||||
"attrs": { "color": "yellow", "xray": "1", "key": "1", "label": "Left" }
|
||||
},
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-right",
|
||||
"top": -32.2,
|
||||
"left": 19.2,
|
||||
"attrs": { "color": "red", "xray": "1", "key": "1", "label": "Right" }
|
||||
},
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-back",
|
||||
"top": -99.4,
|
||||
"left": 115.2,
|
||||
"attrs": { "color": "Magenta", "xray": "1", "key": "1", "label": "Back" }
|
||||
},
|
||||
{
|
||||
"type": "wokwi-pushbutton",
|
||||
"id": "btn-ok",
|
||||
"top": 25.4,
|
||||
"left": 115.2,
|
||||
"attrs": { "color": "Lime", "xray": "1", "key": "1", "label": "Ok" }
|
||||
"id": "btn1",
|
||||
"top": 131,
|
||||
"left": -124.8,
|
||||
"attrs": { "color": "green", "xray": "1", "key": "1" }
|
||||
}
|
||||
],
|
||||
"connections": [
|
||||
@@ -65,18 +30,8 @@
|
||||
[ "lcd1:MOSI", "esp1:35", "violet", [ "v105.6", "h-124.8", "v-144" ] ],
|
||||
[ "lcd1:SCK", "esp1:36", "white", [ "v115.2", "h-144", "v-86.4" ] ],
|
||||
[ "esp1:37", "lcd1:MISO", "magenta", [ "h57.6", "v105.6", "h172.8" ] ],
|
||||
[ "btn-up:2.l", "esp1:38", "purple", [ "h-9.6", "v19.4" ] ],
|
||||
[ "btn-up:1.l", "esp1:GND.2", "black", [ "h0" ] ],
|
||||
[ "btn-down:1.l", "esp1:GND.2", "black", [ "h0" ] ],
|
||||
[ "btn-down:2.l", "esp1:39", "green", [ "h-19.2", "v115.4" ] ],
|
||||
[ "btn-left:2.l", "esp1:40", "yellow", [ "h0", "v173" ] ],
|
||||
[ "btn-left:1.l", "esp1:GND.2", "black", [ "h0" ] ],
|
||||
[ "btn-right:2.l", "esp1:41", "red", [ "h-19.2", "v153.8" ] ],
|
||||
[ "btn-right:1.l", "btn-left:1.r", "black", [ "h-96", "v28.8" ] ],
|
||||
[ "btn-back:2.l", "esp1:42", "Magenta", [ "h-19.2", "v211.58" ] ],
|
||||
[ "btn-back:1.l", "btn-up:1.r", "black", [ "h0" ] ],
|
||||
[ "btn-ok:1.l", "btn-down:1.r", "black", [ "h0" ] ],
|
||||
[ "btn-ok:2.l", "esp1:45", "Lime", [ "h-9.6", "v173" ] ]
|
||||
[ "btn1:1.l", "esp1:GND.2", "green", [ "h-9.6", "v-48" ] ],
|
||||
[ "btn1:2.l", "esp1:38", "green", [ "h-9.6", "v19.4" ] ]
|
||||
],
|
||||
"dependencies": {}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
#![deny(
|
||||
clippy::mem_forget,
|
||||
reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
|
||||
holding buffers for the duration of a data transfer."
|
||||
)]
|
||||
|
||||
use ch1115::Ch1115;
|
||||
use core::cell::RefCell;
|
||||
use creaturedex::display::shared_bus::SharedPin;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_time::Timer;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_graphics::{
|
||||
mono_font::{MonoTextStyle, ascii::FONT_6X10},
|
||||
prelude::*,
|
||||
text::Text,
|
||||
};
|
||||
use esp_hal::clock::CpuClock;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig};
|
||||
use esp_hal::spi::Mode;
|
||||
use esp_hal::spi::master::{Config as SpiConfig, Spi};
|
||||
use esp_hal::time::Rate;
|
||||
use esp_hal::timer::timg::TimerGroup;
|
||||
use log::error;
|
||||
|
||||
#[panic_handler]
|
||||
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||
error!("{}", panic_info);
|
||||
loop {}
|
||||
}
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
esp_bootloader_esp_idf::esp_app_desc!();
|
||||
|
||||
#[esp_rtos::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
esp_println::logger::init_logger_from_env();
|
||||
|
||||
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
||||
let peripherals = esp_hal::init(config);
|
||||
|
||||
// The following GPIO pins are in use by some feature of the module and should not be used.
|
||||
let _ = peripherals.GPIO27;
|
||||
let _ = peripherals.GPIO28;
|
||||
let _ = peripherals.GPIO29;
|
||||
let _ = peripherals.GPIO30;
|
||||
let _ = peripherals.GPIO31;
|
||||
let _ = peripherals.GPIO32;
|
||||
let _ = peripherals.GPIO33;
|
||||
let _ = peripherals.GPIO34;
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744);
|
||||
|
||||
let mut delay = Delay::new();
|
||||
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
let sw_interrupt =
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
|
||||
|
||||
let spi = peripherals.SPI2;
|
||||
let sck = peripherals.GPIO36;
|
||||
let mosi = peripherals.GPIO35;
|
||||
let cs = peripherals.GPIO13;
|
||||
let reset = peripherals.GPIO10;
|
||||
let dc = peripherals.GPIO12;
|
||||
let miso = peripherals.GPIO37;
|
||||
|
||||
let cs = Output::new(cs, Level::High, OutputConfig::default());
|
||||
let dc = Output::new(dc, Level::Low, OutputConfig::default());
|
||||
let reset = Output::new(reset, Level::High, OutputConfig::default());
|
||||
|
||||
let spi = Spi::new(
|
||||
spi,
|
||||
SpiConfig::default()
|
||||
.with_frequency(Rate::from_khz(5000))
|
||||
.with_mode(Mode::_0),
|
||||
)
|
||||
.unwrap()
|
||||
.with_sck(sck)
|
||||
.with_mosi(mosi)
|
||||
.with_miso(miso);
|
||||
|
||||
let spi = RefCell::new(spi);
|
||||
let spi_dev = embedded_hal_bus::spi::RefCellDevice::new(&spi, cs, delay).unwrap();
|
||||
let interface = display_interface_spi::SPIInterface::new(spi_dev, dc);
|
||||
|
||||
let mut display = Ch1115::new(interface, reset, ch1115::Size128x64);
|
||||
display.init(&mut delay).unwrap();
|
||||
|
||||
|
||||
loop {
|
||||
log::info!("Init finished");
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||
Text::new("Hello OLED", Point::new(10, 20), text_style)
|
||||
.draw(&mut display)
|
||||
.unwrap();
|
||||
|
||||
display.flush().unwrap();
|
||||
Timer::after_millis(1000).await;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
#![deny(
|
||||
clippy::mem_forget,
|
||||
reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
|
||||
holding buffers for the duration of a data transfer."
|
||||
)]
|
||||
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_time::Timer;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_graphics::{
|
||||
mono_font::{MonoTextStyle, ascii::FONT_6X10},
|
||||
prelude::*,
|
||||
text::Text,
|
||||
};
|
||||
use embedded_hal_compat::ReverseCompat;
|
||||
use esp_hal::clock::CpuClock;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig};
|
||||
use esp_hal::spi::Mode;
|
||||
use esp_hal::spi::master::{Config as SpiConfig, Spi};
|
||||
use esp_hal::time::Rate;
|
||||
use esp_hal::timer::timg::TimerGroup;
|
||||
use log::error;
|
||||
|
||||
#[panic_handler]
|
||||
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||
error!("{}", panic_info);
|
||||
loop {}
|
||||
}
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
esp_bootloader_esp_idf::esp_app_desc!();
|
||||
|
||||
// This creates a defaembedded_hal_compatedReverseCompat::reverse(Output::new(cs,Level::High,OutputConfig::default()))vel::High,OutputConfig::default())) more information see: embedded_hal_compat::ForwardCompat::forward(Spi::new(spi,SpiConfig::default().with_frequency(Rate::from_khz(100)).with_mode(Mode::_0),).unwrap().with_sck(sck).with_mosi(mosi))rward(Spi::new(spi,SpiConfig::default().with_frequency(Rate::from_khz(100)).with_mode(Mode::_0),).unwrap().with_sck(sck).with_mosi(mosi)) to allocate larger buffers etc. in main"
|
||||
#[esp_rtos::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
esp_println::logger::init_logger_from_env();
|
||||
|
||||
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
||||
let peripherals = esp_hal::init(config);
|
||||
|
||||
// The following GPIO pins are in use by some feature of the module and should not be used.
|
||||
let _ = peripherals.GPIO27;
|
||||
let _ = peripherals.GPIO28;
|
||||
let _ = peripherals.GPIO29;
|
||||
let _ = peripherals.GPIO30;
|
||||
let _ = peripherals.GPIO31;
|
||||
let _ = peripherals.GPIO32;
|
||||
let _ = peripherals.GPIO33;
|
||||
let _ = peripherals.GPIO34;
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744);
|
||||
|
||||
let delay = Delay::new();
|
||||
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
let sw_interrupt =
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
|
||||
|
||||
let spi = peripherals.SPI2;
|
||||
let sck = peripherals.GPIO36;
|
||||
let mosi = peripherals.GPIO35;
|
||||
let cs = peripherals.GPIO13;
|
||||
let reset = peripherals.GPIO10;
|
||||
let dc = peripherals.GPIO12;
|
||||
let miso = peripherals.GPIO37;
|
||||
|
||||
let cs = Output::new(cs, Level::High, OutputConfig::default()).reverse_cell();
|
||||
let dc = Output::new(dc, Level::Low, OutputConfig::default()).reverse_cell();
|
||||
let mut reset = Output::new(reset, Level::High, OutputConfig::default());
|
||||
|
||||
let spi = Spi::new(
|
||||
spi,
|
||||
SpiConfig::default()
|
||||
.with_frequency(Rate::from_khz(5000))
|
||||
.with_mode(Mode::_0),
|
||||
)
|
||||
.unwrap()
|
||||
.with_sck(sck)
|
||||
.with_mosi(mosi)
|
||||
.with_miso(miso)
|
||||
.reverse();
|
||||
|
||||
let mut display: sh1106::mode::GraphicsMode<_> =
|
||||
sh1106::Builder::new().connect_spi(spi, dc, cs).into();
|
||||
|
||||
display.init().unwrap();
|
||||
|
||||
// Hard reset the OLED
|
||||
reset.set_high();
|
||||
delay.delay_millis(1);
|
||||
reset.set_low();
|
||||
delay.delay_millis(10);
|
||||
reset.set_high();
|
||||
|
||||
display.flush().unwrap();
|
||||
|
||||
display.set_pixel(10, 20, 1);
|
||||
|
||||
display.flush().unwrap();
|
||||
|
||||
let mut oled = display;
|
||||
|
||||
oled.clear();
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||
Text::new("Hello OLED", Point::new(10, 20), text_style)
|
||||
.draw(&mut oled)
|
||||
.unwrap();
|
||||
|
||||
oled.flush().unwrap();
|
||||
|
||||
loop {
|
||||
log::info!("Init finished");
|
||||
Timer::after_millis(1000).await;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
#![deny(
|
||||
clippy::mem_forget,
|
||||
reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
|
||||
holding buffers for the duration of a data transfer."
|
||||
)]
|
||||
#![deny(clippy::large_stack_frames)]
|
||||
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_time::Timer;
|
||||
use embedded_graphics::draw_target::DrawTarget;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::{
|
||||
mono_font::{MonoTextStyle, ascii::FONT_6X10},
|
||||
prelude::*,
|
||||
};
|
||||
|
||||
use core::cell::RefCell;
|
||||
use esp_hal::clock::CpuClock;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig};
|
||||
use esp_hal::spi::Mode;
|
||||
use esp_hal::spi::master::{Config as SpiConfig, Spi};
|
||||
use esp_hal::time::Rate;
|
||||
use esp_hal::timer::timg::TimerGroup;
|
||||
use log::error;
|
||||
use ssd1306::Ssd1306;
|
||||
use ssd1306::mode::DisplayConfig;
|
||||
use ssd1306::rotation::DisplayRotation;
|
||||
use ssd1306::size::DisplaySize128x64;
|
||||
|
||||
#[panic_handler]
|
||||
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||
error!("{}", panic_info);
|
||||
loop {}
|
||||
}
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
esp_bootloader_esp_idf::esp_app_desc!();
|
||||
|
||||
// This creates a defaembedded_hal_compatedReverseCompat::reverse(Output::new(cs,Level::High,OutputConfig::default()))vel::High,OutputConfig::default())) more information see: embedded_hal_compat::ForwardCompat::forward(Spi::new(spi,SpiConfig::default().with_frequency(Rate::from_khz(100)).with_mode(Mode::_0),).unwrap().with_sck(sck).with_mosi(mosi))rward(Spi::new(spi,SpiConfig::default().with_frequency(Rate::from_khz(100)).with_mode(Mode::_0),).unwrap().with_sck(sck).with_mosi(mosi)) to allocate larger buffers etc. in main"
|
||||
#[esp_rtos::main]
|
||||
async fn main(_spawner: Spawner) {
|
||||
esp_println::logger::init_logger_from_env();
|
||||
|
||||
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
||||
let peripherals = esp_hal::init(config);
|
||||
|
||||
// The following GPIO pins are in use by some feature of the module and should not be used.
|
||||
let _ = peripherals.GPIO27;
|
||||
let _ = peripherals.GPIO28;
|
||||
let _ = peripherals.GPIO29;
|
||||
let _ = peripherals.GPIO30;
|
||||
let _ = peripherals.GPIO31;
|
||||
let _ = peripherals.GPIO32;
|
||||
let _ = peripherals.GPIO33;
|
||||
let _ = peripherals.GPIO34;
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744);
|
||||
|
||||
let mut delay = Delay::new();
|
||||
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
let sw_interrupt =
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
|
||||
|
||||
let spi = peripherals.SPI2;
|
||||
let sck = peripherals.GPIO36;
|
||||
let mosi = peripherals.GPIO35;
|
||||
let cs = peripherals.GPIO13;
|
||||
let reset = peripherals.GPIO10;
|
||||
let dc = peripherals.GPIO12;
|
||||
let miso = peripherals.GPIO37;
|
||||
|
||||
let cs = Output::new(cs, Level::High, OutputConfig::default());
|
||||
let dc = Output::new(dc, Level::Low, OutputConfig::default());
|
||||
let mut reset = Output::new(reset, Level::High, OutputConfig::default());
|
||||
|
||||
let spi = Spi::new(
|
||||
spi,
|
||||
SpiConfig::default()
|
||||
.with_frequency(Rate::from_khz(5000))
|
||||
.with_mode(Mode::_0),
|
||||
)
|
||||
.unwrap()
|
||||
.with_sck(sck)
|
||||
.with_mosi(mosi)
|
||||
.with_miso(miso);
|
||||
|
||||
let spi = RefCell::new(spi);
|
||||
let spi_dev = embedded_hal_bus::spi::RefCellDevice::new(&spi, cs, delay).unwrap();
|
||||
let interface = display_interface_spi::SPIInterface::new(spi_dev, dc);
|
||||
let mut display = Ssd1306::new(
|
||||
interface,
|
||||
DisplaySize128x64,
|
||||
DisplayRotation::Rotate0,
|
||||
)
|
||||
.into_buffered_graphics_mode();
|
||||
|
||||
display.reset(&mut reset, &mut delay).unwrap();
|
||||
display.init().unwrap();
|
||||
display.clear(BinaryColor::Off).unwrap();
|
||||
|
||||
|
||||
let mut oled = display;
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||
Text::new("Hello OLED", Point::new(10, 20), text_style)
|
||||
.draw(&mut oled)
|
||||
.unwrap();
|
||||
|
||||
oled.flush().unwrap();
|
||||
|
||||
loop {
|
||||
log::info!("Init finished");
|
||||
Timer::after_millis(1000).await;
|
||||
}
|
||||
}
|
||||
+47
-27
@@ -7,22 +7,26 @@
|
||||
)]
|
||||
#![deny(clippy::large_stack_frames)]
|
||||
|
||||
use alloc::boxed::Box;
|
||||
use creaturedex::card::mock::{MOCK_PAYLOAD, MOCK_PAYLOAD2};
|
||||
use creaturedex::display::primary_lcd::{PrimaryLcdDisplay, init_primary_lcd};
|
||||
use creaturedex::display::shared_bus::init_dual_displays;
|
||||
|
||||
use creaturedex::display::views::card_view::render_nfc_payload;
|
||||
use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
|
||||
use creaturedex::navigation::inputs::Inputs;
|
||||
use creaturedex::navigation::navigation;
|
||||
use creaturedex::navigation::input::init_navigation_button;
|
||||
use creaturedex::navigation::state::NavigationState;
|
||||
use creaturedex::network::wifi::setup_wifi;
|
||||
use embassy_executor::Spawner;
|
||||
use embassy_time::Timer;
|
||||
use embedded_graphics::draw_target::DrawTarget;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::pixelcolor::{BinaryColor, Rgb565};
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::{
|
||||
mono_font::{MonoTextStyle, ascii::FONT_6X10},
|
||||
prelude::*,
|
||||
text::Text,
|
||||
};
|
||||
use esp_hal::clock::CpuClock;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Input, InputConfig, Pull};
|
||||
use esp_hal::time::Duration;
|
||||
use esp_hal::timer::timg::TimerGroup;
|
||||
use log::error;
|
||||
@@ -35,8 +39,6 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
const HEAP_SIZE: usize = 73744;
|
||||
|
||||
// This creates a default app-descriptor required by the esp-idf bootloader.
|
||||
// For more information see: <https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/app_image_format.html#application-description>
|
||||
esp_bootloader_esp_idf::esp_app_desc!();
|
||||
@@ -52,24 +54,53 @@ async fn main(spawner: Spawner) {
|
||||
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
|
||||
let peripherals = esp_hal::init(config);
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE);
|
||||
// The following GPIO pins are in use by some feature of the module and should not be used.
|
||||
let _ = peripherals.GPIO27;
|
||||
let _ = peripherals.GPIO28;
|
||||
let _ = peripherals.GPIO29;
|
||||
let _ = peripherals.GPIO30;
|
||||
let _ = peripherals.GPIO31;
|
||||
let _ = peripherals.GPIO32;
|
||||
let _ = peripherals.GPIO33;
|
||||
let _ = peripherals.GPIO34;
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 73744);
|
||||
|
||||
let mut delay = Delay::new();
|
||||
let button1 = init_navigation_button(peripherals.GPIO38);
|
||||
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
let sw_interrupt =
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
|
||||
|
||||
let display: &mut PrimaryLcdDisplay = Box::leak(Box::new(init_primary_lcd(
|
||||
let (mut display, mut oled) = init_dual_displays(
|
||||
peripherals.SPI2,
|
||||
peripherals.GPIO36, // sck
|
||||
peripherals.GPIO35, // mosi
|
||||
peripherals.GPIO37, // miso
|
||||
peripherals.GPIO11, // primary cs
|
||||
peripherals.GPIO13, // oled cs
|
||||
peripherals.GPIO10, // shared reset
|
||||
peripherals.GPIO12, // shared dc
|
||||
)));
|
||||
&mut delay,
|
||||
);
|
||||
|
||||
//setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
|
||||
setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
|
||||
|
||||
let mut nav_state = NavigationState::new();
|
||||
|
||||
oled.clear(BinaryColor::Off).unwrap();
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||
Text::new("Hello OLED", Point::new(10, 20), text_style)
|
||||
.draw(&mut oled)
|
||||
.unwrap();
|
||||
oled.flush().unwrap();
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
|
||||
display.clear_screen(0).unwrap();
|
||||
Text::new("Hello OLED", Point::new(10, 20), text_style).draw(&mut display).unwrap();
|
||||
|
||||
let mut nfc_driver =
|
||||
NfcPn532Driver::new(peripherals.I2C0, peripherals.GPIO17, peripherals.GPIO18);
|
||||
@@ -80,18 +111,7 @@ async fn main(spawner: Spawner) {
|
||||
log::error!("NFC SAM configuration failed");
|
||||
}
|
||||
|
||||
let mut nav_state = NavigationState::new();
|
||||
|
||||
let button_config = InputConfig::default().with_pull(Pull::Up);
|
||||
let inputs = Inputs {
|
||||
up: Input::new(peripherals.GPIO38, button_config.clone()),
|
||||
down: Input::new(peripherals.GPIO39, button_config.clone()),
|
||||
left: Input::new(peripherals.GPIO40, button_config.clone()),
|
||||
right: Input::new(peripherals.GPIO41, button_config.clone()),
|
||||
back: Input::new(peripherals.GPIO42, button_config.clone()),
|
||||
ok: Input::new(peripherals.GPIO45, button_config.clone()),
|
||||
};
|
||||
|
||||
log::info!("Setup complete, entering main loop");
|
||||
spawner.spawn(navigation::run(inputs, display).expect("run task failed"));
|
||||
loop {
|
||||
Timer::after_millis(10).await;
|
||||
}
|
||||
}
|
||||
|
||||
+7
-30
@@ -1,7 +1,5 @@
|
||||
use core::fmt::Display;
|
||||
|
||||
use crate::card::model::NfcPayload;
|
||||
use alloc::string::{String, ToString};
|
||||
use crate::card::model::NfcPayload;
|
||||
|
||||
pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
|
||||
if payload.len() < 0x35A {
|
||||
@@ -20,34 +18,13 @@ pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
|
||||
})
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum Events {
|
||||
CCC39,
|
||||
CCC40,
|
||||
GPN24,
|
||||
GPN25,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
impl Display for Events {
|
||||
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
|
||||
match *self {
|
||||
Events::CCC39 => write!(f, "39C3"),
|
||||
Events::CCC40 => write!(f, "40C3"),
|
||||
Events::GPN24 => write!(f, "GPN24"),
|
||||
Events::GPN25 => write!(f, "GPN25"),
|
||||
Events::Unknown => write!(f, "Unknown"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn decode_known_event(event_encoding: &[u8]) -> Events {
|
||||
pub fn decode_known_event(event_encoding: &[u8]) -> Option<&'static str> {
|
||||
match event_encoding {
|
||||
[0x39, 0xC3] => Events::CCC39,
|
||||
[0x40, 0xC3] => Events::CCC40, // future proofing :)
|
||||
[0xE9, 0x24] => Events::GPN24,
|
||||
[0xE9, 0x25] => Events::GPN25, // future proofing :)
|
||||
_ => Events::Unknown,
|
||||
[0x39, 0xC3] => Some("39C3"),
|
||||
[0x40, 0xC3] => Some("40C3"), // future proofing :)
|
||||
[0xE9, 0x24] => Some("GPN 24"),
|
||||
[0xE9, 0x25] => Some("GPN 25"), // future proofing :)
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-51
@@ -1,4 +1,4 @@
|
||||
/// GlaDos
|
||||
/// Mock payload 2 acting as simulated NFC card read
|
||||
pub const MOCK_PAYLOAD2: [u8; 858] = [
|
||||
0xE9, 0x24, 0x03, 0xDA, 0x45, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0xAA, 0xA0, 0xF0, 0xAA, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
@@ -56,7 +56,7 @@ pub const MOCK_PAYLOAD2: [u8; 858] = [
|
||||
0x95, 0x2D, 0x14, 0xBD, 0x43, 0xB2, 0x40, 0x76, 0x78, 0x00,
|
||||
];
|
||||
|
||||
/// Blue Portal
|
||||
/// Mock payload 1 acting as simulated NFC card read
|
||||
pub const MOCK_PAYLOAD: [u8; 858] = [
|
||||
0xE9, 0x24, 0x01, 0x47, 0xF2, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
@@ -113,52 +113,3 @@ pub const MOCK_PAYLOAD: [u8; 858] = [
|
||||
0x03, 0x63, 0x8F, 0x4C, 0x2F, 0xBA, 0xCC, 0x17, 0x23, 0x51, 0x60, 0x27, 0x3B, 0x00, 0x1C, 0x6D,
|
||||
0x1F, 0x8C, 0x6B, 0x3E, 0x32, 0xE2, 0x53, 0xD9, 0x8F, 0x00,
|
||||
];
|
||||
|
||||
/// Orange Portal
|
||||
pub const MOCK_PAYLOAD3: &[u8] = &[
|
||||
3, 255, 3, 115, 196, 19, 0, 0, 3, 90, 109, 121, 115, 116, 101, 114, 121, 104, 97, 99, 107, 46,
|
||||
99, 111, 109, 58, 99, 99, 49, 233, 36, 1, 10, 75, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 85, 85, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245,
|
||||
85, 85, 85, 85, 95, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 85,
|
||||
255, 255, 85, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 95, 255,
|
||||
255, 255, 245, 85, 95, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 80, 0, 255,
|
||||
255, 245, 85, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 85, 0, 0, 15, 255,
|
||||
255, 245, 85, 245, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 85, 0, 0, 15, 255, 255,
|
||||
255, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 80, 0, 255, 255, 255, 255,
|
||||
245, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 255, 255, 255,
|
||||
245, 85, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 255, 15, 255,
|
||||
245, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 245, 255, 255, 0, 15, 255, 245,
|
||||
85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 80, 0, 0, 15, 255, 255, 245, 95,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 0, 0, 0, 15, 255, 255, 245, 95, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 85, 255, 0, 0, 0, 15, 255, 255, 245, 85, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 85, 240, 0, 0, 0, 15, 255, 255, 245, 85, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 85, 240, 15, 0, 0, 15, 255, 255, 255, 85, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 80, 0, 255, 255, 0, 15, 255, 255, 255, 85, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
240, 0, 0, 255, 255, 0, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 240, 0,
|
||||
0, 255, 255, 240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 0, 5, 255, 255,
|
||||
255, 240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 0, 85, 255, 255, 255,
|
||||
240, 15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240,
|
||||
15, 255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240, 15,
|
||||
255, 255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 255, 255, 240, 15, 255,
|
||||
255, 255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 245, 85, 95, 255, 0, 15, 255, 255,
|
||||
255, 85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 80, 0, 0, 255, 255, 255, 255,
|
||||
85, 95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 245, 0, 15, 255, 255, 255, 255, 255, 85,
|
||||
95, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 255, 255, 85, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 245, 255, 85, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 245, 255, 85, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 240, 5, 95, 255, 245, 95, 85, 85, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 240, 0, 85, 85, 85, 245, 85, 95, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 85, 95, 255, 85, 85, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 0, 5, 85, 85, 85, 95, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 0, 5, 85, 85, 85, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 15, 187,
|
||||
161, 225, 7, 64, 41, 235, 110, 38, 0, 0, 0, 0, 0, 0, 0, 0, 211, 215, 165, 168, 183, 177, 51, 0,
|
||||
165, 172, 187, 153, 209, 187, 161, 238, 123, 2, 204, 136, 150, 159, 7, 0, 134, 57, 162, 97, 11,
|
||||
76, 47, 71, 126, 157, 11, 0, 83, 112, 101, 101, 100, 121, 32, 116, 104, 105, 110, 103, 32, 99,
|
||||
111, 109, 101, 115, 32, 111, 117, 116, 0, 0, 116, 238, 175, 85, 82, 152, 67, 113, 193, 113,
|
||||
219, 188, 173, 50, 137, 138, 96, 130, 104, 40, 72, 189, 43, 63, 72, 73, 101, 120, 136, 168, 16,
|
||||
57, 90, 119, 100, 187, 79, 126, 111, 195, 189, 40, 67, 196, 36, 176, 243, 45, 0, 254, 0, 0, 0,
|
||||
189, 4, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
];
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
use core::fmt::Display;
|
||||
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use num_enum::FromPrimitive;
|
||||
|
||||
use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct NfcPayload<'a> {
|
||||
pub event_encoding: &'a [u8],
|
||||
@@ -17,246 +9,3 @@ pub struct NfcPayload<'a> {
|
||||
pub secret: &'a [u8],
|
||||
pub _opaque_trailer: &'a [u8],
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
|
||||
#[repr(u8)]
|
||||
pub enum CardType {
|
||||
#[num_enum(default)]
|
||||
Default = 0,
|
||||
Blueprint = 1,
|
||||
CYBER = 2,
|
||||
Nature = 3,
|
||||
Fossil = 4,
|
||||
Ghost = 5,
|
||||
Daemon = 6,
|
||||
Fairy = 7,
|
||||
}
|
||||
|
||||
impl Display for CardType {
|
||||
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
|
||||
match *self {
|
||||
CardType::Default => write!(f, "Default"),
|
||||
CardType::Blueprint => write!(f, "Blueprint"),
|
||||
CardType::CYBER => write!(f, "CYBER"),
|
||||
CardType::Nature => write!(f, "Nature"),
|
||||
CardType::Fossil => write!(f, "Fossil"),
|
||||
CardType::Ghost => write!(f, "Ghost"),
|
||||
CardType::Daemon => write!(f, "Daemon"),
|
||||
CardType::Fairy => write!(f, "Fairy"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type PrimaryColor = Rgb565;
|
||||
impl Into<PrimaryColor> for CardType {
|
||||
fn into(self) -> PrimaryColor {
|
||||
match self {
|
||||
CardType::Default => Rgb565::new(0xD8, 0x68, 0x30),
|
||||
CardType::Blueprint => Rgb565::new(0x6D, 0x81, 0xFF),
|
||||
CardType::CYBER => Rgb565::new(0xFF, 0xFF, 0x04),
|
||||
CardType::Nature => Rgb565::new(0x55, 0xA0, 0x58),
|
||||
CardType::Fossil => Rgb565::new(0xB9, 0x7A, 0x60),
|
||||
CardType::Ghost => Rgb565::new(0xAB, 0xAB, 0xAB),
|
||||
CardType::Daemon => Rgb565::new(0x60, 0x00, 0x88),
|
||||
CardType::Fairy => Rgb565::new(0xB0, 0xA9, 0xE4),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type Palette = [Rgb565; 16];
|
||||
impl Into<Palette> for CardType {
|
||||
fn into(self) -> Palette {
|
||||
match self {
|
||||
CardType::Default => [
|
||||
Rgb565::new(31, 23, 35),
|
||||
Rgb565::new(60, 47, 82),
|
||||
Rgb565::new(178, 39, 65),
|
||||
Rgb565::new(70, 86, 165),
|
||||
Rgb565::new(245, 70, 76),
|
||||
Rgb565::new(216, 104, 48),
|
||||
Rgb565::new(140, 127, 144),
|
||||
Rgb565::new(73, 149, 243),
|
||||
Rgb565::new(62, 197, 75),
|
||||
Rgb565::new(240, 149, 72),
|
||||
Rgb565::new(188, 176, 179),
|
||||
Rgb565::new(247, 156, 136),
|
||||
Rgb565::new(114, 222, 235),
|
||||
Rgb565::new(180, 230, 86),
|
||||
Rgb565::new(239, 208, 129),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Blueprint => [
|
||||
Rgb565::new(83, 67, 127),
|
||||
Rgb565::new(44, 111, 153),
|
||||
Rgb565::new(142, 88, 111),
|
||||
Rgb565::new(0, 188, 170),
|
||||
Rgb565::new(153, 104, 226),
|
||||
Rgb565::new(109, 129, 255),
|
||||
Rgb565::new(255, 84, 112),
|
||||
Rgb565::new(196, 143, 158),
|
||||
Rgb565::new(168, 159, 204),
|
||||
Rgb565::new(190, 155, 255),
|
||||
Rgb565::new(255, 155, 113),
|
||||
Rgb565::new(127, 206, 255),
|
||||
Rgb565::new(255, 155, 182),
|
||||
Rgb565::new(255, 217, 174),
|
||||
Rgb565::new(255, 217, 232),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::CYBER => [
|
||||
Rgb565::new(0, 0, 0),
|
||||
Rgb565::new(0, 0, 126),
|
||||
Rgb565::new(0, 0, 255),
|
||||
Rgb565::new(126, 0, 0),
|
||||
Rgb565::new(126, 0, 126),
|
||||
Rgb565::new(4, 126, 0),
|
||||
Rgb565::new(254, 0, 0),
|
||||
Rgb565::new(4, 126, 126),
|
||||
Rgb565::new(254, 0, 255),
|
||||
Rgb565::new(126, 126, 0),
|
||||
Rgb565::new(126, 126, 126),
|
||||
Rgb565::new(6, 255, 4),
|
||||
Rgb565::new(6, 255, 255),
|
||||
Rgb565::new(190, 190, 190),
|
||||
Rgb565::new(255, 255, 4),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Nature => [
|
||||
Rgb565::new(35, 34, 40),
|
||||
Rgb565::new(40, 66, 97),
|
||||
Rgb565::new(30, 116, 83),
|
||||
Rgb565::new(117, 77, 69),
|
||||
Rgb565::new(95, 88, 84),
|
||||
Rgb565::new(36, 133, 166),
|
||||
Rgb565::new(198, 80, 70),
|
||||
Rgb565::new(85, 160, 88),
|
||||
Rgb565::new(135, 133, 115),
|
||||
Rgb565::new(84, 186, 210),
|
||||
Rgb565::new(161, 191, 65),
|
||||
Rgb565::new(230, 146, 138),
|
||||
Rgb565::new(184, 176, 149),
|
||||
Rgb565::new(227, 192, 84),
|
||||
Rgb565::new(195, 213, 199),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Fossil => [
|
||||
Rgb565::new(75, 61, 68),
|
||||
Rgb565::new(119, 66, 81),
|
||||
Rgb565::new(78, 84, 99),
|
||||
Rgb565::new(100, 83, 85),
|
||||
Rgb565::new(156, 82, 78),
|
||||
Rgb565::new(132, 109, 89),
|
||||
Rgb565::new(91, 125, 115),
|
||||
Rgb565::new(125, 123, 98),
|
||||
Rgb565::new(140, 124, 121),
|
||||
Rgb565::new(185, 122, 96),
|
||||
Rgb565::new(168, 138, 94),
|
||||
Rgb565::new(142, 159, 125),
|
||||
Rgb565::new(170, 162, 93),
|
||||
Rgb565::new(169, 156, 141),
|
||||
Rgb565::new(204, 168, 123),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Ghost => [
|
||||
Rgb565::new(0, 0, 0),
|
||||
Rgb565::new(24, 24, 24),
|
||||
Rgb565::new(40, 40, 40),
|
||||
Rgb565::new(56, 56, 56),
|
||||
Rgb565::new(71, 71, 71),
|
||||
Rgb565::new(86, 86, 86),
|
||||
Rgb565::new(100, 100, 100),
|
||||
Rgb565::new(113, 113, 113),
|
||||
Rgb565::new(126, 126, 126),
|
||||
Rgb565::new(140, 140, 140),
|
||||
Rgb565::new(155, 155, 155),
|
||||
Rgb565::new(171, 171, 171),
|
||||
Rgb565::new(189, 189, 189),
|
||||
Rgb565::new(209, 209, 209),
|
||||
Rgb565::new(231, 231, 231),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Daemon => [
|
||||
Rgb565::new(0, 3, 60),
|
||||
Rgb565::new(96, 0, 136),
|
||||
Rgb565::new(0, 56, 132),
|
||||
Rgb565::new(42, 46, 121),
|
||||
Rgb565::new(0, 82, 96),
|
||||
Rgb565::new(177, 5, 133),
|
||||
Rgb565::new(255, 0, 78),
|
||||
Rgb565::new(172, 41, 206),
|
||||
Rgb565::new(0, 157, 74),
|
||||
Rgb565::new(0, 138, 197),
|
||||
Rgb565::new(78, 110, 168),
|
||||
Rgb565::new(255, 92, 255),
|
||||
Rgb565::new(10, 255, 82),
|
||||
Rgb565::new(0, 247, 255),
|
||||
Rgb565::new(173, 212, 250),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
CardType::Fairy => [
|
||||
Rgb565::new(40, 40, 46),
|
||||
Rgb565::new(108, 86, 113),
|
||||
Rgb565::new(135, 168, 137),
|
||||
Rgb565::new(249, 130, 132),
|
||||
Rgb565::new(176, 169, 228),
|
||||
Rgb565::new(222, 163, 139),
|
||||
Rgb565::new(172, 204, 228),
|
||||
Rgb565::new(254, 170, 228),
|
||||
Rgb565::new(217, 200, 191),
|
||||
Rgb565::new(255, 195, 132),
|
||||
Rgb565::new(176, 235, 147),
|
||||
Rgb565::new(179, 227, 218),
|
||||
Rgb565::new(233, 245, 157),
|
||||
Rgb565::new(255, 230, 198),
|
||||
Rgb565::new(255, 247, 160),
|
||||
Rgb565::new(255, 255, 255),
|
||||
],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Sprite {
|
||||
pub data: Vec<u8>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Card {
|
||||
pub uuid: String,
|
||||
pub event: Events,
|
||||
pub cardtype: CardType,
|
||||
pub name: String,
|
||||
|
||||
pub trait1: String,
|
||||
pub trait2: String,
|
||||
pub trait3: String,
|
||||
pub secret: String,
|
||||
|
||||
pub sprite: Sprite,
|
||||
}
|
||||
|
||||
impl TryFrom<NfcPayload<'static>> for Card {
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(payload: NfcPayload) -> Result<Self, Self::Error> {
|
||||
let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
|
||||
let event = decode_known_event(payload.event_encoding);
|
||||
let cardtype = CardType::from(payload.card_type);
|
||||
let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
|
||||
let secret = decode_secret(payload.secret);
|
||||
let sprite = Sprite {
|
||||
data: payload.sprite.to_vec(),
|
||||
};
|
||||
Ok(Self {
|
||||
uuid,
|
||||
event,
|
||||
cardtype,
|
||||
name,
|
||||
trait1,
|
||||
trait2,
|
||||
trait3,
|
||||
secret,
|
||||
sprite,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
pub mod palette;
|
||||
pub mod primary_lcd;
|
||||
pub mod secondary_oled;
|
||||
pub mod shared_bus;
|
||||
pub mod sprite;
|
||||
pub mod tertiary_lcd;
|
||||
pub mod views;
|
||||
|
||||
|
||||
+200
-2
@@ -1,11 +1,11 @@
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::pixelcolor::Rgb888;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct Rgb(pub u8, pub u8, pub u8);
|
||||
|
||||
impl Rgb {
|
||||
pub fn into_rgb565(self) -> Rgb565 {
|
||||
Rgb888::new(self.0, self.1, self.2).into()
|
||||
Rgb565::new(self.0, self.1, self.2)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,3 +15,201 @@ pub struct TypeStyle {
|
||||
pub primary: Rgb,
|
||||
pub text: Rgb,
|
||||
}
|
||||
|
||||
pub const PALETTES: [[Rgb; 16]; 8] = [
|
||||
// Palette Default
|
||||
[
|
||||
Rgb(31, 23, 35),
|
||||
Rgb(60, 47, 82),
|
||||
Rgb(178, 39, 65),
|
||||
Rgb(70, 86, 165),
|
||||
Rgb(245, 70, 76),
|
||||
Rgb(216, 104, 48),
|
||||
Rgb(140, 127, 144),
|
||||
Rgb(73, 149, 243),
|
||||
Rgb(62, 197, 75),
|
||||
Rgb(240, 149, 72),
|
||||
Rgb(188, 176, 179),
|
||||
Rgb(247, 156, 136),
|
||||
Rgb(114, 222, 235),
|
||||
Rgb(180, 230, 86),
|
||||
Rgb(239, 208, 129),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Blueprint
|
||||
[
|
||||
Rgb(83, 67, 127),
|
||||
Rgb(44, 111, 153),
|
||||
Rgb(142, 88, 111),
|
||||
Rgb(0, 188, 170),
|
||||
Rgb(153, 104, 226),
|
||||
Rgb(109, 129, 255),
|
||||
Rgb(255, 84, 112),
|
||||
Rgb(196, 143, 158),
|
||||
Rgb(168, 159, 204),
|
||||
Rgb(190, 155, 255),
|
||||
Rgb(255, 155, 113),
|
||||
Rgb(127, 206, 255),
|
||||
Rgb(255, 155, 182),
|
||||
Rgb(255, 217, 174),
|
||||
Rgb(255, 217, 232),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette CYBER
|
||||
[
|
||||
Rgb(0, 0, 0),
|
||||
Rgb(0, 0, 126),
|
||||
Rgb(0, 0, 255),
|
||||
Rgb(126, 0, 0),
|
||||
Rgb(126, 0, 126),
|
||||
Rgb(4, 126, 0),
|
||||
Rgb(254, 0, 0),
|
||||
Rgb(4, 126, 126),
|
||||
Rgb(254, 0, 255),
|
||||
Rgb(126, 126, 0),
|
||||
Rgb(126, 126, 126),
|
||||
Rgb(6, 255, 4),
|
||||
Rgb(6, 255, 255),
|
||||
Rgb(190, 190, 190),
|
||||
Rgb(255, 255, 4),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Nature
|
||||
[
|
||||
Rgb(35, 34, 40),
|
||||
Rgb(40, 66, 97),
|
||||
Rgb(30, 116, 83),
|
||||
Rgb(117, 77, 69),
|
||||
Rgb(95, 88, 84),
|
||||
Rgb(36, 133, 166),
|
||||
Rgb(198, 80, 70),
|
||||
Rgb(85, 160, 88),
|
||||
Rgb(135, 133, 115),
|
||||
Rgb(84, 186, 210),
|
||||
Rgb(161, 191, 65),
|
||||
Rgb(230, 146, 138),
|
||||
Rgb(184, 176, 149),
|
||||
Rgb(227, 192, 84),
|
||||
Rgb(195, 213, 199),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Fossil
|
||||
[
|
||||
Rgb(75, 61, 68),
|
||||
Rgb(119, 66, 81),
|
||||
Rgb(78, 84, 99),
|
||||
Rgb(100, 83, 85),
|
||||
Rgb(156, 82, 78),
|
||||
Rgb(132, 109, 89),
|
||||
Rgb(91, 125, 115),
|
||||
Rgb(125, 123, 98),
|
||||
Rgb(140, 124, 121),
|
||||
Rgb(185, 122, 96),
|
||||
Rgb(168, 138, 94),
|
||||
Rgb(142, 159, 125),
|
||||
Rgb(170, 162, 93),
|
||||
Rgb(169, 156, 141),
|
||||
Rgb(204, 168, 123),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Ghost
|
||||
[
|
||||
Rgb(0, 0, 0),
|
||||
Rgb(24, 24, 24),
|
||||
Rgb(40, 40, 40),
|
||||
Rgb(56, 56, 56),
|
||||
Rgb(71, 71, 71),
|
||||
Rgb(86, 86, 86),
|
||||
Rgb(100, 100, 100),
|
||||
Rgb(113, 113, 113),
|
||||
Rgb(126, 126, 126),
|
||||
Rgb(140, 140, 140),
|
||||
Rgb(155, 155, 155),
|
||||
Rgb(171, 171, 171),
|
||||
Rgb(189, 189, 189),
|
||||
Rgb(209, 209, 209),
|
||||
Rgb(231, 231, 231),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Daemon
|
||||
[
|
||||
Rgb(0, 3, 60),
|
||||
Rgb(96, 0, 136),
|
||||
Rgb(0, 56, 132),
|
||||
Rgb(42, 46, 121),
|
||||
Rgb(0, 82, 96),
|
||||
Rgb(177, 5, 133),
|
||||
Rgb(255, 0, 78),
|
||||
Rgb(172, 41, 206),
|
||||
Rgb(0, 157, 74),
|
||||
Rgb(0, 138, 197),
|
||||
Rgb(78, 110, 168),
|
||||
Rgb(255, 92, 255),
|
||||
Rgb(10, 255, 82),
|
||||
Rgb(0, 247, 255),
|
||||
Rgb(173, 212, 250),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
// Palette Fairy
|
||||
[
|
||||
Rgb(40, 40, 46),
|
||||
Rgb(108, 86, 113),
|
||||
Rgb(135, 168, 137),
|
||||
Rgb(249, 130, 132),
|
||||
Rgb(176, 169, 228),
|
||||
Rgb(222, 163, 139),
|
||||
Rgb(172, 204, 228),
|
||||
Rgb(254, 170, 228),
|
||||
Rgb(217, 200, 191),
|
||||
Rgb(255, 195, 132),
|
||||
Rgb(176, 235, 147),
|
||||
Rgb(179, 227, 218),
|
||||
Rgb(233, 245, 157),
|
||||
Rgb(255, 230, 198),
|
||||
Rgb(255, 247, 160),
|
||||
Rgb(255, 255, 255),
|
||||
],
|
||||
];
|
||||
|
||||
pub const TYPE_STYLES: [TypeStyle; 8] = [
|
||||
TypeStyle {
|
||||
name: "Default",
|
||||
primary: Rgb(0xD8, 0x68, 0x30),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Blueprint",
|
||||
primary: Rgb(0x6D, 0x81, 0xFF),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "CYBER",
|
||||
primary: Rgb(0xFF, 0xFF, 0x04),
|
||||
text: Rgb(0x00, 0x00, 0x00),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Nature",
|
||||
primary: Rgb(0x55, 0xA0, 0x58),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Fossil",
|
||||
primary: Rgb(0xB9, 0x7A, 0x60),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Ghost",
|
||||
primary: Rgb(0xAB, 0xAB, 0xAB),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Daemon",
|
||||
primary: Rgb(0x60, 0x00, 0x88),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
TypeStyle {
|
||||
name: "Fairy",
|
||||
primary: Rgb(0xB0, 0xA9, 0xE4),
|
||||
text: Rgb(0xFF, 0xFF, 0xFF),
|
||||
},
|
||||
];
|
||||
|
||||
+30
-41
@@ -1,56 +1,43 @@
|
||||
use core::cell::RefCell;
|
||||
use display_interface_spi::SPIInterface;
|
||||
use embedded_graphics::draw_target::DrawTarget;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_hal_bus::spi::ExclusiveDevice;
|
||||
use embedded_hal::digital::OutputPin as EhOutputPin;
|
||||
use embedded_hal_bus::spi::RefCellDevice;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig};
|
||||
use esp_hal::peripherals::{GPIO10, GPIO11, GPIO12, GPIO35, GPIO36, GPIO37, SPI2};
|
||||
use esp_hal::spi::{
|
||||
Mode,
|
||||
master::{Config, Spi},
|
||||
};
|
||||
use esp_hal::time::Rate;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig, OutputPin};
|
||||
use ili9341::{DisplaySize240x320, Ili9341, Orientation};
|
||||
|
||||
pub type PrimaryLcdDisplay<'a> = Ili9341<
|
||||
SPIInterface<ExclusiveDevice<Spi<'a, esp_hal::Blocking>, Output<'a>, Delay>, Output<'a>>,
|
||||
Output<'a>,
|
||||
pub type PrimaryLcdDisplay<'a, BUS, DC, RES> = Ili9341<
|
||||
SPIInterface<
|
||||
RefCellDevice<'a, BUS, Output<'a>, Delay>,
|
||||
DC,
|
||||
>,
|
||||
RES,
|
||||
>;
|
||||
|
||||
pub fn init_primary_lcd(
|
||||
spi2: SPI2<'static>,
|
||||
sck: GPIO36<'static>,
|
||||
mosi: GPIO35<'static>,
|
||||
miso: GPIO37<'static>,
|
||||
cs: GPIO11<'static>,
|
||||
reset: GPIO10<'static>,
|
||||
dc: GPIO12<'static>,
|
||||
) -> PrimaryLcdDisplay<'static> {
|
||||
let freq = Rate::from_khz(60_000);
|
||||
log::info!("Display freq: {freq}");
|
||||
|
||||
let spi_bus = Spi::new(
|
||||
spi2,
|
||||
Config::default().with_frequency(freq).with_mode(Mode::_0),
|
||||
)
|
||||
.unwrap()
|
||||
.with_sck(sck)
|
||||
.with_mosi(mosi)
|
||||
.with_miso(miso);
|
||||
|
||||
let mut delay = Delay::new();
|
||||
|
||||
let cs_main = Output::new(cs, Level::High, OutputConfig::default());
|
||||
let spi_dev = ExclusiveDevice::new(spi_bus, cs_main, delay).unwrap();
|
||||
let reset_main = Output::new(reset, Level::High, OutputConfig::default());
|
||||
let spi_dc = Output::new(dc, Level::High, OutputConfig::default());
|
||||
let iface = SPIInterface::new(spi_dev, spi_dc);
|
||||
pub fn init_primary_lcd_on_bus<'a, BUS, CS, RES, DC>(
|
||||
spi_bus: &'a RefCell<BUS>,
|
||||
cs: CS,
|
||||
reset: RES,
|
||||
dc: DC,
|
||||
delay: &mut Delay,
|
||||
) -> PrimaryLcdDisplay<'a, BUS, DC, RES>
|
||||
where
|
||||
BUS: embedded_hal::spi::SpiBus,
|
||||
CS: OutputPin + 'static,
|
||||
RES: EhOutputPin,
|
||||
DC: EhOutputPin,
|
||||
{
|
||||
let cs_pin = Output::new(cs, Level::High, OutputConfig::default());
|
||||
let spi_dev = RefCellDevice::new(spi_bus, cs_pin, *delay).unwrap();
|
||||
let iface = SPIInterface::new(spi_dev, dc);
|
||||
|
||||
let mut display = Ili9341::new(
|
||||
iface,
|
||||
reset_main,
|
||||
&mut delay,
|
||||
reset,
|
||||
delay,
|
||||
Orientation::Portrait,
|
||||
DisplaySize240x320,
|
||||
)
|
||||
@@ -59,3 +46,5 @@ pub fn init_primary_lcd(
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
display
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1 +1,54 @@
|
||||
// Secondary OLED module
|
||||
use core::cell::RefCell;
|
||||
use display_interface_spi::SPIInterface;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_graphics::prelude::*;
|
||||
use embedded_hal::digital::OutputPin as EhOutputPin;
|
||||
use embedded_hal_bus::spi::RefCellDevice;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig, OutputPin};
|
||||
use ssd1306::mode::BufferedGraphicsMode;
|
||||
use ssd1306::prelude::*;
|
||||
use ssd1306::Ssd1306;
|
||||
|
||||
pub type SecondaryOledDisplay<'a, BUS, DC> = Ssd1306<
|
||||
SPIInterface<
|
||||
RefCellDevice<'a, BUS, Output<'a>, Delay>,
|
||||
DC,
|
||||
>,
|
||||
DisplaySize128x64,
|
||||
BufferedGraphicsMode<DisplaySize128x64>,
|
||||
>;
|
||||
|
||||
pub fn init_secondary_oled_on_bus<'a, BUS, CS, RES, DC>(
|
||||
spi_bus: &'a RefCell<BUS>,
|
||||
cs: CS,
|
||||
mut res: RES,
|
||||
dc: DC,
|
||||
delay: &mut Delay,
|
||||
) -> SecondaryOledDisplay<'a, BUS, DC>
|
||||
where
|
||||
BUS: embedded_hal::spi::SpiBus,
|
||||
CS: OutputPin + 'static,
|
||||
RES: EhOutputPin,
|
||||
DC: EhOutputPin,
|
||||
{
|
||||
let cs_pin = Output::new(cs, Level::High, OutputConfig::default());
|
||||
let spi_dev = RefCellDevice::new(spi_bus, cs_pin, *delay).unwrap();
|
||||
let interface = SPIInterface::new(spi_dev, dc);
|
||||
|
||||
let mut display = Ssd1306::new(
|
||||
interface,
|
||||
DisplaySize128x64,
|
||||
DisplayRotation::Rotate0,
|
||||
)
|
||||
.into_buffered_graphics_mode();
|
||||
|
||||
display.reset(&mut res, delay).unwrap();
|
||||
display.init().unwrap();
|
||||
display.clear(BinaryColor::Off).unwrap();
|
||||
display.flush().unwrap();
|
||||
|
||||
display
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
use alloc::boxed::Box;
|
||||
use core::cell::RefCell;
|
||||
use embedded_hal::digital::{ErrorType, OutputPin as EhOutputPin, PinState};
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::interconnect::{PeripheralInput, PeripheralOutput};
|
||||
use esp_hal::gpio::{Level, Output, OutputConfig, OutputPin};
|
||||
use esp_hal::spi::master::{Config as SpiConfig, Spi};
|
||||
use esp_hal::spi::Mode;
|
||||
use esp_hal::time::Rate;
|
||||
use crate::display::primary_lcd::{init_primary_lcd_on_bus, PrimaryLcdDisplay};
|
||||
|
||||
use crate::display::secondary_oled::{init_secondary_oled_on_bus, SecondaryOledDisplay};
|
||||
|
||||
pub struct SharedPin<'a>(pub &'a RefCell<Output<'static>>);
|
||||
|
||||
impl<'a> ErrorType for SharedPin<'a> {
|
||||
type Error = core::convert::Infallible;
|
||||
}
|
||||
|
||||
impl<'a> EhOutputPin for SharedPin<'a> {
|
||||
fn set_low(&mut self) -> Result<(), Self::Error> {
|
||||
self.0.borrow_mut().set_low();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_high(&mut self) -> Result<(), Self::Error> {
|
||||
self.0.borrow_mut().set_high();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_state(&mut self, state: PinState) -> Result<(), Self::Error> {
|
||||
self.0.borrow_mut().set_state(state);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub type DisplaySpiBus = Spi<'static, esp_hal::Blocking>;
|
||||
pub type DualPrimaryDisplay<'a> = PrimaryLcdDisplay<'a, DisplaySpiBus, SharedPin<'a>, SharedPin<'a>>;
|
||||
pub type DualSecondaryDisplay<'a> = SecondaryOledDisplay<'a, DisplaySpiBus, SharedPin<'a>>;
|
||||
|
||||
pub fn init_dual_displays<SPI, SCK, MOSI, MISO, CS1, CS2, RES, DC>(
|
||||
spi_peripheral: SPI,
|
||||
sck: SCK,
|
||||
mosi: MOSI,
|
||||
miso: MISO,
|
||||
cs_primary: CS1,
|
||||
cs_secondary: CS2,
|
||||
reset_pin: RES,
|
||||
dc_pin: DC,
|
||||
delay: &mut Delay,
|
||||
) -> (DualPrimaryDisplay<'static>, DualSecondaryDisplay<'static>)
|
||||
|
||||
where
|
||||
SPI: esp_hal::spi::master::Instance + 'static,
|
||||
SCK: PeripheralOutput<'static>,
|
||||
MOSI: PeripheralOutput<'static>,
|
||||
MISO: PeripheralInput<'static>,
|
||||
CS1: OutputPin + 'static,
|
||||
CS2: OutputPin + 'static,
|
||||
RES: OutputPin + 'static,
|
||||
DC: OutputPin + 'static,
|
||||
{
|
||||
let spi = Spi::new(
|
||||
spi_peripheral,
|
||||
SpiConfig::default().with_frequency(Rate::from_khz(20_000)).with_mode(Mode::_0),
|
||||
)
|
||||
.unwrap()
|
||||
.with_sck(sck)
|
||||
.with_mosi(mosi)
|
||||
.with_miso(miso);
|
||||
|
||||
let bus_static: &'static RefCell<DisplaySpiBus> = Box::leak(Box::new(RefCell::new(spi)));
|
||||
let reset_static: &'static RefCell<Output<'static>> = Box::leak(Box::new(RefCell::new(
|
||||
Output::new(reset_pin, Level::High, OutputConfig::default()),
|
||||
)));
|
||||
let dc_static: &'static RefCell<Output<'static>> = Box::leak(Box::new(RefCell::new(
|
||||
Output::new(dc_pin, Level::High, OutputConfig::default()),
|
||||
)));
|
||||
|
||||
let primary = init_primary_lcd_on_bus(
|
||||
bus_static,
|
||||
cs_primary,
|
||||
SharedPin(reset_static),
|
||||
SharedPin(dc_static),
|
||||
delay,
|
||||
);
|
||||
|
||||
let secondary = init_secondary_oled_on_bus(
|
||||
bus_static,
|
||||
cs_secondary,
|
||||
SharedPin(reset_static),
|
||||
SharedPin(dc_static),
|
||||
delay,
|
||||
);
|
||||
|
||||
(primary, secondary)
|
||||
}
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
use crate::card::model::Palette;
|
||||
use crate::display::palette::Rgb;
|
||||
use embedded_graphics::{
|
||||
geometry::Size, pixelcolor::Rgb565, pixelcolor::RgbColor, prelude::Point, primitives::Rectangle,
|
||||
};
|
||||
use embedded_graphics::{geometry::Size, pixelcolor::Rgb565, primitives::Rectangle, prelude::Point};
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
use crate::display::palette::Rgb;
|
||||
|
||||
pub fn render_sprite_onto_ili9341<D>(ili9341: &mut D, sprite: &[u8], palette: &Palette)
|
||||
pub fn render_sprite_onto_ili9341<D>(ili9341: &mut D, sprite: &[u8], palette: &[Rgb; 16])
|
||||
where
|
||||
D: DrawTarget<Color = Rgb565>,
|
||||
{
|
||||
@@ -16,8 +13,8 @@ where
|
||||
|
||||
// OPTIMIZATION 1: Pre-compute the 16-color palette to Rgb565 once.
|
||||
let mut palette565 = [Rgb565::new(0, 0, 0); 16];
|
||||
for (i, c) in palette.iter().enumerate() {
|
||||
palette565[i] = Rgb565::new(c.r() >> 3, c.g() >> 2, c.b() >> 3);
|
||||
for (i, Rgb(r, g, b)) in palette.iter().enumerate() {
|
||||
palette565[i] = Rgb565::new(*r >> 3, *g >> 2, *b >> 3);
|
||||
}
|
||||
|
||||
let mut src_width = 1usize;
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
pub mod card_view;
|
||||
pub mod menu_view;
|
||||
pub mod status_bar;
|
||||
@@ -0,0 +1,98 @@
|
||||
use alloc::{format, string::String};
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_6X10;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::Point;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
use crate::card::decoder::{decode_known_event, decode_packed_card_text, decode_secret, split_nfc_hex};
|
||||
use crate::card::model::NfcPayload;
|
||||
use crate::display::palette::{PALETTES, TYPE_STYLES};
|
||||
use crate::display::sprite::render_sprite_onto_ili9341;
|
||||
|
||||
pub fn render_nfc_payload<D>(display: &mut D, payload: &[u8; 858])
|
||||
where
|
||||
D: DrawTarget<Color = Rgb565>,
|
||||
D::Error: core::fmt::Debug,
|
||||
{
|
||||
let nfc_payload: Option<NfcPayload<'_>> = split_nfc_hex(payload);
|
||||
|
||||
if let Some(nfc_payload) = nfc_payload {
|
||||
let (name, trait1, trait2, trait3) = decode_packed_card_text(nfc_payload.packed_card_text);
|
||||
let secret = decode_secret(nfc_payload.secret);
|
||||
|
||||
let background = Rectangle::new(
|
||||
Point::new(0, 0),
|
||||
Size::new(240, 320),
|
||||
);
|
||||
let bg_color: Rgb565 = TYPE_STYLES[(nfc_payload.card_type - 1) as usize]
|
||||
.primary
|
||||
.into_rgb565();
|
||||
|
||||
let _ = display.fill_solid(&background, bg_color);
|
||||
|
||||
let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
|
||||
Text::new(&format!("Name: {}", name), Point::new(20, 240), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!(
|
||||
"Type: {}",
|
||||
TYPE_STYLES[(nfc_payload.card_type - 1) as usize].name
|
||||
),
|
||||
Point::new(20, 250),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!(
|
||||
"Event: {}",
|
||||
decode_known_event(nfc_payload.event_encoding).unwrap_or("Unknown")
|
||||
),
|
||||
Point::new(20, 260),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!(
|
||||
"UUID: {}",
|
||||
nfc_payload
|
||||
.card_uuid
|
||||
.iter()
|
||||
.map(|b| format!("{:02X}", b))
|
||||
.collect::<String>()
|
||||
),
|
||||
Point::new(20, 270),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(&format!("Trait1: {}", trait1), Point::new(20, 280), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(&format!("Trait2: {}", trait2), Point::new(20, 290), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(&format!("Trait3: {}", trait3), Point::new(20, 300), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(&format!("Secret: {}", secret), Point::new(20, 310), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
|
||||
render_sprite_onto_ili9341(
|
||||
display,
|
||||
nfc_payload.sprite,
|
||||
&PALETTES[(nfc_payload.card_type - 1) as usize],
|
||||
);
|
||||
} else {
|
||||
log::error!(
|
||||
"NFC payload too short to decode packed text: {} bytes",
|
||||
payload.len()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
// Menu view module
|
||||
@@ -8,4 +8,3 @@ pub mod drivers;
|
||||
pub mod navigation;
|
||||
pub mod network;
|
||||
pub mod storage;
|
||||
pub mod views;
|
||||
|
||||
+1
-2
@@ -1,3 +1,2 @@
|
||||
pub mod inputs;
|
||||
pub mod navigation;
|
||||
pub mod input;
|
||||
pub mod state;
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
use esp_hal::gpio::{Input, InputConfig, Pull};
|
||||
use esp_hal::peripherals::GPIO38;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum NavCommand {
|
||||
NextCard,
|
||||
PrevCard,
|
||||
Select,
|
||||
ScanTag,
|
||||
}
|
||||
|
||||
pub fn init_navigation_button(pin: GPIO38<'static>) -> Input<'static> {
|
||||
let button_config = InputConfig::default().with_pull(Pull::Up);
|
||||
Input::new(pin, button_config)
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
use esp_hal::gpio::{Input, InputConfig, Pull};
|
||||
use esp_hal::peripherals::Peripherals;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum NavCommand {
|
||||
NextCard,
|
||||
PrevCard,
|
||||
Select,
|
||||
ScanTag,
|
||||
}
|
||||
|
||||
pub struct Inputs {
|
||||
pub up: Input<'static>,
|
||||
pub down: Input<'static>,
|
||||
pub left: Input<'static>,
|
||||
pub right: Input<'static>,
|
||||
pub back: Input<'static>,
|
||||
pub ok: Input<'static>,
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
use crate::navigation::state::NavigationState;
|
||||
use crate::views::view::View;
|
||||
use crate::{display::primary_lcd::PrimaryLcdDisplay, navigation::inputs::Inputs};
|
||||
|
||||
use embassy_futures::select::Either6;
|
||||
use embassy_futures::select::select6;
|
||||
use embassy_time::{Duration, Timer};
|
||||
|
||||
const DEBOUNCE_DURATION_MILLIS: u64 = 100;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Action {
|
||||
Up,
|
||||
Down,
|
||||
Left,
|
||||
Right,
|
||||
Ok,
|
||||
Back,
|
||||
}
|
||||
|
||||
pub trait Navigable {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send;
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send;
|
||||
}
|
||||
|
||||
#[embassy_executor::task]
|
||||
pub async fn run(mut inputs: Inputs, display: &'static mut PrimaryLcdDisplay<'static>) {
|
||||
log::info!("starting navigation");
|
||||
|
||||
let mut state = NavigationState::new();
|
||||
state.screens.last().unwrap().display(display).await;
|
||||
|
||||
loop {
|
||||
let selection = select6(
|
||||
inputs.up.wait_for_low(),
|
||||
inputs.down.wait_for_low(),
|
||||
inputs.left.wait_for_low(),
|
||||
inputs.right.wait_for_low(),
|
||||
inputs.ok.wait_for_low(),
|
||||
inputs.back.wait_for_low(),
|
||||
)
|
||||
.await;
|
||||
|
||||
let action = match selection {
|
||||
Either6::First(_) => Action::Up,
|
||||
Either6::Second(_) => Action::Down,
|
||||
Either6::Third(_) => Action::Left,
|
||||
Either6::Fourth(_) => Action::Right,
|
||||
Either6::Fifth(_) => Action::Ok,
|
||||
Either6::Sixth(_) => Action::Back,
|
||||
};
|
||||
|
||||
log::info!("Action: {:?}", action);
|
||||
|
||||
let screen = match action {
|
||||
Action::Back => state.back(),
|
||||
_ => {
|
||||
state
|
||||
.screens
|
||||
.last()
|
||||
.expect("no screen on stack")
|
||||
.handle_input(action)
|
||||
.await
|
||||
}
|
||||
};
|
||||
|
||||
screen.display(display).await;
|
||||
state.screens.push(screen);
|
||||
|
||||
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
|
||||
}
|
||||
}
|
||||
+17
-13
@@ -1,16 +1,23 @@
|
||||
use crate::views::{main_menu::MainMenu, view::View};
|
||||
use alloc::vec;
|
||||
use alloc::vec::Vec;
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum ScreenMode {
|
||||
CardDetail,
|
||||
DexGrid,
|
||||
Settings,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct NavigationState {
|
||||
pub screens: Vec<View>,
|
||||
pub current_screen: ScreenMode,
|
||||
pub card_index: usize,
|
||||
pub use_first_payload: bool,
|
||||
}
|
||||
|
||||
impl Default for NavigationState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
screens: vec![View::Main(MainMenu { selected: 0 })],
|
||||
current_screen: ScreenMode::CardDetail,
|
||||
card_index: 0,
|
||||
use_first_payload: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,12 +27,9 @@ impl NavigationState {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn back(&mut self) -> View {
|
||||
let screen = self.screens.pop().unwrap();
|
||||
if self.screens.is_empty() {
|
||||
log::info!("last screen");
|
||||
return screen;
|
||||
}
|
||||
self.screens.pop().unwrap()
|
||||
pub fn toggle_payload(&mut self) -> bool {
|
||||
let current = self.use_first_payload;
|
||||
self.use_first_payload = !self.use_first_payload;
|
||||
current
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
pub mod card_view;
|
||||
pub mod journal_view;
|
||||
pub mod main_menu;
|
||||
pub mod menu_item;
|
||||
pub mod scan_menu;
|
||||
pub mod settings_menu;
|
||||
pub mod status_bar;
|
||||
pub mod view;
|
||||
@@ -1,110 +0,0 @@
|
||||
use crate::display::sprite::render_sprite_onto_ili9341;
|
||||
use alloc::{format, string::String};
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_6X10;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::Point;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
|
||||
use core::future;
|
||||
|
||||
use crate::{
|
||||
card::model::{Card, Palette},
|
||||
display::primary_lcd::PrimaryLcdDisplay,
|
||||
navigation::navigation::{Action, Navigable},
|
||||
views::view::View,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct CardView {
|
||||
pub card: Card,
|
||||
}
|
||||
|
||||
impl Navigable for CardView {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
let background = Rectangle::new(Point::new(0, 0), Size::new(240, 320));
|
||||
let bg_color = self.card.cardtype.clone().into();
|
||||
|
||||
let _ = display.fill_solid(&background, bg_color);
|
||||
|
||||
let style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
|
||||
Text::new(
|
||||
&format!("Name: {}", self.card.name),
|
||||
Point::new(20, 240),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Type: {}", self.card.cardtype),
|
||||
Point::new(20, 250),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Event: {}", self.card.event),
|
||||
Point::new(20, 260),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("UUID: {}", self.card.uuid),
|
||||
Point::new(20, 270),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait1: {}", self.card.trait1),
|
||||
Point::new(20, 280),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait2: {}", self.card.trait2),
|
||||
Point::new(20, 290),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait3: {}", self.card.trait3),
|
||||
Point::new(20, 300),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Secret: {}", self.card.secret),
|
||||
Point::new(20, 310),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
|
||||
let palette: Palette = self.card.cardtype.clone().into();
|
||||
render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette);
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
let new_menu = match input {
|
||||
Action::Ok => View::Card(self.clone()),
|
||||
_ => View::Card(self.clone()),
|
||||
};
|
||||
|
||||
future::ready(new_menu)
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
use core::future;
|
||||
|
||||
use alloc::vec::Vec;
|
||||
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
|
||||
use crate::{
|
||||
card::model::Card,
|
||||
display::primary_lcd::PrimaryLcdDisplay,
|
||||
navigation::navigation::{Action, Navigable},
|
||||
views::view::View,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct JournalView {
|
||||
pub cards: Vec<Card>,
|
||||
pub selected_card: usize,
|
||||
}
|
||||
|
||||
impl Navigable for JournalView {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
let new_menu = match input {
|
||||
Action::Ok => View::Journal(self.clone()),
|
||||
_ => View::Journal(self.clone()),
|
||||
};
|
||||
|
||||
future::ready(new_menu)
|
||||
}
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
use alloc::vec;
|
||||
use core::future;
|
||||
|
||||
use crate::card::model::Card;
|
||||
use crate::card::{decoder::split_nfc_hex, mock::MOCK_PAYLOAD, mock::MOCK_PAYLOAD2};
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
use crate::views::card_view::CardView;
|
||||
use crate::views::journal_view::JournalView;
|
||||
use crate::views::{menu_item, settings_menu::SettingsMenu, view::View};
|
||||
|
||||
use crate::navigation::navigation::{Action, Navigable};
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
|
||||
pub const MAX_SELECTED: i32 = 3;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct MainMenu {
|
||||
pub selected: i32,
|
||||
}
|
||||
|
||||
impl Navigable for MainMenu {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
menu_item::show(display, "Last card", 0, self.selected);
|
||||
menu_item::show(display, "Journal", 1, self.selected);
|
||||
menu_item::show(display, "Settings", 2, self.selected);
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
let card_mock1 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD).unwrap()).unwrap();
|
||||
let card_mock2 = Card::try_from(split_nfc_hex(&MOCK_PAYLOAD2).unwrap()).unwrap();
|
||||
|
||||
let new_menu = match input {
|
||||
Action::Up => {
|
||||
let new_selected = if (self.selected - 1) < 0 {
|
||||
MAX_SELECTED - 1
|
||||
} else {
|
||||
self.selected - 1
|
||||
};
|
||||
View::Main(MainMenu {
|
||||
selected: new_selected,
|
||||
})
|
||||
}
|
||||
Action::Down => {
|
||||
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
|
||||
View::Main(MainMenu {
|
||||
selected: new_selected,
|
||||
})
|
||||
}
|
||||
Action::Ok => match self.selected {
|
||||
0 => View::Card(CardView { card: card_mock1 }),
|
||||
1 => View::Journal(JournalView {
|
||||
cards: vec![card_mock1, card_mock2],
|
||||
selected_card: 0,
|
||||
}),
|
||||
2 => View::Settings(SettingsMenu { selected: 0 }),
|
||||
_ => View::Main(self.clone()),
|
||||
},
|
||||
_ => View::Main(self.clone()),
|
||||
};
|
||||
|
||||
future::ready(new_menu)
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_10X20;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::Point;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::{Drawable, geometry::Size, primitives::Rectangle};
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
pub fn show<'a>(
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
name: &str,
|
||||
position: i32,
|
||||
selected: i32,
|
||||
) {
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
let selected_style = MonoTextStyle::new(&FONT_10X20, Rgb565::BLUE);
|
||||
|
||||
Text::new(
|
||||
name,
|
||||
Point::new(40, 40 + position * 40),
|
||||
if position == selected {
|
||||
selected_style
|
||||
} else {
|
||||
style
|
||||
},
|
||||
)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
use alloc::format;
|
||||
use embedded_graphics::Drawable;
|
||||
use embedded_graphics::geometry::AngleUnit as _;
|
||||
use embedded_graphics::geometry::Dimensions as _;
|
||||
use embedded_graphics::geometry::Size;
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_10X20;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::Point;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics::primitives::Arc;
|
||||
use embedded_graphics::primitives::Primitive as _;
|
||||
use embedded_graphics::primitives::PrimitiveStyleBuilder;
|
||||
use embedded_graphics::primitives::Rectangle;
|
||||
use embedded_graphics::primitives::StrokeAlignment;
|
||||
use embedded_graphics::text::Alignment;
|
||||
use embedded_graphics::text::Baseline;
|
||||
use embedded_graphics::text::Text;
|
||||
use embedded_graphics::text::TextStyleBuilder;
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
|
||||
use crate::navigation::navigation::{Action, Navigable};
|
||||
use crate::views::view::View;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ScanMenu {
|
||||
pub progress: u8, // 0..255
|
||||
}
|
||||
|
||||
impl Navigable for ScanMenu {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
let display_area = display.bounding_box();
|
||||
|
||||
Text::new("Scanning...", Point::new(20, 30), style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
|
||||
// Create styles used by the drawing operations.
|
||||
let arc_stroke = PrimitiveStyleBuilder::new()
|
||||
.stroke_color(Rgb565::WHITE)
|
||||
.stroke_width(5)
|
||||
.stroke_alignment(StrokeAlignment::Inside)
|
||||
.build();
|
||||
let character_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
let text_style = TextStyleBuilder::new()
|
||||
.baseline(Baseline::Middle)
|
||||
.alignment(Alignment::Center)
|
||||
.build();
|
||||
|
||||
let sweep = self.progress as f32 * 360.0 / 255.0;
|
||||
|
||||
let width = display_area.size.width;
|
||||
let bounding_box =
|
||||
Rectangle::with_center(display_area.center(), Size::new_equal(4 * width / 5));
|
||||
// log::info!("bounding_box: {:?}", bounding_box);
|
||||
// log::info!("display_area: {:?}", display_area);
|
||||
// Draw an arc with a 5px wide stroke.
|
||||
Arc::new(
|
||||
bounding_box.top_left,
|
||||
bounding_box.size.width,
|
||||
90.0.deg(),
|
||||
sweep.deg(),
|
||||
)
|
||||
.into_styled(arc_stroke)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
|
||||
// Draw centered text.
|
||||
let text = format!("{:.2}%", 100. * (self.progress as f32) / 255.);
|
||||
Text::with_text_style(&text, display_area.center(), character_style, text_style)
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
async move {
|
||||
let new_progress = match input {
|
||||
Action::Up => self.progress.wrapping_add(5),
|
||||
_ => self.progress,
|
||||
};
|
||||
|
||||
View::Scan(ScanMenu {
|
||||
progress: new_progress,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
use crate::display::primary_lcd::PrimaryLcdDisplay;
|
||||
|
||||
use crate::navigation::navigation::{Action, Navigable};
|
||||
use crate::views::{menu_item, view::View};
|
||||
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
use embedded_graphics::prelude::RgbColor;
|
||||
use embedded_graphics_core::draw_target::DrawTarget;
|
||||
pub const MAX_SELECTED: i8 = 2;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct SettingsMenu {
|
||||
pub selected: i32,
|
||||
}
|
||||
|
||||
impl Navigable for SettingsMenu {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
menu_item::show(display, "System Inforation", 0, self.selected);
|
||||
menu_item::show(display, "Wifi Information", 1, self.selected);
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = View> + Send {
|
||||
async move { View::Settings(SettingsMenu { selected: 0 }) }
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
use crate::views::card_view::CardView;
|
||||
use crate::views::{
|
||||
journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
|
||||
settings_menu::SettingsMenu,
|
||||
};
|
||||
|
||||
use crate::navigation::navigation::Navigable;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum View {
|
||||
Main(MainMenu),
|
||||
Scan(ScanMenu),
|
||||
Settings(SettingsMenu),
|
||||
Journal(JournalView),
|
||||
Card(CardView),
|
||||
}
|
||||
|
||||
impl Navigable for View {
|
||||
fn display(
|
||||
&self,
|
||||
display: &mut crate::display::primary_lcd::PrimaryLcdDisplay<'static>,
|
||||
) -> impl core::future::Future<Output = ()> + Send {
|
||||
async move {
|
||||
match self {
|
||||
View::Main(main_menu) => main_menu.display(display).await,
|
||||
View::Scan(scan_menu) => scan_menu.display(display).await,
|
||||
View::Settings(settings_menu) => settings_menu.display(display).await,
|
||||
View::Journal(journal_view) => journal_view.display(display).await,
|
||||
View::Card(card_view) => card_view.display(display).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_input(
|
||||
&self,
|
||||
input: crate::navigation::navigation::Action,
|
||||
) -> impl core::future::Future<Output = Self> + Send {
|
||||
async move {
|
||||
match self {
|
||||
View::Main(main_menu) => main_menu.handle_input(input).await,
|
||||
View::Scan(scan_menu) => scan_menu.handle_input(input).await,
|
||||
View::Settings(settings_menu) => settings_menu.handle_input(input).await,
|
||||
View::Journal(journal_view) => journal_view.handle_input(input).await,
|
||||
View::Card(card_view) => card_view.handle_input(input).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user