From 38f36946a23b0c421a13ecf5ad0c0762815e40ec Mon Sep 17 00:00:00 2001 From: b14ckyy <33039058+b14ckyy@users.noreply.github.com> Date: Tue, 2 Mar 2021 18:10:35 +0100 Subject: [PATCH] Final settings with Plane + Wing Preset in intial popup Testing of the preset settings is ongoing. Will make PR when confirmed working over all plane ranges --- js/defaults_dialog.js | 546 ++++++++++++++++++++++++------------------ 1 file changed, 316 insertions(+), 230 deletions(-) diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index b08ea488..749437e5 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -190,122 +190,165 @@ helper.defaultsDialog = (function() { "reboot": true, "settings": [ { - key: "platform_type" - value: "AIRPLANE" - }, - { - key: "gyro_hardware_lpf", - value: "256HZ" + key: "platform_type" + value: "AIRPLANE" + }, + { + key: "gyro_hardware_lpf", + value: "256HZ" }, { - key: "gyro_lpf_hz" - value: "25" - }, - { - key: "gyro_lpf_type" - value: "BIQUAD" - }, - { - key: "dynamic_gyro_notch_enabled" - value: "ON" - }, - { - key: "dynamic_gyro_notch_q" - value: "250" - }, - { - key: "dynamic_gyro_notch_min_hz" - value: "30" - }, - { - key: "motor_pwm_protocol" - value: "STANDARD" - }, - { - key: "rc_yaw_expo" - value: "30" - }, - { - key: "rc_expo" - value: "30" - }, - { - key: "roll_rate" - value: "18" - }, - { - key: "pitch_rate" - value: "9" - }, - { - key: "yaw_rate" - value: "3" - }, - { - key: "nav_fw_pos_z_p" - value: "20" - }, - { - key: "nav_fw_pos_z_d" - value: "5" - }, - { - key: "nav_fw_pos_xy_p" - value: "50" - }, - { - key: "small_angle" - value: "180" - }, - { - key: "nav_rth_allow_landing" - value: "FS_ONLY" - }, - { - key: "nav_rth_altitude" - value: "5000" - }, - { - key: "nav_wp_radius" - value: "1500" - }, - { - key: "throttle_idle" - value: "5.000" - }, - { - key: "applied_defaults" - value: "3" - }, - { - key: "imu_acc_ignore_rate" - value: "10" - }, - { - key: "airmode_type" - value: "STICK_CENTER_ONCE" - }, - { - key: "airmode_type" - value: "STICK_CENTER_ONCE" - }, - { - key: "nav_rth_climb_first" - value: "OFF" - }, - { - key: "fw_turn_assist_pitch_gain" - value: "0.5" - }, - { - key: "max_angle_inclination_rll" - value: "35" - }, - { - key: "nav_fw_bank_angle" - value: "35" - }, - + key: "gyro_lpf_hz" + value: "25" + }, + { + key: "gyro_lpf_type" + value: "BIQUAD" + }, + { + key: "dynamic_gyro_notch_enabled" + value: "ON" + }, + { + key: "dynamic_gyro_notch_q" + value: "250" + }, + { + key: "dynamic_gyro_notch_min_hz" + value: "30" + }, + { + key: "motor_pwm_protocol" + value: "STANDARD" + }, + { + key: "rc_yaw_expo" + value: "30" + }, + { + key: "rc_expo" + value: "30" + }, + { + key: "roll_rate" + value: "18" + }, + { + key: "pitch_rate" + value: "9" + }, + { + key: "yaw_rate" + value: "3" + }, + { + key: "nav_fw_pos_z_p" + value: "20" + }, + { + key: "nav_fw_pos_z_d" + value: "5" + }, + { + key: "nav_fw_pos_xy_p" + value: "50" + }, + { + key: "small_angle" + value: "180" + }, + { + key: "nav_rth_allow_landing" + value: "FS_ONLY" + }, + { + key: "nav_rth_altitude" + value: "5000" + }, + { + key: "nav_wp_radius" + value: "1500" + }, + { + key: "throttle_idle" + value: "5.000" + }, + { + key: "applied_defaults" + value: "3" + }, + { + key: "imu_acc_ignore_rate" + value: "10" + }, + { + key: "airmode_type" + value: "STICK_CENTER_ONCE" + }, + { + key: "airmode_type" + value: "STICK_CENTER_ONCE" + }, + { + key: "nav_rth_climb_first" + value: "OFF" + }, + { + key: "fw_turn_assist_pitch_gain" + value: "0.5" + }, + { + key: "max_angle_inclination_rll" + value: "35" + }, + { + key: "nav_fw_bank_angle" + value: "35" + }, + { + key: "fw_p_pitch" + value: "15" + }, + { + key: "fw_i_pitch" + value: "10" + }, + { + key: "fw_ff_pitch" + value: "60" + }, + { + key: "fw_p_roll" + value: "10" + }, + { + key: "fw_i_roll" + value: "8" + }, + { + key: "fw_ff_roll" + value: "40" + }, + { + key: "roll_rate" + value: "18" + }, + { + key: "pitch_rate + value: "9" + }, + { + key: "fw_p_yaw" + value: "20" + }, + { + key: "fw_i_yaw" + value: "0" + }, + { + key: "fw_ff_yaw" + value: "100" + }, ], "features":[ { @@ -314,129 +357,172 @@ helper.defaultsDialog = (function() { } ] }, - { - "title": 'Flying Wing with no Tail', + { + "title": 'Flying Wing, Delta, etc.', "notRecommended": false, "id": 3, "reboot": true, "settings": [ { - key: "platform_type" - value: "AIRPLANE" - }, - { - key: "gyro_hardware_lpf", - value: "256HZ" + key: "platform_type" + value: "AIRPLANE" + }, + { + key: "gyro_hardware_lpf", + value: "256HZ" }, { - key: "gyro_lpf_hz" - value: "25" - }, - { - key: "gyro_lpf_type" - value: "BIQUAD" - }, - { - key: "dynamic_gyro_notch_enabled" - value: "ON" - }, - { - key: "dynamic_gyro_notch_q" - value: "250" - }, - { - key: "dynamic_gyro_notch_min_hz" - value: "30" - }, - { - key: "motor_pwm_protocol" - value: "STANDARD" - }, - { - key: "rc_yaw_expo" - value: "30" - }, - { - key: "rc_expo" - value: "30" - }, - { - key: "roll_rate" - value: "18" - }, - { - key: "pitch_rate" - value: "9" - }, - { - key: "yaw_rate" - value: "3" - }, - { - key: "nav_fw_pos_z_p" - value: "20" - }, - { - key: "nav_fw_pos_z_d" - value: "5" - }, - { - key: "nav_fw_pos_xy_p" - value: "50" - }, - { - key: "small_angle" - value: "180" - }, - { - key: "nav_rth_allow_landing" - value: "FS_ONLY" - }, - { - key: "nav_rth_altitude" - value: "5000" - }, - { - key: "nav_wp_radius" - value: "1500" - }, - { - key: "throttle_idle" - value: "5.000" - }, - { - key: "applied_defaults" - value: "3" - }, - { - key: "imu_acc_ignore_rate" - value: "10" - }, - { - key: "airmode_type" - value: "STICK_CENTER_ONCE" - }, - { - key: "airmode_type" - value: "STICK_CENTER_ONCE" - }, - { - key: "nav_rth_climb_first" - value: "OFF" - }, - { - key: "fw_turn_assist_pitch_gain" - value: "0.2" - }, - { - key: "max_angle_inclination_rll" - value: "45" - }, - { - key: "nav_fw_bank_angle" - value: "45" - }, - + key: "gyro_lpf_hz" + value: "25" + }, + { + key: "gyro_lpf_type" + value: "BIQUAD" + }, + { + key: "dynamic_gyro_notch_enabled" + value: "ON" + }, + { + key: "dynamic_gyro_notch_q" + value: "250" + }, + { + key: "dynamic_gyro_notch_min_hz" + value: "30" + }, + { + key: "motor_pwm_protocol" + value: "STANDARD" + }, + { + key: "rc_yaw_expo" + value: "30" + }, + { + key: "rc_expo" + value: "30" + }, + { + key: "roll_rate" + value: "18" + }, + { + key: "pitch_rate" + value: "9" + }, + { + key: "yaw_rate" + value: "3" + }, + { + key: "nav_fw_pos_z_p" + value: "20" + }, + { + key: "nav_fw_pos_z_d" + value: "5" + }, + { + key: "nav_fw_pos_xy_p" + value: "50" + }, + { + key: "small_angle" + value: "180" + }, + { + key: "nav_rth_allow_landing" + value: "FS_ONLY" + }, + { + key: "nav_rth_altitude" + value: "5000" + }, + { + key: "nav_wp_radius" + value: "1500" + }, + { + key: "throttle_idle" + value: "5.000" + }, + { + key: "applied_defaults" + value: "3" + }, + { + key: "imu_acc_ignore_rate" + value: "10" + }, + { + key: "airmode_type" + value: "STICK_CENTER_ONCE" + }, + { + key: "airmode_type" + value: "STICK_CENTER_ONCE" + }, + { + key: "nav_rth_climb_first" + value: "OFF" + }, + { + key: "fw_turn_assist_pitch_gain" + value: "0.2" + }, + { + key: "max_angle_inclination_rll" + value: "45" + }, + { + key: "nav_fw_bank_angle" + value: "45" + }, + { + key: "fw_p_pitch" + value: "10" + }, + { + key: "fw_i_pitch" + value: "15" + }, + { + key: "fw_ff_pitch" + value: "70" + }, + { + key: "fw_p_roll" + value: "5" + }, + { + key: "fw_i_roll" + value: "8" + }, + { + key: "fw_ff_roll" + value: "35" + }, + { + key: "roll_rate" + value: "18" + }, + { + key: "pitch_rate + value: "9" + }, + { + key: "fw_p_yaw" + value: "20" + }, + { + key: "fw_i_yaw" + value: "0" + }, + { + key: "fw_ff_yaw" + value: "100" + }, ], "features":[ {