Skip to content

Commit

Permalink
mavlink: mavlink_camera: Use try_recv over recv to avoid blocking sco…
Browse files Browse the repository at this point in the history
…pe when finishing loop

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
  • Loading branch information
patrickelectric committed Nov 29, 2023
1 parent 7ead76a commit 9a030e4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/mavlink/mavlink_camera.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,15 @@ impl MavlinkCamera {
break;
}

let (header, message) = match receiver.recv().await {
std::thread::sleep(std::time::Duration::from_millis(10));
let (header, message) = match receiver.try_recv() {
Ok(Message::Received(message)) => message,
Err(broadcast::error::RecvError::Closed) => {
Err(broadcast::error::TryRecvError::Closed) => {
unreachable!(
"Closed channel: This should never happen, this channel is static!"
);
}
Ok(Message::ToBeSent(_)) | Err(broadcast::error::RecvError::Lagged(_)) => continue,
Ok(Message::ToBeSent(_)) | Err(_) => continue,
};

trace!("Message received: {header:?}, {message:?}");
Expand Down

0 comments on commit 9a030e4

Please sign in to comment.