File tree 3 files changed +6
-14
lines changed
3 files changed +6
-14
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ impl RavedudeConfig {
49
49
port : args. port . clone ( ) ,
50
50
reset_delay : args. reset_delay ,
51
51
board : args. legacy_board_name ( ) . clone ( ) ,
52
- output_mode : args. output_mode . unwrap_or ( OutputMode :: default ( ) ) ,
52
+ output_mode : args. output_mode . unwrap_or_default ( ) ,
53
53
newline_after : None ,
54
54
newline_on : None ,
55
55
} ,
@@ -67,7 +67,7 @@ impl RavedudeGeneralConfig {
67
67
)
68
68
}
69
69
70
- return Ok ( NewlineMode :: Off ) ;
70
+ return Ok ( NewlineMode :: Off ) ;
71
71
}
72
72
73
73
Ok ( match ( self . newline_on . as_ref ( ) , self . newline_after ) {
Original file line number Diff line number Diff line change @@ -2,12 +2,10 @@ use std::io::Read as _;
2
2
use std:: io:: Write as _;
3
3
4
4
use anyhow:: Context as _;
5
- use colored:: Colorize as _;
6
5
7
6
use crate :: config:: NewlineMode ;
8
7
use crate :: config:: OutputMode ;
9
8
use crate :: config:: OutputMode :: * ;
10
- use crate :: task_message;
11
9
12
10
pub fn open (
13
11
port : & std:: path:: PathBuf ,
@@ -16,11 +14,6 @@ pub fn open(
16
14
newline_mode : NewlineMode ,
17
15
space_after : Option < u8 > ,
18
16
) -> anyhow:: Result < ( ) > {
19
- task_message ! ( "Console" , "{} at {} baud" , port. display( ) , baudrate) ;
20
- task_message ! ( "" , "{}" , "CTRL+C to exit." . dimmed( ) ) ;
21
- // Empty line for visual consistency
22
- eprintln ! ( ) ;
23
-
24
17
let mut rx = serialport:: new ( port. to_string_lossy ( ) , baudrate)
25
18
. timeout ( std:: time:: Duration :: from_secs ( 2 ) )
26
19
. open_native ( )
Original file line number Diff line number Diff line change @@ -348,8 +348,7 @@ fn ravedude() -> anyhow::Result<()> {
348
348
} ) ?;
349
349
350
350
let port = port. context ( "console can only be opened for devices with USB-to-Serial" ) ?;
351
- let newline_mode = ravedude_config. general_options . newline_mode ( ) ?;
352
-
351
+ let newline_mode = ravedude_config. general_options . newline_mode ( ) ?;
353
352
354
353
task_message ! ( "Console" , "{} at {} baud" , port. display( ) , baudrate) ;
355
354
task_message ! ( "" , "{}" , "CTRL+C to exit." . dimmed( ) ) ;
@@ -358,9 +357,9 @@ fn ravedude() -> anyhow::Result<()> {
358
357
console:: open (
359
358
& port,
360
359
baudrate. get ( ) ,
361
- ravedude_config. general_options . output_mode ,
362
- newline_mode,
363
- newline_mode. space_after ( )
360
+ ravedude_config. general_options . output_mode ,
361
+ newline_mode,
362
+ newline_mode. space_after ( ) ,
364
363
) ?;
365
364
} else if args. bin . is_none ( ) && port. is_some ( ) {
366
365
warning ! ( "you probably meant to add -c/--open-console?" ) ;
You can’t perform that action at this time.
0 commit comments