Skip to content

Commit 02dd436

Browse files
committed
fix(cli): code cleanup
1 parent 30c9d4b commit 02dd436

1 file changed

Lines changed: 16 additions & 34 deletions

File tree

  • process-console/src/legacy

process-console/src/legacy/mod.rs

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,36 @@
1-
// puse crate::legacy::errors::TockLoaderError;
21
pub mod errors;
32

3+
use crate::legacy::errors::TockloaderError;
44
use bytes::{Buf, BufMut, BytesMut};
5-
use clap::{Arg, Command};
65
use console::Term;
76
use futures::stream::{SplitSink, SplitStream};
8-
use futures::{select, SinkExt, StreamExt};
9-
use inquire::Text;
10-
use ratatui::text::Line;
11-
use tokio::task::JoinHandle;
12-
// use tokio_stream::StreamExt;
13-
use crossterm::{
14-
cursor::{MoveTo, MoveToColumn, MoveUp, RestorePosition, SavePosition},
15-
terminal::{Clear, ClearType},
16-
ExecutableCommand,
17-
};
18-
// use std::io::{stdout, Write};
19-
use tokio::sync::{mpsc, watch};
20-
21-
use crate::legacy::errors::TockloaderError;
22-
use std::io::{self, stdin, stdout, Write};
23-
use std::ptr::write_volatile;
24-
use std::sync::Arc;
25-
use std::time::Duration;
26-
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
7+
use futures::{SinkExt, StreamExt};
8+
use std::io::{self, Write};
279
use tokio::signal;
28-
use tokio::time::timeout;
2910
use tokio_serial::{SerialPortBuilderExt, SerialStream};
30-
use tokio_util::codec::LinesCodec;
3111
use tokio_util::codec::{Decoder, Encoder, Framed};
3212

33-
// pub mod errors;
3413
#[derive(Debug)]
3514
struct TerminalCodec;
3615

3716
pub async fn run() {
3817
println!("Connecting to board... (press Ctrl+C to stop)");
3918

40-
let stream = tokio_serial::new("/dev/ttyACM0", 115_200)
41-
.open_native_async()
42-
.unwrap();
19+
let stream = tokio_serial::new("/dev/ttyACM0", 115_200).open_native_async();
4320

44-
let (writer, reader) = Framed::new(stream, TerminalCodec).split();
21+
match stream {
22+
Ok(stream) => {
23+
let (writer, reader) = Framed::new(stream, TerminalCodec).split();
4524

46-
let reader_handle = tokio::spawn(listen_serial(reader));
47-
let writer_handle = tokio::spawn(write_serial(writer));
25+
let reader_handle = tokio::spawn(listen_serial(reader));
26+
let writer_handle = tokio::spawn(write_serial(writer));
4827

49-
let _ = tokio::join!(reader_handle, writer_handle);
28+
let _ = tokio::join!(reader_handle, writer_handle);
29+
}
30+
Err(e) => {
31+
println!("{:?}", e);
32+
}
33+
}
5034
}
5135

5236
async fn listen_serial(
@@ -109,9 +93,7 @@ async fn write_serial(
10993
};
11094

11195
tokio::select! {
112-
_ = ctrl_c => {
113-
println!("Writer interrupted.");
114-
}
96+
_ = ctrl_c => {}
11597
res = write_task => {
11698
res?;
11799
}

0 commit comments

Comments
 (0)