fix: Use a single config struct in cargo-espflash

Author: SergioGasquez

cargo-espflash/src/main.rs

@@ -10,7 +10,7 @@ use espflash::{
     Error as EspflashError,
     cli::{
         self,
-        config::{Config, PortConfig},
+        config::Config,
         monitor::{check_monitor_args, monitor},
         *,
     },
@@ -231,27 +231,24 @@ fn main() -> Result<()> {
     // Load any user configuration, if present.
     let config = Config::load()?;
 
-    // Load any user ports configuration, if present.
-    let ports_config = PortConfig::load()?;
-
     // Execute the correct action based on the provided subcommand and its
     // associated arguments.
     match args {
-        Commands::BoardInfo(args) => board_info(&args, &config, &ports_config),
-        Commands::ChecksumMd5(args) => checksum_md5(&args, &config, &ports_config),
+        Commands::BoardInfo(args) => board_info(&args, &config),
+        Commands::ChecksumMd5(args) => checksum_md5(&args, &config),
         Commands::Completions(args) => completions(&args, &mut Cli::command(), "cargo"),
-        Commands::EraseFlash(args) => erase_flash(args, &config, &ports_config),
-        Commands::EraseParts(args) => erase_parts(args, &config, &ports_config),
-        Commands::EraseRegion(args) => erase_region(args, &config, &ports_config),
-        Commands::Flash(args) => flash(args, &config, &ports_config),
-        Commands::HoldInReset(args) => hold_in_reset(args, &config, &ports_config),
-        Commands::ListPorts(args) => list_ports(&args, &ports_config),
-        Commands::Monitor(args) => serial_monitor(args, &config, &ports_config),
+        Commands::EraseFlash(args) => erase_flash(args, &config),
+        Commands::EraseParts(args) => erase_parts(args, &config),
+        Commands::EraseRegion(args) => erase_region(args, &config),
+        Commands::Flash(args) => flash(args, &config),
+        Commands::HoldInReset(args) => hold_in_reset(args, &config),
+        Commands::ListPorts(args) => list_ports(&args, &config.port_config),
+        Commands::Monitor(args) => serial_monitor(args, &config),
         Commands::PartitionTable(args) => partition_table(args),
-        Commands::ReadFlash(args) => read_flash(args, &config, &ports_config),
-        Commands::Reset(args) => reset(args, &config, &ports_config),
+        Commands::ReadFlash(args) => read_flash(args, &config),
+        Commands::Reset(args) => reset(args, &config),
         Commands::SaveImage(args) => save_image(args, &config),
-        Commands::WriteBin(args) => write_bin(args, &config, &ports_config),
+        Commands::WriteBin(args) => write_bin(args, &config),
     }
 }
 
@@ -270,7 +267,7 @@ pub fn erase_parts(args: ErasePartsArgs, config: &Config) -> Result<()> {
     let partition_table = args
         .partition_table
         .as_deref()
-        .or(config.partition_table.as_deref());
+        .or(config.project_config.partition_table.as_deref());
 
     let mut flasher = connect(&args.connect_args, config, false, false)?;
     let chip = flasher.chip();
@@ -296,7 +293,6 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     let mut flasher = connect(
         &args.connect_args,
         config,
-        ports_config,
         args.flash_args.no_verify,
         args.flash_args.no_skip,
     )?;
@@ -306,7 +302,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     // we'll override the detected (or default) value with this.
     if let Some(flash_size) = args.build_args.flash_config_args.flash_size {
         flasher.set_flash_size(flash_size);
-    } else if let Some(flash_size) = config.flash.size {
+    } else if let Some(flash_size) = config.project_config.flash.size {
         flasher.set_flash_size(flash_size);
     }
 
@@ -333,7 +329,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     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(config.project_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
 
@@ -580,7 +576,7 @@ fn save_image(args: SaveImageArgs, config: &Config) -> Result<()> {
     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(config.project_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(