Skip to content

Commit 5a346b3

Browse files
authored
Merge pull request #35 from lonesometraveler/refactor_serial_6
Update serial.rs
2 parents 0983297 + 916363c commit 5a346b3

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/serial.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@ pub fn serial_thread(
5555
if let Ok(read_guard) = device_lock.read() {
5656
device = read_guard.clone();
5757
}
58-
devices = vec![];
59-
for p in serialport::available_ports().unwrap().iter() {
60-
devices.push(p.port_name.clone());
61-
if p.port_name == device {
62-
connected = true;
63-
// break;
64-
}
65-
}
58+
59+
devices = serialport::available_ports()
60+
.unwrap()
61+
.iter()
62+
.map(|p| p.port_name.clone())
63+
.collect();
64+
65+
connected = devices.contains(&device);
66+
6667
if let Ok(mut write_guard) = devices_lock.write() {
6768
*write_guard = devices.clone();
6869
}
@@ -109,11 +110,12 @@ pub fn serial_thread(
109110
.unwrap();
110111

111112
'connected_loop: loop {
112-
// check for reconnection
113-
devices = vec![];
114-
for p in serialport::available_ports().unwrap().iter() {
115-
devices.push(p.port_name.clone());
116-
}
113+
devices = serialport::available_ports()
114+
.unwrap()
115+
.iter()
116+
.map(|p| p.port_name.clone())
117+
.collect();
118+
117119
if let Ok(mut write_guard) = devices_lock.write() {
118120
*write_guard = devices.clone();
119121
}

0 commit comments

Comments
 (0)