1.8 removed

3 files changed, 27 insertions, 80 deletions

diff --git a/js/fc.js b/js/fc.js
index 1e99310c..70393751 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -580,12 +580,10 @@ var FC = {
             {bit: 22, group: 'other', name: 'AIRMODE', haveTip: false, showNameInTip: false}
         );
 
-        if (semver.gte(CONFIG.flightControllerVersion, '1.8.1')) {
-            features.push(
-                {bit: 30, group: 'other', name: 'FW_LAUNCH', haveTip: false, showNameInTip: false},
-                {bit: 2, group: 'other', name: 'TX_PROF_SEL', haveTip: false, showNameInTip: false}
-            );
-        }
+        features.push(
+            {bit: 30, group: 'other', name: 'FW_LAUNCH', haveTip: false, showNameInTip: false},
+            {bit: 2, group: 'other', name: 'TX_PROF_SEL', haveTip: false, showNameInTip: false}
+        );
 
         if (semver.gte(CONFIG.flightControllerVersion, '2.0.0')) {
             features.push(
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index d743adff..b0556947 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -1229,10 +1229,6 @@ var mspHelper = (function (gui) {
                 break;
 
             case MSPCodes.MSP_CALIBRATION_DATA:
-                if (semver.lte(CONFIG.flightControllerVersion, "1.8.0")) {
-                    break;
-                }
-
                 var callibrations = data.getUint8(0);
                 CALIBRATION_DATA.acc.Pos0 = (1 & (callibrations >> 0));
                 CALIBRATION_DATA.acc.Pos1 = (1 & (callibrations >> 1));
@@ -2253,10 +2249,6 @@ var mspHelper = (function (gui) {
 
     self.sendMotorMixer = function (onCompleteCallback) {
 
-        if (semver.lt(CONFIG.flightControllerVersion, "1.8.1")) {
-            onCompleteCallback();
-        }
-
         var nextFunction = sendMixer,
             servoIndex = 0;
 
@@ -2863,19 +2855,11 @@ var mspHelper = (function (gui) {
     };
 
     self.loadCalibrationData = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.8.1")) {
-            MSP.send_message(MSPCodes.MSP_CALIBRATION_DATA, false, false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_CALIBRATION_DATA, false, false, callback);
     };
 
     self.saveCalibrationData = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.8.1")) {
-            MSP.send_message(MSPCodes.MSP_SET_CALIBRATION_DATA, mspHelper.crunch(MSPCodes.MSP_SET_CALIBRATION_DATA), false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_SET_CALIBRATION_DATA, mspHelper.crunch(MSPCodes.MSP_SET_CALIBRATION_DATA), false, callback);
     };
 
     self.loadRthAndLandConfig = function (callback) {
@@ -2895,11 +2879,7 @@ var mspHelper = (function (gui) {
     };
 
     self.getMissionInfo = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.8.1")) {
-            MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_WP_GETINFO, false, false, callback);
     };
 
     self._getSetting = function (name) {
@@ -3111,11 +3091,7 @@ var mspHelper = (function (gui) {
     };
 
     self.loadMotorMixRules = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.8.1")) {
-            MSP.send_message(MSPCodes.MSP2_COMMON_MOTOR_MIXER, false, false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP2_COMMON_MOTOR_MIXER, false, false, callback);
     };
 
     self.loadMotors = function (callback) {
@@ -3123,29 +3099,21 @@ var mspHelper = (function (gui) {
     };
 
     self.getCraftName = function(callback) {
-        if (semver.gt(CONFIG.flightControllerVersion, "1.8.0")) {
-            MSP.send_message(MSPCodes.MSP_NAME, false, false, function(resp) {
-                var name = resp.data.readString();
-                if (callback) {
-                    callback(name);
-                }
-            });
-        } else if (callback) {
-            callback(null);
-        }
+        MSP.send_message(MSPCodes.MSP_NAME, false, false, function(resp) {
+            var name = resp.data.readString();
+            if (callback) {
+                callback(name);
+            }
+        });
     };
 
     self.setCraftName = function(name, callback) {
-        if (semver.gt(CONFIG.flightControllerVersion, "1.8.0")) {
-            var data = [];
-            name = name || "";
-            for (var ii = 0; ii < name.length; ii++) {
-                data.push(name.charCodeAt(ii));
-            }
-            MSP.send_message(MSPCodes.MSP_SET_NAME, data, false, callback);
-        } else if (callback) {
-            callback();
+        var data = [];
+        name = name || "";
+        for (var ii = 0; ii < name.length; ii++) {
+            data.push(name.charCodeAt(ii));
         }
+        MSP.send_message(MSPCodes.MSP_SET_NAME, data, false, callback);
     };
 
     self.loadMixerConfig = function (callback) {
diff --git a/js/periodicStatusUpdater.js b/js/periodicStatusUpdater.js
index 7768a0fc..924bef30 100644
--- a/js/periodicStatusUpdater.js
+++ b/js/periodicStatusUpdater.js
@@ -53,30 +53,16 @@ helper.periodicStatusUpdater = (function () {
         if (ANALOG != undefined) {
             var nbCells;
 
-            if (semver.gte(CONFIG.flightControllerVersion, '1.8.1')) {
-                nbCells = ANALOG.cell_count;
-            } else {
-                nbCells = Math.floor(ANALOG.voltage / MISC.vbatmaxcellvoltage) + 1;
-                if (ANALOG.voltage == 0)
-                    nbCells = 1;
-            }
-
+            nbCells = ANALOG.cell_count;
             var min = MISC.vbatmincellvoltage * nbCells;
             var max = MISC.vbatmaxcellvoltage * nbCells;
             var warn = MISC.vbatwarningcellvoltage * nbCells;
 
-            if (semver.gte(CONFIG.flightControllerVersion, '1.8.1')) {
-                $(".battery-status").css({
-                    width: ANALOG.battery_percentage + "%",
-                    display: 'inline-block'
-                });
-            } else {
-                $(".battery-status").css({
-                    width: ((ANALOG.voltage - min) / (max - min) * 100) + "%",
-                    display: 'inline-block'
-                });
-            }
-
+            $(".battery-status").css({
+                width: ANALOG.battery_percentage + "%",
+                display: 'inline-block'
+            });
+        
             if (active) {
                 $(".linkicon").css({
                     'background-image': 'url("../images/icons/cf_icon_link_active.svg")'
@@ -87,7 +73,7 @@ helper.periodicStatusUpdater = (function () {
                 });
             }
 
-            if (((semver.gte(CONFIG.flightControllerVersion, '1.8.1')) && (((ANALOG.use_capacity_thresholds) && (ANALOG.battery_remaining_capacity <= (MISC.battery_capacity_warning - MISC.battery_capacity_critical))) || ((!ANALOG.use_capacity_thresholds) && (ANALOG.voltage < warn))) || (ANALOG.voltage < min)) || ((semver.lt(CONFIG.flightControllerVersion, '1.8.1')) && (ANALOG.voltage < warn))) {
+            if (((ANALOG.use_capacity_thresholds && ANALOG.battery_remaining_capacity <= MISC.battery_capacity_warning - MISC.battery_capacity_critical) || (!ANALOG.use_capacity_thresholds && ANALOG.voltage < warn)) || ANALOG.voltage < min) {
                 $(".battery-status").css('background-color', '#D42133');
             } else {
                 $(".battery-status").css('background-color', '#59AA29');
@@ -124,12 +110,7 @@ helper.periodicStatusUpdater = (function () {
             }
 
             MSP.send_message(MSPCodes.MSP_ACTIVEBOXES, false, false);
-
-            if (semver.gte(CONFIG.flightControllerVersion, '1.8.1')) {
-                MSP.send_message(MSPCodes.MSPV2_INAV_ANALOG, false, false);
-            } else {
-                MSP.send_message(MSPCodes.MSP_ANALOG, false, false);
-            }
+            MSP.send_message(MSPCodes.MSPV2_INAV_ANALOG, false, false);
 
             privateScope.updateView();
         }