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

Merge branch 'cleanflight/development' into NewPIDFunctions

10.3.x-maintenance
skaman82 2015-12-16 20:53:37 +01:00
parent 843e42e826 b4730034c8
commit 0b3f1a48fb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/serial.js
View File

@ -68,6 +68,12 @@ var serial = {
}); });
} }
break; break;
case 'break':
// This occurs on F1 boards with old firmware.
if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click();
}
break;
case 'timeout': case 'timeout':
// TODO // TODO
break; break;

4
tabs/motors.js
View File

@ -9,6 +9,8 @@ TABS.motors.initialize = function (callback) {
var self = this; var self = this;
self.armed = false; self.armed = false;
self.feature3DSupported = false;
self.allowTestMode = true;
if (GUI.active_tab != 'motors') { if (GUI.active_tab != 'motors') {
GUI.active_tab = 'motors'; GUI.active_tab = 'motors';
@ -176,7 +178,7 @@ TABS.motors.initialize = function (callback) {
localize(); localize();
self.feature3DEnabled = bit_check(BF_CONFIG.features, 12); self.feature3DEnabled = bit_check(BF_CONFIG.features, 12);
self.allowTestMode = true;
if (self.feature3DEnabled && !self.feature3DSupported) { if (self.feature3DEnabled && !self.feature3DSupported) {
self.allowTestMode = false; self.allowTestMode = false;
} }