feat: Move elf arg to MonitorConfigArgs

Author: SergioGasquez

cargo-espflash/src/main.rs

@@ -363,13 +363,9 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
             monitor_args.baud_rate = 74_880;
         }
 
-        monitor(
-            flasher.into_serial(),
-            Some(&elf_data),
-            pid,
-            monitor_args,
-            Some(build_ctx.artifact_path),
-        )
+        monitor_args.elf = Some(build_ctx.artifact_path);
+
+        monitor(flasher.into_serial(), Some(&elf_data), pid, monitor_args)
     } else {
         Ok(())
     }

espflash/src/bin/espflash.rs

@@ -298,13 +298,9 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
             monitor_args.baud_rate = 74_880;
         }
 
-        monitor(
-            flasher.into_serial(),
-            Some(&elf_data),
-            pid,
-            monitor_args,
-            Some(args.image),
-        )
+        monitor_args.elf = Some(args.image);
+
+        monitor(flasher.into_serial(), Some(&elf_data), pid, monitor_args)
     } else {
         Ok(())
     }

espflash/src/cli/mod.rs

@@ -249,9 +249,6 @@ pub struct MonitorArgs {
     /// Connection configuration
     #[clap(flatten)]
     connect_args: ConnectArgs,
-    /// File name of the ELF image to load the symbols from
-    #[arg(short = 'e', long, value_name = "FILE")]
-    elf: Option<PathBuf>,
     /// Monitoring arguments
     #[clap(flatten)]
     monitor_args: MonitorConfigArgs,
@@ -264,6 +261,9 @@ pub struct MonitorConfigArgs {
     /// Baud rate at which to communicate with target device
     #[arg(short = 'r', long, env = "MONITOR_BAUD", default_value = "115_200", value_parser = parse_uint32)]
     pub baud_rate: u32,
+    /// File name of the ELF image to load the symbols from
+    #[arg(short = 'e', long, value_name = "FILE")]
+    pub elf: Option<PathBuf>,
     /// Avoids asking the user for interactions like resetting the device
     #[arg(long)]
     non_interactive: bool,
@@ -432,7 +432,7 @@ pub fn serial_monitor(args: MonitorArgs, config: &Config) -> Result<()> {
     let mut flasher = connect(&args.connect_args, config, true, true)?;
     let pid = flasher.get_usb_pid()?;
 
-    let elf = if let Some(elf_path) = args.elf.clone() {
+    let elf = if let Some(elf_path) = args.monitor_args.elf.clone() {
         let path = fs::canonicalize(elf_path).into_diagnostic()?;
         let data = fs::read(path).into_diagnostic()?;
 
@@ -455,13 +455,7 @@ pub fn serial_monitor(args: MonitorArgs, config: &Config) -> Result<()> {
         monitor_args.baud_rate = 74_880;
     }
 
-    monitor(
-        flasher.into_serial(),
-        elf.as_deref(),
-        pid,
-        monitor_args,
-        args.elf,
-    )
+    monitor(flasher.into_serial(), elf.as_deref(), pid, monitor_args)
 }
 
 /// Convert the provided firmware image from ELF to binary

espflash/src/cli/monitor/mod.rs

@@ -12,7 +12,6 @@
 
 use std::{
     io::{stdout, ErrorKind, Read, Write},
-    path::PathBuf,
     time::Duration,
 };
 
@@ -78,7 +77,6 @@ pub fn monitor(
     elf: Option<&[u8]>,
     pid: u16,
     monitor_args: MonitorConfigArgs,
-    elf_file: Option<PathBuf>,
 ) -> miette::Result<()> {
     if !monitor_args.non_interactive {
         println!("Commands:");
@@ -110,7 +108,8 @@ pub fn monitor(
         LogFormat::Serial => Box::new(parser::serial::Serial),
     };
 
-    let mut external_processors = ExternalProcessors::new(monitor_args.processors, elf_file)?;
+    let mut external_processors =
+        ExternalProcessors::new(monitor_args.processors, monitor_args.elf)?;
 
     let mut buff = [0; 1024];
     loop {