Skip to content

Commit cb21e9d

Browse files
committed
Improve connection reset
1 parent b4272fc commit cb21e9d

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
@@ -234,6 +234,26 @@ function resetConnection() {
234234
$("div.connection_button__label").text(i18n.getMessage("connect"));
235235
$("a.connection_button__link").removeClass("active");
236236

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

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

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

686686
export function read_serial(info) {

0 commit comments

Comments
 (0)