Merge pull request #2110 from McGiverGim/move_fc_vars_inside2

Move FC global vars inside FC object

Author: mikeller

src/js/CliAutoComplete.js

@@ -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");
         }

src/js/Features.js

@@ -33,27 +33,27 @@ var Features = function (config) {
         );
     }
 
-    if (semver.gte(CONFIG.apiVersion, "1.15.0") && !semver.gte(CONFIG.apiVersion, "1.36.0")) {
+    if (semver.gte(FC.CONFIG.apiVersion, "1.15.0") && !semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
         features.push(
             {bit: 8, group: 'rxFailsafe', name: 'FAILSAFE', haveTip: true}
         );
     }
 
-    if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
+    if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
         features.push(
             {bit: 21, group: 'other', name: 'TRANSPONDER', haveTip: true}
         );
     }
 
     if (config.flightControllerVersion !== '') {
-        if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
             features.push(
                 {bit: 22, group: 'other', name: 'AIRMODE'}
             );
         }
 
-        if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
-            if (semver.lt(CONFIG.apiVersion, "1.20.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
+            if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
                 features.push(
                     {bit: 23, group: 'superexpoRates', name: 'SUPEREXPO_RATES'}
                 );
@@ -64,32 +64,32 @@ var Features = function (config) {
             }
         }
 
-        if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
             features.push(
                 {bit: 18, group: 'other', name: 'OSD'}
             );
-            if (!semver.gte(CONFIG.apiVersion, "1.35.0")) {
+            if (!semver.gte(FC.CONFIG.apiVersion, "1.35.0")) {
               features.push(
                 {bit: 24, group: 'other', name: 'VTX'}
               )
             }
         }
 
-        if (semver.gte(CONFIG.apiVersion, "1.31.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.31.0")) {
             features.push(
                 {bit: 25, group: 'rxMode', mode: 'select', name: 'RX_SPI'},
                 {bit: 27, group: 'escSensor', name: 'ESC_SENSOR'}
             );
         }
 
-        if (semver.gte(CONFIG.apiVersion, "1.36.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
             features.push(
                 {bit: 28, group: 'antiGravity', name: 'ANTI_GRAVITY', haveTip: true, hideName: true},
                 {bit: 29, group: 'other', name: 'DYNAMIC_FILTER'}
             );
         }
 
-        if (!semver.gte(CONFIG.apiVersion, "1.36.0")) {
+        if (!semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
             features.push(
                 {bit: 1, group: 'batteryVoltage', name: 'VBAT'},
                 {bit: 11, group: 'batteryCurrent', name: 'CURRENT_METER'}

src/js/RateCurve.js

@@ -88,7 +88,7 @@ var RateCurve = function (useLegacyCurve) {
         var expoPower;
         var rcRateConstant;
 
-        if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
+        if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
             expoPower = 3;
             rcRateConstant = 200;
         } else {
@@ -157,7 +157,7 @@ RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcR
 
     if (rate !== undefined && rcRate !== undefined && rcExpo !== undefined) {
         let rcCommandf = this.rcCommand(rcData, 1, deadband);
-        if (semver.gte(CONFIG.apiVersion, API_VERSION_1_43)) {
+        if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
             rcCommandf = rcCommandf / (500 - deadband);
         } else {
             rcCommandf = rcCommandf / 500;