1.7 family removed

2 files changed, 65 insertions, 138 deletions

diff --git a/js/fc.js b/js/fc.js
index 13e7d256..1e99310c 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -576,11 +576,9 @@ var FC = {
             {bit: 29, group: 'other', name: 'OSD', haveTip: false, showNameInTip: false}
         );
 
-        if (semver.gte(CONFIG.flightControllerVersion, '1.7.3')) {
-            features.push(
-                {bit: 22, group: 'other', name: 'AIRMODE', haveTip: false, showNameInTip: false}
-            );
-        }
+        features.push(
+            {bit: 22, group: 'other', name: 'AIRMODE', haveTip: false, showNameInTip: false}
+        );
 
         if (semver.gte(CONFIG.flightControllerVersion, '1.8.1')) {
             features.push(
@@ -697,22 +695,14 @@ var FC = {
         ];
     },
     getGpsProtocols: function () {
-        var data = [
+        return [
             'NMEA',
             'UBLOX',
             'I2C-NAV',
-            'DJI NAZA'
+            'DJI NAZA',
+            'UBLOX7',
+            'MTK'
         ];
-
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.1")) {
-            data.push('UBLOX7')
-        }
-
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.2")) {
-            data.push('MTK')
-        }
-
-        return data;
     },
     getGpsBaudRates: function () {
         return [
@@ -769,12 +759,10 @@ var FC = {
 
         // Versions using feature bits don't allow not having an
         // RX and fallback to RX_PPM.
-        if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-            rxTypes.push({
-                name: 'RX_NONE',
-                value: 0,
-            });
-        }
+        rxTypes.push({
+            name: 'RX_NONE',
+            value: 0,
+        });
 
         return rxTypes;
     },
@@ -788,25 +776,10 @@ var FC = {
                 }
             }
         }
