Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 01:35:28 +03:00
Code Issues Wiki Activity

Merge pull request #1336 from mikeller/fix_reconnect_attempts

Browse source 
Removed non-working reconnect attempts.
This commit is contained in:
Michael Keller 2019-04-02 20:48:24 +13:00 • committed by GitHub
commit 8abfdb7424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/serial_backend.js
View file

@ -729,14 +729,19 @@ function reinitialiseConnection(originatorTab, callback) {
GUI.log(i18n.getMessage('deviceRebooting'));
if (FC.boardHasVcp()) { // VCP-based flight controls may crash old drivers, we catch and reconnect
setTimeout(function start_connection() {
$('a.connect').click();
GUI.timeout_add('waiting_for_disconnect', function waiting_for_bootup() {
if (callback) {
callback();
}
}, 2500);
}, 100);
//TODO: Need to work out how to do a proper reconnect here.
// caveat: Timeouts set with `GUI.timeout_add()` are removed on disconnect.
} else {
GUI.timeout_add('waiting_for_bootup', function waiting_for_bootup() {
if (callback) {
callback();
}
MSP.send_message(MSPCodes.MSP_STATUS, false, false, function() {
GUI.log(i18n.getMessage('deviceReady'));
originatorTab.initialize(false, $('#content').scrollTop());

7
src/js/tabs/cli.js
View file

@ -398,9 +398,10 @@ TABS.cli.cleanup = function (callback) {
// (another approach is however much more complicated):
// we can setup an interval asking for data lets say every 200ms, when data arrives, callback will be triggered and tab switched
// we could probably implement this someday
reinitialiseConnection(self, function () {
GUI.timeout_add('tab_change_callback', callback, 500);
});
if (callback) {
callback();
}
CONFIGURATOR.cliActive = false;
CONFIGURATOR.cliValid = false;
});