From b40e6fb9ccfc7b64683f050610a4ddfda39bc8b6 Mon Sep 17 00:00:00 2001 From: ede1998 Date: Wed, 29 Jul 2026 18:03:15 +0200 Subject: [PATCH] switch to esp32-wroom-32 for testing --- .cargo/config.toml | 6 +-- Cargo.lock | 131 +++++++++++++-------------------------------- Cargo.toml | 10 ++-- wokwi.toml | 4 +- 4 files changed, 47 insertions(+), 104 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index e52ddf4..a1db842 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,5 +1,5 @@ -[target.xtensa-esp32s3-none-elf] -runner = "espflash flash --monitor --chip esp32s3" +[target.xtensa-esp32-none-elf] +runner = "espflash flash --monitor --chip esp32" [env] ESP_LOG="info" @@ -9,7 +9,7 @@ rustflags = [ "-C", "link-arg=-nostartfiles", ] -target = "xtensa-esp32s3-none-elf" +target = "xtensa-esp32-none-elf" [unstable] build-std = ["alloc", "core"] diff --git a/Cargo.lock b/Cargo.lock index 26a4bd6..71a35fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,6 +97,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa" +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + [[package]] name = "creaturedex" version = "0.1.0" @@ -382,54 +391,6 @@ dependencies = [ "heapless 0.9.3", ] -[[package]] -name = "embassy-time" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b0c143ec626e821d4d90da51a2bd91d559d6c442b7c74a47d368c9e23d97a" -dependencies = [ - "cfg-if", - "critical-section", - "document-features", - "embassy-time-driver", - "embedded-hal 0.2.7", - "embedded-hal 1.0.0", - "embedded-hal-async", - "futures-core", -] - -[[package]] -name = "embassy-time-driver" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee71af1b3a0deaa53eaf2d39252f83504c853646e472400b763060389b9fcc9" -dependencies = [ - "document-features", -] - -[[package]] -name = "embassy-usb-driver" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa675c5f4349b6aa0fcffc4bf9b241f18cd11b97c1f8323273fb9a5449937fbd" -dependencies = [ - "embedded-io-async 0.6.1", - "embedded-io-async 0.7.0", -] - -[[package]] -name = "embassy-usb-synopsys-otg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb205e26d59e483e8c48f91f637ec217ec7e2cfb0b61d50482301b991b4ff431" -dependencies = [ - "critical-section", - "embassy-sync 0.8.0", - "embassy-time", - "embassy-usb-driver", - "portable-atomic", -] - [[package]] name = "embedded-can" version = "0.4.1" @@ -633,8 +594,6 @@ dependencies = [ "embassy-embedded-hal", "embassy-futures", "embassy-sync 0.8.0", - "embassy-usb-driver", - "embassy-usb-synopsys-otg", "embedded-can", "embedded-hal 1.0.0", "embedded-hal-async", @@ -649,7 +608,6 @@ dependencies = [ "esp-riscv-rt", "esp-rom-sys", "esp-sync", - "esp-synopsys-usb-otg", "esp32", "esp32c2", "esp32c3", @@ -667,6 +625,8 @@ dependencies = [ "rand_core 0.6.4", "rand_core 0.9.5", "riscv", + "sha1", + "sha2", "strum", "ufmt-write", "xtensa-lx", @@ -680,7 +640,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aebfabb2c21bec45e575e4f6cb6bb7aa8e1b33e7ac45b5dffa0f9d33ff59105" dependencies = [ "document-features", - "object", "proc-macro-crate", "proc-macro2", "quote", @@ -707,8 +666,8 @@ dependencies = [ "esp-hal", "esp-metadata-generated", "esp-sync", - "esp-wifi-sys-esp32s3", - "esp32s3", + "esp-wifi-sys-esp32", + "esp32", "log", ] @@ -757,7 +716,7 @@ dependencies = [ "esp-wifi-sys-esp32h2", "esp-wifi-sys-esp32s2", "esp-wifi-sys-esp32s3", - "esp32s3", + "esp32", "heapless 0.9.3", "instability", "log", @@ -799,7 +758,7 @@ dependencies = [ "cfg-if", "document-features", "esp-metadata-generated", - "esp32s3", + "esp32", ] [[package]] @@ -842,19 +801,6 @@ dependencies = [ "xtensa-lx", ] -[[package]] -name = "esp-synopsys-usb-otg" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8938451cb19032f13365328ea66ab38c8d16deecdf322067442297110eb74468" -dependencies = [ - "critical-section", - "embedded-hal 0.2.7", - "ral-registers", - "usb-device", - "vcell", -] - [[package]] name = "esp-wifi-sys-esp32" version = "0.2.0" @@ -1259,15 +1205,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "paste" version = "1.0.15" @@ -1343,12 +1280,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "ral-registers" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b71a9d9206e8b46714c74255adcaea8b11e0350c1d8456165073c3f75fc81a" - [[package]] name = "rand_core" version = "0.6.4" @@ -1494,6 +1425,28 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "smoltcp" version = "0.13.1" @@ -1691,16 +1644,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "usb-device" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98816b1accafbb09085168b90f27e93d790b4bfa19d883466b5e53315b5f06a6" -dependencies = [ - "heapless 0.8.0", - "portable-atomic", -] - [[package]] name = "vcell" version = "0.1.3" diff --git a/Cargo.toml b/Cargo.toml index 885e6d8..5a40134 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,25 +9,25 @@ name = "creaturedex" path = "./src/bin/main.rs" [dependencies] -esp-hal = { version = "~1.1.0", features = ["esp32s3", "log-04", "unstable"] } +esp-hal = { version = "~1.1.0", features = ["esp32", "log-04", "unstable"] } esp-rtos = { version = "0.3.0", features = [ "esp-alloc", "esp-radio", - "esp32s3", + "esp32", "log-04", ] } -esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32s3", "log-04"] } +esp-bootloader-esp-idf = { version = "0.5.0", features = ["esp32", "log-04"] } log = "0.4.27" critical-section = "1.2.0" embedded-io = "0.7.1" esp-alloc = "0.10.0" -esp-println = { version = "0.17.0", features = ["esp32s3", "log-04"] } +esp-println = { version = "0.17.0", features = ["esp32", "log-04"] } esp-radio = { version = "0.18.0", features = [ "esp-alloc", - "esp32s3", + "esp32", "log-04", "unstable", "wifi", diff --git a/wokwi.toml b/wokwi.toml index 4445166..45b1b2b 100644 --- a/wokwi.toml +++ b/wokwi.toml @@ -1,5 +1,5 @@ [wokwi] version = 1 gdbServerPort = 3333 -elf = "target/xtensa-esp32s3-none-elf/debug/creaturedex" -firmware = "target/xtensa-esp32s3-none-elf/debug/creaturedex" +elf = "target/xtensa-esp32-none-elf/debug/creaturedex" +firmware = "target/xtensa-esp32-none-elf/debug/creaturedex"