Merge pull request #1274 from b14ckyy/updated-fw-presets

updated FW Presets
pull/1280/head
Paweł Spychalski 3 years ago committed by GitHub
commit bc6c737ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

File diff suppressed because it is too large Load Diff

@ -11,10 +11,10 @@ presets.elementHelper = function (group, field, value) {
}; };
presets.defaultValues = { presets.defaultValues = {
INAV_PID_CONFIG: {"asynchronousMode": "0", "accelerometerTaskFrequency": 500, "attitudeTaskFrequency": 250, "magHoldRateLimit": 90, "magHoldErrorLpfFrequency": 2, "yawJumpPreventionLimit": 200, "gyroscopeLpf": "3", "accSoftLpfHz": 15}, INAV_PID_CONFIG: { "asynchronousMode": "0", "accelerometerTaskFrequency": 500, "attitudeTaskFrequency": 250, "magHoldRateLimit": 90, "magHoldErrorLpfFrequency": 2, "yawJumpPreventionLimit": 200, "gyroscopeLpf": "3", "accSoftLpfHz": 15 },
RC_tuning: {"RC_RATE": 1, "RC_EXPO": 0.7, "roll_pitch_rate": 0, "roll_rate": 200, "pitch_rate": 200, "yaw_rate": 200, "dynamic_THR_PID": 0, "throttle_MID": 0.5, "throttle_EXPO": 0, "dynamic_THR_breakpoint": 1500, "RC_YAW_EXPO": 0.2}, RC_tuning: { "RC_RATE": 1, "RC_EXPO": 0.7, "roll_pitch_rate": 0, "roll_rate": 200, "pitch_rate": 200, "yaw_rate": 200, "dynamic_THR_PID": 0, "throttle_MID": 0.5, "throttle_EXPO": 0, "dynamic_THR_breakpoint": 1500, "RC_YAW_EXPO": 0.2 },
PID_ADVANCED: {"rollPitchItermIgnoreRate": 200, "yawItermIgnoreRate": 50, "yawPLimit": 300, "axisAccelerationLimitRollPitch": 0, "axisAccelerationLimitYaw": 1000}, PID_ADVANCED: { "rollPitchItermIgnoreRate": 200, "yawItermIgnoreRate": 50, "yawPLimit": 300, "axisAccelerationLimitRollPitch": 0, "axisAccelerationLimitYaw": 1000 },
FILTER_CONFIG: {"gyroSoftLpfHz": 60, "dtermLpfHz": 40, "yawLpfHz": 30, "gyroNotchHz1": 0, "gyroNotchCutoff1": 0, "dtermNotchHz": 0, "dtermNotchCutoff": 0, "gyroNotchHz2": 0, "gyroNotchCutoff2": 0, "accNotchHz": 0, "accNotchCutoff": 0, "gyroStage2LowpassHz": 0} FILTER_CONFIG: { "gyroSoftLpfHz": 60, "dtermLpfHz": 40, "yawLpfHz": 30, "gyroNotchHz1": 0, "gyroNotchCutoff1": 0, "dtermNotchHz": 0, "dtermNotchCutoff": 0, "gyroNotchHz2": 0, "gyroNotchCutoff2": 0, "accNotchHz": 0, "accNotchCutoff": 0, "gyroStage2LowpassHz": 0 }
}; };
presets.settings = { presets.settings = {
@ -26,7 +26,7 @@ presets.settings = {
}, },
MR: { MR: {
}, },
get: function(mixerType) { get: function (mixerType) {
var settings = {}; var settings = {};
$.extend(settings, presets.settings.COMMON); $.extend(settings, presets.settings.COMMON);
if (mixerType == 'multirotor') { if (mixerType == 'multirotor') {
@ -942,344 +942,340 @@ presets.presets = [
], ],
type: 'multirotor' type: 'multirotor'
}, },
{ {
name: 'Airplane with a tail', name: 'Airplane with a tail',
description: "General setup for airplanes with tails.", description: "General setup for airplanes with tails.",
features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"], features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"], applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [], settingsMSP: [],
type: 'airplane', type: 'airplane',
settings: [ settings: [
{ {
key: "platform_type", key: "platform_type",
value: "AIRPLANE" value: "AIRPLANE"
}, },
{ {
key: "applied_defaults", key: "applied_defaults",
value: 3 value: 3
}, },
{ {
key: "gyro_hardware_lpf", key: "gyro_hardware_lpf",
value: "256HZ" value: "256HZ"
}, },
{ {
key: "gyro_main_lpf_hz", key: "gyro_main_lpf_hz",
value: 25 value: 25
}, },
{ {
key: "dterm_lpf_hz", key: "dterm_lpf_hz",
value: 40 value: 10
}, },
{ {
key: "d_boost_factor", key: "d_boost_factor",
value: 1 value: 1
}, },
{ {
key: "gyro_main_lpf_type", key: "gyro_main_lpf_type",
value: "BIQUAD" value: "BIQUAD"
}, },
{ {
key: "dynamic_gyro_notch_enabled", key: "dynamic_gyro_notch_enabled",
value: "ON" value: "ON"
}, },
{ {
key: "dynamic_gyro_notch_q", key: "dynamic_gyro_notch_q",
value: 250 value: 250
}, },
{ {
key: "dynamic_gyro_notch_min_hz", key: "dynamic_gyro_notch_min_hz",
value: 30 value: 30
}, },
{ {
key: "motor_pwm_protocol", key: "motor_pwm_protocol",
value: "STANDARD" value: "STANDARD"
}, },
{ {
key: "throttle_idle", key: "throttle_idle",
value: 5.0 value: 5.0
}, },
{ {
key: "rc_yaw_expo", key: "rc_yaw_expo",
value: 30 value: 30
}, },
{ {
key: "rc_expo", key: "rc_expo",
value: 30 value: 30
}, },
{ {
key: "roll_rate", key: "roll_rate",
value: 18 value: 18
}, },
{ {
key: "pitch_rate", key: "pitch_rate",
value: 9 value: 9
}, },
{ {
key: "yaw_rate", key: "yaw_rate",
value: 3 value: 3
}, },
{ {
key: "nav_fw_pos_z_p", key: "nav_fw_pos_z_p",
value: 20 value: 20
}, },
{ {
key: "nav_fw_pos_z_d", key: "nav_fw_pos_z_d",
value: 5 value: 5
}, },
{ {
key: "nav_fw_pos_xy_p", key: "nav_fw_pos_xy_p",
value: 50 value: 60
}, },
{ {
key: "fw_turn_assist_pitch_gain", key: "fw_turn_assist_pitch_gain",
value: 0.5 value: 0.5
}, },
{ {
key: "max_angle_inclination_rll", key: "max_angle_inclination_rll",
value: 350 value: 350
}, },
{ {
key: "nav_fw_bank_angle", key: "nav_fw_bank_angle",
value: 35 value: 35
}, },
{ {
key: "fw_p_pitch", key: "fw_p_pitch",
value: 15 value: 15
}, },
{ {
key: "fw_i_pitch", key: "fw_i_pitch",
value: 10 value: 10
}, },
{ {
key: "fw_ff_pitch", key: "fw_ff_pitch",
value: 60 value: 80
}, },
{ {
key: "fw_p_roll", key: "fw_p_roll",
value: 10 value: 10
}, },
{ {
key: "fw_i_roll", key: "fw_i_roll",
value: 8 value: 8
}, },
{ {
key: "fw_ff_roll", key: "fw_ff_roll",
value: 40 value: 40
}, },
{ {
key: "fw_p_yaw", key: "fw_p_yaw",
value: 20 value: 20
}, },
{ {
key: "fw_i_yaw", key: "fw_i_yaw",
value: 5 value: 5
}, },
{ {
key: "fw_ff_yaw", key: "fw_ff_yaw",
value: 100 value: 100
}, },
{ {
key: "imu_acc_ignore_rate", key: "imu_acc_ignore_rate",
value: 10 value: 9
}, },
{ {
key: "imu_acc_ignore_slope",
value: 5
},
{
key: "airmode_type", key: "airmode_type",
value: "STICK_CENTER_ONCE" value: "STICK_CENTER_ONCE"
}, },
{ {
key: "small_angle", key: "small_angle",
value: 180 value: 180
}, },
{ {
key: "nav_fw_control_smoothness", key: "nav_fw_control_smoothness",
value: 2 value: 2
}, },
{ {
key: "nav_rth_allow_landing", key: "nav_rth_allow_landing",
value: "FS_ONLY" value: "FS_ONLY"
}, },
{ {
key: "nav_rth_altitude", key: "nav_rth_altitude",
value: 5000 value: 5000
}, },
{ {
key: "failsafe_mission", key: "failsafe_mission",
value: "ON" value: "ON"
}, },
{ {
key: "nav_wp_radius", key: "nav_wp_radius",
value: 1500 value: 1500
}, },
], ],
}, },
{ {
name: "Airplane without tail", name: "Airplane without tail",
description: "General setup for airplanes without tails: Flying Wing, Delta, etc.", description: "General setup for airplanes without tails: Flying Wing, Delta, etc.",
features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"], features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"], applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [], settingsMSP: [],
type: 'flyingwing', type: 'flyingwing',
settings: [ settings: [
{ {
key: "platform_type", key: "platform_type",
value: "AIRPLANE" value: "AIRPLANE"
}, },
{ {
key: "applied_defaults", key: "applied_defaults",
value: 3 value: 3
}, },
{ {
key: "gyro_hardware_lpf", key: "gyro_hardware_lpf",
value: "256HZ" value: "256HZ"
}, },
{ {
key: "gyro_main_lpf_hz", key: "gyro_main_lpf_hz",
value: 25 value: 25
}, },
{ {
key: "dterm_lpf_hz", key: "dterm_lpf_hz",
value: 40 value: 10
}, },
{ {
key: "d_boost_factor", key: "d_boost_factor",
value: 1 value: 1
}, },
{ {
key: "gyro_main_lpf_type", key: "gyro_main_lpf_type",
value: "BIQUAD" value: "BIQUAD"
}, },
{ {
key: "dynamic_gyro_notch_enabled", key: "dynamic_gyro_notch_enabled",
value: "ON" value: "ON"
}, },
{ {
key: "dynamic_gyro_notch_q", key: "dynamic_gyro_notch_q",
value: 250 value: 250
}, },
{ {
key: "dynamic_gyro_notch_min_hz", key: "dynamic_gyro_notch_min_hz",
value: 30 value: 30
}, },
{ {
key: "motor_pwm_protocol", key: "motor_pwm_protocol",
value: "STANDARD" value: "STANDARD"
}, },
{ {
key: "throttle_idle", key: "throttle_idle",
value: 5.0 value: 5.0
}, },
{ {
key: "rc_yaw_expo", key: "rc_yaw_expo",
value: 30 value: 30
}, },
{ {
key: "rc_expo", key: "rc_expo",
value: 30 value: 30
}, },
{ {
key: "roll_rate", key: "roll_rate",
value: 18 value: 18
}, },
{ {
key: "pitch_rate", key: "pitch_rate",
value: 9 value: 9
}, },
{ {
key: "yaw_rate", key: "yaw_rate",
value: 3 value: 3
}, },
{ {
key: "nav_fw_pos_z_p", key: "nav_fw_pos_z_p",
value: 20 value: 20
}, },
{ {
key: "nav_fw_pos_z_d", key: "nav_fw_pos_z_d",
value: 5 value: 5
}, },
{ {
key: "nav_fw_pos_xy_p", key: "nav_fw_pos_xy_p",
value: 50 value: 60
}, },
{ {
key: "fw_turn_assist_pitch_gain", key: "fw_turn_assist_pitch_gain",
value: 0.2 value: 0.2
}, },
{ {
key: "max_angle_inclination_rll", key: "max_angle_inclination_rll",
value: 450 value: 450
}, },
{ {
key: "nav_fw_bank_angle", key: "nav_fw_bank_angle",
value: 45 value: 45
}, },
{ {
key: "fw_p_pitch", key: "fw_p_pitch",
value: 10 value: 10
}, },
{ {
key: "fw_i_pitch", key: "fw_i_pitch",
value: 15 value: 15
}, },
{ {
key: "fw_ff_pitch", key: "fw_ff_pitch",
value: 70 value: 70
}, },
{ {
key: "fw_p_roll", key: "fw_p_roll",
value: 5 value: 5
}, },
{ {
key: "fw_i_roll", key: "fw_i_roll",
value: 8 value: 8
}, },
{ {
key: "fw_ff_roll", key: "fw_ff_roll",
value: 35 value: 35
}, },
{ {
key: "fw_p_yaw",
value: 20
},
{
key: "fw_i_yaw",
value: 5
},
{
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate", key: "imu_acc_ignore_rate",
value: 10 value: 9
}, },
{ {
key: "imu_acc_ignore_slope",
value: 5
},
{
key: "airmode_type", key: "airmode_type",
value: "STICK_CENTER_ONCE" value: "STICK_CENTER_ONCE"
}, },
{ {
key: "small_angle", key: "small_angle",
value: 180 value: 180
}, },
{ {
key: "nav_fw_control_smoothness", key: "nav_fw_control_smoothness",
value: 2 value: 2
}, },
{ {
key: "nav_rth_allow_landing", key: "nav_rth_allow_landing",
value: "FS_ONLY" value: "FS_ONLY"
}, },
{ {
key: "nav_rth_altitude", key: "nav_rth_altitude",
value: 5000 value: 5000
}, },
{ {
key: "failsafe_mission", key: "failsafe_mission",
value: "ON" value: "ON"
}, },
{ {
key: "nav_wp_radius", key: "nav_wp_radius",
value: 1500 value: 1500
}, },
], ],
}, },
]; ];

Loading…
Cancel
Save