diff --git a/crates/fbuild-build/src/esp32/configs/esp32.json b/crates/fbuild-build/src/esp32/configs/esp32.json index 303611f1..64abfa18 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32.json +++ b/crates/fbuild-build/src/esp32/configs/esp32.json @@ -145,8 +145,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32c2.json b/crates/fbuild-build/src/esp32/configs/esp32c2.json index d5f30e1e..b8485dcc 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32c2.json +++ b/crates/fbuild-build/src/esp32/configs/esp32c2.json @@ -139,8 +139,8 @@ "default_flash_freq": "60m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32c3.json b/crates/fbuild-build/src/esp32/configs/esp32c3.json index ace813d3..becb1812 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32c3.json +++ b/crates/fbuild-build/src/esp32/configs/esp32c3.json @@ -138,8 +138,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32c5.json b/crates/fbuild-build/src/esp32/configs/esp32c5.json index 14a7d22e..a10f9fa4 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32c5.json +++ b/crates/fbuild-build/src/esp32/configs/esp32c5.json @@ -145,8 +145,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32c6.json b/crates/fbuild-build/src/esp32/configs/esp32c6.json index 14fbd60b..6482c930 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32c6.json +++ b/crates/fbuild-build/src/esp32/configs/esp32c6.json @@ -146,8 +146,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32h2.json b/crates/fbuild-build/src/esp32/configs/esp32h2.json index cad647ad..420a999d 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32h2.json +++ b/crates/fbuild-build/src/esp32/configs/esp32h2.json @@ -139,8 +139,8 @@ "default_flash_freq": "48m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32p4.json b/crates/fbuild-build/src/esp32/configs/esp32p4.json index dd5ec508..e15a6fb1 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32p4.json +++ b/crates/fbuild-build/src/esp32/configs/esp32p4.json @@ -143,8 +143,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32s2.json b/crates/fbuild-build/src/esp32/configs/esp32s2.json index d9099b72..3c59fd2a 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32s2.json +++ b/crates/fbuild-build/src/esp32/configs/esp32s2.json @@ -140,8 +140,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 460800, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/configs/esp32s3.json b/crates/fbuild-build/src/esp32/configs/esp32s3.json index 8f67b895..8873467d 100644 --- a/crates/fbuild-build/src/esp32/configs/esp32s3.json +++ b/crates/fbuild-build/src/esp32/configs/esp32s3.json @@ -146,8 +146,8 @@ "default_flash_freq": "80m", "default_flash_size": "4MB", "default_baud": 921600, - "before_reset": "default_reset", - "after_reset": "hard_reset" + "before_reset": "default-reset", + "after_reset": "hard-reset" }, "defines": [ diff --git a/crates/fbuild-build/src/esp32/mcu_config.rs b/crates/fbuild-build/src/esp32/mcu_config.rs index 80040193..3224da49 100644 --- a/crates/fbuild-build/src/esp32/mcu_config.rs +++ b/crates/fbuild-build/src/esp32/mcu_config.rs @@ -35,9 +35,9 @@ pub struct EsptoolConfig { pub default_flash_size: String, /// Default baud rate for flashing. pub default_baud: u32, - /// Reset mode before flashing (e.g. "default_reset"). + /// Reset mode before flashing (e.g. "default-reset"). pub before_reset: String, - /// Reset mode after flashing (e.g. "hard_reset"). + /// Reset mode after flashing (e.g. "hard-reset"). pub after_reset: String, } @@ -153,12 +153,12 @@ impl Esp32McuConfig { self.esptool.default_baud } - /// Reset mode before flashing (e.g. "default_reset"). + /// Reset mode before flashing (e.g. "default-reset"). pub fn before_reset(&self) -> &str { &self.esptool.before_reset } - /// Reset mode after flashing (e.g. "hard_reset"). + /// Reset mode after flashing (e.g. "hard-reset"). pub fn after_reset(&self) -> &str { &self.esptool.after_reset } diff --git a/crates/fbuild-deploy/src/esp32.rs b/crates/fbuild-deploy/src/esp32.rs index 82a723ef..0347bce9 100644 --- a/crates/fbuild-deploy/src/esp32.rs +++ b/crates/fbuild-deploy/src/esp32.rs @@ -174,7 +174,7 @@ impl Esp32Deployer { /// only when esptool itself failed to run (port not found, stub /// upload failed, etc.). /// - /// On success the chip is hard-reset by esptool's `--after hard_reset`, + /// On success the chip is hard-reset by esptool's `--after hard-reset`, /// matching the post-flash behavior — so callers can treat a `true` /// return as "device is now running the requested firmware" without /// any extra reset. @@ -255,7 +255,7 @@ pub struct RegionVerifyResult { pub enum VerifyOutcome { /// All flashed regions match the candidate image; flashing would be /// a no-op. The device has been hard-reset by esptool's - /// `--after hard_reset` so it's already running the requested image. + /// `--after hard-reset` so it's already running the requested image. Match { stdout: String, stderr: String }, /// At least one region differs from the local files. `regions` carries /// the parsed per-region verdict when stdout was understood; empty @@ -804,7 +804,7 @@ impl Esp32Deployer { self.before_reset.clone(), "--after".to_string(), self.after_reset.clone(), - "write_flash".to_string(), + "write-flash".to_string(), "-z".to_string(), "--flash-mode".to_string(), self.flash_mode.clone(), @@ -983,8 +983,8 @@ mod tests { flash_mode: "dio".to_string(), flash_freq: "80m".to_string(), default_baud: "460800".to_string(), - before_reset: "default_reset".to_string(), - after_reset: "hard_reset".to_string(), + before_reset: "default-reset".to_string(), + after_reset: "hard-reset".to_string(), } } @@ -999,7 +999,7 @@ mod tests { assert_eq!(deployer.bootloader_offset, "0x0"); assert_eq!(deployer.firmware_offset, "0x10000"); assert_eq!(deployer.flash_mode, "dio"); - assert_eq!(deployer.before_reset, "default_reset"); + assert_eq!(deployer.before_reset, "default-reset"); } #[test] @@ -1381,7 +1381,7 @@ Verification successful (digest matched).\n"; ); } - /// The selective write-flash argv must include the write_flash + /// The selective write-flash argv must include the write-flash /// subcommand and only the requested region's offset/file pair. /// Skipping bootloader + partitions is the ~1s save targeted by #67. #[test] @@ -1398,7 +1398,7 @@ Verification successful (digest matched).\n"; let args = deployer.build_write_flash_args(&fw, "COM13", Some(&[FlashRegion::Firmware])); - assert!(args.contains(&"write_flash".to_string())); + assert!(args.contains(&"write-flash".to_string())); assert!(!args.iter().any(|a| a.ends_with("bootloader.bin"))); assert!(!args.iter().any(|a| a.ends_with("partitions.bin"))); assert!(args.contains(&"0x10000".to_string())); @@ -1427,7 +1427,7 @@ Verification successful (digest matched).\n"; } /// If a caller requests a region whose file is missing on disk, fail - /// with a clear error rather than silently emitting a write_flash + /// with a clear error rather than silently emitting a write-flash /// call with no offset/file pair (which would produce an opaque /// esptool usage error). Addresses CodeRabbit review on PR #71. #[test] @@ -1553,8 +1553,8 @@ Verification successful (digest matched).\n"; flash_mode: "dio".to_string(), flash_freq: "80m".to_string(), default_baud: "921600".to_string(), - before_reset: "default_reset".to_string(), - after_reset: "hard_reset".to_string(), + before_reset: "default-reset".to_string(), + after_reset: "hard-reset".to_string(), }; let deployer = Esp32Deployer::new( chip,