Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 16:25:22 +03:00
Code Issues Wiki Activity

Move FC global vars inside FC object

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2020-07-06 08:05:27 +02:00
parent b9137a68e6
commit 24010a2e2a
32 changed files with 2799 additions and 2797 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/CliAutoComplete.js
View file

@ -12,7 +12,7 @@ var CliAutoComplete = {
};
CliAutoComplete.isEnabled = function() {
return this.isBuilding() || (this.configEnabled && CONFIG.flightControllerIdentifier == "BTFL" && this.builder.state != 'fail');
return this.isBuilding() || (this.configEnabled && FC.CONFIG.flightControllerIdentifier == "BTFL" && this.builder.state != 'fail');
};
CliAutoComplete.isBuilding = function() {
@ -397,7 +397,7 @@ CliAutoComplete._initTextcomplete = function() {
search: function(term, callback, match) {
sendOnEnter = false;
var arr = cache.resources;
if (semver.gte(CONFIG.flightControllerVersion, "4.0.0")) {
if (semver.gte(FC.CONFIG.flightControllerVersion, "4.0.0")) {
arr = ['show'].concat(arr);
} else {
arr = ['list'].concat(arr);
@ -509,7 +509,7 @@ CliAutoComplete._initTextcomplete = function() {
})
]);
if (semver.gte(CONFIG.flightControllerVersion, "4.0.0")) {
if (semver.gte(FC.CONFIG.flightControllerVersion, "4.0.0")) {
$textarea.textcomplete('register', [
strategy({ // "resource show all", from BF 4.0.0 onwards
match: /^(\s*resource\s+show\s+)(\w*)$/i,
@ -527,12 +527,12 @@ CliAutoComplete._initTextcomplete = function() {
var diffArgs1 = ["master", "profile", "rates", "all"];
var diffArgs2 = [];
if (semver.lt(CONFIG.flightControllerVersion, "3.4.0")) {
if (semver.lt(FC.CONFIG.flightControllerVersion, "3.4.0")) {
diffArgs2.push("showdefaults");
} else {
// above 3.4.0
diffArgs2.push("defaults");
if (semver.gte(CONFIG.flightControllerVersion, "4.0.0")) {
if (semver.gte(FC.CONFIG.flightControllerVersion, "4.0.0")) {
diffArgs1.push("hardware");
diffArgs2.push("bare");
}