Skip to content

Fix the logic handling missing serial port command-line argument #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2021
Merged

Fix the logic handling missing serial port command-line argument #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions espflash/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@ pub struct SaveImageOpts {

fn main() -> Result<()> {
miette::set_panic_hook();

let mut opts = Opts::parse();
let config = Config::load();

// if only a single argument is passed, it's always the elf
if opts.image.is_none() && config.connection.serial.is_some() {
// If only a single argument is passed, it's always going to be the ELF file. In
// the case that the serial port was not provided as a command-line argument,
// we will either load the value specified in the configuration file or do port
// auto-detection instead.
if opts.image.is_none() && opts.connect_args.serial.is_some() {
swap(&mut opts.image, &mut opts.connect_args.serial);
}

Expand Down