Skip to content

Refresh conn dialog on reconnect, allow device NotFound[CPP-711] #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2022
Merged

Refresh conn dialog on reconnect, allow device NotFound[CPP-711] #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce65f6a
Refresh conn dialog on reconnect, reconnect on device `not found`[CPP…
john-michaelburke Apr 5, 2022
4517a15
Bump up linux/mac timeout.
john-michaelburke Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions console_backend/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,17 @@ fn conn_manager_thd(
ErrorKind::NotConnected => {
(true, String::from("Connection error: not connected"))
}
ErrorKind::NotFound => {
(true, String::from("Connection error: not found"))
}
_ => (false, format!("Connection error: {}", e)),
};
error!("{}", message);
log::logger().flush();
send_conn_notification(&client_sender, message.clone());
if !conn.is_file() {
if reconnect && !shared_state.connection_dialog_visible() {
refresh_connection_frontend(&client_sender, &shared_state);
manager_msg.send(ConnectionManagerMsg::Reconnect(conn))
} else {
manager_msg.send(ConnectionManagerMsg::Disconnect)
Expand Down
2 changes: 1 addition & 1 deletion console_backend/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub(crate) const AVAILABLE_FLOWS: &[&str] = &[
FLOW_CONTROL_SOFTWARE,
FLOW_CONTROL_HARDWARE,
];
pub(crate) const READER_TIMEOUT: Duration = Duration::from_secs(1);
pub(crate) const READER_TIMEOUT: Duration = Duration::from_secs(2);
pub(crate) const CONNECTION_HISTORY_FILENAME: &str = "connection_history.yaml";
pub(crate) const MAX_CONNECTION_HISTORY: i32 = 15;

Expand Down