Allow specifying RTS/DTR GPIO numbers

Author: bugadani

espflash/src/cli/config.rs

@@ -12,6 +12,10 @@ pub struct Config {
     pub connection: Connection,
     #[serde(default)]
     pub usb_device: Vec<UsbDevice>,
+    #[cfg(feature = "raspberry")]
+    pub rts: Option<u8>,
+    #[cfg(feature = "raspberry")]
+    pub dtr: Option<u8>,
     #[serde(skip)]
     save_path: PathBuf,
 }

espflash/src/cli/mod.rs

@@ -42,6 +42,16 @@ pub struct ConnectOpts {
     #[clap(long)]
     pub speed: Option<u32>,
 
+    /// DTR pin to use for the internal UART hardware.
+    #[cfg(feature = "raspberry")]
+    #[cfg_attr(feature = "raspberry", clap(long))]
+    pub dtr: Option<u8>,
+
+    /// RTS pin to use for the internal UART hardware.
+    #[cfg(feature = "raspberry")]
+    #[cfg_attr(feature = "raspberry", clap(long))]
+    pub rts: Option<u8>,
+
     /// Use RAM stub for loading
     #[clap(long)]
     pub use_stub: bool,
@@ -143,14 +153,10 @@ pub fn connect(opts: &ConnectOpts, config: &Config) -> Result<Flasher> {
         }
         _ => unreachable!(),
     };
+    #[cfg(feature = "raspberry")]
+    let mut gpios = rppal::Gpio::new().unwrap();
 
-    let interface = Interface {
-        serial_port: serial,
-        #[cfg(feature = "raspberry")]
-        rts: None,
-        #[cfg(feature = "raspberry")]
-        dtr: None,
-    };
+    let interface = Interface::new(serial, opts, config);
 
     Ok(Flasher::connect(
         interface,

espflash/src/interface.rs

@@ -3,6 +3,8 @@ use serialport::SerialPort;
 #[cfg(feature = "raspberry")]
 use rppal::gpio::OutputPin;
 
+use crate::{cli::ConnectOpts, Config};
+
 /// Wrapper around SerialPort where platform-specific modifications can be implemented.
 pub struct Interface {
     pub serial_port: Box<dyn SerialPort>,
@@ -22,6 +24,29 @@ fn write_gpio(gpio: &mut OutputPin, level: bool) {
 }
 
 impl Interface {
+    #[cfg(feature = "raspberry")]
+    pub(crate) fn new(serial: Box<dyn SerialPort>, opts: &ConnectOpts, config: &Config) -> Self {
+        Self {
+            serial_port: serial,
+            rts: opts
+                .rts
+                .or(config.rts)
+                .map(|num| gpios.get(num).into_output()),
+
+            dtr: opts
+                .dtr
+                .or(config.dtr)
+                .map(|num| gpios.get(num).into_output()),
+        }
+    }
+
+    #[cfg(not(feature = "raspberry"))]
+    pub(crate) fn new(serial: Box<dyn SerialPort>, _opts: &ConnectOpts, _config: &Config) -> Self {
+        Self {
+            serial_port: serial,
+        }
+    }
+
     pub fn write_data_terminal_ready(&mut self, pin_state: bool) -> serialport::Result<()> {
         #[cfg(feature = "raspberry")]
         if let Some(gpio) = self.dtr.as_mut() {