Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-20 06:45:12 +03:00
Code Issues Wiki Activity

Fixed flight controller reboot.

Browse source
This commit is contained in:
mikeller 2017-10-15 17:37:57 +13:00
parent 055d701bdd
commit c74258491b
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/serial_backend.js
View file

@ -36,7 +36,13 @@ $(document).ready(function () {
$('div.connect_controls a.connect').click(function () { $('div.connect_controls a.connect').click(function () {
if (GUI.connect_lock != true) { // GUI control overrides the user control if (GUI.connect_lock != true) { // GUI control overrides the user control
var clicks = $(this).data('clicks'); var thisElement = $(this);
var clicks = thisElement.data('clicks');
var toggleStatus = function() {
thisElement.data("clicks", !clicks);
};
var selected_baud = parseInt($('div#port-picker #baud').val()); var selected_baud = parseInt($('div#port-picker #baud').val());
var selected_port = $('div#port-picker #port option:selected').data().isManual ? var selected_port = $('div#port-picker #port option:selected').data().isManual ?
$('#port-override').val() : $('#port-override').val() :
@ -55,6 +61,8 @@ $(document).ready(function () {
serial.connect(selected_port, {bitrate: selected_baud}, onOpen); serial.connect(selected_port, {bitrate: selected_baud}, onOpen);
toggleStatus();
} else { } else {
GUI.timeout_kill_all(); GUI.timeout_kill_all();
GUI.interval_kill_all(); GUI.interval_kill_all();
@ -67,14 +75,12 @@ $(document).ready(function () {
MSP.send_message(MSPCodes.MSP_ARMING_DISABLE, false, false, function () { MSP.send_message(MSPCodes.MSP_ARMING_DISABLE, false, false, function () {
GUI.log(chrome.i18n.getMessage('armingEnabled')); GUI.log(chrome.i18n.getMessage('armingEnabled'));
finishClose(); finishClose(toggleStatus);
}); });
} else { } else {
finishClose(); finishClose(toggleStatus);
} }
} }
$(this).data("clicks", !clicks);
} }
} }
}); });
@ -113,8 +119,6 @@ $(document).ready(function () {
} }
chrome.storage.local.set({'auto_connect': GUI.auto_connect}); chrome.storage.local.set({'auto_connect': GUI.auto_connect});
}); });
}); });
@ -122,7 +126,7 @@ $(document).ready(function () {
PortUsage.initialize(); PortUsage.initialize();
}); });
function finishClose() { function finishClose(finishedCallback) {
var wasConnected = CONFIGURATOR.connectionValid; var wasConnected = CONFIGURATOR.connectionValid;
serial.disconnect(onClosed); serial.disconnect(onClosed);
@ -155,6 +159,8 @@ function finishClose() {
} }
$('#tabs .tab_landing a').click(); $('#tabs .tab_landing a').click();
finishedCallback();
} }