speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

references to inav 1.3 removed

Browse Source
pull/434/head
Pawel Spychalski (DzikuVx) 6 years ago
parent 13f50294f3
commit 47a063dccd
3 changed files with 42 additions and 69 deletions
Show Stats Download Patch File Download Diff File

14
js/fc.js
Unescape Escape View File

@ -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")) { if (semver.gte(CONFIG.flightControllerVersion, "1.4.0")) {
features.push( features.push(
{bit: 28, group: 'esc-priority', name: 'PWM_OUTPUT_ENABLE', haveTip: true} {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(
features.push( {bit: 27, group: 'other', name: 'PWM_SERVO_DRIVER', haveTip: true, showNameInTip: true}
{bit: 27, group: 'other', name: 'PWM_SERVO_DRIVER', haveTip: true, showNameInTip: true} );
);
}
if (semver.gte(CONFIG.flightControllerVersion, '1.5.0')) { if (semver.gte(CONFIG.flightControllerVersion, '1.5.0')) {
features.push( features.push(

24
js/msp/MSPHelper.js
Unescape Escape View File

@ -2465,11 +2465,7 @@ var mspHelper = (function (gui) {
}; };
self.loadINAVPidConfig = function (callback) { self.loadINAVPidConfig = function (callback) {
if (semver.gt(CONFIG.flightControllerVersion, "1.3.0")) { MSP.send_message(MSPCodes.MSP_INAV_PID, false, false, callback);
MSP.send_message(MSPCodes.MSP_INAV_PID, false, false, callback);
} else {
callback();
}
}; };
self.loadLoopTime = function (callback) { self.loadLoopTime = function (callback) {
@ -2477,11 +2473,7 @@ var mspHelper = (function (gui) {
}; };
self.loadAdvancedConfig = function (callback) { self.loadAdvancedConfig = function (callback) {
if (semver.gte(CONFIG.flightControllerVersion, "1.3.0")) { MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, callback);
MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, callback);
} else {
callback();
}
}; };
self.loadFilterConfig = function (callback) { self.loadFilterConfig = function (callback) {
@ -2601,11 +2593,7 @@ var mspHelper = (function (gui) {
}; };
self.saveINAVPidConfig = function (callback) { 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);
MSP.send_message(MSPCodes.MSP_SET_INAV_PID, mspHelper.crunch(MSPCodes.MSP_SET_INAV_PID), false, callback);
} else {
callback();
}
}; };
self.saveLooptimeConfig = function (callback) { self.saveLooptimeConfig = function (callback) {
@ -2613,11 +2601,7 @@ var mspHelper = (function (gui) {
}; };
self.saveAdvancedConfig = function (callback) { 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);
MSP.send_message(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG), false, callback);
} else {
callback();
}
}; };
self.saveFilterConfig = function (callback) { self.saveFilterConfig = function (callback) {

73
tabs/configuration.js
Unescape Escape View File

@ -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');
var $escProtocol = $('#esc-protocol'); for (i in escProtocols) {
var $escRate = $('#esc-rate'); if (escProtocols.hasOwnProperty(i)) {
for (i in escProtocols) { var protocolData = escProtocols[i];
if (escProtocols.hasOwnProperty(i)) { $escProtocol.append('<option value="' + i + '">' + protocolData.name + '</option>');
var protocolData = escProtocols[i];
$escProtocol.append('<option value="' + i + '">' + protocolData.name + '</option>');
}
} }
}
buildMotorRates();
$escProtocol.val(ADVANCED_CONFIG.motorPwmProtocol);
$escRate.val(ADVANCED_CONFIG.motorPwmRate);
$escProtocol.change(function () {
ADVANCED_CONFIG.motorPwmProtocol = $(this).val();
buildMotorRates(); buildMotorRates();
$escProtocol.val(ADVANCED_CONFIG.motorPwmProtocol); ADVANCED_CONFIG.motorPwmRate = escProtocols[ADVANCED_CONFIG.motorPwmProtocol].defaultRate;
$escRate.val(ADVANCED_CONFIG.motorPwmRate); $escRate.val(ADVANCED_CONFIG.motorPwmRate);
});
$escProtocol.change(function () { $escRate.change(function () {
ADVANCED_CONFIG.motorPwmProtocol = $(this).val(); ADVANCED_CONFIG.motorPwmRate = $(this).val();
buildMotorRates(); });
ADVANCED_CONFIG.motorPwmRate = escProtocols[ADVANCED_CONFIG.motorPwmProtocol].defaultRate;
$escRate.val(ADVANCED_CONFIG.motorPwmRate);
});
$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) { for (i in servoRates) {
if (servoRates.hasOwnProperty(i)) { if (servoRates.hasOwnProperty(i)) {
$servoRate.append('<option value="' + i + '">' + servoRates[i] + '</option>'); $servoRate.append('<option value="' + i + '">' + servoRates[i] + '</option>');
}
}
/*
* If rate from FC is not on the list, add a new entry
*/
if ($servoRate.find('[value="' + ADVANCED_CONFIG.servoPwmRate + '"]').length == 0) {
$servoRate.append('<option value="' + ADVANCED_CONFIG.servoPwmRate + '">' + ADVANCED_CONFIG.servoPwmRate + 'Hz</option>');
} }
}
/*
* If rate from FC is not on the list, add a new entry
*/
if ($servoRate.find('[value="' + ADVANCED_CONFIG.servoPwmRate + '"]').length == 0) {
$servoRate.append('<option value="' + ADVANCED_CONFIG.servoPwmRate + '">' + ADVANCED_CONFIG.servoPwmRate + 'Hz</option>');
}
$servoRate.val(ADVANCED_CONFIG.servoPwmRate); $servoRate.val(ADVANCED_CONFIG.servoPwmRate);
$servoRate.change(function () { $servoRate.change(function () {
ADVANCED_CONFIG.servoPwmRate = $(this).val(); ADVANCED_CONFIG.servoPwmRate = $(this).val();
}); });
$('#servo-rate-container').show(); $('#servo-rate-container').show();
}
var $looptime = $("#looptime"); var $looptime = $("#looptime");

Write Preview
Loading…
Cancel
Save