Skip to content

Commit 1e34651

Browse files
authored
Force timeout stuck flushes (#944)
1 parent 2726478 commit 1e34651

File tree

4 files changed

+185
-62
lines changed

4 files changed

+185
-62
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
### Fixed
1818

1919
- [Windows] Fixed a crash in monitor when espflash is connected via USB Serial/JTAG, and the user is typing into the monitor but the device is not reading serial input. (#943)
20+
- [Linux] Fixed espflash hanging when espflash is connected via USB Serial/JTAG, and the user is typing into the monitor but the device is not reading serial input. (#944)
2021

2122
### Removed
2223

Cargo.lock

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

espflash/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ update-informer = { version = "1.2", optional = true }
6262
[target.'cfg(unix)'.dependencies]
6363
libc = "0.2.174"
6464

65+
[target.'cfg(target_os = "linux")'.dependencies]
66+
nix = { version = "0.30", features = ["time"] }
67+
6568
[features]
6669
default = ["cli"]
6770
cli = [

0 commit comments

Comments
 (0)