Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ede1998
|
bd124bf9c2
|
+4
-2
@@ -2,11 +2,13 @@
|
||||
runner = "espflash flash --monitor --chip esp32s3"
|
||||
|
||||
[env]
|
||||
ESP_LOG = "debug"
|
||||
ESP_LOG="info"
|
||||
WM_CONN = '{"ssid": "Wokwi-GUEST", "psk": "", "data": {}}'
|
||||
|
||||
[build]
|
||||
rustflags = ["-C", "link-arg=-nostartfiles"]
|
||||
rustflags = [
|
||||
"-C", "link-arg=-nostartfiles",
|
||||
]
|
||||
|
||||
target = "xtensa-esp32s3-none-elf"
|
||||
|
||||
|
||||
@@ -32,6 +32,3 @@ creaturedex.wiki/
|
||||
*.zip
|
||||
*.lck
|
||||
schematics/.history/
|
||||
|
||||
wokwi/wokwi-api.h
|
||||
wokwi/ch1115.chip.wasm
|
||||
|
||||
Generated
+192
-170
@@ -34,9 +34,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.5"
|
||||
version = "1.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
|
||||
checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -53,12 +53,6 @@ version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
|
||||
|
||||
[[package]]
|
||||
name = "array-init"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.5.1"
|
||||
@@ -71,6 +65,12 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.23.1"
|
||||
@@ -96,29 +96,6 @@ dependencies = [
|
||||
"vsimd",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "binary_serde"
|
||||
version = "1.0.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4b2fe974c561ed04fb89673dd221bed36fc4794b71ca6ae96ffe19949045686"
|
||||
dependencies = [
|
||||
"array-init",
|
||||
"binary_serde_macros",
|
||||
"recursive_array",
|
||||
"thiserror-no-std",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "binary_serde_macros"
|
||||
version = "1.0.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4790b8dbcfa9d3adf2020ebf5fd36c6bc89a77d434131615ea349bc9620e8831"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitfield"
|
||||
version = "0.17.0"
|
||||
@@ -142,7 +119,7 @@ checksum = "c0cb6f3d4773a2107b94cbeccaa5b5f0b35a88389b5d522d13d659f64317b22d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.4",
|
||||
"syn 3.0.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -244,9 +221,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.4.4"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273"
|
||||
checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"shlex",
|
||||
@@ -314,9 +291,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cordyceps"
|
||||
version = "0.3.5"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b9ab7e0ca1d179628fa0172b2b97203c7fa0cd81be2448bd446fb9559ca9261"
|
||||
checksum = "688d7fbb8092b8de775ef2536f36c8c31f2bc4006ece2e8d8ad2d17d00ce0a2a"
|
||||
dependencies = [
|
||||
"loom",
|
||||
"tracing",
|
||||
@@ -330,9 +307,9 @@ checksum = "417bef24afe1460300965a25ff4a24b8b45ad011948302ec221e8a0a81eb2c79"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.5.1"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550"
|
||||
checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
@@ -341,14 +318,14 @@ dependencies = [
|
||||
name = "creaturedex"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"binary_serde",
|
||||
"base64 0.23.1",
|
||||
"ch1115",
|
||||
"critical-section",
|
||||
"display-interface",
|
||||
"display-interface-spi",
|
||||
"embassy-executor",
|
||||
"embassy-futures",
|
||||
"embassy-sync 0.7.2",
|
||||
"embassy-sync 0.8.0",
|
||||
"embassy-time",
|
||||
"embedded-graphics",
|
||||
"embedded-graphics-core",
|
||||
@@ -356,22 +333,18 @@ dependencies = [
|
||||
"embedded-hal-async",
|
||||
"embedded-hal-bus",
|
||||
"embedded-io 0.7.1",
|
||||
"embedded-storage",
|
||||
"embedded-text",
|
||||
"esp-alloc",
|
||||
"esp-bootloader-esp-idf",
|
||||
"esp-hal",
|
||||
"esp-hal-wifimanager",
|
||||
"esp-nvs",
|
||||
"esp-println",
|
||||
"esp-rtos",
|
||||
"esp-storage",
|
||||
"i2c-character-display",
|
||||
"ili9341",
|
||||
"log",
|
||||
"num_enum",
|
||||
"pn532",
|
||||
"static_assertions",
|
||||
"ssd1306",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -469,12 +442,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.24.1"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec"
|
||||
checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
|
||||
dependencies = [
|
||||
"darling_core 0.24.1",
|
||||
"darling_macro 0.24.1",
|
||||
"darling_core 0.23.0",
|
||||
"darling_macro 0.23.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -506,15 +479,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "darling_core"
|
||||
version = "0.24.1"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff"
|
||||
checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
|
||||
dependencies = [
|
||||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim",
|
||||
"syn 3.0.4",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -541,13 +514,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.24.1"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785"
|
||||
checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
|
||||
dependencies = [
|
||||
"darling_core 0.24.1",
|
||||
"darling_core 0.23.0",
|
||||
"quote",
|
||||
"syn 3.0.4",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -565,9 +538,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "data-encoding"
|
||||
version = "2.11.1"
|
||||
version = "2.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06"
|
||||
checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
|
||||
|
||||
[[package]]
|
||||
name = "data-url"
|
||||
@@ -636,6 +609,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"
|
||||
@@ -718,9 +702,9 @@ checksum = "466dfce9c2172a4e947b81b556f1f07a86029fbac679e323cfb66c738cc2faea"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.18.0"
|
||||
version = "1.17.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
|
||||
checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
|
||||
|
||||
[[package]]
|
||||
name = "embassy-embedded-hal"
|
||||
@@ -1045,17 +1029,6 @@ dependencies = [
|
||||
"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]]
|
||||
name = "enumset"
|
||||
version = "1.1.14"
|
||||
@@ -1132,9 +1105,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "esp-hal"
|
||||
version = "1.1.2"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e2874462a2a0faca8b6318a10b0db87d2b7cd74dded82b3dfd780c07a319038"
|
||||
checksum = "2bfcf2a0842903717f4663f6a08512c32b0f6b2d7fb7db3c8a6895d2e6d49f72"
|
||||
dependencies = [
|
||||
"bitfield 0.19.5",
|
||||
"bitflags 2.13.1",
|
||||
@@ -1231,7 +1204,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "esp-hal-wifimanager"
|
||||
version = "0.3.1"
|
||||
source = "git+https://github.com/rhetenor/esp-hal-wifimanager.git#c35c2b35c9c4b724138f2c62a8aed9adf6365a7f"
|
||||
source = "git+https://github.com/InvisibleUSA/esp-hal-wifimanager#49050fdf44e9c2e1ec0be02b01301422c737519c"
|
||||
dependencies = [
|
||||
"embassy-executor",
|
||||
"embassy-futures",
|
||||
@@ -1525,19 +1498,18 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
|
||||
|
||||
[[package]]
|
||||
name = "find-msvc-tools"
|
||||
version = "0.1.11"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890"
|
||||
checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.1.10"
|
||||
version = "1.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||
checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
"zlib-rs",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1761,9 +1733,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.14.1"
|
||||
version = "2.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07aa2048142242915a31d35844fb311e0e53fcca590c3a0a40dcf1b841fa09eb"
|
||||
checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown 0.17.1",
|
||||
@@ -1782,15 +1754,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "instability"
|
||||
version = "0.3.13"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bf84e73fa6f27f299dec58e13223cf70db80da872eb921d4f6138342a0eabc8"
|
||||
checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
|
||||
dependencies = [
|
||||
"darling 0.24.1",
|
||||
"darling 0.23.0",
|
||||
"indoc",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.4",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1855,9 +1827,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.104"
|
||||
version = "0.3.103"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e0c1080212aad755ea003d18543e8768dd432c48819efd73a7bf1e39b7a5a3a"
|
||||
checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
@@ -1945,9 +1917,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.34"
|
||||
version = "0.4.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
|
||||
checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
||||
|
||||
[[package]]
|
||||
name = "loom"
|
||||
@@ -1983,6 +1955,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.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]]
|
||||
name = "memchr"
|
||||
version = "2.8.3"
|
||||
@@ -2031,9 +2016,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.9.1"
|
||||
version = "0.8.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c"
|
||||
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||
dependencies = [
|
||||
"adler2",
|
||||
"simd-adler32",
|
||||
@@ -2092,9 +2077,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.47"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b"
|
||||
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
@@ -2138,12 +2123,6 @@ dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object-chain"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41af26158b0f5530f7b79955006c2727cd23d0d8e7c3109dc316db0a919784dd"
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.4"
|
||||
@@ -2164,9 +2143,9 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
|
||||
|
||||
[[package]]
|
||||
name = "owo-colors"
|
||||
version = "4.4.0"
|
||||
version = "4.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c45bb4a6ae1280ec0803b1ef9d3455eb50f01efbbe1447ab020f1d54fba9d8"
|
||||
checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
|
||||
|
||||
[[package]]
|
||||
name = "oxc-browserslist"
|
||||
@@ -2194,7 +2173,7 @@ dependencies = [
|
||||
"textwrap",
|
||||
"thiserror",
|
||||
"unicode-segmentation",
|
||||
"unicode-width",
|
||||
"unicode-width 0.2.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2676,9 +2655,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.15.0"
|
||||
version = "1.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
|
||||
checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3"
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic-util"
|
||||
@@ -2737,6 +2716,30 @@ dependencies = [
|
||||
"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]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.107"
|
||||
@@ -2766,6 +2769,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"
|
||||
@@ -2795,9 +2809,9 @@ checksum = "46b71a9d9206e8b46714c74255adcaea8b11e0350c1d8456165073c3f75fc81a"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.8"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
|
||||
checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
|
||||
dependencies = [
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
@@ -2843,12 +2857,6 @@ dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "recursive_array"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69bad83913c3b39011ad9d43b7ac0cae139cec5d7e7288fbea5bb4b4e3cc78f6"
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.18"
|
||||
@@ -2860,9 +2868,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.18"
|
||||
version = "0.4.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
|
||||
checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -2974,14 +2982,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rlsf"
|
||||
version = "0.2.3"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07393724337be2ee43a9d86164df4505746874a3fa65913374bc6d6a92314362"
|
||||
checksum = "1646a59a9734b8b7a0ac51689388a60fe1625d4b956348e9de07591a1478457a"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"const-default",
|
||||
"libc",
|
||||
"rustversion",
|
||||
"svgbobdoc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3068,7 +3077,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.4",
|
||||
"syn 3.0.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3147,9 +3156,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.16.0"
|
||||
version = "1.15.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9be42f50aa861c555654aa3a37f52f4b1074bacf4e48fe0ef7fa584e80f1f0f"
|
||||
checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
|
||||
|
||||
[[package]]
|
||||
name = "smawk"
|
||||
@@ -3185,6 +3194,20 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.1"
|
||||
@@ -3233,6 +3256,19 @@ dependencies = [
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "svgbobdoc"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
|
||||
dependencies = [
|
||||
"base64 0.13.1",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"unicode-width 0.1.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
@@ -3257,9 +3293,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "3.0.4"
|
||||
version = "3.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
|
||||
checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -3289,47 +3325,27 @@ checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
|
||||
dependencies = [
|
||||
"smawk",
|
||||
"unicode-linebreak",
|
||||
"unicode-width",
|
||||
"unicode-width 0.2.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "2.0.20"
|
||||
version = "2.0.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
|
||||
checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "2.0.20"
|
||||
version = "2.0.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
|
||||
checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.4",
|
||||
]
|
||||
|
||||
[[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",
|
||||
"syn 3.0.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3379,9 +3395,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml_parser"
|
||||
version = "1.1.3+spec-1.1.0"
|
||||
version = "1.1.2+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
|
||||
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
|
||||
dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
@@ -3459,6 +3475,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"
|
||||
@@ -3483,6 +3505,12 @@ version = "1.13.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.2.2"
|
||||
@@ -3507,9 +3535,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.26.0"
|
||||
version = "1.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812"
|
||||
checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
@@ -3568,9 +3596,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.127"
|
||||
version = "0.2.126"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b70935747edd64d89de3efa29d73789b806c15798f8e7dca4d8ac356b50ce70"
|
||||
checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
@@ -3581,9 +3609,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.127"
|
||||
version = "0.2.126"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77775f8f3f7217702089053b94958f8f54061a3f663417df76e19cbdcca29bc1"
|
||||
checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@@ -3591,9 +3619,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.127"
|
||||
version = "0.2.126"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e11d33f857dc2fb11b8bc75aee111aa9cbeb12cd9f25efd3d4c2a3dd4e235284"
|
||||
checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
@@ -3604,9 +3632,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.127"
|
||||
version = "0.2.126"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf"
|
||||
checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -3701,30 +3729,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.56"
|
||||
version = "0.8.55"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb"
|
||||
checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.56"
|
||||
version = "0.8.55"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1"
|
||||
checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.119",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zlib-rs"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12"
|
||||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.23"
|
||||
|
||||
+7
-20
@@ -9,11 +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"] } #, "embassy", "embassy-time-timg0", "embassy-executor-thread"] }
|
||||
|
||||
esp-rtos = { version = "0.3.0", features = [
|
||||
"embassy",
|
||||
@@ -28,16 +24,18 @@ log = "0.4.27"
|
||||
|
||||
critical-section = "1.2.0"
|
||||
embedded-io = "0.7.1"
|
||||
embassy-executor = { version = "0.10.0", features = ["trace", "metadata-name"] }
|
||||
embassy-executor = { version = "0.10.0", features = [
|
||||
] }
|
||||
embassy-time = { version = "0.5.1", default-features = false }
|
||||
embassy-futures = "0.1.2"
|
||||
esp-alloc = "0.10.0"
|
||||
esp-hal-wifimanager = { git = "https://github.com/rhetenor/esp-hal-wifimanager.git", default-features = false, features = [
|
||||
esp-hal-wifimanager = { git = "https://github.com/InvisibleUSA/esp-hal-wifimanager", default-features = false, features = [
|
||||
"ap",
|
||||
"esp32s3",
|
||||
] }
|
||||
esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] }
|
||||
display-interface-spi = "0.5.0"
|
||||
display-interface = "*"
|
||||
ili9341 = "0.6.0"
|
||||
embedded-hal = "1.0.0"
|
||||
embedded-hal-bus = "0.3.0"
|
||||
@@ -46,19 +44,11 @@ embedded-graphics-core = "0.4.1"
|
||||
base64 = { version = "0.23.1", default-features = false, features = ["alloc"] }
|
||||
pn532 = "0.5.0"
|
||||
num_enum = { version = "0.7.6", default-features = false }
|
||||
embassy-sync = "0.7.2"
|
||||
embassy-sync = "0.8.0"
|
||||
embedded-hal-async = "1.0.0"
|
||||
i2c-character-display = "0.5.1"
|
||||
ch1115 = { version = "0.1.2", features = ["graphics"] }
|
||||
esp-storage = "0.9.0"
|
||||
embedded-storage = "0.3.1"
|
||||
binary_serde = "1.0.25"
|
||||
static_assertions = { version = "1.1.0", default-features = false }
|
||||
embedded-text = "0.7.3"
|
||||
esp-nvs = { version = "0.5.0", features = ["esp32s3"] }
|
||||
|
||||
[build-dependencies]
|
||||
log = "0.4.27"
|
||||
ssd1306 = { version = "0.10.0", features = [] }
|
||||
|
||||
|
||||
[patch.crates-io]
|
||||
@@ -84,6 +74,3 @@ opt-level = 's'
|
||||
[features]
|
||||
default = []
|
||||
wokwi = []
|
||||
|
||||
[lints.clippy]
|
||||
manual_async_fn = "allow"
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
fn main() {
|
||||
generate_filter_snippet();
|
||||
compile_custom_wokwi_components();
|
||||
linker_be_nice();
|
||||
// make sure linkall.x is the last linker script (otherwise might cause problems with flip-link)
|
||||
println!("cargo:rustc-link-arg=-Tlinkall.x");
|
||||
@@ -70,187 +68,3 @@ fn linker_be_nice() {
|
||||
std::env::current_exe().unwrap().display()
|
||||
);
|
||||
}
|
||||
|
||||
fn compile_custom_wokwi_components() {
|
||||
use std::process::Command;
|
||||
|
||||
if std::env::var("CARGO_FEATURE_WOKWI").is_ok() {
|
||||
println!("cargo:rerun-if-changed=wokwi/ch1115.chip.c");
|
||||
println!("cargo:rerun-if-changed=wokwi/ch1115.chip.json");
|
||||
println!("cargo:rerun-if-changed=wokwi/Makefile");
|
||||
|
||||
let status = Command::new("make")
|
||||
.current_dir("wokwi")
|
||||
.status()
|
||||
.expect("Failed to execute make command. Is 'make' installed?");
|
||||
|
||||
if !status.success() {
|
||||
panic!(
|
||||
"Wokwi custom chip compilation failed with status: {}",
|
||||
status
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Taken over from esp_println because impossible to just extend their existing env logger.
|
||||
// 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
|
||||
}
|
||||
|
||||
+6
-34
@@ -59,23 +59,19 @@
|
||||
"top": -291.2,
|
||||
"left": -167.2,
|
||||
"attrs": { "pins": "i2c" }
|
||||
},
|
||||
{ "type": "chip-ch1115", "id": "chip1", "top": 509.82, "left": -4.8, "attrs": {} },
|
||||
{ "type": "chip-ch1115", "id": "chip2", "top": 625.02, "left": -4.8, "attrs": {} },
|
||||
{ "type": "chip-ch1115", "id": "chip3", "top": 394.62, "left": -4.8, "attrs": {} },
|
||||
{ "type": "wokwi-vcc", "id": "vcc1", "top": 39.16, "left": 316.8, "attrs": {} }
|
||||
}
|
||||
],
|
||||
"connections": [
|
||||
[ "esp1:TX", "$serialMonitor:RX", "", [] ],
|
||||
[ "esp1:RX", "$serialMonitor:TX", "", [] ],
|
||||
[ "lcd1:VCC", "esp1:3V3", "red", [ "v19.2", "h-57.6", "v-105.6", "h-124.95" ] ],
|
||||
[ "lcd1:GND", "esp1:GND.2", "black", [ "v28.8", "h-76.8", "v-76.8" ] ],
|
||||
[ "lcd1:CS", "esp1:11", "orange", [ "v259.2", "h-729.6", "v-95.82" ] ],
|
||||
[ "lcd1:D/C", "esp1:12", "gold", [ "v278.4", "h-729.6", "v-105.42" ] ],
|
||||
[ "lcd1:CS", "esp1:11", "orange", [ "v0" ] ],
|
||||
[ "lcd1:D/C", "esp1:12", "gold", [ "v0" ] ],
|
||||
[ "lcd1:RESET", "esp1:10", "brown", [ "v0" ] ],
|
||||
[ "lcd1:MOSI", "esp1:35", "violet", [ "v124.8", "h-124.8", "v0.18" ] ],
|
||||
[ "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", "v-0.18", "h594.94" ] ],
|
||||
[ "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" ] ],
|
||||
@@ -91,31 +87,7 @@
|
||||
[ "lcd2:GND", "esp1:GND.2", "black", [ "h0" ] ],
|
||||
[ "lcd2:VCC", "esp1:3V3.1", "red", [ "h0" ] ],
|
||||
[ "lcd2:SDA", "esp1:17", "green", [ "h-134.4", "v413" ] ],
|
||||
[ "lcd2:SCL", "esp1:18", "green", [ "h-124.8", "v38.7" ] ],
|
||||
[ "chip2:RES", "chip1:RES", "gray", [ "h-28.8", "v-115.2" ] ],
|
||||
[ "chip1:RES", "chip3:RES", "gray", [ "h-28.8", "v-67.2" ] ],
|
||||
[ "chip2:GND", "chip1:GND", "black", [ "h-48", "v-115.2" ] ],
|
||||
[ "chip1:GND", "chip3:GND", "black", [ "h-48", "v-115.2" ] ],
|
||||
[ "chip2:VCC", "chip1:VCC", "red", [ "h-38.4", "v-115.2" ] ],
|
||||
[ "chip3:VCC", "chip1:VCC", "red", [ "h-38.4", "v115.2" ] ],
|
||||
[ "chip2:DC", "chip1:DC", "gold", [ "h46.84", "v-115.2" ] ],
|
||||
[ "chip1:DC", "chip3:DC", "gold", [ "h46.84", "v-115.2" ] ],
|
||||
[ "chip2:SCL", "chip1:SCL", "white", [ "h56.44", "v-115.2" ] ],
|
||||
[ "chip1:SCL", "chip3:SCL", "white", [ "h56.44", "v-115.2" ] ],
|
||||
[ "chip3:SDA", "chip1:SDA", "violet", [ "h-1.16", "h67.2", "v57.6" ] ],
|
||||
[ "chip1:SDA", "chip2:SDA", "violet", [ "h66.04", "v115.2" ] ],
|
||||
[ "esp1:35", "chip3:SDA", "violet", [ "h364.53", "v153.42" ] ],
|
||||
[ "chip3:SCL", "esp1:36", "white", [ "h56.44", "v-172.62" ] ],
|
||||
[ "esp1:12", "chip3:DC", "gold", [ "h-29.12", "v105.42", "h460.8", "v67.2" ] ],
|
||||
[ "esp1:GND.4", "chip3:GND", "black", [ "h18.93", "v19.02", "h105.6", "v48" ] ],
|
||||
[ "esp1:3V3.1", "chip3:VCC", "red", [ "h-57.92", "v259.02" ] ],
|
||||
[ "lcd1:VCC", "vcc1:VCC", "red", [ "v67.2", "h-48" ] ],
|
||||
[ "lcd1:LED", "vcc1:VCC", "red", [ "v67.2", "h-144.01" ] ],
|
||||
[ "lcd1:RST", "esp1:10", "gray", [ "v268.8", "h-729.6", "v-115.02" ] ],
|
||||
[ "esp1:47", "chip3:RES", "gray", [ "h28.53", "v182.22" ] ],
|
||||
[ "chip3:CS", "esp1:13", "blue", [ "h-278.4", "v-153.42" ] ],
|
||||
[ "esp1:14", "chip1:CS", "magenta", [ "h-9.92", "v259.02" ] ],
|
||||
[ "esp1:21", "chip2:CS", "#8f4814", [ "h95.73", "v316.62" ] ]
|
||||
[ "lcd2:SCL", "esp1:18", "green", [ "h-124.8", "v38.7" ] ]
|
||||
],
|
||||
"dependencies": {}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
[idf_format_args]
|
||||
partition_table = "partitions.csv"
|
||||
+2
-2
@@ -2,8 +2,8 @@ include <common.scad>
|
||||
use <left-half.scad>
|
||||
use <right-half.scad>
|
||||
|
||||
left_half_creaturedex();
|
||||
right_half_creaturedex();
|
||||
left_half();
|
||||
right_half();
|
||||
|
||||
#union() {
|
||||
right_half_components();
|
||||
|
||||
+25
-247
@@ -1,78 +1,9 @@
|
||||
include <BOSL2/std.scad>
|
||||
|
||||
BASE_MODEL_SCALE = [1.1, 1, 1.1];
|
||||
BASE_MODEL_TRANSLATE = [-0.4, 0, 16.978];
|
||||
EPS = 0.01;
|
||||
$fn = 50;
|
||||
|
||||
module pin_header(cols = 4, rows = 1, anchor = BOTTOM, spin = 0, orient = UP) {
|
||||
// Standard pin header dimensions (in mm)
|
||||
base_height = 2.54; // Height of the plastic base
|
||||
pin_width = 0.64; // Width/thickness of the square pin
|
||||
pin_length = 6.0; // Length of pin sticking up
|
||||
pitch = 2.54;
|
||||
|
||||
// 1. The Plastic Base is the Parent
|
||||
// It directly receives your anchor, spin, and orient arguments.
|
||||
color("darkgrey")
|
||||
cuboid([cols * pitch, rows * pitch, base_height], anchor=anchor, spin=spin, orient=orient) {
|
||||
|
||||
// 2. Metal Pins are the Children
|
||||
// Placed relative to the center of the plastic base
|
||||
color("silver")
|
||||
xcopies(spacing=pitch, n=cols) {
|
||||
ycopies(spacing=pitch, n=rows) {
|
||||
up(base_height / 2)
|
||||
cuboid([pin_width, pin_width, pin_length], anchor=BOTTOM);
|
||||
}
|
||||
}
|
||||
|
||||
// Allows attaching other objects to this header if needed
|
||||
children();
|
||||
}
|
||||
}
|
||||
|
||||
module 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);
|
||||
|
||||
if (pin_header)
|
||||
position(BOTTOM + LEFT)
|
||||
xrot(180)
|
||||
pin_header(14, spin=90, anchor=BOTTOM + BACK);
|
||||
}
|
||||
|
||||
xcopies(length - (2 * hole_inset) - hole_diameter) {
|
||||
ycopies(width - (2 * hole_inset) - hole_diameter) {
|
||||
zcyl(d=hole_diameter, h=height + EPS);
|
||||
}
|
||||
}
|
||||
}
|
||||
module main_display(){
|
||||
// Outer dimensions, height currently unknown
|
||||
cube([55.04, 89.3, 10]);
|
||||
}
|
||||
|
||||
module pad(){
|
||||
@@ -80,188 +11,35 @@ module pad() {
|
||||
cube([20, 20, 10]);
|
||||
}
|
||||
|
||||
module secondary_display(pin_header = false) {
|
||||
module small_display_below_main()
|
||||
{
|
||||
// https://de.aliexpress.com/item/1005003753680706.html
|
||||
length = 45.8;
|
||||
width = 20;
|
||||
height = 3.7;
|
||||
cube([45.8, 20, 11.3]);
|
||||
// old i2c variant:
|
||||
//cube([43.5, 19.44, 4.5]);
|
||||
|
||||
hole_diameter = 2;
|
||||
hole_inset = 1.5;
|
||||
|
||||
difference() {
|
||||
cuboid([length, width, height]) {
|
||||
if (pin_header)
|
||||
position(LEFT + TOP)
|
||||
pin_header(7, spin=90, anchor=BACK + BOTTOM);
|
||||
// initial dimension ideas
|
||||
// cube([38,16,4]);
|
||||
// translate([150,0,0]) cube([22,5.5,4]);
|
||||
}
|
||||
|
||||
right(length / 2 - hole_inset) {
|
||||
ycopies(width - (2 * hole_inset) - hole_diameter) {
|
||||
zcyl(d=hole_diameter, h=height + EPS, anchor=RIGHT);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module battery(anchor = BOTTOM) {
|
||||
// 18650
|
||||
rotate([0, 90, 0]) cylinder(d=18, h=65, anchor=anchor);
|
||||
}
|
||||
|
||||
/// USB-C port and switch not 100% dimensionally accurate, take care!
|
||||
module micro_controller(battery_holder = false, battery = false) {
|
||||
pcb_length = 91.5;
|
||||
pcb_height = 6.5; // including components, highest point: jst connector, followed by uC
|
||||
pcb_height_no_components = 1.1;
|
||||
pcb_width = 28.8;
|
||||
|
||||
hole_diameter = 2.5;
|
||||
hole_inset = 1;
|
||||
usb_protrusion = 1.7;
|
||||
usb_width = 9;
|
||||
usb_inset_from_pcb_end = 5;
|
||||
power_switch_protrusion = 2.1;
|
||||
power_switch_inset_from_pcb_end = 8.1;
|
||||
power_switch_width = 4;
|
||||
|
||||
battery_holder_height = 15;
|
||||
battery_holder_width = 21;
|
||||
battery_holder_length = 77.3;
|
||||
|
||||
battery_length = 65;
|
||||
battery_protrusion = 4.5;
|
||||
|
||||
difference() {
|
||||
cuboid([pcb_length, pcb_width, pcb_height], rounding=2, edges="Z") {
|
||||
if (battery_holder)
|
||||
position(TOP)
|
||||
cube([battery_holder_length, battery_holder_width, battery_holder_height], anchor=BOTTOM + CENTER) {
|
||||
if (battery)
|
||||
position(TOP)
|
||||
up(battery_protrusion)
|
||||
battery(anchor=CENTER + LEFT);
|
||||
}
|
||||
position(RIGHT + BOTTOM) {
|
||||
position(FRONT)
|
||||
left(usb_inset_from_pcb_end)
|
||||
cube([usb_width, usb_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + BOTTOM + FRONT);
|
||||
position(BACK)
|
||||
left(power_switch_inset_from_pcb_end)
|
||||
cube([power_switch_width, power_switch_protrusion, pcb_height - pcb_height_no_components], orient=FRONT, anchor=RIGHT + TOP + FRONT);
|
||||
}
|
||||
}
|
||||
|
||||
xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
|
||||
ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
|
||||
cyl(d=hole_diameter, h=pcb_height + EPS, orient=UP);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module nfc(pin_header = true) {
|
||||
length = 43;
|
||||
width = 40.5;
|
||||
height = 4;
|
||||
|
||||
pin_protrusion = 2.2;
|
||||
|
||||
hole_diameter = 3;
|
||||
hole_inset = 6;
|
||||
|
||||
x_span = length - (2 * hole_inset) - hole_diameter;
|
||||
y_span = width - (2 * hole_inset) - hole_diameter;
|
||||
|
||||
color("red")
|
||||
difference() {
|
||||
cuboid([length, width, height], rounding=2, edges="Z") {
|
||||
// pin header is lower than highest other component -> in the cube.
|
||||
if (pin_header)
|
||||
right(6 - pin_protrusion) // ugly: 6mm is the pin height
|
||||
position(LEFT + TOP)
|
||||
yrot(-90)
|
||||
pin_header(7, spin=90, anchor=FRONT + TOP);
|
||||
}
|
||||
|
||||
move_copies(
|
||||
[
|
||||
[x_span / 2, -y_span / 2], // Bottom-Left corner
|
||||
[-x_span / 2, y_span / 2], // Top-Right corner
|
||||
]
|
||||
) {
|
||||
zcyl(d=hole_diameter, h=height + EPS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module tertiary_display(pin_headers = true) {
|
||||
module tertiary_display()
|
||||
{
|
||||
// https://de.aliexpress.com/item/1005006034531826.html
|
||||
|
||||
pcb_length = 81;
|
||||
pcb_width = 36.1;
|
||||
pcb_height = 3.7;
|
||||
|
||||
hole_diameter = 2.8;
|
||||
hole_inset = 1;
|
||||
|
||||
display_length = 71.2;
|
||||
display_width = 24.4;
|
||||
display_height = 7;
|
||||
|
||||
piggy_length = 41.8;
|
||||
piggy_width = 19.1;
|
||||
piggy_height = 8.5 - 2.6;
|
||||
piggy_inset = 6.2;
|
||||
|
||||
jumper_protrusion = 6.6;
|
||||
pin_protrusion = 6.2;
|
||||
|
||||
color("green")
|
||||
difference() {
|
||||
cuboid([pcb_length, pcb_width, pcb_height]) {
|
||||
position(TOP)
|
||||
cuboid([display_length, display_width, display_height], anchor=BOTTOM);
|
||||
cube([80, 36, 10]);
|
||||
}
|
||||
|
||||
xcopies(pcb_length - (2 * hole_inset) - hole_diameter) {
|
||||
ycopies(pcb_width - (2 * hole_inset) - hole_diameter) {
|
||||
zcyl(d=hole_diameter, h=pcb_height + 1);
|
||||
}
|
||||
}
|
||||
module battery() {
|
||||
// 18650
|
||||
rotate([0,90,0]) cylinder(d=18, h=65);
|
||||
}
|
||||
|
||||
// Replaces position(BOTTOM + BACK + LEFT) so that difference cannot mess with color.
|
||||
translate([-pcb_length / 2 + piggy_inset, pcb_width / 2, -pcb_height / 2]) {
|
||||
color("black")
|
||||
cuboid([piggy_length, piggy_width, piggy_height], anchor=TOP + BACK + LEFT);
|
||||
|
||||
if (pin_headers) {
|
||||
// Replaces position(LEFT + BOTTOM) so that parent child cannot mess with color.
|
||||
translate([0, -piggy_width / 2, -piggy_height])
|
||||
right(6 - pin_protrusion)
|
||||
yrot(-90)
|
||||
pin_header(4, spin=90, anchor=BACK + TOP);
|
||||
|
||||
// Replaces position(RIGHT + BOTTOM) so that parent child cannot mess with color.
|
||||
translate([piggy_length, -piggy_width / 2, -piggy_height])
|
||||
left(6 - pin_protrusion)
|
||||
yrot(90)
|
||||
back(1.6)
|
||||
pin_header(2, spin=-90, anchor=BACK + TOP);
|
||||
|
||||
// Replaces position(BACK + TOP) so that parent child cannot mess with color.
|
||||
translate([piggy_length / 2, -EPS, 0])
|
||||
pin_header(16, anchor=BACK + TOP);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// show different components as overview
|
||||
if (false) {
|
||||
back(30) tertiary_display(true);
|
||||
back(80) yrot(180) secondary_display(true);
|
||||
right(100) zrot(90) main_display(true);
|
||||
fwd(20) micro_controller(true, true);
|
||||
fwd(60) nfc(true);
|
||||
module microcontroller() {
|
||||
// width 32 including USB-C port
|
||||
length = 91.5;
|
||||
height = 20;
|
||||
battery_length = 65;
|
||||
delta = length - battery_length;
|
||||
cube([length, 32, height]);
|
||||
translate([delta / 2,16, 15]) battery();
|
||||
}
|
||||
|
||||
+7
-221
@@ -1,226 +1,12 @@
|
||||
include <BOSL2/std.scad>
|
||||
include <common.scad>
|
||||
|
||||
module left_half_orig() {
|
||||
module left_half_components() {
|
||||
cube([1,1,1]);
|
||||
}
|
||||
|
||||
module left_half() {
|
||||
translate(BASE_MODEL_TRANSLATE) scale(BASE_MODEL_SCALE) import(file = "left-half.3mf");
|
||||
}
|
||||
|
||||
BASE_MODEL_SCALE = 1.1;
|
||||
// Bounds: ~ [128.62, 185.46, 35.2]
|
||||
LEFT_HALF_BOUNDING_BOX = BASE_MODEL_SCALE * [116.93, 168.6, 32];
|
||||
|
||||
w = LEFT_HALF_BOUNDING_BOX.x;
|
||||
l = LEFT_HALF_BOUNDING_BOX.y;
|
||||
max_h = LEFT_HALF_BOUNDING_BOX.z;
|
||||
|
||||
// Proportional heights based on a 4.5 unit total scale
|
||||
base_h = max_h * (2.0 / 4.5);
|
||||
border_h = max_h * (2.5 / 4.5);
|
||||
top_h = max_h * (3.5 / 4.5);
|
||||
sphere_r = max_h - top_h;
|
||||
|
||||
recess_h = 3;
|
||||
|
||||
bump_height = 10;
|
||||
faceplate_thickness = 2;
|
||||
wall = 5;
|
||||
|
||||
top_bump_width_big = 55;
|
||||
top_bump_width_small = 35;
|
||||
|
||||
hinge_thickness = 22;
|
||||
|
||||
/// Builds the top bump.
|
||||
module top_bump(height, extra_width = 0, inverted = false, wall = 2, anchor = CENTER, spin = 0, orient = UP) {
|
||||
width_big = top_bump_width_big;
|
||||
width_small = top_bump_width_small;
|
||||
|
||||
// Assuming 'w' is your base width defined in the outer scope.
|
||||
// Lock the left side to the base width, add extra_width only to the right.
|
||||
left_x = -w / 2;
|
||||
right_x = (w / 2) + extra_width;
|
||||
|
||||
top_path = back(
|
||||
// center the path around the origin
|
||||
width_big / 2, [
|
||||
[right_x, 0], // Index 0, top-right
|
||||
[left_x, 0], // Index 1, top-left
|
||||
[left_x, -width_big], // Index 2, bottom-left
|
||||
[left_x / 2 + 20, -width_big], // Index 3, bottom-center-left
|
||||
[0, -width_small], // Index 4, middle-center
|
||||
[right_x, -width_small], // Index 5, bottom-right
|
||||
]
|
||||
);
|
||||
|
||||
radii_list = [5, 5, 5, 15, 5, 5];
|
||||
|
||||
top_poly = round_corners(top_path, radius=radii_list);
|
||||
inner_poly = offset(top_poly, delta=-wall);
|
||||
|
||||
// The new total width
|
||||
total_width = w + extra_width;
|
||||
part_size = [total_width, width_big, height];
|
||||
|
||||
// The geometric center of the asymmetric shape is shifted to the right
|
||||
part_offset = [extra_width / 2, 0, 0];
|
||||
|
||||
// Removed the `right(extra_width)` translation here.
|
||||
// Added `offset` so BOSL2 knows the bounding box isn't centered at [0,0,0],
|
||||
// keeping the CENTER anchor exactly on your original origin point.
|
||||
attachable(anchor, spin, orient, size=part_size, offset=part_offset) {
|
||||
if (inverted) {
|
||||
down(wall / 2)
|
||||
linear_sweep(inner_poly, height=height - wall + EPS, center=true);
|
||||
} else {
|
||||
diff("empty") {
|
||||
linear_sweep(top_poly, height=height, center=true) {
|
||||
attach(TOP)
|
||||
tag("empty")
|
||||
down(wall)
|
||||
left(wall / 4) // (Leaving your original shift here)
|
||||
linear_sweep(inner_poly, height=height - wall + EPS, anchor=TOP);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
children();
|
||||
}
|
||||
}
|
||||
|
||||
module top_bump_skirt(height = 5) {
|
||||
intersection() {
|
||||
diff("heel_holes") {
|
||||
tag("heel_holes")
|
||||
down(EPS / 2)
|
||||
top_bump(height=height * 2 + EPS, wall=wall, inverted=true, anchor=FRONT + BOTTOM);
|
||||
top_bump(height=height, wall=wall, anchor=FRONT + BOTTOM);
|
||||
}
|
||||
down(EPS / 2)
|
||||
cuboid([w, wall + (top_bump_width_big - top_bump_width_small) + EPS, height * 2 + EPS], anchor=FRONT + BOTTOM);
|
||||
}
|
||||
}
|
||||
|
||||
module top_bump_side_extension(width, height = 5) {
|
||||
intersection() {
|
||||
diff("heel_holes") {
|
||||
tag("heel_holes")
|
||||
down(EPS / 2)
|
||||
top_bump(height=height * 2 + EPS, wall=wall, inverted=true, anchor=RIGHT + TOP + BACK);
|
||||
top_bump(height=height, wall=wall, anchor=RIGHT + TOP + BACK);
|
||||
}
|
||||
back(EPS / 2)
|
||||
up(EPS / 2)
|
||||
cuboid([width, top_bump_width_small + EPS, height * 2 + EPS], anchor=RIGHT + TOP + BACK);
|
||||
}
|
||||
}
|
||||
|
||||
module top_bump_big_sphere(diameter, ring_extra_diameter, ring_height) {
|
||||
zcyl(d=diameter + ring_extra_diameter, h=ring_height, anchor=BOTTOM)
|
||||
position(TOP)
|
||||
top_half() sphere(diameter / 2);
|
||||
}
|
||||
|
||||
module top_bump_small_spheres(diameter, spacing) {
|
||||
top_half() {
|
||||
left(spacing) sphere(r=diameter / 2, anchor=CENTER);
|
||||
sphere(r=diameter / 2, anchor=CENTER);
|
||||
right(spacing) sphere(r=diameter / 2, anchor=CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
/// Hinges to attach the right to the left (=this) half.
|
||||
/// Origin is at the bottom left front corner.
|
||||
module hinges(joint_axis_length = 80, hinge_thickness = 22) {
|
||||
hinge_inset = 10;
|
||||
hinge_inset_diameter = 6;
|
||||
|
||||
back(joint_axis_length)
|
||||
yflip_copy(offset=joint_axis_length) {
|
||||
right(border_h / 2 + 2)
|
||||
// cannot get it to align with edge otherwise
|
||||
ycyl(r=border_h / 2 + 2, l=hinge_thickness, anchor=BOTTOM + BACK)
|
||||
position(FRONT) tag("holes") fwd(EPS) ycyl(d=hinge_inset_diameter, l=hinge_inset, anchor=FRONT);
|
||||
cuboid([border_h / 2 + 2 + EPS, hinge_thickness, base_h], anchor=LEFT + BOTTOM + BACK);
|
||||
}
|
||||
}
|
||||
|
||||
module left_half_creaturedex() {
|
||||
left((w + hinge_thickness) / 2)
|
||||
diff("holes", "forcekeep")
|
||||
// Outer walls
|
||||
color_this("green")
|
||||
rect_tube(h=base_h, size=[w, l], wall=wall, rounding=[0, 5, 5, 0]) {
|
||||
|
||||
// Gap for extension of top bump
|
||||
position(RIGHT + BACK + BOTTOM)
|
||||
fwd(wall)
|
||||
move([EPS / 2, 0, -EPS / 2])
|
||||
tag("holes")
|
||||
cuboid([wall + EPS, top_bump_width_small - wall + EPS, EPS + bump_height + base_h], anchor=RIGHT + BOTTOM + BACK);
|
||||
|
||||
// Recessed Faceplate
|
||||
attach(TOP)
|
||||
recolor("blue")
|
||||
down(recess_h) {
|
||||
cuboid([w - EPS, l - EPS, faceplate_thickness], rounding=5, edges="Z", anchor=TOP) {
|
||||
position(BACK)
|
||||
tag("holes") top_bump(height=bump_height + faceplate_thickness + recess_h, wall=wall, inverted=true, anchor=BACK);
|
||||
}
|
||||
}
|
||||
|
||||
// Top Bump
|
||||
tag("forcekeep")
|
||||
recolor("Gold")
|
||||
position(TOP + BACK) {
|
||||
down(recess_h + faceplate_thickness)
|
||||
top_bump(height=bump_height + faceplate_thickness + recess_h, extra_width=hinge_thickness, wall=wall, anchor=BOTTOM + BACK) {
|
||||
position(TOP + BACK)
|
||||
fwd(20) {
|
||||
position(LEFT)
|
||||
right(w / 5)
|
||||
top_bump_big_sphere(diameter=23, ring_extra_diameter=4, ring_height=2);
|
||||
position(RIGHT)
|
||||
left(w / 5)
|
||||
top_bump_small_spheres(diameter=7, spacing=15);
|
||||
}
|
||||
position(FRONT + BOTTOM)
|
||||
fwd(wall)
|
||||
top_bump_skirt(recess_h + faceplate_thickness);
|
||||
position(RIGHT + BACK + TOP)
|
||||
down(EPS)
|
||||
back(EPS)
|
||||
recolor("red")
|
||||
top_bump_side_extension(width=hinge_thickness + wall, height=bump_height + base_h);
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: do this properly!
|
||||
// 4. Cutouts/Details in the Recessed Area
|
||||
*up(base_h / 2 - max_h / 2) {
|
||||
// Main Portrait Display Cutout
|
||||
translate([0, 10, 0])
|
||||
tag("holes") cuboid([w - 40, l - 90, base_h + 2], rounding=2, edges="Z");
|
||||
|
||||
// Small Landscape Display Cutout (Bottom Left)
|
||||
translate([-w / 2 + 35, -l / 2 + 35, 0])
|
||||
tag("holes") cuboid([28, 12, base_h + 2], rounding=1, edges="Z");
|
||||
|
||||
// D-Pad Cutout (Bottom Right)
|
||||
translate([w / 2 - 35, -l / 2 + 35, 0])
|
||||
tag("holes") union() {
|
||||
cuboid([22, 8, base_h + 2], rounding=1, edges="Z");
|
||||
cuboid([8, 22, base_h + 2], rounding=1, edges="Z");
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Right Side Hinges
|
||||
recolor("Red")
|
||||
position(BOTTOM + RIGHT + FRONT) {
|
||||
hinges();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
left_half_creaturedex();
|
||||
|
||||
left(300) left_half_orig();
|
||||
left_half();
|
||||
#left_half_components();
|
||||
@@ -106,10 +106,10 @@ module right_half_hinge_only() {
|
||||
}
|
||||
// !right_half_hinge_only();
|
||||
|
||||
module right_half_creaturedex() {
|
||||
module right_half() {
|
||||
right_half_door_only();
|
||||
right_half_hinge_only();
|
||||
}
|
||||
|
||||
// right_half_creaturedex();
|
||||
// right_half();
|
||||
// #right_half_components();
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
# ESP-IDF Partition Table
|
||||
# Name,Type,SubType,Offset,Size,Flags
|
||||
nvs,data,nvs,0x9000,0x6000,
|
||||
phy_init,data,phy,0xf000,0x1000,
|
||||
# We keep the default layout more or less. But here we add a partition for more data before our application
|
||||
more_nvs,data,nvs,0x10000,0xfa000,
|
||||
# no offset given -> tool infers it for us
|
||||
factory,app,factory, ,0xea6000,
|
||||
|
||||
|
@@ -1,9 +1,3 @@
|
||||
use crate::navigation::navigation::display_error;
|
||||
use crate::{
|
||||
navigation::{navigation::Mutex, outputs::Outputs, state::NavigationState},
|
||||
peripherals::Peripherals,
|
||||
};
|
||||
use alloc::string::ToString;
|
||||
use embedded_hal_bus::i2c::AtomicDevice;
|
||||
use esp_hal::{Blocking, i2c::master::I2c, time::Instant};
|
||||
|
||||
@@ -20,9 +14,6 @@ use crate::{
|
||||
)]
|
||||
pub async fn nfc_scanner(
|
||||
mut nfc_driver: NfcPn532Driver<AtomicDevice<'static, I2c<'static, Blocking>>>,
|
||||
outputs: &'static Mutex<Outputs>,
|
||||
peripherals: &'static Peripherals,
|
||||
navigation_state: &'static Mutex<NavigationState>,
|
||||
) {
|
||||
loop {
|
||||
while CARD_DATA.lock().await.is_none() {
|
||||
@@ -33,37 +24,10 @@ pub async fn nfc_scanner(
|
||||
log::error!("Failed to split NFC card data");
|
||||
continue;
|
||||
};
|
||||
let card = match Card::try_from(split_data) {
|
||||
Ok(card) => card,
|
||||
Err(err) => {
|
||||
log::error!("Invalid card data: {err}");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
CARD_DATA.lock().await.replace(card);
|
||||
|
||||
log::debug!("saving card to flash");
|
||||
match peripherals
|
||||
.store
|
||||
CARD_DATA
|
||||
.lock()
|
||||
.await
|
||||
.card_store
|
||||
.save_raw_card(&split_data, peripherals.rtc.current_time_us())
|
||||
.await
|
||||
{
|
||||
Ok(()) => {}
|
||||
Err(error) => {
|
||||
log::error!("Error storing card in flash: {:?}", error);
|
||||
display_error(
|
||||
error.to_string(),
|
||||
navigation_state,
|
||||
outputs,
|
||||
peripherals,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
|
||||
.replace(Card::try_from(split_data).unwrap());
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
log::info!(
|
||||
"NFC read duration: {} ms, card data length: {}",
|
||||
@@ -71,11 +35,11 @@ pub async fn nfc_scanner(
|
||||
card_data.len()
|
||||
);
|
||||
}
|
||||
Err(_) => {
|
||||
log::info!("No NFC card found");
|
||||
Err(e) => {
|
||||
log::error!("NFC read failed: {e}");
|
||||
}
|
||||
}
|
||||
}
|
||||
embassy_time::Timer::after(embassy_time::Duration::from_millis(10)).await;
|
||||
embassy_time::Timer::after(embassy_time::Duration::from_millis(1000)).await;
|
||||
}
|
||||
}
|
||||
|
||||
+38
-117
@@ -7,26 +7,18 @@
|
||||
)]
|
||||
#![deny(clippy::large_stack_frames)]
|
||||
|
||||
use alloc::boxed::Box;
|
||||
use alloc::sync::Arc;
|
||||
use creaturedex::background_tasks;
|
||||
use creaturedex::drivers::i2c_bus::I2cBusPinConfiguration;
|
||||
use creaturedex::drivers::nfc_pn532::NfcPn532Driver;
|
||||
use creaturedex::drivers::primary_lcd::PrimaryDisplay;
|
||||
use creaturedex::drivers::secondary_oled::SecondaryDisplay;
|
||||
use creaturedex::drivers::spi_bus;
|
||||
use creaturedex::drivers::tertiary_lcd::{
|
||||
BOX, EMPTY, EXAMPLE, HEART, TertiaryDisplay, TertiaryDisplayPinConfiguration,
|
||||
};
|
||||
use creaturedex::navigation::inputs::Inputs;
|
||||
use creaturedex::navigation::navigation::Mutex;
|
||||
use creaturedex::navigation::navigation::{self};
|
||||
use creaturedex::navigation::outputs::Outputs;
|
||||
use creaturedex::navigation::state::NavigationState;
|
||||
use creaturedex::network::wifi::setup_wifi;
|
||||
use creaturedex::peripherals::Peripherals;
|
||||
use creaturedex::peripherals::storage::cardstore::CardStore;
|
||||
use creaturedex::peripherals::storage::store::Store;
|
||||
use embassy_executor::Spawner;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_graphics::{
|
||||
@@ -40,8 +32,6 @@ use esp_hal::gpio::{Input, InputConfig, Pull};
|
||||
use esp_hal::timer::timg::TimerGroup;
|
||||
use log::error;
|
||||
|
||||
use esp_hal::rtc_cntl::Rtc;
|
||||
|
||||
#[panic_handler]
|
||||
fn panic(panic_info: &core::panic::PanicInfo) -> ! {
|
||||
error!("{}", panic_info);
|
||||
@@ -52,9 +42,6 @@ extern crate alloc;
|
||||
|
||||
const HEAP_SIZE: usize = 73744;
|
||||
|
||||
const NVS_PARTITION_OFFSET: usize = 0x10000;
|
||||
const NVS_PARTITION_SIZE: usize = 0xfa000;
|
||||
|
||||
// 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!();
|
||||
@@ -65,87 +52,55 @@ esp_bootloader_esp_idf::esp_app_desc!();
|
||||
)]
|
||||
#[esp_rtos::main]
|
||||
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 esp_peripherals = esp_hal::init(config);
|
||||
let peripherals = esp_hal::init(config);
|
||||
|
||||
esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: HEAP_SIZE);
|
||||
|
||||
let sw_interrupt =
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(esp_peripherals.SW_INTERRUPT);
|
||||
let timg0 = TimerGroup::new(esp_peripherals.TIMG0);
|
||||
esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
|
||||
let timg0 = TimerGroup::new(peripherals.TIMG0);
|
||||
esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
|
||||
|
||||
let (mut primary, mut secondaries) = retry(
|
||||
5,
|
||||
spi_bus::DisplayPinConfiguration {
|
||||
spi_peripheral: esp_peripherals.SPI2,
|
||||
sck: esp_peripherals.GPIO36,
|
||||
mosi: esp_peripherals.GPIO35,
|
||||
miso: esp_peripherals.GPIO37,
|
||||
cs_primary: esp_peripherals.GPIO11,
|
||||
cs_secondary_1: esp_peripherals.GPIO13,
|
||||
cs_secondary_2: esp_peripherals.GPIO14,
|
||||
cs_secondary_3: esp_peripherals.GPIO21,
|
||||
reset_primary: esp_peripherals.GPIO10,
|
||||
reset_secondary: esp_peripherals.GPIO47,
|
||||
dc_pin: esp_peripherals.GPIO12,
|
||||
},
|
||||
spi_bus::DisplayPinConfiguration::build,
|
||||
);
|
||||
let (primary, mut secondaries) = spi_bus::DisplayPinConfiguration {
|
||||
spi_peripheral: peripherals.SPI2,
|
||||
sck: peripherals.GPIO36,
|
||||
mosi: peripherals.GPIO35,
|
||||
miso: peripherals.GPIO37,
|
||||
cs_primary: peripherals.GPIO11,
|
||||
cs_secondary_1: peripherals.GPIO13,
|
||||
cs_secondary_2: peripherals.GPIO14,
|
||||
cs_secondary_3: peripherals.GPIO21,
|
||||
reset_primary: peripherals.GPIO10,
|
||||
reset_secondary: peripherals.GPIO47,
|
||||
dc_pin: peripherals.GPIO12,
|
||||
}
|
||||
.build();
|
||||
|
||||
// Initialize the shared I2C bus using the refactored i2c_bus module.
|
||||
let shared_i2c = {
|
||||
let bus = retry(
|
||||
5,
|
||||
I2cBusPinConfiguration {
|
||||
i2c_peripheral: esp_peripherals.I2C0,
|
||||
scl: esp_peripherals.GPIO18,
|
||||
sda: esp_peripherals.GPIO17,
|
||||
},
|
||||
I2cBusPinConfiguration::build,
|
||||
);
|
||||
Box::leak(Box::new(bus))
|
||||
let config = I2cBusPinConfiguration {
|
||||
i2c_peripheral: peripherals.I2C0,
|
||||
scl: peripherals.GPIO18,
|
||||
sda: peripherals.GPIO17,
|
||||
};
|
||||
config.build()
|
||||
};
|
||||
|
||||
let mut lcd: TertiaryDisplay = retry(
|
||||
5,
|
||||
TertiaryDisplayPinConfiguration { i2c: shared_i2c },
|
||||
TertiaryDisplayPinConfiguration::build,
|
||||
);
|
||||
let mut lcd: TertiaryDisplay = TertiaryDisplayPinConfiguration { i2c: shared_i2c }.build();
|
||||
lcd.load_charset(EXAMPLE).unwrap();
|
||||
let h = EXAMPLE[HEART];
|
||||
let e = EXAMPLE[EMPTY];
|
||||
let b = EXAMPLE[BOX];
|
||||
if let Err(e) = lcd.write(&alloc::format!(
|
||||
"Custom symbols: {h}{e}{b} And more stuff to wrap and cut off please."
|
||||
)) {
|
||||
if let Err(e) = lcd.write(&alloc::format!("Custom symbols: {h}{e}{b} And more stuff to wrap and cut off please.")) {
|
||||
log::error!(
|
||||
"Tertiary LCD startup text write failed over shared I2C bus; check the shared bus, wiring, and device responses: {e}"
|
||||
);
|
||||
}
|
||||
|
||||
let storage = esp_storage::FlashStorage::new(esp_peripherals.FLASH);
|
||||
|
||||
let nvs = Arc::new(Mutex::new(
|
||||
esp_nvs::Nvs::new(NVS_PARTITION_OFFSET, NVS_PARTITION_SIZE, storage)
|
||||
.expect("failed to create nvs"),
|
||||
));
|
||||
|
||||
setup_wifi(esp_peripherals.WIFI, Arc::clone(&nvs), &spawner).await;
|
||||
|
||||
let card_store = CardStore::new(nvs)
|
||||
.await
|
||||
.expect("Could not initialize Card Store");
|
||||
|
||||
let store = Store { card_store };
|
||||
let rtc = Rtc::new(esp_peripherals.LPWR);
|
||||
|
||||
let peripherals = Box::leak(Box::new(Peripherals {
|
||||
store: Mutex::new(store),
|
||||
rtc,
|
||||
}));
|
||||
setup_wifi(peripherals.WIFI, peripherals.FLASH, &spawner).await;
|
||||
|
||||
let mut nfc_driver = NfcPn532Driver::new(AtomicDevice::new(shared_i2c));
|
||||
if nfc_driver.configure_sam().await.is_ok() {
|
||||
@@ -156,20 +111,19 @@ async fn main(spawner: Spawner) {
|
||||
|
||||
let button_config = InputConfig::default().with_pull(Pull::Up);
|
||||
let inputs = Inputs {
|
||||
up: Input::new(esp_peripherals.GPIO38, button_config),
|
||||
down: Input::new(esp_peripherals.GPIO39, button_config),
|
||||
left: Input::new(esp_peripherals.GPIO40, button_config),
|
||||
right: Input::new(esp_peripherals.GPIO41, button_config),
|
||||
back: Input::new(esp_peripherals.GPIO8, button_config),
|
||||
ok: Input::new(esp_peripherals.GPIO0, button_config),
|
||||
up: Input::new(peripherals.GPIO38, button_config),
|
||||
down: Input::new(peripherals.GPIO39, button_config),
|
||||
left: Input::new(peripherals.GPIO40, button_config),
|
||||
right: Input::new(peripherals.GPIO41, button_config),
|
||||
back: Input::new(peripherals.GPIO8, button_config),
|
||||
ok: Input::new(peripherals.GPIO0, button_config),
|
||||
};
|
||||
|
||||
display_shit(&mut secondaries[0], "foo 1");
|
||||
display_shit(&mut secondaries[1], "bar 1");
|
||||
display_shit(&mut secondaries[2], "baz 1");
|
||||
display_shit_prim(&mut primary, "Hello World");
|
||||
|
||||
let outputs = Box::leak(Box::new(Mutex::new({
|
||||
let outputs = {
|
||||
let [sec_1, sec_2, sec_3] = secondaries;
|
||||
Outputs {
|
||||
primary_display: primary,
|
||||
@@ -179,24 +133,15 @@ async fn main(spawner: Spawner) {
|
||||
tertiary_display: lcd,
|
||||
_led_a: (),
|
||||
}
|
||||
})));
|
||||
|
||||
let navigation_state = Box::leak(Box::new(Mutex::new(NavigationState::new())));
|
||||
};
|
||||
|
||||
log::info!("Setup complete, entering main loop");
|
||||
spawner.spawn(
|
||||
navigation::run(inputs, outputs, peripherals, navigation_state).expect("run task failed"),
|
||||
);
|
||||
spawner.spawn(
|
||||
background_tasks::nfc_scanner(nfc_driver, outputs, peripherals, navigation_state)
|
||||
.expect("nfc scanner task failed"),
|
||||
);
|
||||
|
||||
core::future::pending::<()>().await
|
||||
spawner.spawn(navigation::run(inputs, outputs).expect("run task failed"));
|
||||
spawner.spawn(background_tasks::nfc_scanner(nfc_driver).expect("nfc scanner task failed"));
|
||||
}
|
||||
|
||||
fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
|
||||
oled.clear().unwrap();
|
||||
oled.clear(BinaryColor::Off).unwrap();
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
|
||||
Text::new(text, Point::new(10, 20), text_style)
|
||||
@@ -204,27 +149,3 @@ fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
|
||||
.unwrap();
|
||||
oled.flush().unwrap();
|
||||
}
|
||||
|
||||
fn display_shit_prim(main: &mut PrimaryDisplay<'static>, text: &str) {
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
main.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
|
||||
Text::new(text, Point::new(10, 20), text_style)
|
||||
.draw(main)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U {
|
||||
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 crate::card::model::RawCard;
|
||||
use crate::card::model::NfcPayload;
|
||||
use alloc::string::{String, ToString};
|
||||
|
||||
pub fn split_nfc_hex(payload: &[u8]) -> Option<RawCard> {
|
||||
pub fn split_nfc_hex(payload: &[u8]) -> Option<NfcPayload<'_>> {
|
||||
if payload.len() < 0x35A {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(RawCard {
|
||||
event_encoding: payload[0..2].try_into().ok()?,
|
||||
Some(NfcPayload {
|
||||
event_encoding: &payload[0..2],
|
||||
card_type: payload[2],
|
||||
card_uuid: payload[3..5].try_into().ok()?,
|
||||
_reserved: payload[5..9].try_into().ok()?,
|
||||
sprite: payload[9..0x2DB].try_into().ok()?,
|
||||
packed_card_text: payload[0x2DB..0x311].try_into().ok()?,
|
||||
secret: payload[0x311..0x329].try_into().ok()?,
|
||||
_opaque_trailer: payload[0x329..0x35A].try_into().ok()?,
|
||||
_padding: Default::default(),
|
||||
card_uuid: &payload[3..5],
|
||||
_reserved: &payload[5..9],
|
||||
sprite: &payload[9..0x2DB],
|
||||
packed_card_text: &payload[0x2DB..0x311],
|
||||
secret: &payload[0x311..0x329],
|
||||
_opaque_trailer: &payload[0x329..0x35A],
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
+18
-60
@@ -1,6 +1,4 @@
|
||||
use base64::prelude::*;
|
||||
use core::fmt::Display;
|
||||
use esp_nvs::Key;
|
||||
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use num_enum::FromPrimitive;
|
||||
@@ -8,56 +6,18 @@ use num_enum::FromPrimitive;
|
||||
use crate::card::decoder::{Events, decode_known_event, decode_packed_card_text, decode_secret};
|
||||
use embedded_graphics::pixelcolor::{Rgb565, Rgb888};
|
||||
|
||||
use binary_serde::BinarySerde;
|
||||
|
||||
#[derive(Debug, BinarySerde, PartialEq, Eq, Clone, Copy)]
|
||||
#[repr(C)]
|
||||
pub struct RawCard {
|
||||
pub event_encoding: [u8; 2],
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct NfcPayload<'a> {
|
||||
pub event_encoding: &'a [u8],
|
||||
pub card_type: u8,
|
||||
pub card_uuid: [u8; 2],
|
||||
pub _reserved: [u8; 4],
|
||||
pub sprite: [u8; 722],
|
||||
pub packed_card_text: [u8; 54],
|
||||
pub secret: [u8; 24],
|
||||
pub _opaque_trailer: [u8; 49],
|
||||
pub _padding: [u8; 2],
|
||||
pub card_uuid: &'a [u8],
|
||||
pub _reserved: &'a [u8],
|
||||
pub sprite: &'a [u8],
|
||||
pub packed_card_text: &'a [u8],
|
||||
pub secret: &'a [u8],
|
||||
pub _opaque_trailer: &'a [u8],
|
||||
}
|
||||
|
||||
impl Default for RawCard {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
event_encoding: Default::default(),
|
||||
card_type: Default::default(),
|
||||
card_uuid: Default::default(),
|
||||
_reserved: Default::default(),
|
||||
sprite: [0; 722],
|
||||
packed_card_text: [0; 54],
|
||||
secret: Default::default(),
|
||||
_opaque_trailer: [0; 49],
|
||||
_padding: Default::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl RawCard {
|
||||
pub fn get_uuid(&self) -> u32 {
|
||||
((u16::from_ne_bytes(self.event_encoding) as u32) << 16)
|
||||
| (u16::from_ne_bytes(self.card_uuid) as u32)
|
||||
}
|
||||
|
||||
pub fn get_nvs_key(&self) -> Key {
|
||||
let uuid = self.get_uuid();
|
||||
Self::nvs_key_from_uuid(uuid)
|
||||
}
|
||||
|
||||
pub fn nvs_key_from_uuid(uuid: u32) -> Key {
|
||||
let base64 = BASE64_STANDARD.encode(uuid.to_ne_bytes());
|
||||
Key::from_str(&base64)
|
||||
}
|
||||
}
|
||||
static_assertions::const_assert!(RawCard::SERIALIZED_SIZE.is_multiple_of(4));
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq, FromPrimitive)]
|
||||
#[repr(u8)]
|
||||
pub enum CardType {
|
||||
@@ -262,7 +222,7 @@ pub struct Sprite {
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Card {
|
||||
pub uuid: u32,
|
||||
pub uuid: String,
|
||||
pub event: Events,
|
||||
pub cardtype: CardType,
|
||||
pub name: String,
|
||||
@@ -275,19 +235,17 @@ pub struct Card {
|
||||
pub sprite: Sprite,
|
||||
}
|
||||
|
||||
impl TryFrom<RawCard> for Card {
|
||||
impl<'a> TryFrom<NfcPayload<'a>> for Card {
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(raw_card: RawCard) -> Result<Self, Self::Error> {
|
||||
let uuid: u32 = (u16::from_ne_bytes(raw_card.event_encoding) as u32) << 16
|
||||
| (u16::from_ne_bytes(raw_card.card_uuid) as u32);
|
||||
|
||||
let event = decode_known_event(&raw_card.event_encoding);
|
||||
let cardtype = CardType::from(raw_card.card_type);
|
||||
let (name, trait1, trait2, trait3) = decode_packed_card_text(&raw_card.packed_card_text);
|
||||
let secret = decode_secret(&raw_card.secret);
|
||||
fn try_from(payload: NfcPayload<'a>) -> Result<Self, Self::Error> {
|
||||
let uuid: String = "empty for now".into(); //str::from_utf8(payload.card_uuid).unwrap().into();
|
||||
let event = decode_known_event(payload.event_encoding);
|
||||
let cardtype = CardType::from(payload.card_type);
|
||||
let (name, trait1, trait2, trait3) = decode_packed_card_text(payload.packed_card_text);
|
||||
let secret = decode_secret(payload.secret);
|
||||
let sprite = Sprite {
|
||||
data: raw_card.sprite.to_vec(),
|
||||
data: payload.sprite.to_vec(),
|
||||
};
|
||||
Ok(Self {
|
||||
uuid,
|
||||
|
||||
+11
-11
@@ -1,3 +1,4 @@
|
||||
use alloc::boxed::Box;
|
||||
use embedded_hal_bus::i2c::AtomicDevice;
|
||||
use embedded_hal_bus::util::AtomicCell;
|
||||
use esp_hal::gpio::interconnect::PeripheralInput;
|
||||
@@ -20,19 +21,18 @@ where
|
||||
SCL: PeripheralOutput<'a> + PeripheralInput<'a>,
|
||||
SDA: PeripheralOutput<'a> + PeripheralInput<'a>,
|
||||
{
|
||||
pub fn build(self) -> Result<AtomicCell<InnerI2cBus<'a>>, Self> {
|
||||
pub fn build(self) -> I2cBus<'a> {
|
||||
let config = Config::default().with_frequency(esp_hal::time::Rate::from_khz(400));
|
||||
match I2c::new(self.i2c_peripheral, config) {
|
||||
Ok(bus) => {
|
||||
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))
|
||||
}
|
||||
let i2c = match I2c::new(self.i2c_peripheral, config) {
|
||||
Ok(bus) => bus.with_sda(self.sda).with_scl(self.scl),
|
||||
Err(e) => {
|
||||
log::error!("Shared I2C bus initialization failed for GPIO17/GPIO18: {e:?}");
|
||||
unimplemented!("Partial move makes it impossible to retry.");
|
||||
// Err(self)
|
||||
}
|
||||
}
|
||||
panic!("Shared I2C bus initialization failed");
|
||||
}
|
||||
};
|
||||
let shared_i2c = Box::leak(Box::new(AtomicCell::new(i2c)));
|
||||
log::info!("Shared I2C bus ready on GPIO17 (SDA) and GPIO18 (SCL)");
|
||||
|
||||
shared_i2c
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
use core::error::Error;
|
||||
use core::fmt::Debug;
|
||||
use core::fmt::Display;
|
||||
use display_interface_spi::SPIInterface;
|
||||
use embedded_graphics::draw_target::DrawTarget;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
@@ -9,27 +6,10 @@ use embedded_hal_bus::spi::AtomicDevice;
|
||||
use embedded_hal_bus::util::AtomicCell;
|
||||
use esp_hal::delay::Delay;
|
||||
use esp_hal::gpio::Output;
|
||||
use ili9341::{DisplayError, DisplaySize240x320, Ili9341, Orientation};
|
||||
use ili9341::{DisplaySize240x320, Ili9341, Orientation};
|
||||
|
||||
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> =
|
||||
Ili9341<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RES>;
|
||||
pub type PrimaryDisplay<'a> =
|
||||
|
||||
+155
-20
@@ -1,6 +1,6 @@
|
||||
use alloc::format;
|
||||
use ch1115::{Ch1115, Size128x64};
|
||||
use alloc::{format, string::String};
|
||||
use display_interface_spi::SPIInterface;
|
||||
use embedded_graphics::pixelcolor::BinaryColor;
|
||||
use embedded_hal_bus::spi::AtomicDevice;
|
||||
use embedded_hal_bus::util::AtomicCell;
|
||||
use esp_hal::delay::Delay;
|
||||
@@ -8,10 +8,72 @@ use esp_hal::gpio::Output;
|
||||
|
||||
use crate::drivers::spi_bus::{DisplaySpiBus, SharedOutput, SharedReset};
|
||||
|
||||
pub 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>>;
|
||||
pub struct SecondaryDisplay<'a>(
|
||||
#[cfg(feature = "wokwi")] ssd1306_aliases::SecondaryDisplay<'a>,
|
||||
#[cfg(not(feature = "wokwi"))] ch1115_aliases::SecondaryDisplay<'a>,
|
||||
);
|
||||
|
||||
impl<'a> SecondaryDisplay<'a> {
|
||||
pub fn flush(&mut self) -> Result<(), String> {
|
||||
#[cfg(not(feature = "wokwi"))]
|
||||
return self.0.flush().map_err(|e| format!("{e:?}"));
|
||||
#[cfg(feature = "wokwi")]
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> embedded_graphics::geometry::Dimensions for SecondaryDisplay<'a> {
|
||||
fn bounding_box(&self) -> embedded_graphics::primitives::Rectangle {
|
||||
self.0.bounding_box()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> embedded_graphics::draw_target::DrawTarget for SecondaryDisplay<'a> {
|
||||
type Color = BinaryColor;
|
||||
|
||||
type Error = String;
|
||||
|
||||
fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
|
||||
where
|
||||
I: IntoIterator<Item = embedded_graphics::prelude::Pixel<Self::Color>>,
|
||||
{
|
||||
self.0.draw_iter(pixels).map_err(|e| format!("{e:?}"))
|
||||
}
|
||||
|
||||
fn fill_contiguous<I>(
|
||||
&mut self,
|
||||
area: &embedded_graphics::primitives::Rectangle,
|
||||
colors: I,
|
||||
) -> Result<(), Self::Error>
|
||||
where
|
||||
I: IntoIterator<Item = Self::Color>,
|
||||
{
|
||||
self.0
|
||||
.fill_contiguous(area, colors)
|
||||
.map_err(|e| format!("{e:?}"))
|
||||
}
|
||||
|
||||
fn fill_solid(
|
||||
&mut self,
|
||||
area: &embedded_graphics::primitives::Rectangle,
|
||||
color: Self::Color,
|
||||
) -> Result<(), Self::Error> {
|
||||
self.0.fill_solid(area, color).map_err(|e| format!("{e:?}"))
|
||||
}
|
||||
|
||||
fn clear(&mut self, color: Self::Color) -> Result<(), Self::Error> {
|
||||
#[cfg(feature = "wokwi")]
|
||||
return self.0.clear(color).map_err(|e| format!("{e:?}"));
|
||||
|
||||
#[cfg(not(feature = "wokwi"))]
|
||||
{
|
||||
let _ = color;
|
||||
self.0.clear().map_err(|e| format!("{e:?}"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub const SECONDARY_DISPLAY_COUNT: usize = 3;
|
||||
|
||||
pub struct SecondaryDisplayPinConfiguration<'a> {
|
||||
pub spi_bus: &'a AtomicCell<DisplaySpiBus>,
|
||||
@@ -21,25 +83,46 @@ pub struct SecondaryDisplayPinConfiguration<'a> {
|
||||
}
|
||||
|
||||
impl<'a> SecondaryDisplayPinConfiguration<'a> {
|
||||
pub fn build(self) -> [SecondaryDisplay<'a>; 3] {
|
||||
let mut displays = self.cs_pins.map(|cs| {
|
||||
let spi_dev = AtomicDevice::new(self.spi_bus, cs, Delay::new()).unwrap();
|
||||
let interface = SPIInterface::new(spi_dev, self.dc.clone());
|
||||
pub fn build(self) -> [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
|
||||
#[cfg(feature = "wokwi")]
|
||||
type Displays<'b> = [ssd1306_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
|
||||
#[cfg(not(feature = "wokwi"))]
|
||||
type Displays<'b> = [ch1115_aliases::SecondaryDisplay<'b>; SECONDARY_DISPLAY_COUNT];
|
||||
|
||||
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
|
||||
displays.map(SecondaryDisplay)
|
||||
}
|
||||
}
|
||||
|
||||
fn init_single_reset<'a: 'b, 'b>(
|
||||
displays: impl IntoIterator<Item = &'b mut SecondaryDisplay<'a>>,
|
||||
shared_reset: SharedReset<'a>,
|
||||
) {
|
||||
let mut displays = displays.into_iter().peekable();
|
||||
trait MultiDisplay<'a> {
|
||||
fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self;
|
||||
fn reset(&mut self, shared_reset: SharedReset<'a>);
|
||||
}
|
||||
|
||||
mod ch1115_aliases {
|
||||
use super::*;
|
||||
use ch1115::{Ch1115, Size128x64};
|
||||
|
||||
type GenericSecondaryDisplay<'a, BUS, RST, DC> =
|
||||
Ch1115<SPIInterface<AtomicDevice<'a, BUS, Output<'a>, Delay>, DC>, RST, Size128x64>;
|
||||
pub type SecondaryDisplay<'a> =
|
||||
GenericSecondaryDisplay<'a, DisplaySpiBus, SharedReset<'a>, SharedOutput<'a>>;
|
||||
|
||||
impl<'a> MultiDisplay<'a> for [SecondaryDisplay<'a>; SECONDARY_DISPLAY_COUNT] {
|
||||
fn new(config: SecondaryDisplayPinConfiguration<'a>) -> Self {
|
||||
config.cs_pins.map(|cs| {
|
||||
let spi_dev = AtomicDevice::new(config.spi_bus, cs, Delay::new()).unwrap();
|
||||
let interface = SPIInterface::new(spi_dev, config.dc.clone());
|
||||
|
||||
SecondaryDisplay::new(interface, config.res.clone(), Size128x64)
|
||||
})
|
||||
}
|
||||
|
||||
fn reset(&mut self, shared_reset: SharedReset<'a>) {
|
||||
let mut displays = self.iter_mut().peekable();
|
||||
|
||||
// Reset all secondaries via shared reset
|
||||
let Some(any_display) = displays.peek_mut() else {
|
||||
@@ -57,3 +140,55 @@ fn init_single_reset<'a: 'b, 'b>(
|
||||
.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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+10
-11
@@ -135,7 +135,7 @@ where
|
||||
RES2: OutputPin + 'static,
|
||||
DC: OutputPin + 'static,
|
||||
{
|
||||
pub fn build(self) -> Result<(PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]), Self> {
|
||||
pub fn build(self) -> (PrimaryDisplay<'static>, [SecondaryDisplay<'static>; 3]) {
|
||||
let spi = Spi::new(
|
||||
self.spi_peripheral,
|
||||
SpiConfig::default()
|
||||
@@ -158,7 +158,14 @@ where
|
||||
OutputConfig::default(),
|
||||
));
|
||||
|
||||
// Secondary displays must come first or they don't work in wokwi for some reason.
|
||||
let primary = PrimaryDisplayPinConfiguration {
|
||||
spi_bus: bus_static,
|
||||
cs: low_active(self.cs_primary),
|
||||
reset: low_active(self.reset_primary),
|
||||
dc: dc.clone(),
|
||||
}
|
||||
.build();
|
||||
|
||||
let secondaries = SecondaryDisplayPinConfiguration {
|
||||
spi_bus: bus_static,
|
||||
cs_pins: [
|
||||
@@ -167,19 +174,11 @@ where
|
||||
low_active(self.cs_secondary_3),
|
||||
],
|
||||
res: reset_secondary,
|
||||
dc: dc.clone(),
|
||||
}
|
||||
.build();
|
||||
|
||||
let primary = PrimaryDisplayPinConfiguration {
|
||||
spi_bus: bus_static,
|
||||
cs: low_active(self.cs_primary),
|
||||
reset: low_active(self.reset_primary),
|
||||
dc,
|
||||
}
|
||||
.build();
|
||||
|
||||
Ok((primary, secondaries))
|
||||
(primary, secondaries)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,20 +15,19 @@ pub struct TertiaryDisplayPinConfiguration<'a> {
|
||||
}
|
||||
|
||||
impl<'a> TertiaryDisplayPinConfiguration<'a> {
|
||||
pub fn build(self) -> Result<TertiaryDisplay<'a>, Self> {
|
||||
pub fn build(self) -> TertiaryDisplay<'a> {
|
||||
let device = AtomicDevice::new(self.i2c);
|
||||
let mut lcd = CharacterDisplayPCF8574T::new(device, LcdDisplayType::Lcd16x2, Delay::new());
|
||||
match lcd.init() {
|
||||
Ok(()) => {
|
||||
log::info!("I2C tertiary LCD initialized on PCF8574T at address 0x27");
|
||||
Ok(TertiaryDisplay {
|
||||
TertiaryDisplay {
|
||||
display: lcd,
|
||||
charset: create_custom_char_set!(),
|
||||
})
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
|
||||
Err(self)
|
||||
panic!("I2C tertiary LCD init failed on PCF8574T at address 0x27: {e}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -408,3 +407,4 @@ pub const BOX: CharMap = [
|
||||
];
|
||||
|
||||
pub const EXAMPLE: CustomCharset = create_custom_char_set!(HEART, BOX, EMPTY);
|
||||
|
||||
|
||||
+1
-69
@@ -1,5 +1,4 @@
|
||||
#![no_std]
|
||||
#![feature(vec_into_chunks)]
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
@@ -7,74 +6,7 @@ pub mod background_tasks;
|
||||
pub mod card;
|
||||
pub mod display;
|
||||
pub mod drivers;
|
||||
pub mod logging;
|
||||
pub mod navigation;
|
||||
pub mod network;
|
||||
pub mod peripherals;
|
||||
pub mod storage;
|
||||
pub mod views;
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_poll_start(executor_id: u32) {}
|
||||
|
||||
/// This callback is called AFTER a task is initialized/allocated, and BEFORE
|
||||
/// it is enqueued to run for the first time. If the task ends (and does not
|
||||
/// loop "forever"), there will be a matching call to `_embassy_trace_task_end`.
|
||||
///
|
||||
/// Tasks start life in the SPAWNED state.
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_task_new(executor_id: u32, task_id: u32) {
|
||||
log::debug!("Started new task on executer 0x{executor_id:x} with id 0x{task_id:x}")
|
||||
}
|
||||
|
||||
/// This callback is called AFTER a task is destructed/freed. This will always
|
||||
/// have a prior matching call to `_embassy_trace_task_new`.
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_task_end(executor_id: u32, task_id: u32) {
|
||||
log::debug!("Ended task on executer 0x{executor_id:x} with id 0x{task_id:x}")
|
||||
}
|
||||
|
||||
/// This callback is called AFTER a task has been dequeued from the runqueue,
|
||||
/// and BEFORE the task is polled. There will always be a matching call to
|
||||
/// `_embassy_trace_task_exec_end`.
|
||||
///
|
||||
/// This marks the TASK state transition from WAITING -> RUNNING
|
||||
/// This marks the EXECUTOR state transition from SCHEDULING -> POLLING
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_task_exec_begin(executor_id: u32, task_id: u32) {}
|
||||
|
||||
/// This callback is called AFTER a task has completed polling. There will
|
||||
/// always be a matching call to `_embassy_trace_task_exec_begin`.
|
||||
///
|
||||
/// This marks the TASK state transition from either:
|
||||
/// * RUNNING -> IDLE - if there were no `_embassy_trace_task_ready_begin` events
|
||||
/// for this task since the last `_embassy_trace_task_exec_begin` for THIS task
|
||||
/// * RUNNING -> WAITING - if there WAS a `_embassy_trace_task_ready_begin` event
|
||||
/// for this task since the last `_embassy_trace_task_exec_begin` for THIS task
|
||||
///
|
||||
/// This marks the EXECUTOR state transition from POLLING -> SCHEDULING
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_task_exec_end(excutor_id: u32, task_id: u32) {}
|
||||
|
||||
/// This callback is called AFTER the waker for a task is awoken, and BEFORE it
|
||||
/// is added to the run queue.
|
||||
///
|
||||
/// If the given task is currently RUNNING, this marks no state change, BUT the
|
||||
/// RUNNING task will then move to the WAITING stage when polling is complete.
|
||||
///
|
||||
/// If the given task is currently IDLE, this marks the TASK state transition
|
||||
/// from IDLE -> WAITING.
|
||||
///
|
||||
/// NOTE: This may be called from an interrupt, outside the contpub ext of the current
|
||||
/// task or executor.
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_task_ready_begin(executor_id: u32, task_id: u32) {}
|
||||
|
||||
/// This callback is called AFTER all dequeued tasks in a single call to poll
|
||||
/// have been processed. This will always be paired with a call to
|
||||
/// `_embassy_trace_executor_idle`.
|
||||
///
|
||||
///
|
||||
/// This marks the EXECUTOR state transition from SCHEDULING -> IDLE
|
||||
///
|
||||
#[unsafe(no_mangle)]
|
||||
pub extern "Rust" fn _embassy_trace_executor_idle(executor_id: u32) {}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -3,13 +3,7 @@ use crate::navigation::inputs::ButtonAction;
|
||||
use crate::navigation::inputs::Inputs;
|
||||
use crate::navigation::outputs::Outputs;
|
||||
use crate::navigation::state::NavigationState;
|
||||
use crate::peripherals::Peripherals;
|
||||
use crate::views::error_view::ErrorView;
|
||||
use crate::views::view::View;
|
||||
use alloc::boxed::Box;
|
||||
use alloc::string::String;
|
||||
use alloc::string::ToString;
|
||||
use core::error;
|
||||
|
||||
use embassy_futures::select::{Either, select};
|
||||
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
|
||||
@@ -33,64 +27,18 @@ pub struct NewState {
|
||||
}
|
||||
|
||||
pub trait Navigable {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
peripherals: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send;
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send;
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send;
|
||||
}
|
||||
|
||||
pub async fn display_error(
|
||||
error: String,
|
||||
navigation_state: &Mutex<NavigationState>,
|
||||
outputs: &Mutex<Outputs>,
|
||||
peripherals: &Peripherals,
|
||||
) -> () {
|
||||
let error_view = ErrorView {
|
||||
error: error.to_string(),
|
||||
};
|
||||
let mut state = navigation_state.lock().await;
|
||||
state.screens.push(View::Error(error_view));
|
||||
let mut outs = outputs.lock().await;
|
||||
state
|
||||
.screens
|
||||
.last()
|
||||
// Unwrap: we just pushed the state
|
||||
.unwrap()
|
||||
.display(&mut outs, peripherals)
|
||||
.await
|
||||
// Unwrap: display will panic on error in error view
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
#[embassy_executor::task]
|
||||
pub async fn run(
|
||||
mut inputs: Inputs,
|
||||
outputs: &'static Mutex<Outputs>,
|
||||
peripherals: &'static Peripherals,
|
||||
navigation_state: &'static Mutex<NavigationState>,
|
||||
) {
|
||||
pub async fn run(mut inputs: Inputs, mut outputs: Outputs) {
|
||||
log::info!("starting navigation");
|
||||
|
||||
{
|
||||
let mut outs = outputs.lock().await;
|
||||
if let Err(error) = navigation_state
|
||||
.lock()
|
||||
.await
|
||||
.screens
|
||||
.last()
|
||||
.unwrap()
|
||||
.display(&mut outs, peripherals)
|
||||
.await
|
||||
{
|
||||
display_error(error.to_string(), navigation_state, outputs, peripherals).await;
|
||||
};
|
||||
}
|
||||
let mut state = NavigationState::new();
|
||||
state.screens.last().unwrap().display(&mut outputs).await;
|
||||
|
||||
loop {
|
||||
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
|
||||
let mut state = navigation_state.lock().await;
|
||||
let selection = select(
|
||||
inputs.wait_for_press(),
|
||||
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)),
|
||||
@@ -133,16 +81,10 @@ pub async fn run(
|
||||
}
|
||||
state.screens.push(new_state.view);
|
||||
|
||||
let mut outs = outputs.lock().await;
|
||||
if (action != Action::Timer || new_state.redraw)
|
||||
&& let Err(error) = state
|
||||
.screens
|
||||
.last()
|
||||
.unwrap()
|
||||
.display(&mut outs, peripherals)
|
||||
.await
|
||||
{
|
||||
display_error(error.to_string(), navigation_state, outputs, peripherals).await;
|
||||
}
|
||||
if action != Action::Timer || new_state.redraw {
|
||||
state.screens.last().unwrap().display(&mut outputs).await;
|
||||
}
|
||||
|
||||
Timer::after(Duration::from_millis(DEBOUNCE_DURATION_MILLIS)).await;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use embedded_graphics::{
|
||||
draw_target::DrawTarget as _,
|
||||
pixelcolor::{Rgb565, RgbColor as _},
|
||||
draw_target::DrawTarget as _, pixelcolor::{BinaryColor, Rgb565, RgbColor as _},
|
||||
};
|
||||
|
||||
use crate::drivers::{
|
||||
@@ -19,9 +18,9 @@ pub struct Outputs {
|
||||
impl Outputs {
|
||||
pub fn clear_screens(&mut self) {
|
||||
self.primary_display.clear(Rgb565::BLACK).unwrap();
|
||||
self.secondary_display_1.clear().unwrap();
|
||||
// self.secondary_display_2.clear().unwrap();
|
||||
// self.secondary_display_3.clear().unwrap();
|
||||
self.secondary_display_1.clear(BinaryColor::Off).unwrap();
|
||||
self.secondary_display_2.clear(BinaryColor::Off).unwrap();
|
||||
self.secondary_display_3.clear(BinaryColor::Off).unwrap();
|
||||
self.tertiary_display.clear().unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
+18
-18
@@ -1,15 +1,12 @@
|
||||
use crate::navigation::navigation::Mutex;
|
||||
use crate::peripherals::storage::Nvs;
|
||||
use alloc::sync::Arc;
|
||||
use embassy_executor::Spawner;
|
||||
|
||||
#[cfg(not(feature = "wokwi"))]
|
||||
pub async fn setup_wifi(
|
||||
wifi: esp_hal::peripherals::WIFI<'static>,
|
||||
nvs: Arc<Mutex<Nvs>>,
|
||||
flash: esp_hal::peripherals::FLASH<'static>,
|
||||
spawner: &Spawner,
|
||||
) {
|
||||
let espnvs = esp_hal_wifimanager::Nvs::new_from_nvs(nvs, 0, 0);
|
||||
let nvs = esp_hal_wifimanager::Nvs::new(0x9000, 0x6000, flash).unwrap();
|
||||
|
||||
let mut wm_settings = esp_hal_wifimanager::WmSettings::default();
|
||||
|
||||
@@ -22,8 +19,7 @@ pub async fn setup_wifi(
|
||||
wm_settings.wifi_conn_timeout = 30000;
|
||||
wm_settings.esp_reset_timeout = Some(300000); // 5min
|
||||
|
||||
let wifi_res =
|
||||
esp_hal_wifimanager::init_wm(wm_settings, spawner, Some(&espnvs), wifi, None).await;
|
||||
let wifi_res = esp_hal_wifimanager::init_wm(wm_settings, spawner, Some(&nvs), wifi, None).await;
|
||||
|
||||
log::info!("wifi_res: {wifi_res:?}");
|
||||
}
|
||||
@@ -31,27 +27,31 @@ pub async fn setup_wifi(
|
||||
#[cfg(feature = "wokwi")]
|
||||
pub async fn setup_wifi(
|
||||
wifi: esp_hal::peripherals::WIFI<'static>,
|
||||
nvs: Arc<Mutex<Nvs>>,
|
||||
flash: esp_hal::peripherals::FLASH<'static>,
|
||||
spawner: &Spawner,
|
||||
) {
|
||||
log::info!("Wokwi mode active: pre-seeding WiFi Manager with Wokwi credentials");
|
||||
|
||||
use esp_nvs::Key;
|
||||
const WIFIMANAGER_NAMESPACE: Key = Key::from_str("wifimanager");
|
||||
const WIFIMANAGER_NVS_KEY: Key = Key::from_str("WIFI_SETUP");
|
||||
// Preload connection data so init_wm can connect immediately without AP setup.
|
||||
let nvs = match esp_hal_wifimanager::Nvs::new(0x9000, 0x6000, flash) {
|
||||
Ok(nvs) => nvs,
|
||||
Err(e) => {
|
||||
log::error!("Failed to initialize NVS for Wokwi: {e:?}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
if let Err(e) = nvs.lock().await.set(
|
||||
&WIFIMANAGER_NAMESPACE,
|
||||
&WIFIMANAGER_NVS_KEY,
|
||||
if let Err(e) = nvs
|
||||
.set(
|
||||
esp_hal_wifimanager::WIFI_NVS_KEY,
|
||||
"{\"ssid\":\"Wokwi-GUEST\",\"psk\":\"\",\"data\":{}}",
|
||||
) {
|
||||
)
|
||||
.await
|
||||
{
|
||||
log::error!("Failed to store Wokwi WiFi config in NVS: {e:?}");
|
||||
return;
|
||||
}
|
||||
|
||||
// Preload connection data so init_wm can connect immediately without AP setup.
|
||||
let nvs = esp_hal_wifimanager::Nvs::new_from_nvs(nvs, 0, 0);
|
||||
|
||||
let mut wm_settings = esp_hal_wifimanager::WmSettings::default();
|
||||
|
||||
// Wokwi simulation uses a default open network called "Wokwi-GUEST"
|
||||
|
||||
@@ -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,7 +0,0 @@
|
||||
use esp_storage::FlashStorage;
|
||||
|
||||
pub type Nvs = esp_nvs::Nvs<FlashStorage<'static>>;
|
||||
|
||||
pub mod cardstore;
|
||||
pub mod settings;
|
||||
pub mod store;
|
||||
@@ -1,303 +0,0 @@
|
||||
use crate::card::model::RawCard;
|
||||
use crate::peripherals::Mutex;
|
||||
use crate::peripherals::storage::Nvs;
|
||||
use alloc::sync::Arc;
|
||||
use alloc::vec::Vec;
|
||||
use binary_serde::{BinarySerde, DeserializeError, Endianness};
|
||||
use core::error::Error;
|
||||
use core::fmt::Display;
|
||||
use esp_nvs::Key;
|
||||
|
||||
const NVS_NAMESPACE_CARDSTORE: Key = Key::from_str("CARDSTORE");
|
||||
const NVS_NAMESPACE_CARDSTORE_METADATA: Key = Key::from_str("CSMETA");
|
||||
const NVS_NAMESPACE_CARDSTORE_CARDS: Key = Key::from_str("CSCARDS");
|
||||
|
||||
const NVS_CARDSTORE_INITIALIZED_KEY: Key = Key::from_str("INITIALIZED");
|
||||
const NVS_CARDSTORE_CARDCOUNT_KEY: Key = Key::from_str("CARDCOUNT");
|
||||
|
||||
const NVS_CARDSTORE_DUMMY_KEY: Key = Key::from_str("DUMMY");
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum CardStoreError {
|
||||
Store(esp_nvs::error::Error),
|
||||
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<esp_nvs::error::Error> for CardStoreError {
|
||||
fn from(error: esp_nvs::error::Error) -> CardStoreError {
|
||||
CardStoreError::Store(error)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<DeserializeError> for CardStoreError {
|
||||
fn from(error: DeserializeError) -> CardStoreError {
|
||||
CardStoreError::CorruptedEntry(error)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, BinarySerde, PartialEq, Eq, Clone)]
|
||||
pub struct CardStoreMetaData {
|
||||
pub creation_date: u64,
|
||||
pub last_read_date: u64,
|
||||
|
||||
// how often a card has been read by nfc
|
||||
pub read_count: u32,
|
||||
}
|
||||
|
||||
impl CardStoreMetaData {
|
||||
fn new(creation_date: u64) -> Self {
|
||||
Self {
|
||||
creation_date: creation_date,
|
||||
last_read_date: creation_date,
|
||||
read_count: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct CardStore {
|
||||
nvs: Arc<Mutex<Nvs>>,
|
||||
}
|
||||
|
||||
impl CardStore {
|
||||
pub async fn new(nvs: Arc<Mutex<Nvs>>) -> Result<Self, CardStoreError> {
|
||||
if !Self::is_initialized(&nvs).await? {
|
||||
log::info!("CardStore has not been initialized");
|
||||
Self::initialize(&nvs).await?;
|
||||
}
|
||||
|
||||
log::info!("CardStore has been initialized");
|
||||
let card_count = nvs
|
||||
.lock()
|
||||
.await
|
||||
.get::<u32>(&NVS_NAMESPACE_CARDSTORE, &NVS_CARDSTORE_CARDCOUNT_KEY)?;
|
||||
log::info!("Cards stored in flash: {card_count}");
|
||||
|
||||
Ok(Self { nvs })
|
||||
}
|
||||
|
||||
async fn is_initialized(nvs: &Mutex<Nvs>) -> Result<bool, CardStoreError> {
|
||||
log::info!("check initialization");
|
||||
let mut nvs_lock = nvs.lock().await;
|
||||
match nvs_lock.get::<bool>(&NVS_NAMESPACE_CARDSTORE, &NVS_CARDSTORE_INITIALIZED_KEY) {
|
||||
Ok(initialized) => {
|
||||
log::debug!("initialization_check: initialized {initialized:?}");
|
||||
return Ok(true);
|
||||
}
|
||||
Err(esp_nvs::error::Error::NamespaceNotFound) => {
|
||||
log::debug!("initialization_check: error: namespace not found");
|
||||
return Ok(false);
|
||||
}
|
||||
Err(esp_nvs::error::Error::KeyNotFound) => {
|
||||
log::debug!("initialization_check: error: key not found");
|
||||
return Ok(false);
|
||||
}
|
||||
Err(error) => return Err(error.into()),
|
||||
};
|
||||
}
|
||||
|
||||
// initializing cardstore with 0 cards, so that all namespaces exist and there
|
||||
// are only keynotfound errors in the future
|
||||
async fn initialize(nvs: &Mutex<Nvs>) -> Result<(), CardStoreError> {
|
||||
log::info!("initializing card store");
|
||||
|
||||
Self::delete_all_cards(nvs).await?;
|
||||
|
||||
let mut nvs_lock = nvs.lock().await;
|
||||
|
||||
log::debug!("initialization: write card count");
|
||||
// initialize card count
|
||||
nvs_lock.set::<u32>(&NVS_NAMESPACE_CARDSTORE, &NVS_CARDSTORE_CARDCOUNT_KEY, 0)?;
|
||||
|
||||
// initialize card namespace
|
||||
let dummy_card = RawCard::default();
|
||||
let mut carddata_serialized: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE];
|
||||
dummy_card.binary_serialize(&mut carddata_serialized, Endianness::Little);
|
||||
|
||||
log::debug!("initialization: write dummy card");
|
||||
nvs_lock.set::<&[u8]>(
|
||||
&NVS_NAMESPACE_CARDSTORE_CARDS,
|
||||
&NVS_CARDSTORE_DUMMY_KEY,
|
||||
&carddata_serialized,
|
||||
)?;
|
||||
|
||||
// initialize metadata namespace
|
||||
log::debug!("initialization: write dummy metadata");
|
||||
let dummy_metadata = CardStoreMetaData::new(0);
|
||||
|
||||
let mut metadata_serialized: [u8; CardStoreMetaData::SERIALIZED_SIZE] =
|
||||
[0; CardStoreMetaData::SERIALIZED_SIZE];
|
||||
|
||||
dummy_metadata.binary_serialize(&mut metadata_serialized, Endianness::Little);
|
||||
|
||||
nvs_lock.set::<&[u8]>(
|
||||
&NVS_NAMESPACE_CARDSTORE_METADATA,
|
||||
&NVS_CARDSTORE_DUMMY_KEY,
|
||||
&metadata_serialized,
|
||||
)?;
|
||||
|
||||
// set initialized
|
||||
log::debug!("initialization: write initialized");
|
||||
nvs_lock.set::<bool>(
|
||||
&NVS_NAMESPACE_CARDSTORE,
|
||||
&NVS_CARDSTORE_INITIALIZED_KEY,
|
||||
true,
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn delete_all_cards(nvs: &Mutex<Nvs>) -> Result<(), CardStoreError> {
|
||||
log::info!("delete all cards");
|
||||
let mut nvs_lock = nvs.lock().await;
|
||||
let keys = nvs_lock.keys().collect::<Result<Vec<_>, _>>()?;
|
||||
for (namespace, key) in keys {
|
||||
if namespace == NVS_NAMESPACE_CARDSTORE || namespace == NVS_NAMESPACE_CARDSTORE_METADATA
|
||||
{
|
||||
nvs_lock.delete(&namespace, &key)?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn load_card_count(&self) -> Result<u32, CardStoreError> {
|
||||
log::debug!("load card count");
|
||||
let mut nvs_lock = self.nvs.lock().await;
|
||||
let result = nvs_lock.get::<u32>(&NVS_NAMESPACE_CARDSTORE, &NVS_CARDSTORE_CARDCOUNT_KEY)?;
|
||||
log::debug!("card count: {result}");
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
pub async fn load_raw_card(&self, uuid: u32) -> Result<Option<RawCard>, CardStoreError> {
|
||||
log::debug!("load raw card\nuuid: 0x{uuid:x}");
|
||||
let nvs_key = RawCard::nvs_key_from_uuid(uuid);
|
||||
let mut nvs_lock = self.nvs.lock().await;
|
||||
|
||||
let carddata_binary: Vec<u8> = match nvs_lock.get(&NVS_NAMESPACE_CARDSTORE_CARDS, &nvs_key)
|
||||
{
|
||||
Ok(carddata) => carddata,
|
||||
Err(esp_nvs::error::Error::KeyNotFound) => return Ok(None),
|
||||
Err(error) => return Err(error.into()),
|
||||
};
|
||||
|
||||
let carddata = RawCard::binary_deserialize(carddata_binary.as_ref(), Endianness::Little)?;
|
||||
Ok(Some(carddata))
|
||||
}
|
||||
|
||||
async fn write_card(&self, nvs_key: Key, card: &RawCard) -> Result<(), CardStoreError> {
|
||||
log::debug!("writing card...\nkey: {nvs_key:?}");
|
||||
let mut carddata_serialized: [u8; RawCard::SERIALIZED_SIZE] = [0; RawCard::SERIALIZED_SIZE];
|
||||
card.binary_serialize(&mut carddata_serialized, Endianness::Little);
|
||||
|
||||
self.nvs.lock().await.set::<&[u8]>(
|
||||
&NVS_NAMESPACE_CARDSTORE_CARDS,
|
||||
&nvs_key,
|
||||
&carddata_serialized,
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn update_card_metadata(
|
||||
&self,
|
||||
nvs_key: Key,
|
||||
timestamp: u64,
|
||||
) -> Result<bool, CardStoreError> {
|
||||
log::debug!("updating card metadata...\nkey: {nvs_key:?}\ntimestamp: {timestamp}");
|
||||
let mut is_new = false;
|
||||
// update metadata
|
||||
let metadata: CardStoreMetaData =
|
||||
if let Some(mut metadata) = self.load_card_metadata(nvs_key).await? {
|
||||
log::debug!("found existing card");
|
||||
metadata.last_read_date = timestamp;
|
||||
metadata.read_count += 1;
|
||||
metadata
|
||||
} else {
|
||||
log::debug!("new card");
|
||||
is_new = true;
|
||||
CardStoreMetaData::new(timestamp)
|
||||
};
|
||||
|
||||
let mut metadata_serialized: [u8; CardStoreMetaData::SERIALIZED_SIZE] =
|
||||
[0; CardStoreMetaData::SERIALIZED_SIZE];
|
||||
|
||||
metadata.binary_serialize(&mut metadata_serialized, Endianness::Little);
|
||||
|
||||
self.nvs.lock().await.set::<&[u8]>(
|
||||
&NVS_NAMESPACE_CARDSTORE_METADATA,
|
||||
&nvs_key,
|
||||
&metadata_serialized,
|
||||
)?;
|
||||
|
||||
Ok(is_new)
|
||||
}
|
||||
|
||||
async fn increment_card_count(&self) -> Result<(), CardStoreError> {
|
||||
log::debug!("incrementing card count");
|
||||
let card_count: u32 = self.load_card_count().await?;
|
||||
log::debug!("previous card count: {card_count}");
|
||||
self.nvs.lock().await.set::<u32>(
|
||||
&NVS_NAMESPACE_CARDSTORE,
|
||||
&NVS_CARDSTORE_CARDCOUNT_KEY,
|
||||
card_count + 1,
|
||||
)?;
|
||||
|
||||
let card_count = self
|
||||
.nvs
|
||||
.lock()
|
||||
.await
|
||||
.get::<u32>(&NVS_NAMESPACE_CARDSTORE, &NVS_CARDSTORE_CARDCOUNT_KEY)?;
|
||||
log::info!("Cards stored in flash: {card_count}");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn save_raw_card(
|
||||
&self,
|
||||
card: &RawCard,
|
||||
timestamp: u64,
|
||||
) -> Result<(), CardStoreError> {
|
||||
log::debug!("saving raw card\ntimestamp: {timestamp}");
|
||||
let nvs_key = card.get_nvs_key();
|
||||
|
||||
self.write_card(nvs_key, card).await?;
|
||||
|
||||
let new_card = self.update_card_metadata(nvs_key, timestamp).await?;
|
||||
|
||||
if new_card {
|
||||
self.increment_card_count().await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn load_card_metadata(
|
||||
&self,
|
||||
nvs_key: Key,
|
||||
) -> Result<Option<CardStoreMetaData>, CardStoreError> {
|
||||
log::debug!("load card meta data\nkey: {nvs_key:?}");
|
||||
let mut nvs_lock = self.nvs.lock().await;
|
||||
let metadata_binary: Vec<u8> =
|
||||
match nvs_lock.get(&NVS_NAMESPACE_CARDSTORE_METADATA, &nvs_key) {
|
||||
Ok(metadata) => metadata,
|
||||
Err(esp_nvs::error::Error::KeyNotFound) => return Ok(None),
|
||||
Err(error) => return Err(error.into()),
|
||||
};
|
||||
|
||||
let metadata =
|
||||
CardStoreMetaData::binary_deserialize(metadata_binary.as_ref(), Endianness::Little)?;
|
||||
|
||||
Ok(Some(metadata))
|
||||
}
|
||||
}
|
||||
@@ -1,112 +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 {
|
||||
write!(f, "FlashStoreError:\n{:?}", self.0)
|
||||
}
|
||||
}
|
||||
|
||||
const FLASH_ADDR: u32 = 0x200000;
|
||||
|
||||
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;
|
||||
let addr = FLASH_ADDR + offset;
|
||||
let to = FLASH_ADDR + offset + bytes.len() as u32;
|
||||
log::debug!("Erasing from 0x{addr:x} to 0x{to:x}");
|
||||
//lock.erase(addr, to)?;
|
||||
|
||||
log::debug!("Writing bytes...");
|
||||
lock.write(addr, 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,5 +0,0 @@
|
||||
use crate::peripherals::storage::cardstore::CardStore;
|
||||
|
||||
pub struct Store {
|
||||
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 error_view;
|
||||
pub mod flash_info_view;
|
||||
pub mod journal_view;
|
||||
pub mod main_menu;
|
||||
pub mod menu_item;
|
||||
|
||||
+10
-21
@@ -1,11 +1,7 @@
|
||||
use crate::display::sprite::render_sprite_onto_ili9341;
|
||||
use crate::drivers::primary_lcd::PrimaryDisplayError;
|
||||
use crate::navigation::navigation::NewState;
|
||||
use crate::navigation::outputs::Outputs;
|
||||
use crate::peripherals::Peripherals;
|
||||
use alloc::boxed::Box;
|
||||
use alloc::format;
|
||||
use core::error;
|
||||
use embedded_graphics::mono_font::MonoTextStyle;
|
||||
use embedded_graphics::mono_font::ascii::FONT_6X10;
|
||||
use embedded_graphics::pixelcolor::Rgb565;
|
||||
@@ -29,16 +25,10 @@ pub struct CardView {
|
||||
}
|
||||
|
||||
impl Navigable for CardView {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
async move {
|
||||
let display = &mut outputs.primary_display;
|
||||
display
|
||||
.clear(Rgb565::BLACK)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
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();
|
||||
@@ -52,60 +42,59 @@ impl Navigable for CardView {
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Type: {}", self.card.cardtype),
|
||||
Point::new(20, 250),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Event: {}", self.card.event),
|
||||
Point::new(20, 260),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("UUID: {}", self.card.uuid),
|
||||
Point::new(20, 270),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait1: {}", self.card.trait1),
|
||||
Point::new(20, 280),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait2: {}", self.card.trait2),
|
||||
Point::new(20, 290),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Trait3: {}", self.card.trait3),
|
||||
Point::new(20, 300),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
Text::new(
|
||||
&format!("Secret: {}", self.card.secret),
|
||||
Point::new(20, 310),
|
||||
style,
|
||||
)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
|
||||
let palette: Palette = self.card.cardtype.clone().into();
|
||||
render_sprite_onto_ili9341(display, self.card.sprite.data.as_slice(), &palette);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,101 +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::string::String;
|
||||
use alloc::string::ToString;
|
||||
use core::error;
|
||||
use embedded_graphics::{
|
||||
Drawable,
|
||||
mono_font::{MonoTextStyle, ascii::FONT_10X20},
|
||||
pixelcolor::Rgb565,
|
||||
prelude::*,
|
||||
primitives::Rectangle,
|
||||
text::Text,
|
||||
};
|
||||
|
||||
use embedded_text::{
|
||||
TextBox,
|
||||
alignment::HorizontalAlignment,
|
||||
style::{HeightMode, TextBoxStyleBuilder},
|
||||
};
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ErrorView {
|
||||
pub error: String,
|
||||
}
|
||||
|
||||
impl Navigable for ErrorView {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
async move {
|
||||
outputs
|
||||
.primary_display
|
||||
.clear(Rgb565::BLACK)
|
||||
.unwrap_or_else(|error| {
|
||||
panic!(
|
||||
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
|
||||
self.error
|
||||
)
|
||||
});
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::RED);
|
||||
let display_area = outputs.primary_display.bounding_box();
|
||||
Text::new(
|
||||
"Error",
|
||||
Point::new((display_area.size.width / 2 - 25) as i32, 30),
|
||||
style,
|
||||
)
|
||||
.draw(&mut outputs.primary_display)
|
||||
.unwrap_or_else(|error| {
|
||||
panic!(
|
||||
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
|
||||
self.error
|
||||
)
|
||||
});
|
||||
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
let textbox_style = TextBoxStyleBuilder::new()
|
||||
.height_mode(HeightMode::FitToText)
|
||||
.alignment(HorizontalAlignment::Center)
|
||||
.build();
|
||||
|
||||
let bounds = Rectangle::new(Point::new(0, 50), display_area.size);
|
||||
|
||||
TextBox::with_textbox_style(&self.error.to_string(), bounds, style, textbox_style)
|
||||
.draw(&mut outputs.primary_display)
|
||||
.unwrap_or_else(|error| {
|
||||
panic!(
|
||||
"Error: {error:?}\nDraw error while rendering ErrorView: {}",
|
||||
self.error
|
||||
)
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
|
||||
async move {
|
||||
let new_menu = View::Error(self.clone());
|
||||
match input {
|
||||
Action::Button(_) => NewState {
|
||||
replace_view: matches!(new_menu, View::FlashInfo(_)),
|
||||
view: new_menu,
|
||||
redraw: true,
|
||||
},
|
||||
Action::Timer => {
|
||||
// Skip timer inputs
|
||||
NewState {
|
||||
view: new_menu,
|
||||
replace_view: true,
|
||||
redraw: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,93 +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::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,
|
||||
};
|
||||
|
||||
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 {
|
||||
outputs
|
||||
.primary_display
|
||||
.clear(Rgb565::BLACK)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
let _style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
let textbox_style = TextBoxStyleBuilder::new()
|
||||
.height_mode(HeightMode::FitToText)
|
||||
.alignment(HorizontalAlignment::Justified)
|
||||
.build();
|
||||
|
||||
let display_area = outputs.primary_display.bounding_box();
|
||||
let bounds = Rectangle::new(Point::new(0, 30), display_area.size);
|
||||
|
||||
log::debug!("locking store");
|
||||
let store = peripherals.store.lock().await;
|
||||
|
||||
log::debug!("getting card count");
|
||||
let card_count = store.card_store.load_card_count().await?;
|
||||
|
||||
TextBox::with_textbox_style(
|
||||
&format!(
|
||||
"
|
||||
Card Count: {}\n
|
||||
",
|
||||
card_count
|
||||
),
|
||||
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 new_menu = View::FlashInfo(self.clone());
|
||||
match input {
|
||||
Action::Button(_) => NewState {
|
||||
replace_view: matches!(new_menu, View::FlashInfo(_)),
|
||||
view: new_menu,
|
||||
redraw: true,
|
||||
},
|
||||
Action::Timer => {
|
||||
// Skip timer inputs
|
||||
NewState {
|
||||
view: new_menu,
|
||||
replace_view: true,
|
||||
redraw: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 alloc::vec::Vec;
|
||||
@@ -26,17 +22,9 @@ pub struct JournalView {
|
||||
}
|
||||
|
||||
impl Navigable for JournalView {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
async move {
|
||||
outputs
|
||||
.primary_display
|
||||
.clear(Rgb565::BLACK)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
Ok(())
|
||||
outputs.primary_display.clear(Rgb565::BLACK).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
-20
@@ -1,8 +1,4 @@
|
||||
use crate::drivers::primary_lcd::PrimaryDisplayError;
|
||||
use crate::peripherals::Peripherals;
|
||||
use alloc::boxed::Box;
|
||||
use alloc::vec;
|
||||
use core::error;
|
||||
|
||||
use crate::card::model::Card;
|
||||
use crate::card::{decoder::split_nfc_hex, mock::*};
|
||||
@@ -26,26 +22,16 @@ pub struct MainMenu {
|
||||
}
|
||||
|
||||
impl Navigable for MainMenu {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
async move {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
let display = &mut outputs.primary_display;
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
menu_item::show(display, "Scan card", 0, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Last card", 1, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Journal", 2, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Settings", 3, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Scan card", 0, self.selected);
|
||||
menu_item::show(display, "Last card", 1, self.selected);
|
||||
menu_item::show(display, "Journal", 2, self.selected);
|
||||
menu_item::show(display, "Settings", 3, self.selected);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
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::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
|
||||
D: DrawTarget<Color = Rgb565>,
|
||||
D::Error: core::fmt::Debug,
|
||||
@@ -24,6 +24,6 @@ where
|
||||
style
|
||||
},
|
||||
)
|
||||
.draw(display)?;
|
||||
Ok(())
|
||||
.draw(display)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
+7
-18
@@ -1,11 +1,7 @@
|
||||
use crate::drivers::primary_lcd::PrimaryDisplayError;
|
||||
use crate::navigation::inputs::ButtonAction;
|
||||
use crate::navigation::navigation::CARD_DATA;
|
||||
use crate::navigation::navigation::NewState;
|
||||
use crate::navigation::outputs::Outputs;
|
||||
use crate::peripherals::Peripherals;
|
||||
use alloc::boxed::Box;
|
||||
use core::error;
|
||||
|
||||
use alloc::format;
|
||||
use embedded_graphics::Drawable;
|
||||
@@ -37,23 +33,16 @@ pub struct ScanMenu {
|
||||
}
|
||||
|
||||
impl Navigable for ScanMenu {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
async move {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
let display = &mut outputs.primary_display;
|
||||
let style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
|
||||
display
|
||||
.clear(Rgb565::BLACK)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
|
||||
let display_area = display.bounding_box();
|
||||
|
||||
Text::new("Scanning...", Point::new(20, 30), style)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.unwrap();
|
||||
|
||||
// Create styles used by the drawing operations.
|
||||
let arc_stroke = PrimitiveStyleBuilder::new()
|
||||
@@ -83,15 +72,15 @@ impl Navigable for ScanMenu {
|
||||
)
|
||||
.into_styled(arc_stroke)
|
||||
.draw(display)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
.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)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
Ok(())
|
||||
}
|
||||
.unwrap();
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
|
||||
|
||||
+11
-62
@@ -1,18 +1,11 @@
|
||||
use crate::drivers::primary_lcd::PrimaryDisplayError;
|
||||
use crate::navigation::navigation::{Action, Navigable, NewState};
|
||||
use crate::navigation::outputs::Outputs;
|
||||
use crate::peripherals::Peripherals;
|
||||
use crate::views::{flash_info_view::FlashInfoView, menu_item, view::View};
|
||||
use alloc::boxed::Box;
|
||||
use core::error;
|
||||
|
||||
use crate::navigation::inputs::ButtonAction;
|
||||
use crate::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: i32 = 3;
|
||||
pub const MAX_SELECTED: i8 = 2;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct SettingsMenu {
|
||||
@@ -20,65 +13,21 @@ pub struct SettingsMenu {
|
||||
}
|
||||
|
||||
impl Navigable for SettingsMenu {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
_: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
async move {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
let display = &mut outputs.primary_display;
|
||||
display
|
||||
.clear(Rgb565::BLACK)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "System Inforation", 0, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Wifi Information", 1, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
menu_item::show(display, "Flash Information", 2, self.selected)
|
||||
.map_err(PrimaryDisplayError::from)?;
|
||||
Ok(())
|
||||
}
|
||||
display.clear(Rgb565::BLACK).unwrap();
|
||||
menu_item::show(display, "System Inforation", 0, self.selected);
|
||||
menu_item::show(display, "Wifi Information", 1, self.selected);
|
||||
|
||||
core::future::ready(())
|
||||
}
|
||||
|
||||
fn handle_input(&self, input: Action) -> impl core::future::Future<Output = NewState> + Send {
|
||||
async move {
|
||||
let Action::Button(input) = input else {
|
||||
// Skip timer inputs
|
||||
return NewState {
|
||||
view: View::Settings(self.clone()),
|
||||
replace_view: true,
|
||||
redraw: false,
|
||||
};
|
||||
};
|
||||
|
||||
let new_menu = match input {
|
||||
ButtonAction::Up => {
|
||||
let new_selected = if (self.selected - 1) < 0 {
|
||||
MAX_SELECTED - 1
|
||||
} else {
|
||||
self.selected - 1
|
||||
};
|
||||
View::Settings(SettingsMenu {
|
||||
selected: new_selected,
|
||||
})
|
||||
}
|
||||
ButtonAction::Down => {
|
||||
let new_selected = self.selected.wrapping_add(1) % MAX_SELECTED;
|
||||
View::Settings(SettingsMenu {
|
||||
selected: new_selected,
|
||||
})
|
||||
}
|
||||
ButtonAction::Ok => match self.selected {
|
||||
2 => View::FlashInfo(FlashInfoView {}),
|
||||
_ => View::Settings(self.clone()),
|
||||
},
|
||||
_ => View::Settings(self.clone()),
|
||||
};
|
||||
|
||||
NewState {
|
||||
replace_view: matches!(new_menu, View::Settings(_)),
|
||||
view: new_menu,
|
||||
redraw: true,
|
||||
view: View::Settings(SettingsMenu { selected: 0 }),
|
||||
replace_view: true,
|
||||
redraw: !matches!(input, Action::Timer),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-23
@@ -1,43 +1,30 @@
|
||||
use crate::navigation::outputs::Outputs;
|
||||
use crate::peripherals::Peripherals;
|
||||
use crate::views::card_view::CardView;
|
||||
use crate::views::{
|
||||
error_view::ErrorView, flash_info_view::FlashInfoView, journal_view::JournalView,
|
||||
main_menu::MainMenu, scan_menu::ScanMenu, settings_menu::SettingsMenu,
|
||||
journal_view::JournalView, main_menu::MainMenu, scan_menu::ScanMenu,
|
||||
settings_menu::SettingsMenu,
|
||||
};
|
||||
use alloc::boxed::Box;
|
||||
use core::error;
|
||||
|
||||
use crate::navigation::navigation::{Navigable, NewState};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum View {
|
||||
Error(ErrorView),
|
||||
Main(MainMenu),
|
||||
Scan(ScanMenu),
|
||||
Settings(SettingsMenu),
|
||||
Journal(JournalView),
|
||||
Card(CardView),
|
||||
FlashInfo(FlashInfoView),
|
||||
}
|
||||
|
||||
impl Navigable for View {
|
||||
fn display(
|
||||
&self,
|
||||
outputs: &mut Outputs,
|
||||
peripherals: &Peripherals,
|
||||
) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
|
||||
fn display(&self, outputs: &mut Outputs) -> impl core::future::Future<Output = ()> + Send {
|
||||
async move {
|
||||
match self {
|
||||
View::Error(error_view) => error_view.display(outputs, peripherals).await,
|
||||
View::Main(main_menu) => main_menu.display(outputs, peripherals).await,
|
||||
View::Scan(scan_menu) => scan_menu.display(outputs, peripherals).await,
|
||||
View::Settings(settings_menu) => settings_menu.display(outputs, peripherals).await,
|
||||
View::Journal(journal_view) => journal_view.display(outputs, peripherals).await,
|
||||
View::Card(card_view) => card_view.display(outputs, peripherals).await,
|
||||
View::FlashInfo(flash_info_view) => {
|
||||
flash_info_view.display(outputs, peripherals).await
|
||||
}
|
||||
View::Main(main_menu) => main_menu.display(outputs).await,
|
||||
View::Scan(scan_menu) => scan_menu.display(outputs).await,
|
||||
View::Settings(settings_menu) => settings_menu.display(outputs).await,
|
||||
View::Journal(journal_view) => journal_view.display(outputs).await,
|
||||
View::Card(card_view) => card_view.display(outputs).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,13 +35,11 @@ impl Navigable for View {
|
||||
) -> impl core::future::Future<Output = NewState> + Send {
|
||||
async move {
|
||||
match self {
|
||||
View::Error(error_view) => error_view.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::Settings(settings_menu) => settings_menu.handle_input(input).await,
|
||||
View::Journal(journal_view) => journal_view.handle_input(input).await,
|
||||
View::Card(card_view) => card_view.handle_input(input).await,
|
||||
View::FlashInfo(flash_info_view) => flash_info_view.handle_input(input).await,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,3 @@ version = 1
|
||||
gdbServerPort = 3333
|
||||
elf = "target/xtensa-esp32s3-none-elf/debug/creaturedex"
|
||||
firmware = "target/xtensa-esp32s3-none-elf/debug/creaturedex"
|
||||
|
||||
[[chip]]
|
||||
name = 'ch1115'
|
||||
binary = 'wokwi/ch1115.chip.wasm'
|
||||
@@ -1,36 +0,0 @@
|
||||
.PHONY: all auto native docker clean
|
||||
|
||||
# Configuration
|
||||
SRC = ch1115.chip.c
|
||||
OUT = ch1115.chip.wasm
|
||||
|
||||
# Check if wokwi-cli exists in PATH
|
||||
WOKWI_CLI := $(shell command -v wokwi-cli 2> /dev/null)
|
||||
|
||||
HOST_UID := $(shell id -u)
|
||||
HOST_GID := $(shell id -g)
|
||||
|
||||
# Default target runs the auto-detection
|
||||
all: auto
|
||||
|
||||
auto:
|
||||
ifeq ($(WOKWI_CLI),)
|
||||
@echo "wokwi-cli not found in PATH. Falling back to Docker build..."
|
||||
$(MAKE) docker
|
||||
else
|
||||
@echo "Found wokwi-cli at $(WOKWI_CLI). Using native build..."
|
||||
$(MAKE) native
|
||||
endif
|
||||
|
||||
native:
|
||||
wokwi-cli chip compile $(SRC) -o $(OUT)
|
||||
|
||||
docker:
|
||||
docker run --rm -v $(CURDIR):/workspace -w /workspace ubuntu:latest \
|
||||
bash -c "apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && \
|
||||
curl -L https://wokwi.com/ci/install.sh | sh && \
|
||||
~/.wokwi/bin/wokwi-cli chip compile $(SRC) -o $(OUT) && \
|
||||
chown $(HOST_UID):$(HOST_GID) $(OUT)"
|
||||
|
||||
clean:
|
||||
rm -f $(OUT)
|
||||
@@ -1,86 +0,0 @@
|
||||
#include "wokwi-api.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
typedef struct {
|
||||
pin_t cs, dc, res;
|
||||
spi_dev_t spi;
|
||||
buffer_t fb;
|
||||
uint32_t width, height;
|
||||
uint8_t spi_buffer[1];
|
||||
uint8_t page;
|
||||
uint8_t col;
|
||||
} chip_state_t;
|
||||
|
||||
// Forward declarations
|
||||
static void on_cs_change(void *user_data, pin_t pin, uint32_t value);
|
||||
static void chip_spi_done(void *user_data, uint8_t *buffer, uint32_t count);
|
||||
|
||||
void chip_init(void) {
|
||||
printf("Initing CH1115 chip\n");
|
||||
fflush(stdout);
|
||||
|
||||
chip_state_t *chip = malloc(sizeof(chip_state_t));
|
||||
chip->fb = framebuffer_init(&chip->width, &chip->height);
|
||||
|
||||
chip->cs = pin_init("CS", INPUT_PULLUP);
|
||||
chip->dc = pin_init("DC", INPUT);
|
||||
chip->res = pin_init("RES", INPUT_PULLUP);
|
||||
|
||||
const spi_config_t spi_cfg = {
|
||||
.sck = pin_init("SCL", INPUT),
|
||||
.mosi = pin_init("SDA", INPUT),
|
||||
.miso = NO_PIN,
|
||||
.mode = 0,
|
||||
.done = chip_spi_done,
|
||||
.user_data = chip,
|
||||
};
|
||||
chip->spi = spi_init(&spi_cfg);
|
||||
|
||||
const pin_watch_config_t cs_watch = {
|
||||
.edge = BOTH,
|
||||
.pin_change = on_cs_change,
|
||||
.user_data = chip,
|
||||
};
|
||||
pin_watch(chip->cs, &cs_watch);
|
||||
}
|
||||
|
||||
static void on_cs_change(void *user_data, pin_t pin, uint32_t value) {
|
||||
chip_state_t *chip = (chip_state_t*)user_data;
|
||||
if (value == LOW) {
|
||||
// Start receiving 1 byte at a time
|
||||
spi_start(chip->spi, chip->spi_buffer, 1);
|
||||
} else {
|
||||
spi_stop(chip->spi);
|
||||
}
|
||||
}
|
||||
|
||||
static void chip_spi_done(void *user_data, uint8_t *buffer, uint32_t count) {
|
||||
chip_state_t *chip = (chip_state_t*)user_data;
|
||||
if (!count) return;
|
||||
|
||||
uint8_t val = buffer[0];
|
||||
bool is_data = pin_read(chip->dc) == HIGH;
|
||||
|
||||
if (is_data) {
|
||||
// Write 8 vertical pixels to the Wokwi RGBA Framebuffer
|
||||
for (int i = 0; i < 8; i++) {
|
||||
// 0xFFFFFFFF = White, 0x000000FF = Black
|
||||
uint32_t color = (val & (1 << i)) ? 0xFFFFFFFF : 0x000000FF;
|
||||
uint32_t y = (chip->page * 8) + i;
|
||||
uint32_t offset = (y * chip->width + chip->col) * 4;
|
||||
buffer_write(chip->fb, offset, &color, 4);
|
||||
}
|
||||
chip->col++; // Auto-increment column
|
||||
} else {
|
||||
// CH1115 Core Commands
|
||||
if ((val & 0xB0) == 0xB0) chip->page = val & 0x0F; // Set Page Start
|
||||
else if ((val & 0xF0) == 0x00) chip->col = (chip->col & 0xF0) | (val & 0x0F); // Lower Col
|
||||
else if ((val & 0xF0) == 0x10) chip->col = (chip->col & 0x0F) | ((val & 0x0F) << 4); // Upper Col
|
||||
}
|
||||
|
||||
// Continue receiving if CS is still active
|
||||
if (pin_read(chip->cs) == LOW) {
|
||||
spi_start(chip->spi, chip->spi_buffer, 1);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"name": "CH1115 OLED",
|
||||
"author": "ede1998",
|
||||
"pins": ["VCC", "GND", "CS", "RES", "DC", "SCL", "SDA"],
|
||||
"display": {
|
||||
"width": 128,
|
||||
"height": 64
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user