bugfix: fix reset sequence for usb-serial-jtag chips (esp-rs#157)

Author: JurajSadel

cargo-espflash/src/main.rs

@@ -178,7 +178,8 @@ fn flash(
     }
 
     if opts.flash_opts.monitor {
-        monitor(flasher.into_serial(), &elf_data).into_diagnostic()?;
+        let pid = flasher.get_usb_pid()?;
+        monitor(flasher.into_serial(), &elf_data, pid).into_diagnostic()?;
     }
 
     Ok(())

espflash/src/cli/monitor.rs

@@ -1,6 +1,5 @@
 use std::{
     io::{stdout, ErrorKind, Read, Write},
-    thread::sleep,
     time::Duration,
 };
 
@@ -12,6 +11,8 @@ use espmonitor::{handle_serial, load_bin_context, SerialState};
 use miette::{IntoDiagnostic, Result};
 use serialport::SerialPort;
 
+use crate::connection::reset_after_flash;
+
 /// Converts key events from crossterm into appropriate character/escape
 /// sequences which are then sent over the serial connection.
 ///
@@ -82,7 +83,7 @@ impl Drop for RawModeGuard {
     }
 }
 
-pub fn monitor(mut serial: Box<dyn SerialPort>, elf: &[u8]) -> serialport::Result<()> {
+pub fn monitor(mut serial: Box<dyn SerialPort>, elf: &[u8], pid: u16) -> serialport::Result<()> {
     println!("Commands:");
     println!("    CTRL+R    Reset chip");
     println!("    CTRL+C    Exit");
@@ -125,12 +126,7 @@ pub fn monitor(mut serial: Box<dyn SerialPort>, elf: &[u8]) -> serialport::Resul
                         //       https://github.com/crossterm-rs/crossterm/pull/629
                         KeyCode::Char('c') | KeyCode::Char('C') => break,
                         KeyCode::Char('r') | KeyCode::Char('R') => {
-                            serial.write_data_terminal_ready(false)?;
-                            serial.write_request_to_send(true)?;
-
-                            sleep(Duration::from_millis(100));
-
-                            serial.write_request_to_send(false)?;
+                            reset_after_flash(&mut *serial, pid)?;
                             continue;
                         }
                         _ => {}

espflash/src/connection.rs

@@ -122,16 +122,8 @@ impl Connection {
     }
 
     pub fn reset(&mut self) -> Result<(), Error> {
-        sleep(Duration::from_millis(100));
-
-        self.serial.write_data_terminal_ready(false)?;
-        self.serial.write_request_to_send(true)?;
-
-        sleep(Duration::from_millis(100));
-
-        self.serial.write_request_to_send(false)?;
-
-        Ok(())
+        let pid = self.port_info.pid;
+        Ok(reset_after_flash(&mut *self.serial, pid)?)
     }
 
     pub fn reset_to_flash(&mut self, extra_delay: bool) -> Result<(), Error> {
@@ -280,4 +272,35 @@ impl Connection {
     pub fn into_serial(self) -> Box<dyn SerialPort> {
         self.serial
     }
+
+    pub fn get_usb_pid(&self) -> Result<u16, Error> {
+        Ok(self.port_info.pid)
+    }
+}
+
+pub fn reset_after_flash(serial: &mut dyn SerialPort, pid: u16) -> Result<(), serialport::Error> {
+    sleep(Duration::from_millis(100));
+
+    if pid == USB_SERIAL_JTAG_PID {
+        serial.write_data_terminal_ready(false)?;
+
+        sleep(Duration::from_millis(100));
+
+        serial.write_request_to_send(true)?;
+        serial.write_data_terminal_ready(false)?;
+        serial.write_request_to_send(true)?;
+
+        sleep(Duration::from_millis(100));
+
+        serial.write_request_to_send(false)?;
+    } else {
+        serial.write_data_terminal_ready(false)?;
+        serial.write_request_to_send(true)?;
+
+        sleep(Duration::from_millis(100));
+
+        serial.write_request_to_send(false)?;
+    }
+
+    Ok(())
 }

espflash/src/flasher.rs

@@ -521,6 +521,10 @@ impl Flasher {
     pub fn into_serial(self) -> Box<dyn SerialPort> {
         self.connection.into_serial()
     }
+
+    pub fn get_usb_pid(&self) -> Result<u16, Error> {
+        self.connection.get_usb_pid()
+    }
 }
 
 pub(crate) fn get_erase_size(offset: usize, size: usize) -> usize {

espflash/src/main.rs

@@ -134,7 +134,8 @@ fn flash(opts: Opts, config: Config) -> Result<()> {
     }
 
     if opts.flash_opts.monitor {
-        monitor(flasher.into_serial(), &elf_data).into_diagnostic()?;
+        let pid = flasher.get_usb_pid()?;
+        monitor(flasher.into_serial(), &elf_data, pid).into_diagnostic()?;
     }
 
     Ok(())