Update flash size (#797)

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

* feat: Move logic inside make_flash_settings

* docs: Udpate changelog

* Don't require passing `Flasher` struct around

---------

Co-authored-by: Jesse Braham <[email protected]>

Author: SergioGasquez

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `get_usb_pid` is now `usb_pid` and no longer needlessly returns a `Result` (#795)
 - `CodeSegment` and `RomSegment` have been merged into a single `Segment` struct (#796)
 - `IdfBootloaderFormat` has had its constructor's parameters reduced/simplified (#798)
+- Update flash size when creating the app partition (#797)
 
 ### Fixed
 

cargo-espflash/src/main.rs

@@ -8,6 +8,7 @@ use cargo_metadata::{Message, MetadataCommand};
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
     cli::{self, config::Config, monitor::monitor, *},
+    flasher::FlashSize,
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
@@ -329,12 +330,19 @@ 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 // Use CLI argument if provided
+        .or(config.flash.size) // If no CLI argument, try the config file
+        .or_else(|| flasher.flash_detect().ok().flatten()) // Try detecting flash size next
+        .or_else(|| Some(FlashSize::default())); // Otherwise, use a reasonable default value
+
     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(),
@@ -570,9 +578,15 @@ 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 // Use CLI argument if provided
+        .or(config.flash.size) // If no CLI argument, try the config file
+        .or_else(|| Some(FlashSize::default())); // Otherwise, use a reasonable default value
+
     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(),

espflash/src/bin/espflash.rs

@@ -3,6 +3,7 @@ use std::{fs, path::PathBuf};
 use clap::{Args, CommandFactory, Parser, Subcommand};
 use espflash::{
     cli::{self, config::Config, monitor::monitor, *},
+    flasher::FlashSize,
     logging::initialize_logger,
     targets::{Chip, XtalFrequency},
     update::check_for_update,
@@ -233,25 +234,26 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
         flasher.set_flash_size(flash_size);
     }
 
-    print_board_info(&mut flasher)?;
-
     let chip = flasher.chip();
     let target = chip.into_target();
     let target_xtal_freq = target.crystal_freq(flasher.connection())?;
 
     // Read the ELF data from the build path and load it to the target.
     let elf_data = fs::read(&args.image).into_diagnostic()?;
 
+    print_board_info(&mut flasher)?;
+
+    let mut flash_config = args.flash_config_args;
+    flash_config.flash_size = flash_config
+        .flash_size // Use CLI argument if provided
+        .or(config.flash.size) // If no CLI argument, try the config file
+        .or_else(|| flasher.flash_detect().ok().flatten()) // Try detecting flash size next
+        .or_else(|| Some(FlashSize::default())); // Otherwise, use a reasonable default value
+
     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(
@@ -297,9 +299,15 @@ 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 // Use CLI argument if provided
+        .or(config.flash.size) // If no CLI argument, try the config file
+        .or_else(|| Some(FlashSize::default())); // Otherwise, use a reasonable default value
+
     let flash_data = make_flash_data(
         args.save_image_args.image,
-        &args.flash_config_args,
+        &flash_config,
         config,
         None,
         None,

espflash/src/cli/mod.rs

@@ -946,14 +946,6 @@ fn pretty_print(table: PartitionTable) {
     println!("{pretty}");
 }
 
-pub fn make_flash_settings(flash_config_args: &FlashConfigArgs, config: &Config) -> FlashSettings {
-    FlashSettings::new(
-        flash_config_args.flash_mode.or(config.flash.mode),
-        flash_config_args.flash_size.or(config.flash.size),
-        flash_config_args.flash_freq.or(config.flash.freq),
-    )
-}
-
 pub fn make_flash_data(
     image_args: ImageArgs,
     flash_config_args: &FlashConfigArgs,
@@ -983,7 +975,12 @@ pub fn make_flash_data(
         println!("Partition table:   {}", path.display());
     }
 
-    let flash_settings = make_flash_settings(flash_config_args, config);
+    let flash_settings = FlashSettings::new(
+        flash_config_args.flash_mode.or(config.flash.mode),
+        flash_config_args.flash_size,
+        flash_config_args.flash_freq.or(config.flash.freq),
+    );
+
     FlashData::new(
         bootloader,
         partition_table,

espflash/src/flasher/mod.rs

@@ -840,7 +840,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)?;