speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1188 from b14ckyy/b14ckyy_new_fw_defaults

Browse Source 
New fixed Wing generic presets
pull/1199/head
Paweł Spychalski 4 years ago committed by GitHub
parent ee4a36af94 22a53d1fab
commit c14b5afd5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 535 additions and 450 deletions
Show Stats Download Patch File Download Diff File

260
js/defaults_dialog.js
Unescape Escape View File

@ -184,11 +184,19 @@ helper.defaultsDialog = (function() {
] ]
}, },
{ {
"title": 'Airplane', "title": 'Airplane with a Tail',
"notRecommended": false, "notRecommended": false,
"id": 3, "id": 3,
"reboot": true, "reboot": true,
"settings": [ "settings": [
{
key: "platform_type",
value: "AIRPLANE"
},
{
key: "applied_defaults",
value: 3
},
{ {
key: "gyro_hardware_lpf", key: "gyro_hardware_lpf",
value: "256HZ" value: "256HZ"
@ -197,6 +205,10 @@ helper.defaultsDialog = (function() {
key: "gyro_lpf_hz", key: "gyro_lpf_hz",
value: 25 value: 25
}, },
{
key: "dterm_lpf_hz",
value: 10
},
{ {
key: "gyro_lpf_type", key: "gyro_lpf_type",
value: "BIQUAD" value: "BIQUAD"
@ -217,6 +229,10 @@ helper.defaultsDialog = (function() {
key: "motor_pwm_protocol", key: "motor_pwm_protocol",
value: "STANDARD" value: "STANDARD"
}, },
{
key: "throttle_idle",
value: 5.0
},
{ {
key: "rc_yaw_expo", key: "rc_yaw_expo",
value: 30 value: 30
@ -227,15 +243,83 @@ helper.defaultsDialog = (function() {
}, },
{ {
key: "roll_rate", key: "roll_rate",
value: 20 value: 18
}, },
{ {
key: "pitch_rate", key: "pitch_rate",
value: 15 value: 9
}, },
{ {
key: "yaw_rate", key: "yaw_rate",
value: 9 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: "fw_turn_assist_pitch_gain",
value: 0.5
},
{
key: "max_angle_inclination_rll",
value: 350
},
{
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: "fw_p_yaw",
value: 20
},
{
key: "fw_i_yaw",
value: 5
},
{
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate",
value: 10
},
{
key: "airmode_type",
value: "STICK_CENTER_ONCE"
}, },
{ {
key: "small_angle", key: "small_angle",
@ -255,36 +339,190 @@ helper.defaultsDialog = (function() {
}, },
{ {
key: "failsafe_mission", key: "failsafe_mission",
value: "OFF" value: "ON"
}, },
{ {
key: "nav_wp_radius", key: "nav_wp_radius",
value: 3000 value: 1500
}, },
],
"features":[
{ {
bit: 4, // Enable MOTOR_STOP
state: true
}
]
},
{
"title": 'Airplane without a Tail (Wing, Delta, etc)',
"notRecommended": false,
"id": 3,
"reboot": true,
"settings": [
{
key: "platform_type", key: "platform_type",
value: "AIRPLANE" value: "AIRPLANE"
}, },
{ {
key: "applied_defaults", key: "applied_defaults",
value: 3 value: 3
}, },
{ {
key: "imu_acc_ignore_rate", key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 25
},
{
key: "dterm_lpf_hz",
value: 10 value: 10
}, },
{ {
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: "throttle_idle",
value: 5.0
},
{
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: "fw_turn_assist_pitch_gain",
value: 0.2
},
{
key: "max_angle_inclination_rll",
value: 450
},
{
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: "fw_p_yaw",
value: 20
},
{
key: "fw_i_yaw",
value: 5
},
{
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate",
value: 10
},
{
key: "airmode_type", key: "airmode_type",
value: "STICK_CENTER_ONCE" value: "STICK_CENTER_ONCE"
} },
], {
key: "small_angle",
value: 180
},
{
key: "nav_fw_control_smoothness",
value: 2
},
{
key: "nav_rth_allow_landing",
value: "FS_ONLY"
},
{
key: "nav_rth_altitude",
value: 5000
},
{
key: "failsafe_mission",
value: "ON"
},
{
key: "nav_wp_radius",
value: 1500
},
],
"features":[ "features":[
{ {
bit: 4, // Enable MOTOR_STOP bit: 4, // Enable MOTOR_STOP
state: true state: true
} }
] ]
}, },
{ {
"title": 'Rovers & Boats', "title": 'Rovers & Boats',
"notRecommended": false, "notRecommended": false,

719
js/preset_definitions.js
Unescape Escape View File

@ -1157,489 +1157,336 @@ presets.presets = [
], ],
type: 'multirotor' type: 'multirotor'
}, },
{ {
name: "Generic Airplane", name: 'Airplane with a tail',
description: "General setup for airplanes.", description: "General setup for airplanes with tails.",
features: [ features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"],
"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: [],
presets.elementHelper("RC_tuning", "roll_rate", 200), type: 'airplane',
presets.elementHelper("RC_tuning", "pitch_rate", 150),
presets.elementHelper("RC_tuning", "yaw_rate", 90),
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 1)
],
settings: [ settings: [
{ {
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 25
},
{
key: "dynamic_gyro_notch_enabled",
value: "ON"
},
{
key: "dynamic_gyro_notch_q",
value: 250
},
{
key: "dynamic_gyro_notch_min_hz",
value: 30
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type", key: "platform_type",
value: "AIRPLANE" value: "AIRPLANE"
}, },
{ {
key: "rc_expo", key: "applied_defaults",
value: 30 value: 3
}, },
{ {
key: "manual_rc_expo",
value: 30
},
{
key: "imu_acc_ignore_rate",
value: 10
}
],
type: 'airplane'
},
{
name: "Flying Wing Z84",
description: "Small flying wing on multirotor racer parts. 3S/4S battery, AUW under 500g.",
features: [
"Adjusted gyro filtering",
"Adjusted PIDs",
"Adjusted rates"
],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [
presets.elementHelper("RC_tuning", "roll_rate", 350),
presets.elementHelper("RC_tuning", "pitch_rate", 90),
presets.elementHelper("RC_tuning", "dynamic_THR_PID", 33),
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1300),
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 4)
],
settings: [
{
key: "gyro_hardware_lpf", key: "gyro_hardware_lpf",
value: "256HZ" value: "256HZ"
}, },
{ {
key: "gyro_lpf_hz", key: "gyro_lpf_hz",
value: 25 value: 25
}, },
{ {
key: "dynamic_gyro_notch_enabled", key: "dterm_lpf_hz",
value: "ON" value: 10
}, },
{ {
key: "dynamic_gyro_notch_q",
value: 250
},
{
key: "dynamic_gyro_notch_min_hz",
value: 30
},
{
key: "gyro_lpf_type", key: "gyro_lpf_type",
value: "BIQUAD" value: "BIQUAD"
}, },
{ {
key: "platform_type",
value: "AIRPLANE"
},
{
key: "fw_p_pitch",
value: 2
},
{
key: "fw_i_pitch",
value: 15
},
{
key: "fw_ff_pitch",
value: 70
},
{
key: "fw_p_roll",
value: 2
},
{
key: "fw_i_roll",
value: 15
},
{
key: "fw_ff_roll",
value: 30
},
{
key: "rc_expo",
value: 30
},
{
key: "manual_rc_expo",
value: 30
},
{
key: "imu_acc_ignore_rate",
value: 10
}
],
type: 'flyingwing'
},
{
name: "Flying Wing S800 Sky Shadow",
description: "Flying wing on multirotor racer parts. 3S/4S battery and FPV equipment. AUW under 1000g.",
features: [
"Adjusted gyro filtering",
"Adjusted PIDs",
"Adjusted rates"
],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 0),
presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 40),
presets.elementHelper("RC_tuning", "roll_rate", 280),
presets.elementHelper("RC_tuning", "pitch_rate", 140),
presets.elementHelper("RC_tuning", "dynamic_THR_PID", 20),
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1600)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 25
},
{
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: "gyro_lpf_type", key: "motor_pwm_protocol",
value: "BIQUAD" value: "STANDARD"
}, },
{ {
key: "platform_type", key: "throttle_idle",
value: "AIRPLANE" value: 5.0
}, },
{ {
key: "fw_p_pitch", key: "rc_yaw_expo",
value: 6
},
{
key: "fw_i_pitch",
value: 9
},
{
key: "fw_ff_pitch",
value: 52
},
{
key: "fw_p_roll",
value: 6
},
{
key: "fw_i_roll",
value: 6
},
{
key: "fw_ff_roll",
value: 49
},
{
key: "rc_expo",
value: 30
},
{
key: "manual_rc_expo",
value: 30 value: 30
}, },
{ {
key: "imu_acc_ignore_rate", key: "rc_expo",
value: 10
}
],
type: 'flyingwing'
},
{
name: "Ritewing Mini Drak",
description: "8x6 propeller, 2216 1400kV motor, 4S LiPo. AUW above 1200g.",
features: [
"Adjusted gyro filtering",
"Adjusted PIDs",
"Adjusted rates"
],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 0),
presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 35),
presets.elementHelper("RC_tuning", "roll_rate", 260),
presets.elementHelper("RC_tuning", "pitch_rate", 140),
presets.elementHelper("RC_tuning", "dynamic_THR_PID", 30),
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1550)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 25
},
{
key: "dynamic_gyro_notch_enabled",
value: "ON"
},
{
key: "dynamic_gyro_notch_q",
value: 250
},
{
key: "dynamic_gyro_notch_min_hz",
value: 30 value: 30
}, },
{ {
key: "gyro_lpf_type", key: "roll_rate",
value: "BIQUAD" value: 18
}, },
{ {
key: "platform_type", key: "pitch_rate",
value: "AIRPLANE" value: 9
}, },
{ {
key: "fw_p_pitch", key: "yaw_rate",
value: 3
},
{
key: "nav_fw_pos_z_p",
value: 20
},
{
key: "nav_fw_pos_z_d",
value: 5 value: 5
}, },
{ {
key: "nav_fw_pos_xy_p",
value: 50
},
{
key: "fw_turn_assist_pitch_gain",
value: 0.5
},
{
key: "max_angle_inclination_rll",
value: 350
},
{
key: "nav_fw_bank_angle",
value: 35
},
{
key: "fw_p_pitch",
value: 15
},
{
key: "fw_i_pitch", key: "fw_i_pitch",
value: 14 value: 10
}, },
{ {
key: "fw_ff_pitch", key: "fw_ff_pitch",
value: 56 value: 60
}, },
{ {
key: "fw_p_roll", key: "fw_p_roll",
value: 7 value: 10
}, },
{ {
key: "fw_i_roll", key: "fw_i_roll",
value: 12 value: 8
}, },
{ {
key: "fw_ff_roll", key: "fw_ff_roll",
value: 25 value: 40
}, },
{ {
key: "rc_expo", key: "fw_p_yaw",
value: 30 value: 20
}, },
{ {
key: "manual_rc_expo", key: "fw_i_yaw",
value: 30 value: 5
}, },
{ {
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate", key: "imu_acc_ignore_rate",
value: 10 value: 10
} },
], {
type: 'flyingwing' key: "airmode_type",
value: "STICK_CENTER_ONCE"
},
{
key: "small_angle",
value: 180
},
{
key: "nav_fw_control_smoothness",
value: 2
},
{
key: "nav_rth_allow_landing",
value: "FS_ONLY"
},
{
key: "nav_rth_altitude",
value: 5000
},
{
key: "failsafe_mission",
value: "ON"
},
{
key: "nav_wp_radius",
value: 1500
},
],
}, },
{ {
name: "ZOHD Dart 250g", name: "Airplane without tail",
description: "3x5x3 propeller, 1406 2600kV motor, 3S LiPo. 570mm wingspan, AUW potentially under 250g on 2S.<br /><br /><strong>Please set the Stabilised Roll weight to 80, and the Stabilised Pitch weight to 65.</strong>", description: "General setup for airplanes without tails: Flying Wing, Delta, etc.",
features: [ features: ["Adjusted gyro filtering", "Adjusted PIDs", "Adjusted rates"],
"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: [],
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 3), type: 'flyingwing',
presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 30),
presets.elementHelper("RC_tuning", "roll_rate", 360),
presets.elementHelper("RC_tuning", "pitch_rate", 130),
presets.elementHelper("RC_tuning", "dynamic_THR_PID", 30),
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1500)
],
settings: [ settings: [
{ {
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 25
},
{
key: "dynamic_gyro_notch_enabled",
value: "ON"
},
{
key: "dynamic_gyro_notch_q",
value: 250
},
{
key: "dynamic_gyro_notch_min_hz",
value: 30
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type", key: "platform_type",
value: "AIRPLANE" value: "AIRPLANE"
}, },
{ {
key: "fw_p_pitch", key: "applied_defaults",
value: 3 value: 3
}, },
{ {
key: "fw_i_pitch",
value: 7
},
{
key: "fw_ff_pitch",
value: 40
},
{
key: "fw_p_roll",
value: 2
},
{
key: "fw_i_roll",
value: 4
},
{
key: "fw_ff_roll",
value: 18
},
{
key: "rc_expo",
value: 70
},
{
key: "manual_rc_expo",
value: 70
},
{
key: "rc_yaw_expo",
value: 20
},
{
key: "imu_acc_ignore_rate",
value: 10
}
],
type: 'flyingwing'
},
{
name: "SonicModell Mini AR Wing",
description: "5x4.5 propeller, 1805 2400kV motor, 3S LiPo. 600mm wingspan, AUW under 400g.",
features: [
"Adjusted gyro filtering",
"Adjusted PIDs",
"Adjusted rates"
],
applyDefaults: ["INAV_PID_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG"],
settingsMSP: [
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 0),
presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 35),
presets.elementHelper("RC_tuning", "roll_rate", 280),
presets.elementHelper("RC_tuning", "pitch_rate", 120)
],
settings: [
{
key: "gyro_hardware_lpf", key: "gyro_hardware_lpf",
value: "256HZ" value: "256HZ"
}, },
{ {
key: "gyro_lpf_hz", key: "gyro_lpf_hz",
value: 25 value: 25
}, },
{ {
key: "dterm_lpf_hz",
value: 10
},
{
key: "gyro_lpf_type",
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: "gyro_lpf_type", key: "motor_pwm_protocol",
value: "BIQUAD" value: "STANDARD"
}, },
{ {
key: "platform_type", key: "throttle_idle",
value: "AIRPLANE" value: 5.0
}, },
{ {
key: "fw_p_pitch", 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 value: 5
}, },
{ {
key: "nav_fw_pos_xy_p",
value: 50
},
{
key: "fw_turn_assist_pitch_gain",
value: 0.2
},
{
key: "max_angle_inclination_rll",
value: 450
},
{
key: "nav_fw_bank_angle",
value: 45
},
{
key: "fw_p_pitch",
value: 10
},
{
key: "fw_i_pitch", key: "fw_i_pitch",
value: 18 value: 15
}, },
{ {
key: "fw_ff_pitch", key: "fw_ff_pitch",
value: 60 value: 70
}, },
{ {
key: "fw_p_roll", key: "fw_p_roll",
value: 8 value: 5
}, },
{ {
key: "fw_i_roll", key: "fw_i_roll",
value: 16 value: 8
}, },
{ {
key: "fw_ff_roll", key: "fw_ff_roll",
value: 64 value: 35
}, },
{ {
key: "rc_expo", key: "fw_p_yaw",
value: 30 value: 20
}, },
{ {
key: "manual_rc_expo", key: "fw_i_yaw",
value: 30 value: 5
}, },
{ {
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate", key: "imu_acc_ignore_rate",
value: 10 value: 10
} },
], {
type: 'flyingwing' key: "airmode_type",
} value: "STICK_CENTER_ONCE"
},
{
key: "small_angle",
value: 180
},
{
key: "nav_fw_control_smoothness",
value: 2
},
{
key: "nav_rth_allow_landing",
value: "FS_ONLY"
},
{
key: "nav_rth_altitude",
value: 5000
},
{
key: "failsafe_mission",
value: "ON"
},
{
key: "nav_wp_radius",
value: 1500
},
],
},
]; ];

6
src/css/defaults_dialog.css
Unescape Escape View File

@ -15,8 +15,8 @@
z-index: 2002; z-index: 2002;
position: absolute; position: absolute;
width: 500px; width: 500px;
height: 450px; height: 485px;
overflow-y: auto; overflow: none;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -54,4 +54,4 @@
.defaults_btn--not-recommended a:hover { .defaults_btn--not-recommended a:hover {
color: #222 !important; color: #222 !important;
} }

Write Preview
Loading…
Cancel
Save