From 009f6cbb2e7f0e03b610d62212b73d3e179ef1f3 Mon Sep 17 00:00:00 2001 From: Djeeberjr Date: Mon, 27 Oct 2025 13:56:13 +0100 Subject: [PATCH] changed to new ESP libs WIP --- Cargo.lock | 924 ++++++++++++++++++++++------------------ Cargo.toml | 74 ++-- src/feedback.rs | 295 +++++-------- src/init/hardware.rs | 61 ++- src/init/network.rs | 16 +- src/init/wifi.rs | 46 +- src/main.rs | 21 +- src/webserver/api.rs | 3 +- src/webserver/assets.rs | 7 +- src/webserver/mod.rs | 4 +- 10 files changed, 706 insertions(+), 745 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5bd03f4..e55fb72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,15 +4,9 @@ version = 4 [[package]] name = "allocator-api2" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78200ac3468a57d333cd0ea5dd398e25111194dcacd49208afca95c629a6311d" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d" [[package]] name = "android_system_properties" @@ -25,9 +19,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "autocfg" @@ -36,13 +30,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "basic-toml" -version = "0.1.10" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba62675e8242a4c4e806d12f11d136e626e6c8361d6b829310732241652a178a" -dependencies = [ - "serde", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitfield" @@ -52,22 +43,22 @@ checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" [[package]] name = "bitfield" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1bcd90f88eabbf0cadbfb87a45bceeaebcd3b4bc9e43da379cd2ef0162590d" +checksum = "6bf79f42d21f18b5926a959280215903e659760da994835d27c3a0c5ff4f898f" dependencies = [ "bitfield-macros", ] [[package]] name = "bitfield-macros" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3787a07661997bfc05dd3431e379c0188573f78857080cf682e1393ab8e4d64c" +checksum = "6115af052c7914c0cbb97195e5c72cb61c511527250074f5c041d1048b0d8b16" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -78,9 +69,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bleps" @@ -91,8 +82,8 @@ dependencies = [ "bleps-dedup", "bleps-macros", "critical-section", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io-async 0.6.1", "futures", "log", "rand_core 0.6.4", @@ -103,11 +94,11 @@ name = "bleps-dedup" version = "0.1.0" source = "git+https://github.com/bjoernQ/bleps?rev=a5148d8ae679e021b78f53fd33afb8bb35d0b62e#a5148d8ae679e021b78f53fd33afb8bb35d0b62e" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -139,9 +130,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.1" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" [[package]] name = "byteorder" @@ -151,31 +142,37 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.31" +version = "1.2.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" +checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "num-traits", "windows-link", ] +[[package]] +name = "const-default" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa" + [[package]] name = "const-sha1" version = "0.3.0" @@ -210,8 +207,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -225,7 +232,20 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 2.0.108", ] [[package]] @@ -234,9 +254,20 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", "quote", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", + "quote", + "syn 2.0.108", ] [[package]] @@ -247,7 +278,7 @@ checksum = "6178a82cf56c836a3ba61a7935cdb1c49bfaa6fa4327cd5bf554a503087de26b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -270,16 +301,16 @@ dependencies = [ "mime_guess", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "document-features" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" dependencies = [ - "litrs 0.4.2", + "litrs 1.0.0", ] [[package]] @@ -288,7 +319,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06092da010fc293e78440557ff06ec633e06204d93a11e120c69be9a40745931" dependencies = [ - "bitfield 0.19.1", + "bitfield 0.19.3", "cfg-if", "chrono", "embedded-hal 1.0.0", @@ -307,7 +338,7 @@ dependencies = [ "edge-raw", "embassy-futures", "embassy-time 0.4.0", - "heapless", + "heapless 0.8.0", "log", "num_enum", "rand_core 0.6.4", @@ -320,7 +351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac19c3edcdad839c71cb919cd09a632d9915d630760b37f0b74290188c08f248" dependencies = [ "embassy-time 0.4.0", - "embedded-io-async", + "embedded-io-async 0.6.1", ] [[package]] @@ -332,8 +363,8 @@ dependencies = [ "edge-nal", "embassy-futures", "embassy-net", - "embedded-io-async", - "heapless", + "embedded-io-async 0.6.1", + "heapless 0.8.0", "log", ] @@ -345,27 +376,9 @@ checksum = "6207c84e9bc8df8ef3c155196df290f2a51f010bd60c2e78366e51979988bdb5" [[package]] name = "embassy-embedded-hal" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c62a3bf127e03832fb97d8b01a058775e617653bc89e2a12c256485a7fb54c1" -dependencies = [ - "embassy-embedded-hal 0.4.0", - "embassy-futures", - "embassy-sync 0.6.2", - "embassy-time 0.4.0", - "embedded-hal 0.2.7", - "embedded-hal 1.0.0", - "embedded-hal-async", - "embedded-storage", - "embedded-storage-async", - "nb 1.1.0", -] - -[[package]] -name = "embassy-embedded-hal" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1611b7a7ab5d1fbed84c338df26d56fd9bded58006ebb029075112ed2c5e039" +checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" dependencies = [ "embassy-futures", "embassy-hal-internal", @@ -380,27 +393,34 @@ dependencies = [ [[package]] name = "embassy-executor" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" +checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" dependencies = [ "critical-section", "document-features", "embassy-executor-macros", + "embassy-executor-timer-queue", ] [[package]] name = "embassy-executor-macros" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" +checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] +[[package]] +name = "embassy-executor-timer-queue" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" + [[package]] name = "embassy-futures" version = "0.1.2" @@ -429,9 +449,9 @@ dependencies = [ "embassy-net-driver", "embassy-sync 0.7.2", "embassy-time 0.5.0", - "embedded-io-async", + "embedded-io-async 0.6.1", "embedded-nal-async", - "heapless", + "heapless 0.8.0", "managed", "smoltcp", ] @@ -450,10 +470,10 @@ checksum = "8d2c8cdff05a7a51ba0087489ea44b0b1d97a296ca6b1d6d1a33ea7423d34049" dependencies = [ "cfg-if", "critical-section", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-sink", "futures-util", - "heapless", + "heapless 0.8.0", ] [[package]] @@ -464,10 +484,10 @@ checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" dependencies = [ "cfg-if", "critical-section", - "embedded-io-async", + "embedded-io-async 0.6.1", "futures-core", "futures-sink", - "heapless", + "heapless 0.8.0", "log", ] @@ -481,7 +501,6 @@ dependencies = [ "critical-section", "document-features", "embassy-time-driver", - "embassy-time-queue-utils", "embedded-hal 0.2.7", "embedded-hal 1.0.0", "embedded-hal-async", @@ -515,12 +534,12 @@ dependencies = [ [[package]] name = "embassy-time-queue-utils" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83" +checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" dependencies = [ - "embassy-executor", - "heapless", + "embassy-executor-timer-queue", + "heapless 0.8.0", ] [[package]] @@ -573,13 +592,28 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" +[[package]] +name = "embedded-io" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7" + [[package]] name = "embedded-io-async" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" dependencies = [ - "embedded-io", + "embedded-io 0.6.1", +] + +[[package]] +name = "embedded-io-async" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0" +dependencies = [ + "embedded-io 0.7.1", ] [[package]] @@ -597,7 +631,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76959917cd2b86f40a98c28dd5624eddd1fa69d746241c8257eac428d83cb211" dependencies = [ - "embedded-io-async", + "embedded-io-async 0.6.1", "embedded-nal", ] @@ -609,7 +643,7 @@ checksum = "a1132a10f327a9dff9d0629124e8b26cb2b3a930ab3dfedbadd295c107955e92" dependencies = [ "byteorder", "embedded-hal 1.0.0", - "heapless", + "heapless 0.8.0", "log", ] @@ -630,23 +664,23 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.7" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee17054f550fd7400e1906e2f9356c7672643ed34008a9e8abe147ccd2d821" +checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d07902c93376f1e96c34abc4d507c0911df3816cef50b01f5a2ff3ad8c370d" +checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -657,16 +691,18 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "esp-alloc" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e95f1de57ce5a6600368f3d3c931b0dfe00501661e96f5ab83bc5cdee031784" +checksum = "641e43d6a60244429117ef2fa7a47182120c7561336ea01f6fb08d634f46bae1" dependencies = [ "allocator-api2", "cfg-if", - "critical-section", "document-features", "enumset", + "esp-config 0.6.0", + "esp-sync", "linked_list_allocator", + "rlsf", ] [[package]] @@ -696,45 +732,48 @@ dependencies = [ [[package]] name = "esp-config" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd4a8db4b72794637a25944bc8d361c3cc271d4f03987ce8741312b6b61529c" +checksum = "289fde78fff1ff500e81efbdf958b1dae1614eacc61cc5560b0a3e03a25f266e" dependencies = [ "document-features", "esp-metadata-generated", - "evalexpr", "serde", "serde_yaml", + "somni-expr", ] [[package]] name = "esp-hal" -version = "1.0.0-rc.0" +version = "1.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3887eda2917deef3d99e7a5c324f9190714e99055361ad36890dffd0a995b49" +checksum = "f75242d788e67fc7ce51308019c0ff5d5103f989721577bb566b02710ef1ba79" dependencies = [ - "bitfield 0.19.1", - "bitflags 2.9.1", + "bitfield 0.19.3", + "bitflags 2.10.0", "bytemuck", "cfg-if", "critical-section", "delegate", "digest", "document-features", - "embassy-embedded-hal 0.3.2", + "embassy-embedded-hal", "embassy-futures", - "embassy-sync 0.6.2", + "embassy-sync 0.7.2", "embedded-can", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io 0.7.1", + "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "enumset", - "esp-config 0.5.0", + "esp-config 0.6.0", "esp-hal-procmacros", "esp-metadata-generated", "esp-riscv-rt", "esp-rom-sys", + "esp-sync", "esp32", "esp32c2", "esp32c3", @@ -751,152 +790,178 @@ dependencies = [ "rand_core 0.6.4", "rand_core 0.9.3", "riscv", - "serde", "strum", "ufmt-write", "xtensa-lx", "xtensa-lx-rt", ] -[[package]] -name = "esp-hal-embassy" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d000d94064c485f86adc6b02b541e2f072e03321b4f03d4303b7ff3062c7e692" -dependencies = [ - "cfg-if", - "critical-section", - "document-features", - "embassy-executor", - "embassy-sync 0.6.2", - "embassy-time 0.4.0", - "embassy-time-driver", - "embassy-time-queue-utils", - "esp-config 0.5.0", - "esp-hal", - "esp-hal-procmacros", - "esp-metadata-generated", - "portable-atomic", - "static_cell", -] - [[package]] name = "esp-hal-procmacros" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbece384edaf0d1eabfa45afa96d910634d4158638ef983b2d419a8dec832246" +checksum = "9fd82a6506fb08d53a1086d165d92f085717aa9c59e67ac87a9e6f8acdcf6897" dependencies = [ "document-features", - "litrs 0.4.2", "object", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "termcolor", ] [[package]] name = "esp-hal-smartled" -version = "0.16.0" -source = "git+https://github.com/esp-rs/esp-hal-community.git?branch=main#bbe8484a013267132cd3fb4693606de2c8317a53" +version = "0.17.0" +source = "git+https://github.com/esp-rs/esp-hal-community.git?branch=main#ab4316534d90e3a12785907f043f6899faee0f20" dependencies = [ "document-features", "esp-hal", + "rgb", "smart-leds-trait", ] [[package]] -name = "esp-metadata" -version = "0.8.0" +name = "esp-metadata-generated" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fbc1d166be84c0750f121e95c8989ddebd7e7bdd86af3594a6cfb34f039650" -dependencies = [ - "anyhow", - "basic-toml", - "indexmap", - "proc-macro2", - "quote", - "serde", - "strum", -] +checksum = "b18b1787dd3adea642fb529dd83fe558a08ace365bbaede4643a8959992900f4" [[package]] -name = "esp-metadata-generated" +name = "esp-phy" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189d36b8c8a752bdebec67fd02a15ebb1432feea345553749bca7ce2393cc795" +checksum = "62199c3e50eefcf53b8f3c690946582a124f7137b45bd1b14eb4b90a3fec2dd7" dependencies = [ - "esp-metadata", + "cfg-if", + "document-features", + "esp-config 0.6.0", + "esp-hal", + "esp-metadata-generated", + "esp-sync", + "esp-wifi-sys", + "log", ] [[package]] name = "esp-println" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e3ab41e96093d7fd307e93bfc88bd646a8ff23036ebf809e116b18869f719" +checksum = "6dcd18cbb132db6eb30d7c96bd831c3b6916894210f4528321f69fa66178b331" dependencies = [ - "critical-section", "document-features", "esp-metadata-generated", + "esp-sync", "log", "portable-atomic", ] [[package]] -name = "esp-riscv-rt" -version = "0.12.0" +name = "esp-radio" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a00370dfcb0ccc01c6b2540076379c6efd6890a27f584de217c38e3239e19d5" -dependencies = [ - "document-features", - "riscv", - "riscv-rt-macros", -] - -[[package]] -name = "esp-rom-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "646aca2b30503b6c6f34250255fbd5887fd0c4104ea90802c1fea34f3035e7d6" -dependencies = [ - "cfg-if", - "document-features", - "esp-metadata-generated", -] - -[[package]] -name = "esp-wifi" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84908f2e95cb99a200cf448abafc416576338be590778a15d9224eee237f3210" +checksum = "d83744f57d19a7190a538ad42025da7f53940c3aca71cbcd92275095d671e254" dependencies = [ "allocator-api2", "cfg-if", - "critical-section", "document-features", "embassy-net-driver", - "embedded-io", - "embedded-io-async", + "embedded-io 0.6.1", + "embedded-io 0.7.1", + "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "enumset", "esp-alloc", - "esp-config 0.5.0", + "esp-config 0.6.0", "esp-hal", + "esp-hal-procmacros", "esp-metadata-generated", + "esp-phy", + "esp-radio-rtos-driver", + "esp-sync", "esp-wifi-sys", + "heapless 0.9.1", + "instability", "log", "num-derive", "num-traits", "portable-atomic", "portable_atomic_enum", - "rand_core 0.9.3", + "smoltcp", +] + +[[package]] +name = "esp-radio-rtos-driver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab031e544f6bc086c2d7aba89276e6a47ce6bb5614ae3c88a1c12a4ab4f8f25c" + +[[package]] +name = "esp-riscv-rt" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502744a5b1e7268d27fd2a4e56ad45efe42ead517d6c517a6961540de949b0ee" +dependencies = [ + "document-features", + "riscv", + "riscv-rt", +] + +[[package]] +name = "esp-rom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01bafc39f59d56610b38ed0f63b16abeb8b357b8f546507d0d6c50c1a494f530" +dependencies = [ + "cfg-if", + "document-features", + "esp-metadata-generated", +] + +[[package]] +name = "esp-rtos" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01dbf6e54315b6e05da3ad828c7da1ba98f541eb8b0c5d5d260b8eb3b64a8cd" +dependencies = [ + "allocator-api2", + "cfg-if", + "document-features", + "embassy-executor", + "embassy-sync 0.7.2", + "embassy-time-driver", + "embassy-time-queue-utils", + "esp-alloc", + "esp-config 0.6.0", + "esp-hal", + "esp-hal-procmacros", + "esp-metadata-generated", + "esp-radio-rtos-driver", + "esp-sync", + "portable-atomic", +] + +[[package]] +name = "esp-sync" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b977b028ae5959f0b2daf6602a1d751723b2d329c7251daf869ad382c8ed1543" +dependencies = [ + "cfg-if", + "document-features", + "embassy-sync 0.6.2", + "embassy-sync 0.7.2", + "esp-metadata-generated", + "riscv", + "xtensa-lx", ] [[package]] name = "esp-wifi-sys" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b5438361891c431970194a733415006fb3d00b6eb70b3dcb66fd58f04d9b39" +checksum = "89b6544f6f0cb86169d1f93ba2101a8d50358a040c5043676ed86b793e09b12c" dependencies = [ "anyhow", "log", @@ -904,9 +969,9 @@ dependencies = [ [[package]] name = "esp32" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7680f79e3a4770e59c2dc25b17dcd852921ee57ffae9a4c4806c9ca5001d54d" +checksum = "b76170a463d18f888a1ad258031901036fd827a9ef126733053ba5f8739fb0c8" dependencies = [ "critical-section", "vcell", @@ -914,9 +979,9 @@ dependencies = [ [[package]] name = "esp32c2" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1bcf86fca83543e0e95561cba27bbcc6b6e7adc5428f49187f5868bc0c3ed2" +checksum = "e62cf8932966b8d445b6f1832977b468178f0a84effb2e9fda89f60c24d45aa3" dependencies = [ "critical-section", "vcell", @@ -924,9 +989,9 @@ dependencies = [ [[package]] name = "esp32c3" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2c5a33d4377f974cbe8cadf8307f04f2c39755704cb09e81852c63ee4ac7b8" +checksum = "356af3771d0d6536c735bf71136594f4d1cbb506abf6e0c51a6639e9bf4e7988" dependencies = [ "critical-section", "vcell", @@ -934,9 +999,9 @@ dependencies = [ [[package]] name = "esp32c6" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca8fc81b7164df58b5e04aaac9e987459312e51903cca807317990293973a6e" +checksum = "8f5e511df672d79cd63365c92045135e01ba952b6bddd25b660baff5e1110f6b" dependencies = [ "critical-section", "vcell", @@ -944,9 +1009,9 @@ dependencies = [ [[package]] name = "esp32h2" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80171d08c17d8c63b53334c60ca654786a7593481531d19b639c4e5c76d276de" +checksum = "ed4a50bbd1380931e095e0973b9b12f782a9c481f2edf1f7c42e7eb4ff736d6d" dependencies = [ "critical-section", "vcell", @@ -954,9 +1019,9 @@ dependencies = [ [[package]] name = "esp32s2" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c90d347480fca91f4be3e94b576af9c6c7987795c58dc3c5a7c108b6b3966dc" +checksum = "98574d4c577fbe888fe3e6df7fc80d25a05624d9998f7d7de1500ae21fcca78f" dependencies = [ "critical-section", "vcell", @@ -964,19 +1029,19 @@ dependencies = [ [[package]] name = "esp32s3" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3769c56222c4548833f236c7009f1f8b3f2387af26366f6bd1cea456666a49d" +checksum = "1810d8ee4845ef87542af981e38eb80ab531d0ef1061e1486014ab7af74c337a" dependencies = [ "critical-section", "vcell", ] [[package]] -name = "evalexpr" -version = "12.0.2" +name = "find-msvc-tools" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a3229bec56a977f174b32fe7b8d89e8c79ebb4493d10ad763b6676dc2dc0c9" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" [[package]] name = "fnv" @@ -1070,20 +1135,20 @@ dependencies = [ "embassy-futures", "embassy-net", "embassy-sync 0.7.2", - "embassy-time 0.4.0", + "embassy-time 0.5.0", "embedded-hal 1.0.0", "embedded-hal-bus", - "embedded-io", - "embedded-io-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-sdmmc", "esp-alloc", "esp-bootloader-esp-idf", "esp-hal", - "esp-hal-embassy", "esp-hal-smartled", "esp-println", - "esp-wifi", - "heapless", + "esp-radio", + "esp-rtos", + "heapless 0.8.0", "log", "picoserve", "serde", @@ -1101,9 +1166,9 @@ checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", @@ -1120,9 +1185,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heapless" @@ -1135,6 +1200,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1edcd5a338e64688fbdcb7531a846cfd3476a54784dcb918a0844682bc7ada5" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.5.0" @@ -1143,9 +1218,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1173,20 +1248,22 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "2.10.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", - "serde", ] [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "instability" @@ -1194,11 +1271,11 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a" dependencies = [ - "darling", + "darling 0.20.11", "indoc", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1209,9 +1286,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -1219,9 +1296,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.174" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "linked_list_allocator" @@ -1240,18 +1317,15 @@ dependencies = [ [[package]] name = "litrs" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" -dependencies = [ - "proc-macro2", -] +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "managed" @@ -1269,7 +1343,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1308,9 +1382,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "mime" @@ -1351,7 +1425,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1365,9 +1439,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", "rustversion", @@ -1375,20 +1449,20 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] @@ -1412,9 +1486,9 @@ source = "git+https://github.com/sammhicks/picoserve.git?rev=400df53f61137e1bb28 dependencies = [ "const-sha1", "embassy-net", - "embassy-time 0.4.0", - "embedded-io-async", - "heapless", + "embassy-time 0.5.0", + "embedded-io-async 0.6.1", + "heapless 0.8.0", "log", "picoserve_derive", "ryu", @@ -1430,7 +1504,7 @@ source = "git+https://github.com/sammhicks/picoserve.git?rev=400df53f61137e1bb28 dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1469,14 +1543,14 @@ checksum = "a33fa6ec7f2047f572d49317cca19c87195de99c6e5b6ee492da701cfe02b053" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "proc-macro-crate" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ "toml_edit", ] @@ -1518,9 +1592,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -1531,26 +1605,20 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "679341d22c78c6c649893cbd6c3278dcbe9fc4faa62fea3a9296ae2b50c14625" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "memchr", "unicase", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] -[[package]] -name = "r0" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" - [[package]] name = "rand_core" version = "0.6.4" @@ -1574,9 +1642,9 @@ dependencies = [ [[package]] name = "riscv" -version = "0.12.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea8ff73d3720bdd0a97925f0bf79ad2744b6da8ff36be3840c48ac81191d7a7" +checksum = "b05cfa3f7b30c84536a9025150d44d26b8e1cc20ddf436448d74cd9591eefb25" dependencies = [ "critical-section", "embedded-hal 1.0.0", @@ -1587,13 +1655,13 @@ dependencies = [ [[package]] name = "riscv-macros" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f265be5d634272320a7de94cea15c22a3bfdd4eb42eb43edc528415f066a1f25" +checksum = "7d323d13972c1b104aa036bc692cd08b822c8bbf23d79a27c526095856499799" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] @@ -1603,21 +1671,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436" [[package]] -name = "riscv-rt-macros" -version = "0.4.0" +name = "riscv-rt" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc71814687c45ba4cd1e47a54e03a2dbc62ca3667098fbae9cc6b423956758fa" +checksum = "3d07b9f3a0eff773fc4df11f44ada4fa302e529bff4b7fe7e6a4b98a65ce9174" +dependencies = [ + "riscv", + "riscv-pac", + "riscv-rt-macros", + "riscv-target-parser", +] + +[[package]] +name = "riscv-rt-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c3138fdd8d128b2d81829842a3e0ce771b3712f7b6318ed1476b0695e7d330" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "riscv-target-parser" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1376b15f3ff160e9b1e8ea564ce427f2f6fcf77528cc0a8bf405cb476f9cea7" + +[[package]] +name = "rlsf" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222fb240c3286247ecdee6fa5341e7cdad0ffdf8e7e401d9937f2d58482a20bf" +dependencies = [ + "cfg-if", + "const-default", + "libc", + "svgbobdoc", ] [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1627,10 +1725,11 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1640,32 +1739,42 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b81787e655bd59cecadc91f7b6b8651330b2be6c33246039a65e5cd6f4e0828" dependencies = [ - "heapless", + "heapless 0.8.0", "ryu", "serde", ] [[package]] -name = "serde_derive" -version = "1.0.219" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1704,9 +1813,9 @@ dependencies = [ [[package]] name = "smart-leds-trait" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edeb89c73244414bb0568611690dd095b2358b3fda5bae65ad784806cca00157" +checksum = "a7f4441a131924d58da6b83a7ad765c460e64630cce504376c3a87a2558c487f" dependencies = [ "rgb", ] @@ -1720,15 +1829,30 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "cfg-if", - "heapless", + "heapless 0.8.0", "managed", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "somni-expr" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "3ed9b7648d5e8b2df6c5e49940c54bcdd2b4dd71eafc6e8f1c714eb4581b0f53" +dependencies = [ + "somni-parser", +] + +[[package]] +name = "somni-parser" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c" + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_cell" @@ -1763,7 +1887,20 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", +] + +[[package]] +name = "svgbobdoc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50" +dependencies = [ + "base64", + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-width", ] [[package]] @@ -1779,9 +1916,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.104" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -1799,46 +1936,59 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "toml_datetime" -version = "0.6.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] [[package]] name = "toml_edit" -version = "0.22.27" +version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ "indexmap", "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ "winnow", ] [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ufmt-write" @@ -1854,9 +2004,15 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -1866,9 +2022,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "uuid" -version = "1.17.0" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ "js-sys", "wasm-bindgen", @@ -1894,35 +2050,36 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1930,40 +2087,40 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys", ] [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -1974,160 +2131,95 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] [[package]] name = "windows-link" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets", + "windows-link", ] -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - [[package]] name = "winnow" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" dependencies = [ "memchr", ] [[package]] name = "xtensa-lx" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a564fffeb3cd773a524e8d8a5c66ca5e9739ea7450e36a3e6a54dd31f1e652f" +checksum = "e012d667b0aa6d2592ace8ef145a98bff3e76cca7a644f4181ecd7a916ed289b" dependencies = [ "critical-section", ] [[package]] name = "xtensa-lx-rt" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520a8fb0121eb6868f4f5ff383e262dc863f9042496724e01673a98a9b7e6c2b" +checksum = "8709f037fb123fe7ff146d2bce86f9dc0dfc53045c016bfd9d703317b6502845" dependencies = [ "document-features", - "r0", "xtensa-lx", "xtensa-lx-rt-proc-macros", ] [[package]] name = "xtensa-lx-rt-proc-macros" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a56a616147f5947ceb673790dd618d77b30e26e677f4a896df049d73059438" +checksum = "96fb42cd29c42f8744c74276e9f5bee7b06685bbe5b88df891516d72cb320450" dependencies = [ "proc-macro2", "quote", - "syn 2.0.104", + "syn 2.0.108", ] diff --git a/Cargo.toml b/Cargo.toml index 7ed32b2..fe87538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,64 +12,44 @@ bench = false [dependencies] esp-bootloader-esp-idf = "0.1.0" -embassy-net = { version = "0.7.0", features = [ - "dhcpv4", - "medium-ethernet", - "tcp", - "udp", -] } -embedded-hal = "=1.0.0" -embedded-io = "0.6.1" -embedded-io-async = "0.6.1" -esp-alloc = "0.8.0" -esp-hal = { version = "1.0.0-beta.1", features = ["esp32c6", "unstable"] } -smoltcp = { version = "0.12.0", default-features = false, features = [ - "medium-ethernet", - "multicast", - "proto-dhcpv4", - "proto-dns", - "proto-ipv4", - "socket-dns", - "socket-icmp", - "socket-raw", - "socket-tcp", - "socket-udp", -] } -# for more networking protocol support see https://crates.io/crates/edge-net -bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "a5148d8ae679e021b78f53fd33afb8bb35d0b62e", features = [ - "async", - "macros", -] } +esp-hal = { version = "1.0.0-rc.1", features = ["esp32c6", "unstable"] } +esp-alloc = "0.9.0" +esp-println = { version = "0.16.0", features = ["esp32c6", "log-04"] } +esp-radio = { version = "0.16.0", features = ["esp32c6","esp-alloc", "wifi", "log-04", "smoltcp","unstable"]} +esp-rtos = { version = "0.1.1", features = ["esp32c6", "embassy", "esp-radio", "esp-alloc"] } + critical-section = "1.2.0" -embassy-executor = { version = "0.7.0", features = ["nightly"] } -embassy-time = { version = "0.4.0", features = ["generic-queue-8"] } -esp-hal-embassy = { version = "0.9.0", features = ["esp32c6"] } -esp-wifi = { version = "0.15.0", features = [ - "wifi", - "builtin-scheduler", - "esp-alloc", - "esp32c6", - "log-04", -] } -heapless = { version = "0.8.0", default-features = false } -static_cell = { version = "2.1.0", features = ["nightly"] } -esp-println = { version = "0.15.0", features = ["esp32c6", "log-04"] } log = { version = "0.4" } +static_cell = { version = "2.1.1", features = ["nightly"] } +heapless = { version = "0.8.0", default-features = false } +chrono = { version = "0.4.41", default-features = false } + +embedded-hal = "1.0.0" +embedded-io = "0.7.1" +embedded-io-async = "0.7.0" +embassy-executor = { version = "0.9.0", features = [] } +embassy-time = { version = "0.5.0", features = [] } +embassy-futures = { version = "0.1.2", features = ["log"] } +embassy-sync = { version = "0.7.2", features = ["log"] } + +embassy-net = { version = "0.7.0", features = [ "dhcpv4", "medium-ethernet", "tcp", "udp" ] } +smoltcp = { version = "0.12.0", default-features = false, features = [ "medium-ethernet", "multicast", "proto-dhcpv4", "proto-dns", "proto-ipv4", "socket-dns", "socket-icmp", "socket-raw", "socket-tcp", "socket-udp" ] } +bleps = { git = "https://github.com/bjoernQ/bleps", package = "bleps", rev = "a5148d8ae679e021b78f53fd33afb8bb35d0b62e", features = [ "async", "macros" ] } edge-dhcp = { version = "0.6.0", features = ["log"] } edge-nal = "0.5.0" edge-nal-embassy = { version = "0.6.0", features = ["log"] } + picoserve = { git = "https://github.com/sammhicks/picoserve.git", rev = "400df53f61137e1bb2883ec610fc191bfe551a3a", features = ["embassy", "log", "json"] } -embassy-sync = { version = "0.7.0", features = ["log"] } -ds3231 = { version = "0.3.0", features = ["async", "temperature_f32"] } -chrono = { version = "0.4.41", default-features = false } dir-embed = "0.3.0" +serde = { version = "1.0.219", default-features = false, features = ["derive", "alloc"] } +serde_json = { version = "1.0.143", default-features = false, features = ["alloc"]} + +ds3231 = { version = "0.3.0", features = ["async", "temperature_f32"] } esp-hal-smartled = { git = "https://github.com/esp-rs/esp-hal-community.git", package = "esp-hal-smartled", branch = "main", features = ["esp32c6"]} smart-leds = "0.4.0" -serde = { version = "1.0.219", default-features = false, features = ["derive", "alloc"] } + embedded-sdmmc = "0.8.0" embedded-hal-bus = "0.3.0" -serde_json = { version = "1.0.143", default-features = false, features = ["alloc"]} -embassy-futures = { version = "0.1.2", features = ["log"] } [profile.dev] # Rust debug is too slow. diff --git a/src/feedback.rs b/src/feedback.rs index 28dc2b9..3da3a74 100644 --- a/src/feedback.rs +++ b/src/feedback.rs @@ -1,5 +1,5 @@ use embassy_time::{Duration, Timer}; -use esp_hal::{peripherals, rmt::ConstChannelAccess}; +use esp_hal::peripherals; use esp_hal_smartled::SmartLedsAdapterAsync; use log::debug; use smart_leds::SmartLedsWriteAsync; @@ -24,210 +24,107 @@ const LED_LEVEL: u8 = 255; #[embassy_executor::task] pub async fn feedback_task( - mut led: SmartLedsAdapterAsync< - ConstChannelAccess, - { init::hardware::LED_BUFFER_SIZE }, - >, + // mut led: SmartLedsAdapterAsync< + // ConstChannelAccess, + // { init::hardware::LED_BUFFER_SIZE }, + // >, buzzer: peripherals::GPIO21<'static>, ) { debug!("Starting feedback task"); let mut buzzer = init::hardware::setup_buzzer(buzzer); loop { let feedback_state = FEEDBACK_STATE.wait().await; - match feedback_state { - FeedbackState::Ack => { - led.write(brightness( - [GREEN; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - buzzer.set_high(); - Timer::after(Duration::from_millis(100)).await; - buzzer.set_low(); - Timer::after(Duration::from_millis(50)).await; - } - FeedbackState::Nack => { - led.write(brightness( - [YELLOW; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - buzzer.set_high(); - Timer::after(Duration::from_millis(100)).await; - buzzer.set_low(); - Timer::after(Duration::from_millis(100)).await; - buzzer.set_high(); - Timer::after(Duration::from_millis(100)).await; - buzzer.set_low(); - led.write(brightness( - [BLACK; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - } - FeedbackState::Error => { - led.write(brightness( - [RED; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - buzzer.set_high(); - Timer::after(Duration::from_millis(500)).await; - buzzer.set_low(); - Timer::after(Duration::from_millis(500)).await; - buzzer.set_high(); - Timer::after(Duration::from_millis(500)).await; - buzzer.set_low(); - } - FeedbackState::Startup => { - led.write(brightness( - [GREEN; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - buzzer.set_high(); - Timer::after(Duration::from_millis(10)).await; - buzzer.set_low(); - Timer::after(Duration::from_millis(10)).await; - buzzer.set_high(); - Timer::after(Duration::from_millis(10)).await; - buzzer.set_low(); - Timer::after(Duration::from_millis(50)).await; - buzzer.set_high(); - Timer::after(Duration::from_millis(100)).await; - buzzer.set_low(); - led.write(brightness( - [BLACK; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - } - FeedbackState::WIFI => { - led.write(brightness( - [BLUE; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - } - FeedbackState::Idle => { - led.write(brightness( - [GREEN; init::hardware::NUM_LEDS].into_iter(), - LED_LEVEL, - )) - .await - .unwrap(); - } - }; + // match feedback_state { + // FeedbackState::Ack => { + // led.write(brightness( + // [GREEN; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // buzzer.set_high(); + // Timer::after(Duration::from_millis(100)).await; + // buzzer.set_low(); + // Timer::after(Duration::from_millis(50)).await; + // } + // FeedbackState::Nack => { + // led.write(brightness( + // [YELLOW; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // buzzer.set_high(); + // Timer::after(Duration::from_millis(100)).await; + // buzzer.set_low(); + // Timer::after(Duration::from_millis(100)).await; + // buzzer.set_high(); + // Timer::after(Duration::from_millis(100)).await; + // buzzer.set_low(); + // led.write(brightness( + // [BLACK; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // } + // FeedbackState::Error => { + // led.write(brightness( + // [RED; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // buzzer.set_high(); + // Timer::after(Duration::from_millis(500)).await; + // buzzer.set_low(); + // Timer::after(Duration::from_millis(500)).await; + // buzzer.set_high(); + // Timer::after(Duration::from_millis(500)).await; + // buzzer.set_low(); + // } + // FeedbackState::Startup => { + // led.write(brightness( + // [GREEN; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // buzzer.set_high(); + // Timer::after(Duration::from_millis(10)).await; + // buzzer.set_low(); + // Timer::after(Duration::from_millis(10)).await; + // buzzer.set_high(); + // Timer::after(Duration::from_millis(10)).await; + // buzzer.set_low(); + // Timer::after(Duration::from_millis(50)).await; + // buzzer.set_high(); + // Timer::after(Duration::from_millis(100)).await; + // buzzer.set_low(); + // led.write(brightness( + // [BLACK; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // } + // FeedbackState::WIFI => { + // led.write(brightness( + // [BLUE; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // } + // FeedbackState::Idle => { + // led.write(brightness( + // [GREEN; init::hardware::NUM_LEDS].into_iter(), + // LED_LEVEL, + // )) + // .await + // .unwrap(); + // } + // }; debug!("Feedback state: {:?}", feedback_state); } } - -// async fn beep_ack() { -// buzzer.set_high(); -// buzzer.set_low(); -// //Timer::after(Duration::from_millis(100)).await; -// } - -/* pub async fn failure(&mut self) { - let buzzer_handle = Self::beep_nak(&mut self.buzzer); - let led_handle = Self::flash_led_for_duration(&mut self.led, RED, LED_BLINK_DURATION); - - let (buzzer_result, _) = join!(buzzer_handle, led_handle); - - buzzer_result.unwrap_or_else(|err| { error!("Failed to buzz: {err}"); - }); - - let _ = self.led_to_status(); -} - -pub async fn activate_error_state(&mut self) -> Result<()> { - self.led.turn_on(RED)?; - Self::beep_nak(&mut self.buzzer).await?; - Ok(()) -} - -pub async fn startup(&mut self){ - self.device_status = DeviceStatus::Ready; - - let led_handle = Self::flash_led_for_duration(&mut self.led, GREEN, Duration::from_secs(1)); - let buzzer_handle = Self::beep_startup(&mut self.buzzer); - - let (buzzer_result, led_result) = join!(buzzer_handle, led_handle); - - buzzer_result.unwrap_or_else(|err| { - error!("Failed to buzz: {err}"); - }); - - led_result.unwrap_or_else(|err| { - error!("Failed to blink led: {err}"); - }); - - let _ = self.led_to_status(); -} - - -async fn flash_led_for_duration(led: &mut L, color: RGB8, duration: Duration) -> Result<()> { - led.turn_on(color)?; - - sleep(duration).await; - - led.turn_off()?; - - Ok(()) -} - -async fn beep_ack(buzzer: &mut B) -> Result<()> { - buzzer - .modulated_tone(1200.0, Duration::from_millis(100)) - .await?; - sleep(Duration::from_millis(10)).await; - buzzer - .modulated_tone(2000.0, Duration::from_millis(50)) - .await?; - Ok(()) -} - -async fn beep_nak(buzzer: &mut B) -> Result<()> { - buzzer - .modulated_tone(600.0, Duration::from_millis(150)) - .await?; - sleep(Duration::from_millis(100)).await; - buzzer - .modulated_tone(600.0, Duration::from_millis(150)) - .await?; - Ok(()) -} - -async fn beep_startup(buzzer: &mut B) -> Result<()> { - buzzer - .modulated_tone(523.0, Duration::from_millis(150)) - .await?; - buzzer - .modulated_tone(659.0, Duration::from_millis(150)) - .await?; - buzzer - .modulated_tone(784.0, Duration::from_millis(150)) - .await?; - buzzer - .modulated_tone(1046.0, Duration::from_millis(200)) - .await?; - - sleep(Duration::from_millis(100)).await; - - buzzer - .modulated_tone(784.0, Duration::from_millis(100)) - .await?; - buzzer - .modulated_tone(880.0, Duration::from_millis(200)) - .await?; - Ok(()) -} - - */ diff --git a/src/init/hardware.rs b/src/init/hardware.rs index 6aec482..6b50200 100644 --- a/src/init/hardware.rs +++ b/src/init/hardware.rs @@ -11,7 +11,6 @@ use esp_hal::peripherals::{ GPIO0, GPIO1, GPIO16, GPIO17, GPIO18, GPIO19, GPIO20, GPIO21, GPIO22, GPIO23, I2C0, RMT, SPI2, UART1, }; -use esp_hal::rmt::{ConstChannelAccess, Rmt}; use esp_hal::spi::master::{Config as Spi_config, Spi}; use esp_hal::system::software_reset; use esp_hal::time::Rate; @@ -24,7 +23,6 @@ use esp_hal::{ timer::systimer::SystemTimer, uart::Uart, }; -use esp_hal_smartled::{SmartLedsAdapterAsync, buffer_size_async}; use esp_println::logger::init_logger; use log::{debug, error}; @@ -65,12 +63,11 @@ fn panic(info: &core::panic::PanicInfo) -> ! { esp_bootloader_esp_idf::esp_app_desc!(); pub async fn hardware_init( - spawner: &mut Spawner, + spawner: Spawner, ) -> ( Uart<'static, Async>, Stack<'static>, I2c<'static, Async>, - SmartLedsAdapterAsync, LED_BUFFER_SIZE>, GPIO21<'static>, GPIO0<'static>, SDCardPersistence, @@ -78,19 +75,20 @@ pub async fn hardware_init( let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max()); let peripherals = esp_hal::init(config); - esp_alloc::heap_allocator!(size: 72 * 1024); + esp_alloc::heap_allocator!(#[unsafe(link_section = ".dram2_uninit")] size: 65536); - let timer0 = SystemTimer::new(peripherals.SYSTIMER); - esp_hal_embassy::init(timer0.alarm0); + let timg0 = TimerGroup::new(peripherals.TIMG0); + let sw_interrupt = + esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT); + esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0); init_logger(log::LevelFilter::Debug); - let timer1 = TimerGroup::new(peripherals.TIMG0); - let mut rng = esp_hal::rng::Rng::new(peripherals.RNG); + let rng = esp_hal::rng::Rng::new(); let network_seed = (rng.random() as u64) << 32 | rng.random() as u64; wifi::set_antenna_mode(peripherals.GPIO3, peripherals.GPIO14).await; - let interfaces = wifi::setup_wifi(timer1.timer0, rng, peripherals.WIFI, spawner); + let interfaces = wifi::setup_wifi(peripherals.WIFI, spawner); let stack = network::setup_network(network_seed, interfaces.ap, spawner); Timer::after(Duration::from_millis(1)).await; @@ -120,15 +118,12 @@ pub async fn hardware_init( Timer::after(Duration::from_millis(500)).await; - let led = setup_led(peripherals.RMT, peripherals.GPIO1); - debug!("hardware init done"); ( uart_device, stack, i2c_device, - led, buzzer_gpio, sd_det_gpio, vol_mgr, @@ -189,23 +184,23 @@ pub fn setup_buzzer(buzzer_gpio: GPIO21<'static>) -> Output<'static> { buzzer } -fn setup_led( - rmt: RMT<'static>, - led_gpio: GPIO1<'static>, -) -> SmartLedsAdapterAsync, LED_BUFFER_SIZE> { - debug!("setup led"); - let rmt: Rmt<'_, esp_hal::Async> = { - let frequency: Rate = Rate::from_mhz(80); - Rmt::new(rmt, frequency) - } - .expect("Failed to initialize RMT") - .into_async(); - - let rmt_channel = rmt.channel0; - let rmt_buffer = [0_u32; buffer_size_async(NUM_LEDS)]; - - let led: SmartLedsAdapterAsync<_, LED_BUFFER_SIZE> = - SmartLedsAdapterAsync::new(rmt_channel, led_gpio, rmt_buffer); - - led -} +// fn setup_led( +// rmt: RMT<'static>, +// led_gpio: GPIO1<'static>, +// ) -> SmartLedsAdapterAsync, LED_BUFFER_SIZE> { +// debug!("setup led"); +// let rmt: Rmt<'_, esp_hal::Async> = { +// let frequency: Rate = Rate::from_mhz(80); +// Rmt::new(rmt, frequency) +// } +// .expect("Failed to initialize RMT") +// .into_async(); +// +// let rmt_channel = rmt.channel0; +// let rmt_buffer = [0_u32; buffer_size_async(NUM_LEDS)]; +// +// let led: SmartLedsAdapterAsync<_, LED_BUFFER_SIZE> = +// SmartLedsAdapterAsync::new(rmt_channel, led_gpio, rmt_buffer); +// +// led +// } diff --git a/src/init/network.rs b/src/init/network.rs index 378cda4..7c68e55 100644 --- a/src/init/network.rs +++ b/src/init/network.rs @@ -2,15 +2,15 @@ use core::{net::Ipv4Addr, str::FromStr}; use embassy_executor::Spawner; use embassy_net::{Ipv4Cidr, Runner, Stack, StackResources, StaticConfigV4}; use embassy_time::{Duration, Timer}; -use esp_wifi::wifi::WifiDevice; +use esp_radio::wifi::WifiDevice; use static_cell::make_static; use crate::webserver::WEB_TAKS_SIZE; pub const NETWORK_STACK_SIZE: usize = WEB_TAKS_SIZE + 2; // + 2 for other network taks. Breaks - // without +// without -pub fn setup_network<'a>(seed: u64, wifi: WifiDevice<'static>, spawner: &mut Spawner) -> Stack<'a> { +pub fn setup_network<'a>(seed: u64, wifi: WifiDevice<'static>, spawner: Spawner) -> Stack<'a> { let gw_ip_addr_str = "192.168.2.1"; let gw_ip_addr = Ipv4Addr::from_str(gw_ip_addr_str).expect("failed to parse gateway ip"); let config = embassy_net::Config::ipv4_static(StaticConfigV4 { @@ -19,12 +19,10 @@ pub fn setup_network<'a>(seed: u64, wifi: WifiDevice<'static>, spawner: &mut Spa dns_servers: Default::default(), }); - let (stack, runner) = embassy_net::new( - wifi, - config, - make_static!(StackResources::::new()), - seed, - ); + let nw_stack: &'static mut StackResources = + make_static!(StackResources::::new()); + + let (stack, runner) = embassy_net::new(wifi, config, nw_stack, seed); spawner.must_spawn(net_task(runner)); spawner.must_spawn(run_dhcp(stack, gw_ip_addr_str)); diff --git a/src/init/wifi.rs b/src/init/wifi.rs index ac964d0..58f0398 100644 --- a/src/init/wifi.rs +++ b/src/init/wifi.rs @@ -2,11 +2,14 @@ use embassy_executor::Spawner; use embassy_time::{Duration, Timer}; use esp_hal::gpio::{Output, OutputConfig}; use esp_hal::peripherals::{GPIO3, GPIO14, WIFI}; -use esp_wifi::wifi::{ - AccessPointConfiguration, Configuration, WifiController, WifiEvent, WifiState, +use esp_radio::Controller; +use esp_radio::wifi::{ + AccessPointConfig, Interfaces, ModeConfig, WifiApState, WifiController, WifiEvent, }; -use esp_wifi::{EspWifiRngSource, EspWifiTimerSource, wifi::Interfaces}; -use static_cell::make_static; +use log::debug; +use static_cell::StaticCell; + +static ESP_WIFI_CTRL: StaticCell> = StaticCell::new(); pub async fn set_antenna_mode(gpio3: GPIO3<'static>, gpio14: GPIO14<'static>) { let mut rf_switch = Output::new(gpio3, esp_hal::gpio::Level::Low, OutputConfig::default()); @@ -20,26 +23,23 @@ pub async fn set_antenna_mode(gpio3: GPIO3<'static>, gpio14: GPIO14<'static>) { antenna_mode.set_low(); } -pub fn setup_wifi<'d: 'static>( - timer: impl EspWifiTimerSource + 'd, - rng: impl EspWifiRngSource + 'd, - wifi: WIFI<'static>, - spawner: &mut Spawner, -) -> Interfaces<'d> { - let esp_wifi_ctrl = make_static!(esp_wifi::init(timer, rng).unwrap()); +pub fn setup_wifi<'d: 'static>(wifi: WIFI<'static>, spawner: Spawner) -> Interfaces<'d> { + let esp_wifi_ctrl = ESP_WIFI_CTRL.init(esp_radio::init().unwrap()); - let (controller, interfaces) = esp_wifi::wifi::new(esp_wifi_ctrl, wifi).unwrap(); + let config = esp_radio::wifi::Config::default(); + let (controller, interfaces) = esp_radio::wifi::new(esp_wifi_ctrl, wifi, config).unwrap(); spawner.must_spawn(connection(controller)); interfaces } - #[embassy_executor::task] async fn connection(mut controller: WifiController<'static>) { + debug!("start connection task"); + debug!("Device capabilities: {:?}", controller.capabilities()); loop { - match esp_wifi::wifi::wifi_state() { - WifiState::ApStarted => { + match esp_radio::wifi::ap_state() { + WifiApState::Started => { // wait until we're no longer connected controller.wait_for_event(WifiEvent::ApStop).await; Timer::after(Duration::from_millis(5000)).await @@ -47,14 +47,16 @@ async fn connection(mut controller: WifiController<'static>) { _ => {} } if !matches!(controller.is_started(), Ok(true)) { - let client_config = Configuration::AccessPoint(AccessPointConfiguration { - ssid: env!("WIFI_SSID").try_into().unwrap(), - password: env!("WIFI_PASSWD").try_into().unwrap(), - auth_method: esp_wifi::wifi::AuthMethod::WPA2Personal, - ..Default::default() - }); - controller.set_configuration(&client_config).unwrap(); + let client_config = ModeConfig::AccessPoint( + AccessPointConfig::default() + .with_ssid(env!("WIFI_SSID").try_into().unwrap()) + .with_password(env!("WIFI_PASSWD").try_into().unwrap()) + .with_auth_method(esp_radio::wifi::AuthMethod::Wpa2Personal), + ); + controller.set_config(&client_config).unwrap(); + debug!("Starting wifi"); controller.start_async().await.unwrap(); + debug!("Wifi started!"); } } } diff --git a/src/main.rs b/src/main.rs index ed82c68..9c46bc6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ #![no_main] #![feature(type_alias_impl_trait)] #![feature(impl_trait_in_assoc_type)] - #![warn(clippy::unwrap_used)] use alloc::rc::Rc; @@ -21,7 +20,7 @@ use embassy_time::{Duration, Timer}; use esp_hal::gpio::Input; use esp_hal::{gpio::InputConfig, peripherals}; use log::{debug, info}; -use static_cell::make_static; +use static_cell::StaticCell; extern crate alloc; @@ -44,10 +43,12 @@ type TallyPublisher = Publisher<'static, NoopRawMutex, TallyID, 8, 2, 1>; type TallySubscriber = Subscriber<'static, NoopRawMutex, TallyID, 8, 2, 1>; type UsedStore = IDStore; -#[esp_hal_embassy::main] -async fn main(mut spawner: Spawner) { - let (uart_device, stack, i2c, led, buzzer_gpio, sd_det_gpio, persistence_layer) = - init::hardware::hardware_init(&mut spawner).await; +static CHAN: StaticCell = StaticCell::new(); + +#[esp_rtos::main] +async fn main(spawner: Spawner) -> ! { + let (uart_device, stack, i2c, buzzer_gpio, sd_det_gpio, persistence_layer) = + init::hardware::hardware_init(spawner).await; info!("Starting up..."); @@ -56,13 +57,13 @@ async fn main(mut spawner: Spawner) { let store: UsedStore = IDStore::new_from_storage(persistence_layer).await; let shared_store = Rc::new(Mutex::new(store)); - let chan: &'static mut TallyChannel = make_static!(PubSubChannel::new()); + let chan: &'static mut TallyChannel = CHAN.init(PubSubChannel::new()); let publisher: TallyPublisher = chan.publisher().unwrap(); let mut sub: TallySubscriber = chan.subscriber().unwrap(); wait_for_stack_up(stack).await; - start_webserver(&mut spawner, stack, shared_store.clone(), chan); + start_webserver(spawner, stack, shared_store.clone(), chan); /****************************** Spawning tasks ***********************************/ debug!("spawing NFC reader task..."); @@ -71,8 +72,8 @@ async fn main(mut spawner: Spawner) { publisher, )); - debug!("spawing feedback task.."); - spawner.must_spawn(feedback::feedback_task(led, buzzer_gpio)); + // debug!("spawing feedback task.."); + // spawner.must_spawn(feedback::feedback_task(led, buzzer_gpio)); debug!("spawn sd detect task"); spawner.must_spawn(sd_detect_task(sd_det_gpio)); diff --git a/src/webserver/api.rs b/src/webserver/api.rs index 66e93ef..c535b64 100644 --- a/src/webserver/api.rs +++ b/src/webserver/api.rs @@ -1,4 +1,3 @@ -use esp_println::dbg; use log::error; use picoserve::{ extract::{Json, Query, State}, @@ -7,7 +6,7 @@ use picoserve::{ use serde::Deserialize; use crate::{ - store::{self, Name, day::Day, tally_id::TallyID}, + store::{Name, day::Day, tally_id::TallyID}, webserver::{app::AppState, sse::IDEvents}, }; diff --git a/src/webserver/assets.rs b/src/webserver/assets.rs index 805b031..2401306 100644 --- a/src/webserver/assets.rs +++ b/src/webserver/assets.rs @@ -38,7 +38,7 @@ impl ); response_writer - .write_response(request.body_connection.finalize().await.unwrap(), response) + .write_response(request.body_connection.finalize().await?, response) .await } None => { @@ -68,10 +68,7 @@ impl Content for StaticAsset { self.0.len() } - async fn write_content( - self, - mut writer: W, - ) -> Result<(), W::Error> { + async fn write_content(self, mut writer: W) -> Result<(), W::Error> { writer.write_all(self.0).await } } diff --git a/src/webserver/mod.rs b/src/webserver/mod.rs index 3bddc8a..5a90988 100644 --- a/src/webserver/mod.rs +++ b/src/webserver/mod.rs @@ -16,10 +16,10 @@ mod app; mod assets; mod sse; -pub const WEB_TAKS_SIZE: usize = 3; // Up this number if request start fail with Timeouts. +pub const WEB_TAKS_SIZE: usize = 5; // Up this number if request start fail with Timeouts. pub fn start_webserver( - spawner: &mut Spawner, + spawner: Spawner, stack: Stack<'static>, store: Rc>, chan: &'static TallyChannel,