Skip to content

Commit 8b7e99b

Browse files
authored
Merge pull request #29 from lonesometraveler/refactor_serial_3
2 parents 52a5e7e + 667b114 commit 8b7e99b

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/serial.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ fn serial_write(
1414
write_port.write(cmd)
1515
}
1616

17-
fn serial_read(port: &mut BufReader<Box<dyn SerialPort>>, serial_buf: &mut String) -> bool {
18-
match port.read_line(serial_buf) {
19-
Ok(_) => true,
20-
Err(_) => {
21-
// this probably means that either there is no data,
22-
// or it could not be decoded to a String (binary stuff...)
23-
false
24-
}
25-
}
17+
fn serial_read(
18+
port: &mut BufReader<Box<dyn SerialPort>>,
19+
serial_buf: &mut String,
20+
) -> Result<usize, std::io::Error> {
21+
port.read_line(serial_buf)
2622
}
2723

2824
pub fn serial_thread(
@@ -165,7 +161,7 @@ pub fn serial_thread(
165161

166162
// perform reads
167163
let mut serial_buf = "".to_string();
168-
if serial_read(&mut port, &mut serial_buf) {
164+
if serial_read(&mut port, &mut serial_buf).is_ok() {
169165
if let Ok(mut write_guard) = raw_data_lock.write() {
170166
// println!("received: {:?}", serial_buf);
171167
let payloads: Vec<&str> = if serial_buf.contains("\r\n") {

0 commit comments

Comments
 (0)