sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reorder some of the cleanup routines, cleanup (experimental)

10.3.x-maintenance
cTn 2014-10-19 16:17:44 +02:00
parent f387ea96ac
commit be96da6098
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/serial_backend.js
View File

@ -3,10 +3,9 @@
$(document).ready(function () { $(document).ready(function () {
$('div#port-picker a.connect').click(function () { $('div#port-picker 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 clicks = $(this).data('clicks'),
selected_port = String($('div#port-picker #port').val()),
var selected_port = String($('div#port-picker #port').val()); selected_baud = parseInt($('div#port-picker #baud').val());
var selected_baud = parseInt($('div#port-picker #baud').val());
if (selected_port != '0' && selected_port != 'DFU') { if (selected_port != '0' && selected_port != 'DFU') {
if (!clicks) { if (!clicks) {
@ -27,24 +26,27 @@ $(document).ready(function () {
serial.disconnect(onClosed); serial.disconnect(onClosed);
GUI.connected_to = false; GUI.connected_to = false;
CONFIGURATOR.connectionValid = false;
MSP.disconnect_cleanup();
PortUsage.reset();
// Reset various UI elements // Reset various UI elements
$('span.i2c-error').text(0); $('span.i2c-error').text(0);
$('span.cycle-time').text(0); $('span.cycle-time').text(0);
MSP.disconnect_cleanup();
PortUsage.reset();
CONFIGURATOR.connectionValid = false;
// unlock port select & baud // unlock port select & baud
$('div#port-picker #port').prop('disabled', false); $('div#port-picker #port').prop('disabled', false);
if (!GUI.auto_connect) $('div#port-picker #baud').prop('disabled', false); if (!GUI.auto_connect) $('div#port-picker #baud').prop('disabled', false);
// reset connect / disconnect button
$(this).text(chrome.i18n.getMessage('connect')); $(this).text(chrome.i18n.getMessage('connect'));
$(this).removeClass('active'); $(this).removeClass('active');
sensor_status(0); // reset active sensor indicators // reset active sensor indicators
$('#tabs > ul li').removeClass('active'); // de-select any selected tabs sensor_status(0);
// de-select any selected tabs
$('#tabs > ul li').removeClass('active');
// detach listeners and remove element data // detach listeners and remove element data
$('#content').empty(); $('#content').empty();