Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-17 21:35:33 +03:00
Code Issues Wiki Activity

Implement version checking part 2

Browse source
This commit is contained in:
U-DESKTOP-12PPI61\boris.bozic 2016-06-24 14:29:46 +02:00
parent c7d89ed710
commit a116ce6b05
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/msp.js
View file

@ -1439,12 +1439,19 @@ MSP.crunch = function (code) {
case MSP_codes.MSP_SET_ADVANCED_TUNING: case MSP_codes.MSP_SET_ADVANCED_TUNING:
buffer.push16(ADVANCED_TUNING.rollPitchItermIgnoreRate) buffer.push16(ADVANCED_TUNING.rollPitchItermIgnoreRate)
.push16(ADVANCED_TUNING.yawItermIgnoreRate) .push16(ADVANCED_TUNING.yawItermIgnoreRate)
.push16(ADVANCED_TUNING.yaw_p_limit) .push16(ADVANCED_TUNING.yaw_p_limit);
.push8(ADVANCED_TUNING.deltaMethod) if (CONFIG.flightControllerIdentifier == "BTFL" && semver.gte(CONFIG.flightControllerVersion, "2.8.2")) {
.push8(ADVANCED_TUNING.vbatPidCompensation); buffer.push(ADVANCED_TUNING.deltaMethod)
buffer.push(ADVANCED_TUNING.vbatPidCompensation);
}
break; break;
case MSP_codes.MSP_SET_SPECIAL_PARAMETERS: case MSP_codes.MSP_SET_SPECIAL_PARAMETERS:
buffer.push(Math.round(SPECIAL_PARAMETERS.RC_RATE_YAW * 100)); buffer.push(Math.round(SPECIAL_PARAMETERS.RC_RATE_YAW * 100));
if (CONFIG.flightControllerIdentifier == "BTFL" && semver.gte(CONFIG.flightControllerVersion, "2.8.2")) {
buffer.push(SPECIAL_PARAMETERS.airModeActivateThreshold);
buffer.push(SPECIAL_PARAMETERS.rcSmoothInterval);
buffer.push(SPECIAL_PARAMETERS.escDesyncProtection);
}
break; break;
default: default:
return false; return false;

12
tabs/pid_tuning.js
View file

@ -186,6 +186,10 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_filter .dterm').val(FILTER_CONFIG.dterm_lpf_hz); $('.pid_filter .dterm').val(FILTER_CONFIG.dterm_lpf_hz);
$('.pid_filter .yaw').val(FILTER_CONFIG.yaw_lpf_hz); $('.pid_filter .yaw').val(FILTER_CONFIG.yaw_lpf_hz);
if (CONFIG.flightControllerIdentifier == "BTFL" && semver.lt(CONFIG.flightControllerVersion, "2.8.1")) {
$('.pid_filter').hide();
$('.pid_tuning input[name="rc_rate_yaw"]').hide();
}
} }
function form_to_pid_and_rc() { function form_to_pid_and_rc() {
@ -427,6 +431,10 @@ TABS.pid_tuning.initialize = function (callback) {
ADVANCED_TUNING.deltaMethod = $(this).val(); ADVANCED_TUNING.deltaMethod = $(this).val();
}); });
if (CONFIG.flightControllerIdentifier == "BTFL" && semver.lt(CONFIG.flightControllerVersion, "2.8.2")) {
$('.delta').hide();
}
// update == save. // update == save.
$('a.update').click(function () { $('a.update').click(function () {
form_to_pid_and_rc(); form_to_pid_and_rc();
@ -442,13 +450,17 @@ TABS.pid_tuning.initialize = function (callback) {
if (TABS.pid_tuning.controllerChanged) { return; } if (TABS.pid_tuning.controllerChanged) { return; }
MSP.promise(MSP_codes.MSP_SET_PID, MSP.crunch(MSP_codes.MSP_SET_PID)).then(function() { MSP.promise(MSP_codes.MSP_SET_PID, MSP.crunch(MSP_codes.MSP_SET_PID)).then(function() {
if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); } if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); }
if (CONFIG.flightControllerIdentifier == "BTFL" && semver.gte(CONFIG.flightControllerVersion, "2.8.1")) {
return MSP.promise(MSP_codes.MSP_SET_SPECIAL_PARAMETERS, MSP.crunch(MSP_codes.MSP_SET_SPECIAL_PARAMETERS)); return MSP.promise(MSP_codes.MSP_SET_SPECIAL_PARAMETERS, MSP.crunch(MSP_codes.MSP_SET_SPECIAL_PARAMETERS));
}
}).then(function() { }).then(function() {
if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); } if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); }
return MSP.promise(MSP_codes.MSP_SET_ADVANCED_TUNING, MSP.crunch(MSP_codes.MSP_SET_ADVANCED_TUNING)); return MSP.promise(MSP_codes.MSP_SET_ADVANCED_TUNING, MSP.crunch(MSP_codes.MSP_SET_ADVANCED_TUNING));
}).then(function() { }).then(function() {
if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); } if (TABS.pid_tuning.controllerChanged) { Promise.reject('pid controller changed'); }
if (CONFIG.flightControllerIdentifier == "BTFL" && semver.gte(CONFIG.flightControllerVersion, "2.8.1")) {
return MSP.promise(MSP_codes.MSP_SET_FILTER_CONFIG, MSP.crunch(MSP_codes.MSP_SET_FILTER_CONFIG)); return MSP.promise(MSP_codes.MSP_SET_FILTER_CONFIG, MSP.crunch(MSP_codes.MSP_SET_FILTER_CONFIG));
}
}).then(function() { }).then(function() {
return MSP.promise(MSP_codes.MSP_SET_RC_TUNING, MSP.crunch(MSP_codes.MSP_SET_RC_TUNING)); return MSP.promise(MSP_codes.MSP_SET_RC_TUNING, MSP.crunch(MSP_codes.MSP_SET_RC_TUNING));
}).then(function() { }).then(function() {