Skip to content

Commit d458b77

Browse files
authored
Merge pull request #203 from jessebraham/fixes/crossterm
Update `crossterm` and remove the temporary bugfix from our monitor
2 parents c4a7228 + 976173b commit d458b77

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

Cargo.lock

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

espflash/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ binread = "2.2"
3737
bytemuck = { version = "1.9", features = ["derive"] }
3838
clap = { version = "3.2", features = ["derive"] }
3939
comfy-table = "6.0"
40-
crossterm = "0.23"
40+
crossterm = "0.24"
4141
csv = "1.1"
4242
dialoguer = "0.10"
4343
directories-next = "2.0"

espflash/src/cli/monitor.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,8 @@ pub fn monitor(mut serial: Box<dyn SerialPort>, elf: &[u8], pid: u16) -> serialp
120120
if let Event::Key(key) = read()? {
121121
if key.modifiers.contains(KeyModifiers::CONTROL) {
122122
match key.code {
123-
// NOTE: Both the lower- and upper-case variants shouldn't
124-
// need to be matched normally, but there is a bug in
125-
// crossterm 0.23 which requires this fix. See:
126-
// https://github.com/crossterm-rs/crossterm/pull/629
127-
KeyCode::Char('c') | KeyCode::Char('C') => break,
128-
KeyCode::Char('r') | KeyCode::Char('R') => {
123+
KeyCode::Char('c') => break,
124+
KeyCode::Char('r') => {
129125
reset_after_flash(&mut *serial, pid)?;
130126
continue;
131127
}

0 commit comments

Comments
 (0)