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

Removed support for 32 kHz gyro mode.

Browse source
This commit is contained in:
mikeller 2019-02-12 22:59:22 +13:00
parent c30c2142b1
commit cc31ceb896
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -919,7 +919,10 @@ MspHelper.prototype.process_data = function(dataHandler) {
PID_ADVANCED_CONFIG.digitalIdlePercent = data.readU16() / 100; PID_ADVANCED_CONFIG.digitalIdlePercent = data.readU16() / 100;
if (semver.gte(CONFIG.apiVersion, "1.25.0")) { if (semver.gte(CONFIG.apiVersion, "1.25.0")) {
PID_ADVANCED_CONFIG.gyroUse32kHz = data.readU8(); let gyroUse32kHz = data.readU8();
if (semver.lt(CONFIG.apiVersion, "1.41.0")) {
PID_ADVANCED_CONFIG.gyroUse32kHz = gyroUse32kHz;
}
} }
} }
break; break;
@ -941,12 +944,15 @@ MspHelper.prototype.process_data = function(dataHandler) {
} }
if (semver.gte(CONFIG.apiVersion, "1.39.0")) { if (semver.gte(CONFIG.apiVersion, "1.39.0")) {
FILTER_CONFIG.gyro_hardware_lpf = data.readU8(); FILTER_CONFIG.gyro_hardware_lpf = data.readU8();
FILTER_CONFIG.gyro_32khz_hardware_lpf = data.readU8(); let gyro_32khz_hardware_lpf = data.readU8();
FILTER_CONFIG.gyro_lowpass_hz = data.readU16(); FILTER_CONFIG.gyro_lowpass_hz = data.readU16();
FILTER_CONFIG.gyro_lowpass2_hz = data.readU16(); FILTER_CONFIG.gyro_lowpass2_hz = data.readU16();
FILTER_CONFIG.gyro_lowpass_type = data.readU8(); FILTER_CONFIG.gyro_lowpass_type = data.readU8();
FILTER_CONFIG.gyro_lowpass2_type = data.readU8(); FILTER_CONFIG.gyro_lowpass2_type = data.readU8();
FILTER_CONFIG.dterm_lowpass2_hz = data.readU16(); FILTER_CONFIG.dterm_lowpass2_hz = data.readU16();
if (semver.lt(CONFIG.apiVersion, "1.41.0")) {
FILTER_CONFIG.gyro_32khz_hardware_lpf = data.readU8();
}
} }
} }
break; break;
@ -1630,7 +1636,11 @@ MspHelper.prototype.crunch = function(code) {
buffer.push16(PID_ADVANCED_CONFIG.digitalIdlePercent * 100); buffer.push16(PID_ADVANCED_CONFIG.digitalIdlePercent * 100);
if (semver.gte(CONFIG.apiVersion, "1.25.0")) { if (semver.gte(CONFIG.apiVersion, "1.25.0")) {
buffer.push8(PID_ADVANCED_CONFIG.gyroUse32kHz); let gyroUse32kHz = 0;
if (semver.lt(CONFIG.apiVersion, "1.41.0")) {
gyroUse32kHz = PID_ADVANCED_CONFIG.gyroUse32kHz;
}
buffer.push8(gyroUse32kHz);
} }
} }
break; break;
@ -1651,8 +1661,12 @@ MspHelper.prototype.crunch = function(code) {
buffer.push8(FILTER_CONFIG.dterm_lowpass_type); buffer.push8(FILTER_CONFIG.dterm_lowpass_type);
} }
if (semver.gte(CONFIG.apiVersion, "1.39.0")) { if (semver.gte(CONFIG.apiVersion, "1.39.0")) {
let gyro_32khz_hardware_lpf = 0;
if (semver.lt(CONFIG.apiVersion, "1.41.0")) {
gyro_32khz_hardware_lpf = FILTER_CONFIG.gyro_32khz_hardware_lpf;
}
buffer.push8(FILTER_CONFIG.gyro_hardware_lpf) buffer.push8(FILTER_CONFIG.gyro_hardware_lpf)
.push8(FILTER_CONFIG.gyro_32khz_hardware_lpf) .push8(gyro_32khz_hardware_lpf)
.push16(FILTER_CONFIG.gyro_lowpass_hz) .push16(FILTER_CONFIG.gyro_lowpass_hz)
.push16(FILTER_CONFIG.gyro_lowpass2_hz) .push16(FILTER_CONFIG.gyro_lowpass2_hz)
.push8(FILTER_CONFIG.gyro_lowpass_type) .push8(FILTER_CONFIG.gyro_lowpass_type)

6
src/js/tabs/configuration.js
View file

@ -445,7 +445,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
gyro_select_e.change(); gyro_select_e.change();
}; };
if (semver.gte(CONFIG.apiVersion, "1.25.0")) { if (semver.gte(CONFIG.apiVersion, "1.25.0") && semver.lt(CONFIG.apiVersion, "1.41.0")) {
gyroUse32kHz_e.prop('checked', PID_ADVANCED_CONFIG.gyroUse32kHz !== 0); gyroUse32kHz_e.prop('checked', PID_ADVANCED_CONFIG.gyroUse32kHz !== 0);
gyroUse32kHz_e.change(function () { gyroUse32kHz_e.change(function () {
@ -470,7 +470,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
var originalPidDenom = pid_select_e.val(); var originalPidDenom = pid_select_e.val();
var pidBaseFreq = 8; var pidBaseFreq = 8;
if (semver.gte(CONFIG.apiVersion, "1.25.0") && gyroUse32kHz_e.is(':checked')) { if (semver.gte(CONFIG.apiVersion, "1.25.0") && semver.lt(CONFIG.apiVersion, "1.41.0") && gyroUse32kHz_e.is(':checked')) {
pidBaseFreq = 32; pidBaseFreq = 32;
} }
@ -1023,7 +1023,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
PID_ADVANCED_CONFIG.gyro_sync_denom = parseInt(gyro_select_e.val()); PID_ADVANCED_CONFIG.gyro_sync_denom = parseInt(gyro_select_e.val());
PID_ADVANCED_CONFIG.pid_process_denom = parseInt(pid_select_e.val()); PID_ADVANCED_CONFIG.pid_process_denom = parseInt(pid_select_e.val());
PID_ADVANCED_CONFIG.digitalIdlePercent = parseFloat($('input[name="digitalIdlePercent"]').val()); PID_ADVANCED_CONFIG.digitalIdlePercent = parseFloat($('input[name="digitalIdlePercent"]').val());
if (semver.gte(CONFIG.apiVersion, "1.25.0")) { if (semver.gte(CONFIG.apiVersion, "1.25.0") && semver.lt(CONFIG.apiVersion, "1.41.0")) {
PID_ADVANCED_CONFIG.gyroUse32kHz = $('input[id="gyroUse32kHz"]').is(':checked') ? 1 : 0; PID_ADVANCED_CONFIG.gyroUse32kHz = $('input[id="gyroUse32kHz"]').is(':checked') ? 1 : 0;
} }

2
src/js/tabs/onboard_logging.js
View file

@ -209,7 +209,7 @@ TABS.onboard_logging.initialize = function (callback) {
var loggingRates = []; var loggingRates = [];
var pidRateBase = 8000; var pidRateBase = 8000;
if (PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) { if (semver.gte(CONFIG.apiVersion, "1.25.0") && semver.lt(CONFIG.apiVersion, "1.41.0") && PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) {
pidRateBase = 32000; pidRateBase = 32000;
} }