From 35fabf278935aef78c59e33f8e65dbca97e16aee Mon Sep 17 00:00:00 2001 From: Dane Slattery Date: Tue, 25 Nov 2025 14:54:20 +0200 Subject: [PATCH 1/5] Change long form of save-image --ignore-app-descriptor --- espflash/src/cli/mod.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs index ec833a2c..426effdf 100644 --- a/espflash/src/cli/mod.rs +++ b/espflash/src/cli/mod.rs @@ -42,14 +42,8 @@ use crate::{ }, error::{Error, MissingPartition, MissingPartitionTable}, flasher::{ - DeviceInfo, - FLASH_SECTOR_SIZE, - FlashData, - FlashFrequency, - FlashMode, - FlashSettings, - FlashSize, - Flasher, + DeviceInfo, FLASH_SECTOR_SIZE, FlashData, FlashFrequency, FlashMode, FlashSettings, + FlashSize, Flasher, }, image_format::{ImageFormat, ImageFormatKind, Metadata, idf::IdfBootloaderFormat}, target::{Chip, ProgressCallbacks, XtalFrequency}, @@ -259,7 +253,7 @@ pub struct ImageArgs { #[arg(long, value_name = "MMU_PAGE_SIZE", value_parser = parse_u32)] pub mmu_page_size: Option, /// Skip checking whether the app descriptor is present in the image. - #[arg(long = "ignore_app_descriptor", default_value_t = true, action = clap::ArgAction::SetFalse)] + #[arg(long = "ignore-app-descriptor", default_value_t = true, action = clap::ArgAction::SetFalse)] pub check_app_descriptor: bool, } From be2267330599374ce07aabc29ac0dc0b05c11d32 Mon Sep 17 00:00:00 2001 From: Dane Slattery Date: Tue, 25 Nov 2025 14:57:02 +0200 Subject: [PATCH 2/5] fix fmt --- espflash/src/cli/mod.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs index 426effdf..c0551799 100644 --- a/espflash/src/cli/mod.rs +++ b/espflash/src/cli/mod.rs @@ -42,8 +42,14 @@ use crate::{ }, error::{Error, MissingPartition, MissingPartitionTable}, flasher::{ - DeviceInfo, FLASH_SECTOR_SIZE, FlashData, FlashFrequency, FlashMode, FlashSettings, - FlashSize, Flasher, + DeviceInfo, + FLASH_SECTOR_SIZE, + FlashData, + FlashFrequency, + FlashMode, + FlashSettings, + FlashSize, + Flasher, }, image_format::{ImageFormat, ImageFormatKind, Metadata, idf::IdfBootloaderFormat}, target::{Chip, ProgressCallbacks, XtalFrequency}, From 9c8dca23723df8b6198b7ca0c5fdb5e42b0abf7a Mon Sep 17 00:00:00 2001 From: Dane Slattery Date: Tue, 25 Nov 2025 15:05:38 +0200 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f9b1af..d48f51c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- The CLI argument `save-image`, `ignore-app-descriptor` is now consistent with other args (#974) + ### Fixed - Corrected eFuse BLOCK0 definitions for ESP32-C2, ESP32-C3, and ESP32-S3 (#961) From 73ecd94371e2e0912a2b1c89329c8944e61de0e0 Mon Sep 17 00:00:00 2001 From: Dane Slattery Date: Fri, 5 Dec 2025 15:48:22 +0200 Subject: [PATCH 4/5] support alias --- espflash/src/cli/mod.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs index c0551799..6304186c 100644 --- a/espflash/src/cli/mod.rs +++ b/espflash/src/cli/mod.rs @@ -42,14 +42,8 @@ use crate::{ }, error::{Error, MissingPartition, MissingPartitionTable}, flasher::{ - DeviceInfo, - FLASH_SECTOR_SIZE, - FlashData, - FlashFrequency, - FlashMode, - FlashSettings, - FlashSize, - Flasher, + DeviceInfo, FLASH_SECTOR_SIZE, FlashData, FlashFrequency, FlashMode, FlashSettings, + FlashSize, Flasher, }, image_format::{ImageFormat, ImageFormatKind, Metadata, idf::IdfBootloaderFormat}, target::{Chip, ProgressCallbacks, XtalFrequency}, @@ -259,8 +253,8 @@ pub struct ImageArgs { #[arg(long, value_name = "MMU_PAGE_SIZE", value_parser = parse_u32)] pub mmu_page_size: Option, /// Skip checking whether the app descriptor is present in the image. - #[arg(long = "ignore-app-descriptor", default_value_t = true, action = clap::ArgAction::SetFalse)] - pub check_app_descriptor: bool, + #[arg(long = "ignore-app-descriptor", visible_alias ="ignore_app_descriptor",default_value_t = true, action = clap::ArgAction::SetFalse)] + pub check_app_descriptor: bool, // todo: remove ignore_app_descriptor alias before v5 } /// ESP-IDF image format arguments From e21df867462b6daca478cb4436a78605cb6f810b Mon Sep 17 00:00:00 2001 From: Dane Slattery Date: Fri, 5 Dec 2025 15:49:55 +0200 Subject: [PATCH 5/5] format --- espflash/src/cli/mod.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs index 6304186c..fa668c02 100644 --- a/espflash/src/cli/mod.rs +++ b/espflash/src/cli/mod.rs @@ -42,8 +42,14 @@ use crate::{ }, error::{Error, MissingPartition, MissingPartitionTable}, flasher::{ - DeviceInfo, FLASH_SECTOR_SIZE, FlashData, FlashFrequency, FlashMode, FlashSettings, - FlashSize, Flasher, + DeviceInfo, + FLASH_SECTOR_SIZE, + FlashData, + FlashFrequency, + FlashMode, + FlashSettings, + FlashSize, + Flasher, }, image_format::{ImageFormat, ImageFormatKind, Metadata, idf::IdfBootloaderFormat}, target::{Chip, ProgressCallbacks, XtalFrequency},