Skip to content

Fixed timeout closing of 'Reset to custom defaults' dialog. #2000

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 1 commit into from
May 4, 2020
Merged

Fixed timeout closing of 'Reset to custom defaults' dialog. #2000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions src/js/serial_backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function finishClose(finishedCallback) {
connectedTime = undefined;
}
// close reset to custom defaults dialog
$('#dialogResetToCustomDefaults-cancelbtn').click();
$('#dialogResetToCustomDefaults')[0].close();

analytics.resetFlightControllerData();

Expand Down Expand Up @@ -198,6 +198,16 @@ function finishClose(finishedCallback) {
finishedCallback();
}

function setConnectionTimeout() {
// disconnect after 10 seconds with error if we don't get IDENT data
GUI.timeout_add('connecting', function () {
if (!CONFIGURATOR.connectionValid) {
GUI.log(i18n.getMessage('noConfigurationReceived'));

$('div.connect_controls a.connect').click(); // disconnect
}
}, 10000);
}

function onOpen(openInfo) {
if (openInfo) {
Expand All @@ -224,14 +234,7 @@ function onOpen(openInfo) {

serial.onReceive.addListener(read_serial);

// disconnect after 10 seconds with error if we don't get IDENT data
GUI.timeout_add('connecting', function () {
if (!CONFIGURATOR.connectionValid) {
GUI.log(i18n.getMessage('noConfigurationReceived'));

$('div.connect_controls a.connect').click(); // disconnect
}
}, 10000);
setConnectionTimeout();

FC.resetState();
MSP.listen(update_packet_error);
Expand Down Expand Up @@ -339,7 +342,7 @@ function processBoardInfo() {

dialog.close();

GUI.timeout_add('connecting', function () {
GUI.timeout_add('disconnect', function () {
$('div.connect_controls a.connect').click(); // disconnect
}, 0);
});
Expand All @@ -349,10 +352,14 @@ function processBoardInfo() {

dialog.close();

setConnectionTimeout();

checkReportProblems();
});

dialog.showModal();

GUI.timeout_remove('connecting'); // kill connecting timer
} else {
checkReportProblems();
}
Expand Down