Skip to content

🔧 Abort when already connected #4560

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 3 commits into from
Jul 31, 2025
Merged

🔧 Abort when already connected #4560

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a59b7d7
Abort when already connected
haslinghuis Jul 30, 2025
6c34e23
Remove duplicate code
haslinghuis Jul 30, 2025
ffeb071
Improve connection reset
haslinghuis Jul 31, 2025
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
45 changes: 25 additions & 20 deletions src/js/serial_backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,26 @@ function resetConnection() {
$("div.connection_button__label").text(i18n.getMessage("connect"));
$("a.connection_button__link").removeClass("active");

clearLiveDataRefreshTimer();

MSP.clearListeners();

if (PortHandler.portPicker.selectedPort !== "virtual") {
serial.removeEventListener("receive", read_serial_adapter);
serial.removeEventListener("connect", connectHandler);
serial.removeEventListener("disconnect", disconnectHandler);
}

$("#tabs ul.mode-connected").hide();
$("#tabs ul.mode-connected-cli").hide();
$("#tabs ul.mode-disconnected").show();

// header bar
$("#sensor-status").hide();
$("#portsinput").show();
$("#dataflash_wrapper_global").hide();
$("#quad-status_wrapper").hide();

CONFIGURATOR.connectionValid = false;
CONFIGURATOR.cliValid = false;
CONFIGURATOR.cliActive = false;
Expand Down Expand Up @@ -331,6 +351,11 @@ function onOpen(openInfo) {
}
});
} else {
if (!serial.connected) {
abortConnection();
return;
}

const dialog = $(".dialogConnectWarning")[0];

$(".dialogConnectWarning-content").html(
Expand Down Expand Up @@ -654,29 +679,9 @@ function onConnect() {
function onClosed(result) {
gui_log(i18n.getMessage(result ? "serialPortClosedOk" : "serialPortClosedFail"));

$("#tabs ul.mode-connected").hide();
$("#tabs ul.mode-connected-cli").hide();
$("#tabs ul.mode-disconnected").show();

// header bar
$("#sensor-status").hide();
$("#portsinput").show();
$("#dataflash_wrapper_global").hide();
$("#quad-status_wrapper").hide();

console.log(`${logHead} Connection closed:`, result);

resetConnection();

clearLiveDataRefreshTimer();

MSP.clearListeners();

if (PortHandler.portPicker.selectedPort !== "virtual") {
serial.removeEventListener("receive", read_serial_adapter);
serial.removeEventListener("connect", connectHandler);
serial.removeEventListener("disconnect", disconnectHandler);
}
}

export function read_serial(info) {
Expand Down