feat: Update flash size if not provided and read from the target

SergioGasquez · SergioGasquez · commit cfef334b24b1 · 2025-02-28T12:47:28.000+01:00
diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
@@ -8,7 +8,7 @@ use cargo_metadata::{Message, MetadataCommand};
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
     cli::{self, config::Config, monitor::monitor, *},
-    flasher::parse_partition_table,
+    flasher::{parse_partition_table, FlashSize},
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
@@ -330,12 +330,18 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
 
     print_board_info(&mut flasher)?;
 
+    let mut flash_config = args.build_args.flash_config_args;
+    flash_config.flash_size = flash_config
+        .flash_size
+        .or_else(|| flasher.flash_detect().ok().flatten())
+        .or_else(|| Some(FlashSize::default()));
+
     if args.flash_args.ram {
         flasher.load_elf_to_ram(&elf_data, Some(&mut EspflashProgress::default()))?;
     } else {
         let flash_data = make_flash_data(
             args.flash_args.image,
-            &args.build_args.flash_config_args,
+            &flash_config,
             config,
             build_ctx.bootloader_path.as_deref(),
             build_ctx.partition_table_path.as_deref(),
@@ -571,9 +577,14 @@ fn save_image(args: SaveImageArgs, config: &Config) -> Result<()> {
     println!("Merge:             {}", args.save_image_args.merge);
     println!("Skip padding:      {}", args.save_image_args.skip_padding);
 
+    let mut flash_config = args.build_args.flash_config_args;
+    flash_config.flash_size = flash_config
+        .flash_size
+        .or_else(|| Some(FlashSize::default()));
+
     let flash_data = make_flash_data(
         args.save_image_args.image,
-        &args.build_args.flash_config_args,
+        &flash_config,
         config,
         build_ctx.bootloader_path.as_deref(),
         build_ctx.partition_table_path.as_deref(),
diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
@@ -3,7 +3,7 @@ use std::{fs, path::PathBuf};
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
     cli::{self, config::Config, monitor::monitor, *},
-    flasher::parse_partition_table,
+    flasher::{parse_partition_table, FlashSize},
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
@@ -243,16 +243,16 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     // Read the ELF data from the build path and load it to the target.
     let elf_data = fs::read(&args.image).into_diagnostic()?;
 
+    let mut flash_config = args.flash_config_args;
+    flash_config.flash_size = flash_config
+        .flash_size
+        .or_else(|| flasher.flash_detect().ok().flatten())
+        .or_else(|| Some(FlashSize::default()));
+
     if args.flash_args.ram {
         flasher.load_elf_to_ram(&elf_data, Some(&mut EspflashProgress::default()))?;
     } else {
-        let flash_data = make_flash_data(
-            args.flash_args.image,
-            &args.flash_config_args,
-            config,
-            None,
-            None,
-        )?;
+        let flash_data = make_flash_data(args.flash_args.image, &flash_config, config, None, None)?;
 
         if args.flash_args.erase_parts.is_some() || args.flash_args.erase_data_parts.is_some() {
             erase_partitions(
@@ -298,9 +298,14 @@ fn save_image(args: SaveImageArgs, config: &Config) -> Result<()> {
     println!("Merge:             {}", args.save_image_args.merge);
     println!("Skip padding:      {}", args.save_image_args.skip_padding);
 
+    let mut flash_config = args.flash_config_args;
+    flash_config.flash_size = flash_config
+        .flash_size
+        .or_else(|| Some(FlashSize::default()));
+
     let flash_data = make_flash_data(
         args.save_image_args.image,
-        &args.flash_config_args,
+        &flash_config,
         config,
         None,
         None,
diff --git a/espflash/src/flasher/mod.rs b/espflash/src/flasher/mod.rs
@@ -843,7 +843,7 @@ impl Flasher {
         Err(Error::FlashConnect)
     }
 
-    fn flash_detect(&mut self) -> Result<Option<FlashSize>, Error> {
+    pub fn flash_detect(&mut self) -> Result<Option<FlashSize>, Error> {
         const FLASH_RETRY: u8 = 0xFF;
 
         let flash_id = self.spi_command(CommandType::FlashDetect, &[], 24)?;

Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ impl Flasher {`
`843`	`843`	`Err(Error::FlashConnect)`
`844`	`844`	`}`
`845`	`845`
`846`		`- fn flash_detect(&mut self) -> Result<Option<FlashSize>, Error> {`
	`846`	`+ pub fn flash_detect(&mut self) -> Result<Option<FlashSize>, Error> {`
`847`	`847`	`const FLASH_RETRY: u8 = 0xFF;`
`848`	`848`
`849`	`849`	`let flash_id = self.spi_command(CommandType::FlashDetect, &[], 24)?;`