From bcadfbb0fffde0d1b9f132c3a134154c959a4f48 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Fri, 3 Feb 2023 09:54:11 +0100 Subject: [PATCH 1/3] Create 3" defaults profile --- js/defaults_dialog.js | 196 +++++++++++++++++++++++++++++++++++- src/css/defaults_dialog.css | 2 +- 2 files changed, 195 insertions(+), 3 deletions(-) diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index b1ad95eeb..1c54cd9e8 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -11,8 +11,200 @@ helper.defaultsDialog = (function () { let $container; - let data = [{ - "title": 'Mini Quad with 3"-5" propellers', + let data = [ + { + "title": 'Mini Quad with 3" propellers', + "id": 6, + "notRecommended": false, + "reboot": true, + "mixerToApply": 3, + "settings": [ + { + key: "model_preview_type", + value: 3 + }, + /* + System + */ + { + key: "gyro_hardware_lpf", + value: "256HZ" + }, + { + key: "looptime", + value: 500 + }, + { + key: "motor_pwm_protocol", + value: "DSHOT300" + }, + /* + Filtering + */ + { + key: "gyro_main_lpf_hz", + value: 90 + }, + { + key: "gyro_main_lpf_type", + value: "PT1" + }, + { + key: "dterm_lpf_hz", + value: 85 + }, + { + key: "dterm_lpf_type", + value: "PT3" + }, + { + key: "dterm_lpf2_hz", + value: 0 + }, + { + key: "dterm_lpf2_type", + value: "PT1" + }, + { + key: "dynamic_gyro_notch_enabled", + value: "ON" + }, + { + key: "dynamic_gyro_notch_q", + value: 250 + }, + { + key: "dynamic_gyro_notch_min_hz", + value: 70 + }, + { + key: "setpoint_kalman_enabled", + value: "ON" + }, + { + key: "setpoint_kalman_q", + value: 200 + }, + { + key: "smith_predictor_delay", // Enable Smith Predictor + value: 1.5 + }, + /* + Mechanics + */ + { + key: "airmode_type", + value: "THROTTLE_THRESHOLD" + }, + { + key: "airmode_throttle_threshold", + value: 1150 + }, + { + key: "mc_iterm_relax", + value: "RP" + }, + { + key: "d_boost_min", + value: 1.0 + }, + { + key: "d_boost_max", + value: 1.0 + }, + { + key: "antigravity_gain", + value: 2 + }, + { + key: "antigravity_accelerator", + value: 5 + }, + /* + Rates + */ + { + key: "rc_yaw_expo", + value: 75 + }, + { + key: "rc_expo", + value: 75 + }, + { + key: "roll_rate", + value: 70 + }, + { + key: "pitch_rate", + value: 70 + }, + { + key: "yaw_rate", + value: 60 + }, + /* + PIDs + */ + { + key: "mc_p_pitch", + value: 32 + }, + { + key: "mc_i_pitch", + value: 90 + }, + { + key: "mc_d_pitch", + value: 25 + }, + { + key: "mc_p_roll", + value: 28 + }, + { + key: "mc_i_roll", + value: 80 + }, + { + key: "mc_d_roll", + value: 23 + }, + { + key: "mc_p_yaw", + value: 30 + }, + { + key: "mc_i_yaw", + value: 80 + }, + /* + * TPA + */ + { + key: "tpa_rate", + value: 20 + }, + { + key: "tpa_breakpoint", + value: 1200 + }, + { + key: "platform_type", + value: "MULTIROTOR" + }, + { + key: "applied_defaults", + value: 6 + }, + { + key: "failsafe_procedure", + value: "DROP" + } + ] + }, + { + "title": 'Mini Quad with 5" propellers', "id": 2, "notRecommended": false, "reboot": true, diff --git a/src/css/defaults_dialog.css b/src/css/defaults_dialog.css index 9ec599a73..fabf7bfd4 100644 --- a/src/css/defaults_dialog.css +++ b/src/css/defaults_dialog.css @@ -15,7 +15,7 @@ z-index: 2002; position: absolute; width: 500px; - height: 485px; + height: 535px; overflow: none; top: 0; bottom: 0; From 1f8364974a348e3460fe238f19dceeadeb6c5e22 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Fri, 3 Feb 2023 11:20:48 +0100 Subject: [PATCH 2/3] Enable Dynamic LPF on 5" preset --- js/defaults_dialog.js | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index 1c54cd9e8..7e754c779 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -240,6 +240,28 @@ helper.defaultsDialog = (function () { key: "gyro_main_lpf_type", value: "PT1" }, + /* + Dynamic gyro LPF + */ + { + key: "gyro_use_dyn_lpf", + value: "ON" + }, + { + key: "gyro_dyn_lpf_min_hz", + value: 85 + }, + { + key: "gyro_dyn_lpf_max_hz", + value: 300 + }, + { + key: "gyro_dyn_lpf_curve_expo", + value: 1 + }, + /* + D-term + */ { key: "dterm_lpf_hz", value: 110 @@ -266,7 +288,7 @@ helper.defaultsDialog = (function () { }, { key: "dynamic_gyro_notch_min_hz", - value: 120 + value: 100 }, { key: "setpoint_kalman_enabled", @@ -297,11 +319,11 @@ helper.defaultsDialog = (function () { }, { key: "d_boost_min", - value: 0.8 + value: 1.0 }, { key: "d_boost_max", - value: 1.2 + value: 1.0 }, { key: "antigravity_gain", @@ -339,27 +361,27 @@ helper.defaultsDialog = (function () { */ { key: "mc_p_pitch", - value: 44 + value: 40 }, { key: "mc_i_pitch", - value: 75 + value: 90 }, { key: "mc_d_pitch", - value: 25 + value: 27 }, { key: "mc_p_roll", - value: 40 + value: 36 }, { key: "mc_i_roll", - value: 60 + value: 80 }, { key: "mc_d_roll", - value: 23 + value: 25 }, { key: "mc_p_yaw", From 320958c3ff1dc4e77392a5c530e43454f73bc5a3 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Fri, 3 Feb 2023 12:31:40 +0100 Subject: [PATCH 3/3] Small update --- js/defaults_dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index 7e754c779..d6319b51d 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -257,7 +257,7 @@ helper.defaultsDialog = (function () { }, { key: "gyro_dyn_lpf_curve_expo", - value: 1 + value: 3 }, /* D-term