From 7c82c5aa7b9674a73f6fa32246b4c0a1c1f1c2ab Mon Sep 17 00:00:00 2001 From: macronova Date: Sun, 22 Jun 2025 22:59:24 -0500 Subject: [PATCH] Try jj --- xiao-esp32c6/Cargo.lock | 110 +++++++++++----------------------------- xiao-esp32c6/Cargo.toml | 49 +++++++++--------- xiao-esp32c6/src/lib.rs | 4 +- 3 files changed, 55 insertions(+), 108 deletions(-) diff --git a/xiao-esp32c6/Cargo.lock b/xiao-esp32c6/Cargo.lock index 6aee544..b703cbd 100644 --- a/xiao-esp32c6/Cargo.lock +++ b/xiao-esp32c6/Cargo.lock @@ -2,25 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - [[package]] name = "allocator-api2" version = "0.3.0" @@ -106,11 +87,11 @@ dependencies = [ [[package]] name = "bt-hci" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f377753756ec12e76b52d2dd657437be0448cc9736402ffadd0b8b8b9602c8a1" +checksum = "fa7f7c19df9648c1da4f5356c4256533e38bd65633b6a41654922475a1c6d777" dependencies = [ - "embassy-sync 0.6.2", + "embassy-sync 0.7.0", "embassy-time", "embedded-io", "embedded-io-async", @@ -119,19 +100,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "bt-hci" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7f7c19df9648c1da4f5356c4256533e38bd65633b6a41654922475a1c6d777" -dependencies = [ - "embassy-sync 0.7.0", - "embedded-io", - "embedded-io-async", - "futures-intrusive", - "heapless", -] - [[package]] name = "bumpalo" version = "3.18.1" @@ -177,6 +145,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "convert_case" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -716,7 +693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3700028d3d2ee57e6d2a5c5f60544711052f8d394e73a6f534b538fbfb9d058c" dependencies = [ "allocator-api2", - "bt-hci 0.3.2", + "bt-hci", "cfg-if", "critical-section", "document-features", @@ -967,12 +944,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "libc" version = "0.2.174" @@ -1203,35 +1174,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - [[package]] name = "riscv" version = "0.12.1" @@ -1360,9 +1302,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "static_cell" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89b0684884a883431282db1e4343f34afc2ff6996fe1f4a1664519b66e14c1e" +checksum = "0530892bb4fa575ee0da4b86f86c667132a94b74bb72160f58ee5a4afec74c23" dependencies = [ "portable-atomic", ] @@ -1458,13 +1400,13 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "trouble-host" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31abacc7bd8bc686160f6de3347a3b7669ae4a31e4eef9a306466e97d297cea" +checksum = "2f759a3da7d8501bf4be7a11d0754f1da3d2bad226d64cdad9314cec00288fbc" dependencies = [ - "bt-hci 0.2.1", + "bt-hci", "embassy-futures", - "embassy-sync 0.6.2", + "embassy-sync 0.7.0", "embassy-time", "embedded-io", "futures", @@ -1477,11 +1419,11 @@ dependencies = [ [[package]] name = "trouble-host-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2798a58a818bdf9d98f5283cc7ac647f11ecbd1e5ff4cdc45a2a13c31bf86fd" +checksum = "ab5c25c521a9a0cad8c62b86bd3ca9abd6c94842ecf62b64fc56f0d91bb1a426" dependencies = [ - "Inflector", + "convert_case", "darling", "proc-macro2", "quote", @@ -1507,6 +1449,12 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "uuid" version = "1.17.0" @@ -1747,7 +1695,7 @@ dependencies = [ name = "xiao-esp32c6" version = "0.1.0" dependencies = [ - "bt-hci 0.2.1", + "bt-hci", "critical-section", "embassy-executor", "embassy-net", diff --git a/xiao-esp32c6/Cargo.toml b/xiao-esp32c6/Cargo.toml index f5d89b7..1289216 100644 --- a/xiao-esp32c6/Cargo.toml +++ b/xiao-esp32c6/Cargo.toml @@ -8,41 +8,39 @@ name = "xiao-esp32c6" path = "./src/bin/main.rs" [dependencies] -esp-bootloader-esp-idf = "0.1.0" -esp-hal = { version = "=1.0.0-beta.1", features = [ - "esp32c6", - "log-04", - "unstable", +# for more networking protocol support see https://crates.io/crates/edge-net +bt-hci = { version = "*", features = [] } +critical-section = "*" +embassy-executor = { version = "*", features = [ + "log", + "task-arena-size-20480", ] } -log = "0.4.27" - -embassy-net = { version = "0.7.0", features = [ +embassy-net = { version = "*", features = [ "dhcpv4", "log", "medium-ethernet", "tcp", "udp", ] } -embedded-io = "0.6.1" -embedded-io-async = "0.6.1" -esp-alloc = "0.8.0" -esp-backtrace = { version = "0.16.0", features = [ +embassy-time = { version = "*", features = ["log"] } +embedded-io = "*" +embedded-io-async = "*" +esp-alloc = "*" +esp-backtrace = { version = "*", features = [ "esp32c6", "exception-handler", "panic-handler", "println", ] } -esp-println = { version = "0.14.0", features = ["esp32c6", "log-04"] } -# for more networking protocol support see https://crates.io/crates/edge-net -bt-hci = { version = "0.2.1", features = [] } -critical-section = "1.2.0" -embassy-executor = { version = "0.7.0", features = [ - "log", - "task-arena-size-20480", +esp-bootloader-esp-idf = "*" +esp-hal = { version = "=1.0.0-beta.1", features = [ + "esp32c6", + "log-04", + "unstable", ] } -embassy-time = { version = "0.4.0", features = ["log"] } -esp-hal-embassy = { version = "0.8.1", features = ["esp32c6", "log-04"] } -esp-wifi = { version = "0.14.1", features = [ +esp-hal-embassy = { version = "*", features = ["esp32c6", "log-04"] } +esp-println = { version = "*", features = ["esp32c6", "log-04"] } +esp-wifi = { version = "*", features = [ "ble", "builtin-scheduler", "coex", @@ -52,7 +50,8 @@ esp-wifi = { version = "0.14.1", features = [ "smoltcp", "wifi", ] } -smoltcp = { version = "0.12.0", default-features = false, features = [ +log = "*" +smoltcp = { version = "*", default-features = false, features = [ "log", "medium-ethernet", "multicast", @@ -65,8 +64,8 @@ smoltcp = { version = "0.12.0", default-features = false, features = [ "socket-tcp", "socket-udp", ] } -static_cell = { version = "2.1.0", features = ["nightly"] } -trouble-host = { version = "0.1.0", features = ["gatt"] } +static_cell = { version = "*", features = ["nightly"] } +trouble-host = { version = "*", features = ["gatt"] } [profile.dev] diff --git a/xiao-esp32c6/src/lib.rs b/xiao-esp32c6/src/lib.rs index a4d4287..8d513ee 100644 --- a/xiao-esp32c6/src/lib.rs +++ b/xiao-esp32c6/src/lib.rs @@ -44,9 +44,9 @@ pub async fn entrypoint(spawner: Spawner) { let mut led = Output::new(peripherals.GPIO15, Level::High, OutputConfig::default()); loop { - log::info!("Blink!"); + log::info!("Slow blink!"); led.toggle(); - Timer::after(Duration::from_secs(1)).await; + Timer::after(Duration::from_secs(2)).await; } // for inspiration have a look at the examples at https://github.com/esp-rs/esp-hal/tree/esp-hal-v1.0.0-beta.1/examples/src/bin