From 683a72ea3c3c7310726576387b2393be8eb150dd Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Tue, 10 Jan 2023 09:37:53 -0800
Subject: [PATCH] Use the flasher stub by default

---
 cargo-espflash/src/main.rs   |  2 +-
 espflash/src/bin/espflash.rs |  2 +-
 espflash/src/cli/mod.rs      | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
index 7c05f68c..e6e7196e 100644
--- a/cargo-espflash/src/main.rs
+++ b/cargo-espflash/src/main.rs
@@ -218,7 +218,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
 
         // The 26MHz ESP32-C2's need to be treated as a special case.
         let default_baud =
-            if chip == Chip::Esp32c2 && !args.connect_args.use_stub && target_xtal_freq == 26 {
+            if chip == Chip::Esp32c2 && args.connect_args.no_stub && target_xtal_freq == 26 {
                 74_880
             } else {
                 115_200
diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
index a23321f0..82166a18 100644
--- a/espflash/src/bin/espflash.rs
+++ b/espflash/src/bin/espflash.rs
@@ -160,7 +160,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
 
         // The 26MHz ESP32-C2's need to be treated as a special case.
         let default_baud =
-            if chip == Chip::Esp32c2 && !args.connect_args.use_stub && target_xtal_freq == 26 {
+            if chip == Chip::Esp32c2 && args.connect_args.no_stub && target_xtal_freq == 26 {
                 74_880
             } else {
                 115_200
diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs
index 98b95885..4e5151da 100644
--- a/espflash/src/cli/mod.rs
+++ b/espflash/src/cli/mod.rs
@@ -15,7 +15,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use clap::{builder::ArgPredicate, Args};
+use clap::Args;
 use comfy_table::{modifiers, presets::UTF8_FULL, Attribute, Cell, Color, Table};
 use esp_idf_part::{DataType, Partition, PartitionTable};
 use indicatif::{style::ProgressStyle, HumanCount, ProgressBar, ProgressDrawTarget};
@@ -55,9 +55,9 @@ pub struct ConnectArgs {
     #[cfg(feature = "raspberry")]
     #[cfg_attr(feature = "raspberry", clap(long))]
     pub rts: Option<u8>,
-    /// Use RAM stub for loading
-    #[arg(long, default_value_ifs([("erase_parts", ArgPredicate::IsPresent, Some("true")), ("erase_data_parts", ArgPredicate::IsPresent, Some("true"))]))]
-    pub use_stub: bool,
+    /// Do not use the RAM stub for loading
+    #[arg(long)]
+    pub no_stub: bool,
 }
 
 /// Configure communication with the target device's flash
@@ -254,7 +254,7 @@ pub fn connect(args: &ConnectArgs, config: &Config) -> Result<Flasher> {
         interface,
         port_info,
         args.baud,
-        args.use_stub,
+        !args.no_stub,
     )?)
 }
 
@@ -303,7 +303,7 @@ pub fn serial_monitor(args: MonitorArgs, config: &Config) -> Result<()> {
 
     // The 26MHz ESP32-C2's need to be treated as a special case.
     let default_baud = if chip == Chip::Esp32c2
-        && !args.connect_args.use_stub
+        && args.connect_args.no_stub
         && target.crystal_freq(flasher.connection())? == 26
     {
         74_880