From f2fd1e1077a889d23018d5d6614eb3e90c56cd74 Mon Sep 17 00:00:00 2001 From: "U-DESKTOP-12PPI61\\boris.bozic" Date: Mon, 20 Jun 2016 23:51:34 +0200 Subject: [PATCH] Continue filling PID tuning tab --- js/fc.js | 5 +++++ js/msp.js | 10 ++++++++-- tabs/pid_tuning.js | 12 +++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/js/fc.js b/js/fc.js index a03f449b..e5960afb 100644 --- a/js/fc.js +++ b/js/fc.js @@ -38,6 +38,7 @@ var RXFAIL_CONFIG; var PID_ADVANCED_CONFIG; var FILTER_CONFIG; var ADVANCED_TUNING; +var TEMPORARY_COMMANDS; var FC = { resetState: function() { @@ -257,6 +258,10 @@ var FC = { yawItermIgnoreRate: 0, yaw_p_limit: 0 }; + + TEMPORARY_COMMANDS = { + RC_YAW_RATE: 0 + }; RX_CONFIG = { serialrx_provider: 0, diff --git a/js/msp.js b/js/msp.js index 28805ad2..2e8f46a8 100755 --- a/js/msp.js +++ b/js/msp.js @@ -47,7 +47,8 @@ var MSP_codes = { MSP_SET_FILTER_CONFIG: 93, MSP_ADVANCED_TUNING: 94, MSP_SET_ADVANCED_TUNING: 95, - + MSP_TEMPORARY_COMMANDS: 98, + MSP_SET_TEMPORARY_COMMANDS: 99, // Multiwii MSP commands MSP_IDENT: 100, @@ -884,7 +885,6 @@ var MSP = { PID_ADVANCED_CONFIG.fast_pwm_protocol = data.getUint8(offset++, 1); PID_ADVANCED_CONFIG.motor_pwm_rate = data.getUint16(offset++, 1); break; - case MSP_codes.MSP_FILTER_CONFIG: var offset = 0; FILTER_CONFIG.gyro_soft_lpf_hz = data.getUint8(offset++, 1); @@ -901,6 +901,9 @@ var MSP = { offset += 2; ADVANCED_TUNING.yaw_p_limit = data.getUint16(offset, 1); break; + case MSP_codes.MSP_TEMPORARY_COMMANDS: + TEMPORARY_COMMANDS.RC_RATE_YAW = data.getUint8(0, 1); + break; case MSP_codes.MSP_LED_STRIP_CONFIG: LED_STRIP = []; @@ -1404,6 +1407,9 @@ MSP.crunch = function (code) { buffer.push(lowByte(PID_ADVANCED_CONFIG.motor_pwm_rate)); buffer.push(highByte(PID_ADVANCED_CONFIG.motor_pwm_rate)); break; + case MSP_codes.MSP_TEMPORARY_COMMANDS: + buffer.push(TEMPORARY_COMMANDS.RC_RATE_YAW); + break; default: return false; } diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js index dc654738..ff679572 100755 --- a/tabs/pid_tuning.js +++ b/tabs/pid_tuning.js @@ -27,13 +27,15 @@ TABS.pid_tuning.initialize = function (callback) { } function get_rc_tuning_data() { - MSP.send_message(MSP_codes.MSP_RC_TUNING, false, false, get_filter_config); + MSP.send_message(MSP_codes.MSP_RC_TUNING, false, false, get_temp_data); } + + function get_temp_data() { + MSP.send_message(MSP_codes.MSP_TEMPORARY_COMMANDS, 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); + MSP.send_message(MSP_codes.MSP_FILTER_CONFIG, false, false, load_html); } function load_html() {