Add command-line arguments for setting flash parameters

Author: jessebraham

cargo-espflash/src/main.rs

@@ -10,9 +10,9 @@ use clap::Parser;
 use espflash::{
     cli::{
         board_info, connect, flash_elf_image, monitor::monitor, save_elf_as_image, ConnectOpts,
-        FlashOpts,
+        FlashConfigOpts, FlashOpts,
     },
-    Chip, Config, FlashFrequency, FlashMode, FlashSize, ImageFormatId,
+    Chip, Config, ImageFormatId,
 };
 use miette::{IntoDiagnostic, Result, WrapErr};
 
@@ -81,6 +81,8 @@ pub struct BuildOpts {
     /// Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
     #[clap(short = 'Z')]
     pub unstable: Option<Vec<String>>,
+    #[clap(flatten)]
+    pub flash_config_opts: FlashConfigOpts,
 }
 
 #[derive(Parser)]
@@ -154,16 +156,15 @@ fn flash(
             .transpose()?
             .or(metadata.format);
 
-        // FIXME
         flash_elf_image(
             &mut flasher,
             &elf_data,
             bootloader,
             partition_table,
             image_format,
-            None,
-            None,
-            None,
+            opts.build_opts.flash_config_opts.flash_mode,
+            opts.build_opts.flash_config_opts.flash_size,
+            opts.build_opts.flash_config_opts.flash_freq,
         )?;
     }
 
@@ -317,8 +318,15 @@ fn save_image(
         .transpose()?
         .or(metadata.format);
 
-    // FIXME
-    save_elf_as_image(chip, &elf_data, opts.file, image_format, None, None, None)?;
+    save_elf_as_image(
+        chip,
+        &elf_data,
+        opts.file,
+        image_format,
+        opts.build_opts.flash_config_opts.flash_mode,
+        opts.build_opts.flash_config_opts.flash_size,
+        opts.build_opts.flash_config_opts.flash_freq,
+    )?;
 
     Ok(())
 }

espflash/src/cli/mod.rs

@@ -11,6 +11,7 @@ use clap::Parser;
 use config::Config;
 use miette::{IntoDiagnostic, Result, WrapErr};
 use serialport::{FlowControl, SerialPortType};
+use strum::VariantNames;
 
 use crate::{
     cli::serial::get_serial_port_info,
@@ -51,6 +52,19 @@ pub struct FlashOpts {
     pub monitor: bool,
 }
 
+#[derive(Parser)]
+pub struct FlashConfigOpts {
+    /// Flash mode to use
+    #[clap(short = 'm', long, possible_values = FlashMode::VARIANTS, value_name = "MODE")]
+    pub flash_mode: Option<FlashMode>,
+    /// Flash size of the target
+    #[clap(short = 's', long, possible_values = FlashSize::VARIANTS, value_name = "SIZE")]
+    pub flash_size: Option<FlashSize>,
+    /// Flash frequency
+    #[clap(short = 'f', long, possible_values = FlashFrequency::VARIANTS, value_name = "FREQUENCY")]
+    pub flash_freq: Option<FlashFrequency>,
+}
+
 pub fn connect(opts: &ConnectOpts, config: &Config) -> Result<Flasher> {
     let port_info = get_serial_port_info(opts, config)?;
 

espflash/src/main.rs

@@ -4,9 +4,9 @@ use clap::{IntoApp, Parser};
 use espflash::{
     cli::{
         board_info, connect, flash_elf_image, monitor::monitor, save_elf_as_image, ConnectOpts,
-        FlashOpts,
+        FlashConfigOpts, FlashOpts,
     },
-    Chip, Config, FlashFrequency, FlashMode, FlashSize, ImageFormatId,
+    Chip, Config, ImageFormatId,
 };
 use miette::{IntoDiagnostic, Result, WrapErr};
 
@@ -17,6 +17,8 @@ struct Opts {
     #[clap(long, possible_values = &["bootloader", "direct-boot"])]
     pub format: Option<String>,
     #[clap(flatten)]
+    pub flash_config_opts: FlashConfigOpts,
+    #[clap(flatten)]
     flash_opts: FlashOpts,
     #[clap(flatten)]
     connect_opts: ConnectOpts,
@@ -36,6 +38,8 @@ pub enum SubCommand {
 
 #[derive(Parser)]
 pub struct SaveImageOpts {
+    #[clap(flatten)]
+    pub flash_config_opts: FlashConfigOpts,
     /// Image format to flash
     #[clap(long, possible_values = &["bootloader", "direct-boot"])]
     format: Option<String>,
@@ -108,16 +112,15 @@ fn flash(opts: Opts, config: Config) -> Result<()> {
             .map(ImageFormatId::from_str)
             .transpose()?;
 
-        // FIXME
         flash_elf_image(
             &mut flasher,
             &elf_data,
             bootloader,
             partition_table,
             image_format,
-            None,
-            None,
-            None,
+            opts.flash_config_opts.flash_mode,
+            opts.flash_config_opts.flash_size,
+            opts.flash_config_opts.flash_freq,
         )?;
     }
 
@@ -139,15 +142,14 @@ fn save_image(opts: SaveImageOpts) -> Result<()> {
         .map(ImageFormatId::from_str)
         .transpose()?;
 
-    // FIXME
     save_elf_as_image(
         opts.chip,
         &elf_data,
         opts.file,
         image_format,
-        None,
-        None,
-        None,
+        opts.flash_config_opts.flash_mode,
+        opts.flash_config_opts.flash_size,
+        opts.flash_config_opts.flash_freq,
     )?;
 
     Ok(())