Skip to content

Commit ffeb071

Browse files
committed
Improve connection reset
1 parent 6c34e23 commit ffeb071

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/js/serial_backend.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,26 @@ function resetConnection() {
235235
$("div.connection_button__label").text(i18n.getMessage("connect"));
236236
$("a.connection_button__link").removeClass("active");
237237

238+
clearLiveDataRefreshTimer();
239+
240+
MSP.clearListeners();
241+
242+
if (PortHandler.portPicker.selectedPort !== "virtual") {
243+
serial.removeEventListener("receive", read_serial_adapter);
244+
serial.removeEventListener("connect", connectHandler);
245+
serial.removeEventListener("disconnect", disconnectHandler);
246+
}
247+
248+
$("#tabs ul.mode-connected").hide();
249+
$("#tabs ul.mode-connected-cli").hide();
250+
$("#tabs ul.mode-disconnected").show();
251+
252+
// header bar
253+
$("#sensor-status").hide();
254+
$("#portsinput").show();
255+
$("#dataflash_wrapper_global").hide();
256+
$("#quad-status_wrapper").hide();
257+
238258
CONFIGURATOR.connectionValid = false;
239259
CONFIGURATOR.cliValid = false;
240260
CONFIGURATOR.cliActive = false;
@@ -659,29 +679,9 @@ function onConnect() {
659679
function onClosed(result) {
660680
gui_log(i18n.getMessage(result ? "serialPortClosedOk" : "serialPortClosedFail"));
661681

662-
$("#tabs ul.mode-connected").hide();
663-
$("#tabs ul.mode-connected-cli").hide();
664-
$("#tabs ul.mode-disconnected").show();
665-
666-
// header bar
667-
$("#sensor-status").hide();
668-
$("#portsinput").show();
669-
$("#dataflash_wrapper_global").hide();
670-
$("#quad-status_wrapper").hide();
671-
672682
console.log(`${logHead} Connection closed:`, result);
673683

674684
resetConnection();
675-
676-
clearLiveDataRefreshTimer();
677-
678-
MSP.clearListeners();
679-
680-
if (PortHandler.portPicker.selectedPort !== "virtual") {
681-
serial.removeEventListener("receive", read_serial_adapter);
682-
serial.removeEventListener("connect", connectHandler);
683-
serial.removeEventListener("disconnect", disconnectHandler);
684-
}
685685
}
686686

687687
export function read_serial(info) {

0 commit comments

Comments
 (0)