RSDK-5805 - support remembering serial port for espflash (#140)

viamrobotics · Jan 17, 2024 · 786eccc · 786eccc
1 parent a17f70e
commit 786eccc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/micro-rdk-installer/src/error.rs b/micro-rdk-installer/src/error.rs
@@ -45,6 +45,8 @@ pub enum Error {
     MonitorError(String),
     #[error("Unimplemented command: {0}")]
     UnimplementedError(String),
+    #[error("Serial config error: {0}")]
+    SerialConfigError(String),
     #[error("No command received")]
     NoCommandError,
 }

diff --git a/micro-rdk-installer/src/main.rs b/micro-rdk-installer/src/main.rs
@@ -234,7 +234,7 @@ fn flash(
         port: None,
         no_stub: false,
     };
-    let conf = Config::default();
+    let conf = Config::load().map_err(|err| Error::SerialConfigError(err.to_string()))?;
     log::info!("Connecting...");
     let mut flasher = connect(&connect_args, &conf).map_err(|_| Error::FlashConnect)?;
     let mut f = File::open(binary_path).map_err(Error::FileError)?;
@@ -265,7 +265,7 @@ fn monitor_esp32(baud_rate: Option<u32>, log_file_path: Option<String>) -> Resul
         port: None,
         no_stub: false,
     };
-    let conf = Config::default();
+    let conf = Config::load().map_err(|err| Error::SerialConfigError(err.to_string()))?;
     log::info!("Connecting...");
     let flasher = connect(&connect_args, &conf).map_err(|_| Error::FlashConnect)?;
     let pid = flasher.get_usb_pid().map_err(Error::EspFlashError)?;