Add --connect-under-reset

Author: JaciBrunning

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "grapple-bundle"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 description = "Grapple's Embedded Firmware and Bootloader Bundler and Flasher utility"
 documentation = "https://docs.rs/grapple-bundle"

Cargo.toml

@@ -199,7 +199,7 @@ pub struct FlashConfig {
 
 
 
-pub fn flash_bundle(bundle: &Path, chip: &str, jtag: bool) -> anyhow::Result<()> {
+pub fn flash_bundle(bundle: &Path, chip: &str, jtag: bool, connect_under_reset: bool) -> anyhow::Result<()> {
   // Step 1 - open bundle, read index, read config
   let file = File::open(bundle)?;
   let mut archive = zip::ZipArchive::new(file)?;
@@ -225,7 +225,10 @@ pub fn flash_bundle(bundle: &Path, chip: &str, jtag: bool) -> anyhow::Result<()>
     probe.select_protocol(probe_rs::probe::WireProtocol::Swd)?;
   }
 
-  let mut session = probe.attach(chip, Permissions::default())?;
+  let mut session = match connect_under_reset {
+    true => probe.attach_under_reset(chip, Permissions::default())?,
+    false => probe.attach(chip, Permissions::default())?,
+  };
 
   // Step 3 - run routine
   for action in config.procedure.iter() {

src/flash.rs

@@ -37,7 +37,9 @@ enum Commands {
     #[arg(short, long)]
     chip: String,
     #[arg(short, long)]
-    jtag: bool
+    jtag: bool,
+    #[arg(long)]
+    connect_under_reset: bool
   }
 }
 
@@ -48,8 +50,8 @@ fn main() {
     Commands::Build { output, firmware, bootloader, config, lasercan_rev1_bootloader_check } => {
       build_bundle(output, firmware, bootloader, config, *lasercan_rev1_bootloader_check).unwrap();
     },
-    Commands::Flash { bundle, chip, jtag } => {
-      flash_bundle(bundle, chip, *jtag).unwrap();
+    Commands::Flash { bundle, chip, jtag, connect_under_reset } => {
+      flash_bundle(bundle, chip, *jtag, *connect_under_reset).unwrap();
     },
   }
 }