commit 92ffcd51baf446f22382e447c60cd8e264bfd446
parent 3fe7317906ae6f7cdfc5c1569f0d72bd7444b451
Author: filipton <filipton12@gmail.com>
Date: Wed, 16 Jul 2025 18:57:07 +0200
chore: update to newest version of esp-hal (with pacs)
Diffstat:
7 files changed, 216 insertions(+), 184 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -64,63 +64,63 @@ dependencies = [
[[package]]
name = "esp32"
-version = "0.37.0"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ddfdb413ef0739d84bd3fce771e6e0feb6457ac1bcdd7a1dcd6326061e919d"
+checksum = "a7680f79e3a4770e59c2dc25b17dcd852921ee57ffae9a4c4806c9ca5001d54d"
dependencies = [
"vcell",
]
[[package]]
name = "esp32c2"
-version = "0.26.0"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ec669dc34787e73c8a7d99059fcdbd800cb0699c2ea9cd0a3d99cb5e9caefb"
+checksum = "da1bcf86fca83543e0e95561cba27bbcc6b6e7adc5428f49187f5868bc0c3ed2"
dependencies = [
"vcell",
]
[[package]]
name = "esp32c3"
-version = "0.29.0"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c0b2a8e8efa1755a28ca3ef54c85436f76531ba93dc79b55d5330349d067d7"
+checksum = "ce2c5a33d4377f974cbe8cadf8307f04f2c39755704cb09e81852c63ee4ac7b8"
dependencies = [
"vcell",
]
[[package]]
name = "esp32c6"
-version = "0.20.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8009092b2a8f41532ce836ea7403b657eca7cd396c4513c650ade648831ed76"
+checksum = "2ca8fc81b7164df58b5e04aaac9e987459312e51903cca807317990293973a6e"
dependencies = [
"vcell",
]
[[package]]
name = "esp32h2"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03f683882d3713ec41379980406117b15fb48c2be8d5acdf1795ecb5fe9b6e41"
+checksum = "80171d08c17d8c63b53334c60ca654786a7593481531d19b639c4e5c76d276de"
dependencies = [
"vcell",
]
[[package]]
name = "esp32s2"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4391e38b14eb59a675e816598bde7d9b8c8f43a695a284bd97bcd0cf3092404"
+checksum = "4c90d347480fca91f4be3e94b576af9c6c7987795c58dc3c5a7c108b6b3966dc"
dependencies = [
"vcell",
]
[[package]]
name = "esp32s3"
-version = "0.32.0"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27a4c6fd31207a297fc29d2b8f4da27facf45f8c83041f7c0f978aa65ab367c9"
+checksum = "a3769c56222c4548833f236c7009f1f8b3f2387af26366f6bd1cea456666a49d"
dependencies = [
"vcell",
]
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,16 +13,16 @@ embedded-storage = "0.3.1"
log = { version = "0.4.27", optional = true }
defmt = { version = "1.0.1", optional = true }
-esp32 = { version = "0.37.0", optional = true }
+esp32 = { version = "0.38.0", optional = true }
-esp32s2 = { version = "0.28.0", optional = true }
-esp32s3 = { version = "0.32.0", optional = true }
+esp32s2 = { version = "0.29.0", optional = true }
+esp32s3 = { version = "0.33.0", optional = true }
-esp32c2 = { version = "0.26.0", optional = true }
-esp32c3 = { version = "0.29.0", optional = true }
-esp32c6 = { version = "0.20.0", optional = true }
+esp32c2 = { version = "0.27.0", optional = true }
+esp32c3 = { version = "0.30.0", optional = true }
+esp32c6 = { version = "0.21.0", optional = true }
-esp32h2 = { version = "0.16.0", optional = true }
+esp32h2 = { version = "0.17.0", optional = true }
[features]
default = []
diff --git a/README.md b/README.md
@@ -16,12 +16,12 @@ But esp32s3, esp32c3 and esp32 are working perfectly fine.
## Getting started
- Create `partitions.csv` file in project root (copy `partitions.csv.template` file)
-- In your project edit `./.cargo/config.toml` file and append `-T ./partitions.csv` to the `runner` attribute
+- In your project edit `./.cargo/config.toml` file and append `--partition-table ./partitions.csv` to the `runner` attribute
- Optionally append `--erase-parts otadata` to `./cargo/config.toml` to fix some ota issues
```toml
[target.xtensa-esp32s3-none-elf]
-runner = "espflash flash --monitor -T ./partitions.csv --erase-parts otadata"
+runner = "espflash flash --monitor --partition-table ./partitions.csv --erase-parts otadata"
```
## Example
diff --git a/examples/.cargo/config.toml b/examples/.cargo/config.toml
@@ -4,13 +4,13 @@ esp32s3 = "run --no-default-features --features=esp32s3 --target=xtensa-esp32s3-
esp32 = "run --no-default-features --features=esp32 --target=xtensa-esp32-none-elf"
[target.'cfg(target_arch = "riscv32")']
-runner = "espflash flash --monitor -T ./partitions.csv --erase-parts otadata"
+runner = "espflash flash --monitor --partition-table ./partitions.csv --erase-parts otadata"
rustflags = [
"-C", "force-frame-pointers",
]
[target.'cfg(target_arch = "xtensa")']
-runner = "espflash flash --monitor -T ./partitions.csv --erase-parts otadata"
+runner = "espflash flash --monitor --partition-table ./partitions.csv --erase-parts otadata"
rustflags = [
"-C", "link-arg=-nostartfiles",
]
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
@@ -88,9 +88,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
[[package]]
name = "critical-section"
@@ -411,18 +411,6 @@ dependencies = [
]
[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "enumset"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -465,48 +453,52 @@ dependencies = [
[[package]]
name = "esp-backtrace"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c304bbe17df32db8bc0027a9da989aa3efebbd4e7a79d58850deb29e2af577f"
+checksum = "5f270a29a3c4e492399b13e157b10151a7616cba69c4d554076ea93ed1bd2916"
dependencies = [
"cfg-if",
- "esp-build",
"esp-config",
- "esp-metadata",
"esp-println",
"heapless",
"semihosting",
]
[[package]]
-name = "esp-build"
-version = "0.3.0"
+name = "esp-bootloader-esp-idf"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "837020ff95fbf4c15c206541dda7994f1bbe6e1505e36a6a5ecb51fdb61656d7"
+checksum = "3a093dbdc64b0288baacc214c2e8c2f3f13ecbf979c36ee2f63797ecf22538f1"
dependencies = [
- "quote",
- "syn",
- "termcolor",
+ "cfg-if",
+ "document-features",
+ "embedded-storage",
+ "esp-config",
+ "esp-rom-sys",
+ "jiff",
+ "log",
+ "strum",
]
[[package]]
name = "esp-config"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8c4c95d8d6243ddb39efe1fcf2524c9becd0f86bb3e24048ed30b4f553609f"
+checksum = "abd4a8db4b72794637a25944bc8d361c3cc271d4f03987ce8741312b6b61529c"
dependencies = [
"document-features",
+ "esp-metadata-generated",
+ "evalexpr",
"serde",
- "serde_json",
+ "serde_yaml",
]
[[package]]
name = "esp-hal"
-version = "1.0.0-beta.1"
+version = "1.0.0-rc.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d973697621cd3eef9c3f260fa8c1af77d8547cfc92734255d8e8ddf05c7d331"
+checksum = "f3887eda2917deef3d99e7a5c324f9190714e99055361ad36890dffd0a995b49"
dependencies = [
- "basic-toml",
"bitfield",
"bitflags 2.9.1",
"bytemuck",
@@ -526,14 +518,18 @@ dependencies = [
"embedded-io",
"embedded-io-async",
"enumset",
- "esp-build",
"esp-config",
"esp-hal-procmacros",
- "esp-metadata",
+ "esp-metadata-generated",
"esp-riscv-rt",
+ "esp-rom-sys",
"esp-synopsys-usb-otg",
"esp32",
+ "esp32c2",
"esp32c3",
+ "esp32c6",
+ "esp32h2",
+ "esp32s2",
"esp32s3",
"fugit",
"instability",
@@ -552,9 +548,9 @@ dependencies = [
[[package]]
name = "esp-hal-embassy"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd751f4b235764f6e766731e7da09d8f8d443642b829c3e6e469c38320da044"
+checksum = "d000d94064c485f86adc6b02b541e2f072e03321b4f03d4303b7ff3062c7e692"
dependencies = [
"cfg-if",
"critical-section",
@@ -564,18 +560,17 @@ dependencies = [
"embassy-time",
"embassy-time-driver",
"embassy-time-queue-utils",
- "esp-build",
"esp-config",
"esp-hal",
"esp-hal-procmacros",
- "esp-metadata",
+ "esp-metadata-generated",
"portable-atomic",
"static_cell",
]
[[package]]
name = "esp-hal-ota"
-version = "0.4.1"
+version = "0.4.3"
dependencies = [
"embedded-storage",
"esp32",
@@ -594,6 +589,7 @@ dependencies = [
"embassy-time",
"esp-alloc",
"esp-backtrace",
+ "esp-bootloader-esp-idf",
"esp-hal",
"esp-hal-embassy",
"esp-hal-ota",
@@ -606,52 +602,62 @@ dependencies = [
[[package]]
name = "esp-hal-procmacros"
-version = "0.18.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73164008cb2eada2ef85e6b0e459001d851f9b8e65e96e0d594bdfa8cf1b813b"
+checksum = "fbece384edaf0d1eabfa45afa96d910634d4158638ef983b2d419a8dec832246"
dependencies = [
- "darling",
"document-features",
"litrs",
"object",
"proc-macro-crate",
- "proc-macro-error2",
"proc-macro2",
"quote",
"syn",
+ "termcolor",
]
[[package]]
name = "esp-metadata"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0154d59933c2419ef25a01938517cc6969f47b6af53ebb34c279393aa20d9654"
+checksum = "a6fbc1d166be84c0750f121e95c8989ddebd7e7bdd86af3594a6cfb34f039650"
dependencies = [
"anyhow",
"basic-toml",
+ "indexmap",
+ "proc-macro2",
+ "quote",
"serde",
"strum",
]
[[package]]
+name = "esp-metadata-generated"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "189d36b8c8a752bdebec67fd02a15ebb1432feea345553749bca7ce2393cc795"
+dependencies = [
+ "esp-metadata",
+]
+
+[[package]]
name = "esp-println"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fae8b38d5fdc1d29d823c4737f18edfb0ccf0406985cf893f87c0cfc26a6ab33"
+checksum = "3e7e3ab41e96093d7fd307e93bfc88bd646a8ff23036ebf809e116b18869f719"
dependencies = [
"critical-section",
"document-features",
- "esp-build",
- "esp-metadata",
+ "esp-metadata-generated",
"log",
"portable-atomic",
]
[[package]]
name = "esp-riscv-rt"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05c2badd16cbd6307d463090615332b77c17a6766b41ba5fe5bb783310e8af6"
+checksum = "9a00370dfcb0ccc01c6b2540076379c6efd6890a27f584de217c38e3239e19d5"
dependencies = [
"document-features",
"riscv",
@@ -659,16 +665,26 @@ dependencies = [
]
[[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-storage"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b6502654e5750e8162e66512d7e8d84f7eb51d17ec6aa7e0da95cd102769425"
+checksum = "f276ad8a3bdc6b47cd92a3e91013f2e42dce9b3fc5023392063387a1ce2ed69a"
dependencies = [
"critical-section",
"document-features",
"embedded-storage",
- "esp-build",
- "esp-metadata",
+ "esp-rom-sys",
]
[[package]]
@@ -686,9 +702,9 @@ dependencies = [
[[package]]
name = "esp-wifi"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0e7cc4d0ceed4117e0f190abba1f021d986a5b6a54ef2116541e4288b700a9"
+checksum = "84908f2e95cb99a200cf448abafc416576338be590778a15d9224eee237f3210"
dependencies = [
"allocator-api2",
"bt-hci",
@@ -700,10 +716,9 @@ dependencies = [
"embedded-io-async",
"enumset",
"esp-alloc",
- "esp-build",
"esp-config",
"esp-hal",
- "esp-metadata",
+ "esp-metadata-generated",
"esp-wifi-sys",
"num-derive",
"num-traits",
@@ -724,9 +739,19 @@ dependencies = [
[[package]]
name = "esp32"
-version = "0.37.0"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ddfdb413ef0739d84bd3fce771e6e0feb6457ac1bcdd7a1dcd6326061e919d"
+checksum = "a7680f79e3a4770e59c2dc25b17dcd852921ee57ffae9a4c4806c9ca5001d54d"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32c2"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da1bcf86fca83543e0e95561cba27bbcc6b6e7adc5428f49187f5868bc0c3ed2"
dependencies = [
"critical-section",
"vcell",
@@ -734,9 +759,39 @@ dependencies = [
[[package]]
name = "esp32c3"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2c5a33d4377f974cbe8cadf8307f04f2c39755704cb09e81852c63ee4ac7b8"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32c6"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ca8fc81b7164df58b5e04aaac9e987459312e51903cca807317990293973a6e"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32h2"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80171d08c17d8c63b53334c60ca654786a7593481531d19b639c4e5c76d276de"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32s2"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c0b2a8e8efa1755a28ca3ef54c85436f76531ba93dc79b55d5330349d067d7"
+checksum = "4c90d347480fca91f4be3e94b576af9c6c7987795c58dc3c5a7c108b6b3966dc"
dependencies = [
"critical-section",
"vcell",
@@ -744,15 +799,21 @@ dependencies = [
[[package]]
name = "esp32s3"
-version = "0.32.0"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27a4c6fd31207a297fc29d2b8f4da27facf45f8c83041f7c0f978aa65ab367c9"
+checksum = "a3769c56222c4548833f236c7009f1f8b3f2387af26366f6bd1cea456666a49d"
dependencies = [
"critical-section",
"vcell",
]
[[package]]
+name = "evalexpr"
+version = "12.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02a3229bec56a977f174b32fe7b8d89e8c79ebb4493d10ad763b6676dc2dc0c9"
+
+[[package]]
name = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -868,6 +929,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
dependencies = [
"equivalent",
"hashbrown",
+ "serde",
]
[[package]]
@@ -896,6 +958,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "linked_list_allocator"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -939,15 +1025,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
-name = "minijinja"
-version = "2.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd72e8b4e42274540edabec853f607c015c73436159b06c39c7af85a20433155"
-dependencies = [
- "serde",
-]
-
-[[package]]
name = "nb"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1016,6 +1093,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
name = "portable_atomic_enum"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1046,28 +1132,6 @@ dependencies = [
]
[[package]]
-name = "proc-macro-error-attr2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "proc-macro-error2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
-dependencies = [
- "proc-macro-error-attr2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "proc-macro2"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1195,24 +1259,16 @@ dependencies = [
]
[[package]]
-name = "serde_json"
-version = "1.0.140"
+name = "serde_yaml"
+version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
+ "indexmap",
"itoa",
- "memchr",
"ryu",
"serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
+ "unsafe-libyaml",
]
[[package]]
@@ -1236,9 +1292,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",
]
@@ -1292,25 +1348,10 @@ dependencies = [
]
[[package]]
-name = "toml"
-version = "0.8.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
name = "toml_datetime"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
-dependencies = [
- "serde",
-]
[[package]]
name = "toml_edit"
@@ -1319,20 +1360,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
dependencies = [
"indexmap",
- "serde",
- "serde_spanned",
"toml_datetime",
- "toml_write",
"winnow",
]
[[package]]
-name = "toml_write"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
-
-[[package]]
name = "typenum"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1351,6 +1383,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
+name = "unsafe-libyaml"
+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"
@@ -1471,39 +1509,31 @@ dependencies = [
[[package]]
name = "xtensa-lx"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68737a6c8f32ddcd97476acf68ddc6d411697fd94f64a601af16854b74967dff"
+checksum = "3a564fffeb3cd773a524e8d8a5c66ca5e9739ea7450e36a3e6a54dd31f1e652f"
dependencies = [
"critical-section",
- "document-features",
]
[[package]]
name = "xtensa-lx-rt"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235815f34d1bf9c2f9c07917e2b63efbcab5ca5ce9d8faddb97b7105eed1ade3"
+checksum = "520a8fb0121eb6868f4f5ff383e262dc863f9042496724e01673a98a9b7e6c2b"
dependencies = [
- "anyhow",
"document-features",
- "enum-as-inner",
- "minijinja",
"r0",
- "serde",
- "strum",
- "toml",
"xtensa-lx",
"xtensa-lx-rt-proc-macros",
]
[[package]]
name = "xtensa-lx-rt-proc-macros"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c1ab67b22f0576b953a25c43bdfed0ff84af2e01ced85e95c29e7bac6bf2180"
+checksum = "c5a56a616147f5947ceb673790dd618d77b30e26e677f4a896df049d73059438"
dependencies = [
- "darling",
"proc-macro2",
"quote",
"syn",
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -6,20 +6,20 @@ edition = "2024"
license = "MIT OR Apache-2.0"
[dependencies]
-esp-backtrace = { version = "0.16.0", features = [ "exception-handler", "panic-handler", "println" ] }
-esp-hal = { version = "1.0.0-beta.1", features = ["unstable"] }
-esp-println = { version = "0.14.0", features = ["log-04"] }
+esp-backtrace = { version = "0.17.0", features = [ "exception-handler", "panic-handler", "println" ] }
+esp-hal = { version = "1.0.0-rc.0", features = ["unstable"] }
+esp-println = { version = "0.15.0", features = ["log-04"] }
log = { version = "0.4.27" }
-esp-wifi = { version = "0.14.0", features = [ "wifi", "ble" ] }
-esp-hal-embassy = { version = "0.8.0", features = [] }
+esp-wifi = { version = "0.15.0", features = [ "wifi", "ble" ] }
+esp-hal-embassy = { version = "0.9.0", features = [] }
embassy-executor = { version = "0.7.0", package = "embassy-executor", features = ["arch-riscv32", "task-arena-size-10240"] }
embassy-net = { version = "0.7.0", features = ["tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-time = { version = "0.4.0" }
-esp-storage = { version = "0.6.0", features = [] }
-esp-hal-ota = { path = "/home/pilif/projects/esp-hal-ota", features = ["log"] }
-static_cell = { version = "2.1.0", features = ["nightly"] }
-#xtensa-lx-rt = { version = "0.17.2", optional = true, features = ["esp32s3", "float-save-restore"] }
+esp-storage = { version = "0.7.0", features = [] }
+esp-hal-ota = { path = "../", features = ["log"] }
+static_cell = { version = "2.1.1", features = ["nightly"] }
esp-alloc = "0.8.0"
+esp-bootloader-esp-idf = { version = "0.2.0", features = ["log-04"] }
[build-dependencies]
dotenvy = "0.15.7"
@@ -40,6 +40,6 @@ overflow-checks = false
[features]
default = ["esp32s3"]
-esp32s3 = ["esp-backtrace/esp32s3", "esp-hal/esp32s3", "esp-println/esp32s3", "esp-wifi/esp32s3", "esp-hal-embassy/esp32s3", "esp-storage/esp32s3", "esp-hal-ota/esp32s3"]
-esp32c3 = ["esp-backtrace/esp32c3", "esp-hal/esp32c3", "esp-println/esp32c3", "esp-wifi/esp32c3", "esp-hal-embassy/esp32c3", "esp-storage/esp32c3", "esp-hal-ota/esp32c3"]
-esp32 = ["esp-backtrace/esp32", "esp-hal/esp32", "esp-println/esp32", "esp-wifi/esp32", "esp-hal-embassy/esp32", "esp-storage/esp32", "esp-hal-ota/esp32"]
+esp32s3 = ["esp-backtrace/esp32s3", "esp-hal/esp32s3", "esp-println/esp32s3", "esp-wifi/esp32s3", "esp-hal-embassy/esp32s3", "esp-storage/esp32s3", "esp-hal-ota/esp32s3", "esp-bootloader-esp-idf/esp32s3"]
+esp32c3 = ["esp-backtrace/esp32c3", "esp-hal/esp32c3", "esp-println/esp32c3", "esp-wifi/esp32c3", "esp-hal-embassy/esp32c3", "esp-storage/esp32c3", "esp-hal-ota/esp32c3", "esp-bootloader-esp-idf/esp32c3"]
+esp32 = ["esp-backtrace/esp32", "esp-hal/esp32", "esp-println/esp32", "esp-wifi/esp32", "esp-hal-embassy/esp32", "esp-storage/esp32", "esp-hal-ota/esp32", "esp-bootloader-esp-idf/esp32"]
diff --git a/examples/src/main.rs b/examples/src/main.rs
@@ -34,6 +34,8 @@ macro_rules! mk_static {
}};
}
+esp_bootloader_esp_idf::esp_app_desc!();
+
#[esp_hal_embassy::main]
async fn main(spawner: Spawner) {
#[cfg(not(feature = "esp32"))]
@@ -77,7 +79,7 @@ async fn main(spawner: Spawner) {
let init = &*mk_static!(
EspWifiController<'static>,
- esp_wifi::init(timg1.timer0, rng.clone(), peripherals.RADIO_CLK).unwrap()
+ esp_wifi::init(timg1.timer0, rng.clone()).unwrap()
);
let timg0 = TimerGroup::new(peripherals.TIMG0);