-        if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-            return RX_CONFIG.receiver_type == rxType.value;
-        }
-        return bit_check(BF_CONFIG.features, rxType.bit);
+        return RX_CONFIG.receiver_type == rxType.value;
     },
     setRxTypeEnabled: function(rxType) {
-        if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-            RX_CONFIG.receiver_type = rxType.value;
-        } else {
-            // Clear other rx features before
-            var rxTypes = this.getRxTypes();
-            for (var ii = 0; ii < rxTypes.length; ii++) {
-                BF_CONFIG.features = bit_clear(BF_CONFIG.features, rxTypes[ii].bit);
-            }
-            // Set the feature for this rx type (if any, RX_NONE is set by clearing all)
-            if (rxType.bit !== undefined) {
-                BF_CONFIG.features = bit_set(BF_CONFIG.features, rxType.bit);
-            }
-        }
+        RX_CONFIG.receiver_type = rxType.value;
     },
     getSerialRxTypes: function () {
         var data = [
@@ -1070,11 +1043,7 @@ var FC = {
         return ["Current", "Extra", "Fixed", "Max", "At Least"];
     },
     getRthAllowLanding: function() {
-        var values = ["Never", "Always"];
-        if (semver.gt(CONFIG.flightControllerVersion, '1.7.3')) {
-            values.push("Only on failsafe");
-        }
-        return values;
+        return ["Never", "Always", "Only on failsafe"];
     },
     getFailsafeProcedure: function () {
         return {
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index 20d8f3b0..d743adff 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -93,12 +93,6 @@ var mspHelper = (function (gui) {
                 CONFIG.cycleTime = data.getUint16(0, true);
                 CONFIG.i2cError = data.getUint16(2, true);
                 CONFIG.activeSensors = data.getUint16(4, true);
-
-                /* For 1.7.4+ MSP_ACTIVEBOXES should be used to determine active modes */
-                if (semver.lt(CONFIG.flightControllerVersion, "1.7.4")) {
-                    CONFIG.mode = data.getUint32(6, true);
-                }
-
                 CONFIG.profile = data.getUint8(10);
                 CONFIG.cpuload = data.getUint16(11, true);
                 CONFIG.armingFlags = data.getUint16(13, true);
@@ -867,12 +861,10 @@ var mspHelper = (function (gui) {
                     RX_CONFIG.spirx_channel_count = data.getUint8(offset);
                     offset += 1;
                 }
-                if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-                    // unused byte for fpvCamAngleDegrees, for compatiblity with betaflight
-                    offset += 1;
-                    RX_CONFIG.receiver_type = data.getUint8(offset);
-                    offset += 1;
-                }
+                // unused byte for fpvCamAngleDegrees, for compatiblity with betaflight
+                offset += 1;
+                RX_CONFIG.receiver_type = data.getUint8(offset);
+                offset += 1;
                 break;
 
             case MSPCodes.MSP_FAILSAFE_CONFIG:
@@ -888,24 +880,20 @@ var mspHelper = (function (gui) {
                 offset += 2;
                 FAILSAFE_CONFIG.failsafe_procedure = data.getUint8(offset);
                 offset++;
-                if (semver.gte(CONFIG.flightControllerVersion, "1.7.3")) {
-                    FAILSAFE_CONFIG.failsafe_recovery_delay = data.getUint8(offset);
-                    offset++;
-                    FAILSAFE_CONFIG.failsafe_fw_roll_angle = data.getUint16(offset, true);
-                    offset += 2;
-                    FAILSAFE_CONFIG.failsafe_fw_pitch_angle = data.getUint16(offset, true);
-                    offset += 2;
-                    FAILSAFE_CONFIG.failsafe_fw_yaw_rate = data.getUint16(offset, true);
-                    offset += 2;
-                    FAILSAFE_CONFIG.failsafe_stick_motion_threshold = data.getUint16(offset, true);
-                    offset += 2;
-                }
-                if (semver.gte(CONFIG.flightControllerVersion, "1.7.4")) {
-                    FAILSAFE_CONFIG.failsafe_min_distance = data.getUint16(offset, true);
-                    offset += 2;
-                    FAILSAFE_CONFIG.failsafe_min_distance_procedure = data.getUint8(offset);
-                    offset++;
-                }
+                FAILSAFE_CONFIG.failsafe_recovery_delay = data.getUint8(offset);
+                offset++;
+                FAILSAFE_CONFIG.failsafe_fw_roll_angle = data.getUint16(offset, true);
+                offset += 2;
+                FAILSAFE_CONFIG.failsafe_fw_pitch_angle = data.getUint16(offset, true);
+                offset += 2;
+                FAILSAFE_CONFIG.failsafe_fw_yaw_rate = data.getUint16(offset, true);
+                offset += 2;
+                FAILSAFE_CONFIG.failsafe_stick_motion_threshold = data.getUint16(offset, true);
+                offset += 2;
+                FAILSAFE_CONFIG.failsafe_min_distance = data.getUint16(offset, true);
+                offset += 2;
+                FAILSAFE_CONFIG.failsafe_min_distance_procedure = data.getUint8(offset);
+                offset++;
                 break;
 
             case MSPCodes.MSP_RXFAIL_CONFIG:
@@ -1702,12 +1690,10 @@ var mspHelper = (function (gui) {
                     buffer.push32(RX_CONFIG.spirx_id);
                     buffer.push(RX_CONFIG.spirx_channel_count);
                 }
-                if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-                    // unused byte for fpvCamAngleDegrees, for compatiblity with betaflight
-                    buffer.push(0);
-                    // receiver type in RX_CONFIG rather than in BF_CONFIG.features
-                    buffer.push(RX_CONFIG.receiver_type);
-                }
+                // unused byte for fpvCamAngleDegrees, for compatiblity with betaflight
+                buffer.push(0);
+                // receiver type in RX_CONFIG rather than in BF_CONFIG.features
+                buffer.push(RX_CONFIG.receiver_type);
                 break;
 
             case MSPCodes.MSP_SET_FAILSAFE_CONFIG:
@@ -1719,22 +1705,18 @@ var mspHelper = (function (gui) {
                 buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_throttle_low_delay));
                 buffer.push(highByte(FAILSAFE_CONFIG.failsafe_throttle_low_delay));
                 buffer.push(FAILSAFE_CONFIG.failsafe_procedure);
-                if (semver.gte(CONFIG.flightControllerVersion, "1.7.3")) {
-                    buffer.push(FAILSAFE_CONFIG.failsafe_recovery_delay);
-                    buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
-                    buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
-                    buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
-                    buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
-                    buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
-                    buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
-                    buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
-                    buffer.push(highByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
-                }
-                if (semver.gte(CONFIG.flightControllerVersion, "1.7.4")) {
-                    buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_min_distance));
-                    buffer.push(highByte(FAILSAFE_CONFIG.failsafe_min_distance));
-                    buffer.push(FAILSAFE_CONFIG.failsafe_min_distance_procedure);
-                }
+                buffer.push(FAILSAFE_CONFIG.failsafe_recovery_delay);
+                buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
+                buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_roll_angle));
+                buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
+                buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_pitch_angle));
+                buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
+                buffer.push(highByte(FAILSAFE_CONFIG.failsafe_fw_yaw_rate));
+                buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
+                buffer.push(highByte(FAILSAFE_CONFIG.failsafe_stick_motion_threshold));
+                buffer.push(lowByte(FAILSAFE_CONFIG.failsafe_min_distance));
+                buffer.push(highByte(FAILSAFE_CONFIG.failsafe_min_distance));
+                buffer.push(FAILSAFE_CONFIG.failsafe_min_distance_procedure);
                 break;
 
             case MSPCodes.MSP_SET_TRANSPONDER_CONFIG:
@@ -2897,35 +2879,19 @@ var mspHelper = (function (gui) {
     };
 
     self.loadRthAndLandConfig = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.1")) {
-            MSP.send_message(MSPCodes.MSP_RTH_AND_LAND_CONFIG, false, false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_RTH_AND_LAND_CONFIG, false, false, callback);
     };
 
     self.saveRthAndLandConfig = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.1")) {
-            MSP.send_message(MSPCodes.MSP_SET_RTH_AND_LAND_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RTH_AND_LAND_CONFIG), false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_SET_RTH_AND_LAND_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RTH_AND_LAND_CONFIG), false, callback);
     };
 
     self.loadFwConfig = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.1")) {
