From 968406cf8e9edd4a712a6754ab99d79a2e2f3ffd Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 18 Sep 2025 10:34:16 +0200 Subject: [PATCH 1/2] build: Bump espflash and cargo-espflash versions --- Cargo.lock | 60 +++++++++++++++++++++++---------------- cargo-espflash/Cargo.toml | 4 +-- espflash/Cargo.toml | 2 +- espflash/src/lib.rs | 2 +- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9247ea88..7ab1606d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,7 +251,7 @@ dependencies = [ [[package]] name = "cargo-espflash" -version = "4.0.1" +version = "4.1.0" dependencies = [ "cargo_metadata", "clap", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "espflash" -version = "4.0.1" +version = "4.1.0" dependencies = [ "addr2line 0.25.1", "base64", @@ -1499,9 +1499,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.78" +version = "0.3.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" +checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" dependencies = [ "once_cell", "wasm-bindgen", @@ -1919,11 +1919,11 @@ dependencies = [ [[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", + "toml_edit 0.23.5", ] [[package]] @@ -2690,9 +2690,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" dependencies = [ "rustls", "tokio", @@ -2707,7 +2707,7 @@ dependencies = [ "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", - "toml_edit", + "toml_edit 0.22.27", ] [[package]] @@ -2757,6 +2757,18 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ad0b7ae9cfeef5605163839cb9221f453399f15cfb5c10be9885fcf56611f9" +dependencies = [ + "indexmap", + "toml_datetime 0.7.1", + "toml_parser", + "winnow", +] + [[package]] name = "toml_parser" version = "1.0.2" @@ -3053,9 +3065,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" +checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" dependencies = [ "cfg-if", "once_cell", @@ -3066,9 +3078,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" +checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" dependencies = [ "bumpalo", "log", @@ -3080,9 +3092,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.51" +version = "0.4.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" +checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67" dependencies = [ "cfg-if", "js-sys", @@ -3093,9 +3105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" +checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3103,9 +3115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" +checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" dependencies = [ "proc-macro2", "quote", @@ -3116,18 +3128,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.101" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.78" +version = "0.3.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" +checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index 6d38d048..098d3a65 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-espflash" -version = "4.0.1" +version = "4.1.0" edition = "2024" rust-version = "1.85" description = "Cargo subcommand for interacting with Espressif devices" @@ -23,7 +23,7 @@ pkg-fmt = "zip" [dependencies] cargo_metadata = "0.22" clap = { version = "4.5", features = ["derive", "wrap_help"] } -espflash = { version = "4.0", path = "../espflash" } +espflash = { version = "4.1", path = "../espflash" } log = "0.4" miette = { version = "7.6", features = ["fancy"] } serde = { version = "1.0", features = ["derive"] } diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index 6d1f93bd..090f8e3f 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espflash" -version = "4.0.1" +version = "4.1.0" edition = "2024" rust-version = "1.85" description = "A command-line tool for interacting with Espressif devices" diff --git a/espflash/src/lib.rs b/espflash/src/lib.rs index 3269d89f..343266da 100644 --- a/espflash/src/lib.rs +++ b/espflash/src/lib.rs @@ -14,7 +14,7 @@ //! [espflash] can also be used as a library: //! //! ```toml -//! espflash = { version = "4.0.1", default-features = false } +//! espflash = { version = "4.1.0", default-features = false } //! ``` //! //! We add `default-features` here to disable the `cli` feature, which is From 6815a5f63da3ddbf168ea17935e5bcf2f580ace7 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 18 Sep 2025 10:34:52 +0200 Subject: [PATCH 2/2] docs: Update changelog --- CHANGELOG.md | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4500774..f5440760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,27 +8,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +### Changed + +### Fixed + +### Removed + +## [4.1.0] - 2025-09-18 + +### Added + - Add `--no-addresses` flag to `monitor` subcommand (#942) +- Add new ESP32-C5 magic values (#940) ### Changed -- Renamed `--check-app-descriptor` to `--ignore-app-descriptor` (#833) +- Rename `--check-app-descriptor` to `--ignore-app-descriptor` (#833) ### Fixed -- [Windows] Fixed a crash in monitor when espflash is connected via USB Serial/JTAG, and the user is typing into the monitor but the device is not reading serial input. (#943) -- [Linux/MacOS] Fixed espflash hanging when espflash is connected via USB Serial/JTAG, and the user is typing into the monitor but the device is not reading serial input. (#944, #945) -- Fixed ESP32-S2 flash size detection issues (#950) +- Fix a crash in monitor when espflash is connected via USB Serial/JTAG, and the user is typing into the monitor but the device is not reading serial input. (#943, #944, #945) +- Fix ESP32-S2 flash size detection issues (#950) - Images are now automatically padded to 4 bytes before writing by the library (previously this was done in the CLI) (#951) -### Removed - ## [4.0.1] - 2025-07-07 ### Changed + - `espflash` now allows wider version ranges on its dependencies(#924) ### Fixed + - `save-image` now checks if the ELF contains the app descriptor (#920) ## [4.0.0] - 2025-07-01 @@ -411,7 +422,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0] - 2021-09-21 -[Unreleased]: https://github.com/esp-rs/espflash/compare/v4.0.1...HEAD +[Unreleased]: https://github.com/esp-rs/espflash/compare/v4.1.0...HEAD +[4.1.0]: https://github.com/esp-rs/espflash/compare/v4.0.1...v4.1.0 [4.0.1]: https://github.com/esp-rs/espflash/compare/v4.0.0...v4.0.1 [4.0.0]: https://github.com/esp-rs/espflash/compare/v3.3.0...v4.0.0 [3.3.0]: https://github.com/esp-rs/espflash/compare/v3.2.0...v3.3.0