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

First step towards adding filter settings in configurator

Browse source
This commit is contained in:
KiteAnton 2016-06-20 23:17:32 +02:00 • committed by U-DESKTOP-12PPI61\boris.bozic
parent 61297fbe1c
commit c9a5294f43
3 changed files with 46 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/fc.js
View file

@ -36,6 +36,8 @@ var RX_CONFIG;
var FAILSAFE_CONFIG; var FAILSAFE_CONFIG;
var RXFAIL_CONFIG; var RXFAIL_CONFIG;
var PID_ADVANCED_CONFIG; var PID_ADVANCED_CONFIG;
var FILTER_CONFIG;
var ADVANCED_TUNING;
var FC = { var FC = {
resetState: function() { resetState: function() {
@ -244,6 +246,18 @@ var FC = {
motor_pwm_rate: 0 motor_pwm_rate: 0
}; };
FILTER_CONFIG = {
gyro_soft_lpf_hz: 0,
dterm_lpf_hz: 0,
yaw_lpf_hz: 0
};
ADVANCED_TUNING = {
rollPitchItermIgnoreRate: 0,
yawItermIgnoreRate: 0,
yaw_p_limit: 0
};
RX_CONFIG = { RX_CONFIG = {
serialrx_provider: 0, serialrx_provider: 0,
maxcheck: 0, maxcheck: 0,

22
js/msp.js
View file

@ -43,6 +43,11 @@ var MSP_codes = {
MSP_PID_ADVANCED_CONFIG: 90, MSP_PID_ADVANCED_CONFIG: 90,
MSP_SET_PID_ADVANCED_CONFIG: 91, MSP_SET_PID_ADVANCED_CONFIG: 91,
MSP_FILTER_CONFIG: 92,
MSP_SET_FILTER_CONFIG: 93,
MSP_ADVANCED_TUNING: 94,
MSP_SET_ADVANCED_TUNING: 95,
// Multiwii MSP commands // Multiwii MSP commands
MSP_IDENT: 100, MSP_IDENT: 100,
@ -879,6 +884,23 @@ var MSP = {
PID_ADVANCED_CONFIG.fast_pwm_protocol = data.getUint8(offset++, 1); PID_ADVANCED_CONFIG.fast_pwm_protocol = data.getUint8(offset++, 1);
PID_ADVANCED_CONFIG.motor_pwm_rate = data.getUint16(offset++, 1); PID_ADVANCED_CONFIG.motor_pwm_rate = data.getUint16(offset++, 1);
break; break;
case MSP_codes.MSP_FILTER_CONFIG:
var offset = 0;
FILTER_CONFIG.gyro_soft_lpf_hz = data.getUint8(offset++, 1);
FILTER_CONFIG.dterm_lpf_hz = data.getUint16(offset, 1);
offset += 2;
FILTER_CONFIG.yaw_lpf_hz = data.getUint16(offset, 1);
break;
case MSP_codes.MSP_ADVANCED_TUNING:
var offset = 0;
ADVANCED_TUNING.rollPitchItermIgnoreRate = data.getUint16(offset, 1);
offset += 2;
ADVANCED_TUNING.yawItermIgnoreRate = data.getUint16(offset, 1);
offset += 2;
ADVANCED_TUNING.yaw_p_limit = data.getUint16(offset, 1);
break;
case MSP_codes.MSP_LED_STRIP_CONFIG: case MSP_codes.MSP_LED_STRIP_CONFIG:
LED_STRIP = []; LED_STRIP = [];

11
tabs/pid_tuning.js
View file

@ -27,7 +27,13 @@ TABS.pid_tuning.initialize = function (callback) {
} }
function get_rc_tuning_data() { function get_rc_tuning_data() {
MSP.send_message(MSP_codes.MSP_RC_TUNING, false, false, load_html); MSP.send_message(MSP_codes.MSP_RC_TUNING, false, false, get_filter_config);
}
function get_filter_config() {
MSP.send_message(MSP_codes.MSP_FILTER_CONFIG, false, false, get_advanced_tuning);
}
function get_advanced_tuning() {
MSP.send_message(MSP_codes.MSP_ADVANCED_TUNING, false, false, load_html);
} }
function load_html() { function load_html() {
@ -185,6 +191,9 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning input[name="rc_yaw_expo"]').hide(); $('.pid_tuning input[name="rc_yaw_expo"]').hide();
$('.pid_tuning input[name="rc_expo"]').attr("rowspan", "3"); $('.pid_tuning input[name="rc_expo"]').attr("rowspan", "3");
} }
} }
function form_to_pid_and_rc() { function form_to_pid_and_rc() {