From 47a063dccd0ec882c9410e1bcdac1a658cb7b644 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Mon, 7 May 2018 20:48:48 +0200 Subject: [PATCH] references to inav 1.3 removed --- js/fc.js | 14 ++------- js/msp/MSPHelper.js | 24 +++----------- tabs/configuration.js | 73 +++++++++++++++++++++---------------------- 3 files changed, 42 insertions(+), 69 deletions(-) diff --git a/js/fc.js b/js/fc.js index 23df3e97..c5999291 100644 --- a/js/fc.js +++ b/js/fc.js @@ -519,12 +519,6 @@ var FC = { ); } - if (semver.lt(CONFIG.flightControllerVersion, "1.3.0")) { - features.push( - {bit: 18, group: 'esc', name: 'ONESHOT125', haveTip: true} - ); - } - if (semver.gte(CONFIG.flightControllerVersion, "1.4.0")) { features.push( {bit: 28, group: 'esc-priority', name: 'PWM_OUTPUT_ENABLE', haveTip: true} @@ -548,11 +542,9 @@ var FC = { ); } - if (semver.gte(CONFIG.flightControllerVersion, '1.3.0')) { - features.push( - {bit: 27, group: 'other', name: 'PWM_SERVO_DRIVER', haveTip: true, showNameInTip: true} - ); - } + features.push( + {bit: 27, group: 'other', name: 'PWM_SERVO_DRIVER', haveTip: true, showNameInTip: true} + ); if (semver.gte(CONFIG.flightControllerVersion, '1.5.0')) { features.push( diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index f7fbc945..bd43231c 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -2465,11 +2465,7 @@ var mspHelper = (function (gui) { }; self.loadINAVPidConfig = function (callback) { - if (semver.gt(CONFIG.flightControllerVersion, "1.3.0")) { - MSP.send_message(MSPCodes.MSP_INAV_PID, false, false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_INAV_PID, false, false, callback); }; self.loadLoopTime = function (callback) { @@ -2477,11 +2473,7 @@ var mspHelper = (function (gui) { }; self.loadAdvancedConfig = function (callback) { - if (semver.gte(CONFIG.flightControllerVersion, "1.3.0")) { - MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, callback); }; self.loadFilterConfig = function (callback) { @@ -2601,11 +2593,7 @@ var mspHelper = (function (gui) { }; self.saveINAVPidConfig = function (callback) { - if (semver.gt(CONFIG.flightControllerVersion, "1.3.0")) { - MSP.send_message(MSPCodes.MSP_SET_INAV_PID, mspHelper.crunch(MSPCodes.MSP_SET_INAV_PID), false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_SET_INAV_PID, mspHelper.crunch(MSPCodes.MSP_SET_INAV_PID), false, callback); }; self.saveLooptimeConfig = function (callback) { @@ -2613,11 +2601,7 @@ var mspHelper = (function (gui) { }; self.saveAdvancedConfig = function (callback) { - if (semver.gte(CONFIG.flightControllerVersion, "1.3.0")) { - MSP.send_message(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG), false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG), false, callback); }; self.saveFilterConfig = function (callback) { diff --git a/tabs/configuration.js b/tabs/configuration.js index a33c631f..7440f89d 100644 --- a/tabs/configuration.js +++ b/tabs/configuration.js @@ -372,55 +372,52 @@ TABS.configuration.initialize = function (callback, scrollPosition) { } - if (semver.gte(CONFIG.flightControllerVersion, "1.3.0")) { - - var $escProtocol = $('#esc-protocol'); - var $escRate = $('#esc-rate'); - for (i in escProtocols) { - if (escProtocols.hasOwnProperty(i)) { - var protocolData = escProtocols[i]; - $escProtocol.append(''); - } + var $escProtocol = $('#esc-protocol'); + var $escRate = $('#esc-rate'); + for (i in escProtocols) { + if (escProtocols.hasOwnProperty(i)) { + var protocolData = escProtocols[i]; + $escProtocol.append(''); } + } + + buildMotorRates(); + $escProtocol.val(ADVANCED_CONFIG.motorPwmProtocol); + $escRate.val(ADVANCED_CONFIG.motorPwmRate); + $escProtocol.change(function () { + ADVANCED_CONFIG.motorPwmProtocol = $(this).val(); buildMotorRates(); - $escProtocol.val(ADVANCED_CONFIG.motorPwmProtocol); + ADVANCED_CONFIG.motorPwmRate = escProtocols[ADVANCED_CONFIG.motorPwmProtocol].defaultRate; $escRate.val(ADVANCED_CONFIG.motorPwmRate); + }); - $escProtocol.change(function () { - ADVANCED_CONFIG.motorPwmProtocol = $(this).val(); - buildMotorRates(); - ADVANCED_CONFIG.motorPwmRate = escProtocols[ADVANCED_CONFIG.motorPwmProtocol].defaultRate; - $escRate.val(ADVANCED_CONFIG.motorPwmRate); - }); - - $escRate.change(function () { - ADVANCED_CONFIG.motorPwmRate = $(this).val(); - }); + $escRate.change(function () { + ADVANCED_CONFIG.motorPwmRate = $(this).val(); + }); - $("#esc-protocols").show(); + $("#esc-protocols").show(); - var $servoRate = $('#servo-rate'); + var $servoRate = $('#servo-rate'); - for (i in servoRates) { - if (servoRates.hasOwnProperty(i)) { - $servoRate.append(''); - } - } - /* - * If rate from FC is not on the list, add a new entry - */ - if ($servoRate.find('[value="' + ADVANCED_CONFIG.servoPwmRate + '"]').length == 0) { - $servoRate.append(''); + for (i in servoRates) { + if (servoRates.hasOwnProperty(i)) { + $servoRate.append(''); } + } + /* + * If rate from FC is not on the list, add a new entry + */ + if ($servoRate.find('[value="' + ADVANCED_CONFIG.servoPwmRate + '"]').length == 0) { + $servoRate.append(''); + } - $servoRate.val(ADVANCED_CONFIG.servoPwmRate); - $servoRate.change(function () { - ADVANCED_CONFIG.servoPwmRate = $(this).val(); - }); + $servoRate.val(ADVANCED_CONFIG.servoPwmRate); + $servoRate.change(function () { + ADVANCED_CONFIG.servoPwmRate = $(this).val(); + }); - $('#servo-rate-container').show(); - } + $('#servo-rate-container').show(); var $looptime = $("#looptime");