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

Move TPA from Rates to PID tuning (UI)

Browse source
This commit is contained in:
Mark Haslinghuis 2022-08-08 23:10:10 +02:00
parent a1449a8c9f
commit be2cdbd9f1
4 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/msp/MSPHelper.js
View file

@ -1271,7 +1271,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
FC.ADVANCED_TUNING.thrustLinearization = data.readU8();
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
FC.ADVANCED_TUNING.tpaRate = data.readU8();
FC.ADVANCED_TUNING.tpaRate = parseFloat((data.readU8() / 100).toFixed(2));
FC.ADVANCED_TUNING.tpaBreakpoint = data.readU16();
}
}
@ -2292,7 +2292,7 @@ MspHelper.prototype.crunch = function(code) {
.push8(FC.ADVANCED_TUNING.thrustLinearization);
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
buffer.push8(FC.ADVANCED_TUNING.tpaRate);
buffer.push8(Math.round(FC.ADVANCED_TUNING.tpaRate * 100));
buffer.push16(FC.ADVANCED_TUNING.tpaBreakpoint);
}
}

24
src/js/tabs/pid_tuning.js
View file

@ -111,11 +111,11 @@ pid_tuning.initialize = function (callback) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
// Moved tpa to profile
$('.tpa input[name="tpa"]').val(FC.ADVANCED_TUNING.tpaRate);
$('.tpa input[name="tpa-breakpoint"]').val(FC.ADVANCED_TUNING.tpaBreakpoint);
$('input[id="tpaRate"]').val(FC.ADVANCED_TUNING.tpaRate.toFixed(2));
$('input[id="tpaBreakpoint"]').val(FC.ADVANCED_TUNING.tpaBreakpoint);
} else {
$('.tpa input[name="tpa"]').val(FC.RC_TUNING.dynamic_THR_PID.toFixed(2));
$('.tpa input[name="tpa-breakpoint"]').val(FC.RC_TUNING.dynamic_THR_breakpoint);
$('.tpa-old input[name="tpa"]').val(FC.RC_TUNING.dynamic_THR_PID.toFixed(2));
$('.tpa-old input[name="tpa-breakpoint"]').val(FC.RC_TUNING.dynamic_THR_breakpoint);
}
if (semver.lt(FC.CONFIG.apiVersion, "1.10.0")) {
@ -1191,11 +1191,11 @@ pid_tuning.initialize = function (callback) {
FC.RC_TUNING.throttle_EXPO = parseFloat($('.throttle input[name="expo"]').val());
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
FC.ADVANCED_TUNING.tpaRate = parseFloat($('.tpa input[name="tpa"]').val());
FC.ADVANCED_TUNING.tpaBreakpoint = parseInt($('.tpa input[name="tpa-breakpoint"]').val());
FC.ADVANCED_TUNING.tpaRate = parseFloat($('input[id="tpaRate"]').val());
FC.ADVANCED_TUNING.tpaBreakpoint = parseInt($('input[id="tpaBreakpoint"]').val());
} else {
FC.RC_TUNING.dynamic_THR_PID = parseFloat($('.tpa input[name="tpa"]').val());
FC.RC_TUNING.dynamic_THR_breakpoint = parseInt($('.tpa input[name="tpa-breakpoint"]').val());
FC.RC_TUNING.dynamic_THR_PID = parseFloat($('.tpa-old input[name="tpa"]').val());
FC.RC_TUNING.dynamic_THR_breakpoint = parseInt($('.tpa-old input[name="tpa-breakpoint"]').val());
}
FC.FILTER_CONFIG.gyro_lowpass_hz = parseInt($('.pid_filter input[name="gyroLowpassFrequency"]').val());
@ -1782,7 +1782,7 @@ pid_tuning.initialize = function (callback) {
}
if (semver.lt(FC.CONFIG.apiVersion, "1.7.0")) {
$('.tpa .tpa-breakpoint').hide();
$('.tpa-old .tpa-breakpoint').hide();
$('.pid_tuning .roll_rate').hide();
$('.pid_tuning .pitch_rate').hide();
@ -1790,6 +1790,12 @@ pid_tuning.initialize = function (callback) {
$('.pid_tuning .roll_pitch_rate').hide();
}
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
$('.tpa-old').hide();
} else {
$('.tpa').hide();
}
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
$('.pid_tuning .bracket').hide();
$('.pid_tuning input[name=rc_rate]').parent().attr('class', 'pid_data');