Move board_info into Flasher where it's usable by both applications

Author: jessebraham

cargo-espflash/src/main.rs

@@ -141,11 +141,13 @@ fn main() -> Result<()> {
         None
     };
 
-    // Connect the Flasher to the target device. If the '--board-info' flag has been
-    // provided, display the board info and terminate the application.
+    // Connect the Flasher to the target device and print the board information
+    // upon connection. If the '--board-info' flag has been provided, we have
+    // nothing left to do so exit early.
     let mut flasher = Flasher::connect(serial, speed)?;
+    flasher.board_info()?;
+
     if matches.is_present("board_info") {
-        board_info(&mut flasher)?;
         return Ok(());
     }
 
@@ -193,6 +195,7 @@ fn main() -> Result<()> {
     } else {
         flasher.load_elf_to_flash(&elf_data, bootloader, partition_table)?;
     }
+    println!("\nFlashing has completed!");
 
     if matches.is_present("monitor") {
         monitor(flasher.into_serial()).into_diagnostic()?;
@@ -202,25 +205,6 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-fn board_info(flasher: &mut Flasher) -> Result<()> {
-    let chip = flasher.chip();
-    let revision = chip.chip_revision(flasher.connection())?;
-    let freq = chip.crystal_freq(flasher.connection())?;
-
-    // Print the detected chip type, and if available the silicon revision.
-    print!("Chip type:         {}", chip);
-    if let Some(revision) = revision {
-        println!(" (revision {})", revision);
-    } else {
-        println!();
-    }
-
-    println!("Crystal frequency: {}MHz", freq);
-    println!("Flash size:        {}", flasher.flash_size());
-
-    Ok(())
-}
-
 fn build(
     release: bool,
     example: Option<&str>,

espflash/src/flasher.rs

@@ -459,6 +459,24 @@ impl Flasher {
         self.flash_size
     }
 
+    /// Read and print any information we can about the connected board
+    pub fn board_info(&mut self) -> Result<(), Error> {
+        let chip = self.chip();
+        let maybe_revision = chip.chip_revision(self.connection())?;
+        let freq = chip.crystal_freq(self.connection())?;
+        let size = self.flash_size();
+
+        print!("Chip type:         {}", chip);
+        match maybe_revision {
+            Some(revision) => println!(" (revision {})", revision),
+            None => println!(),
+        }
+        println!("Crystal frequency: {}MHz", freq);
+        println!("Flash size:        {}", size);
+
+        Ok(())
+    }
+
     /// Load an elf image to ram and execute it
     ///
     /// Note that this will not touch the flash on the device

espflash/src/main.rs

@@ -56,8 +56,7 @@ fn main() -> Result<()> {
     let mut flasher = Flasher::connect(serial, None)?;
 
     if board_info {
-        println!("Chip type: {}", flasher.chip());
-        println!("Flash size: {}", flasher.flash_size());
+        flasher.board_info()?;
 
         return Ok(());
     }