Skip to content

Commit cd4ec7c

Browse files
authored
Merge pull request #125 from jessebraham/fixes/misc
Update `clap` to stable version, reset baud when starting serial monitor
2 parents 8f161cf + a79db0e commit cd4ec7c

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

Cargo.lock

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cargo-espflash/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ categories = [
2626

2727
[dependencies]
2828
cargo_metadata = "0.14"
29-
cargo_toml = "0.10"
30-
clap = { version = "3.0.0-rc.1", features = ["derive"] }
29+
cargo_toml = "0.11"
30+
clap = { version = "3.0", features = ["derive"] }
3131
crossterm = "0.22"
3232
espflash = { version = "1", path = "../espflash" }
3333
miette = { version = "3", features = ["fancy"] }
3434
serde = { version = "1", features = ["derive"] }
35+
thiserror = "1.0"
3536
toml = "0.5"
36-
thiserror = "1"
3737

3838
[package.metadata.binstall]
3939
pkg-url = "{ repo }/releases/download/v{ version }/{ name }"

espflash/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ binread = "2"
2020
bytemuck = { version = "1", features = ["derive"] }
2121
indicatif = "0.16"
2222
md5 = "0.7"
23-
clap = { version = "3.0.0-rc.1", features = ["derive"] }
23+
clap = { version = "3.0", features = ["derive"] }
2424
serialport = "4"
2525
sha2 = "0.10"
2626
slip-codec = "0.3"

espflash/src/cli/monitor.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ pub fn monitor(mut serial: Box<dyn SerialPort>) -> serialport::Result<()> {
8484
println!();
8585

8686
let mut buff = [0; 128];
87+
serial.set_baud_rate(115_200)?;
8788
serial.set_timeout(Duration::from_millis(5))?;
8889

8990
let _raw_mode = RawModeGuard::new();

0 commit comments

Comments
 (0)