-            MSP.send_message(MSPCodes.MSP_FW_CONFIG, false, false, callback);
-        } else {
-            callback();
-        }
+        MSP.send_message(MSPCodes.MSP_FW_CONFIG, false, false, callback);
     };
 
     self.saveFwConfig = function (callback) {
-        if (semver.gte(CONFIG.flightControllerVersion, "1.7.1")) {
             MSP.send_message(MSPCodes.MSP_SET_FW_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FW_CONFIG), false, callback);
-        } else {
-            callback();
-        }
     };
 
     self.getMissionInfo = function (callback) {
@@ -3117,31 +3083,23 @@ var mspHelper = (function (gui) {
     };
 
     self.getRTC = function (callback) {
-        if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-            MSP.send_message(MSPCodes.MSP_RTC, false, false, function (resp) {
-                var seconds = resp.data.read32();
-                var millis = resp.data.readU16();
-                if (callback) {
-                    callback(seconds, millis);
-                }
-            });
-        } else if (callback) {
-            callback(0, 0);
-        }
+        MSP.send_message(MSPCodes.MSP_RTC, false, false, function (resp) {
+            var seconds = resp.data.read32();
+            var millis = resp.data.readU16();
+            if (callback) {
+                callback(seconds, millis);
+            }
+        });
     };
 
     self.setRTC = function (callback) {
-        if (semver.gt(CONFIG.flightControllerVersion, "1.7.3")) {
-            var now = Date.now();
-            var secs = now / 1000;
-            var millis = now % 1000;
-            var data = [];
-            data.push32(secs);
-            data.push16(millis);
-            MSP.send_message(MSPCodes.MSP_SET_RTC, data, false, callback);
-        } else if (callback) {
-            callback();
-        }
+        var now = Date.now();
+        var secs = now / 1000;
+        var millis = now % 1000;
+        var data = [];
+        data.push32(secs);
+        data.push16(millis);
+        MSP.send_message(MSPCodes.MSP_SET_RTC, data, false, callback);
     };
 
     self.loadServoConfiguration = function (callback) {