Merge pull request #51 from brainstorm/upgrade_espflash

brainstorm · web-flow · commit 7adf32927f3e · 2025-07-09T20:12:16.000+10:00
Upgrade to espflash 4.x
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,13 +9,13 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-cfg-if = "1.0.0"
+cfg-if = "1"
 ed25519-dalek = { version = "2", default-features = false }
 embassy-executor = { version = "0.7"}
 embassy-net = { version = "0.7", features = ["tcp", "udp", "dhcpv4", "medium-ethernet"] }
 smoltcp = { version = "0.12", default-features = false, features = ["medium-ethernet", "socket-raw"]}
 embassy-time = { version = "0.4" }
-embedded-io-async = "0.6.0"
+embedded-io-async = "0.6"
 esp-alloc = "0.8"
 esp-backtrace = { version = "0.16", features = [
     "exception-handler",
@@ -40,6 +40,7 @@ edge-dhcp = "0.6"
 edge-nal = "0.5"
 edge-nal-embassy = "0.6"
 portable-atomic = "1"
+esp-bootloader-esp-idf = "0.1"
 
 [profile.dev]
 # Rust debug is too slow.
diff --git a/src/main.rs b/src/main.rs
@@ -33,6 +33,7 @@ async fn main(spawner: Spawner) -> ! {
                 esp_alloc::heap_allocator!(size: 72 * 1024);
         }
     );
+    esp_bootloader_esp_idf::esp_app_desc!();
     esp_println::logger::init_logger_from_env();
 
     // System init

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ async fn main(spawner: Spawner) -> ! {`
`33`	`33`	`esp_alloc::heap_allocator!(size: 72 * 1024);`
`34`	`34`	`}`
`35`	`35`	`);`
	`36`	`+ esp_bootloader_esp_idf::esp_app_desc!();`
`36`	`37`	`esp_println::logger::init_logger_from_env();`
`37`	`38`
`38`	`39`	`// System init`