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

Merge branch 'master' into dzikuvx-programming-pid-support

Browse Source
pull/1129/head
Pawel Spychalski (DzikuVx) 4 years ago
parent 91f606c339 b8aa8c541e
commit c046e53a13
7 changed files with 107 additions and 102 deletions
Show Stats Download Patch File Download Diff File

4
js/data_storage.js
Unescape Escape View File

@ -2,8 +2,8 @@
var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.5.0',
'maxFirmwareVersionAccepted': '2.7.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'minfirmwareVersionAccepted': '2.6.0',
'maxFirmwareVersionAccepted': '2.8.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'connectionValid': false,
'connectionValidCliOnly': false,
'cliActive': false,

36
js/defaults_dialog.js
Unescape Escape View File

@ -61,10 +61,6 @@ helper.defaultsDialog = (function() {
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "dynamic_gyro_notch_enabled",
value: "ON"
@ -92,14 +88,6 @@ helper.defaultsDialog = (function() {
key: "mc_airmode_type",
value: "THROTTLE_THRESHOLD"
},
{
key: "dterm_setpoint_weight",
value: 0.75
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -201,6 +189,18 @@ helper.defaultsDialog = (function() {
"id": 3,
"reboot": true,
"settings": [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "motor_pwm_protocol",
value: "STANDARD"
@ -270,6 +270,18 @@ helper.defaultsDialog = (function() {
"notRecommended": false,
"reboot": true,
"settings": [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 10
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "motor_pwm_protocol",
value: "STANDARD"

156
js/preset_definitions.js
Unescape Escape View File

@ -97,14 +97,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -204,10 +196,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.500
}
],
type: 'multirotor'
@ -259,14 +247,6 @@ presets.presets = [
key: "dterm_lpf_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -366,10 +346,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.850
}
],
type: 'multirotor'
@ -429,14 +405,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RPY"
@ -536,10 +504,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.800
}
],
type: 'multirotor'
@ -604,14 +568,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RPY"
@ -712,10 +668,6 @@ presets.presets = [
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.300
},
{
key: "heading_hold_rate_limit",
value: 30
@ -786,14 +738,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "GYRO"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -893,10 +837,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.400
}
],
type: 'multirotor'
@ -956,14 +896,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -1063,10 +995,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.850
}
],
type: 'multirotor'
@ -1126,14 +1054,6 @@ presets.presets = [
key: "dterm_lpf2_type",
value: "PT1"
},
{
key: "use_dterm_fir_filter",
value: "OFF"
},
{
key: "mc_iterm_relax_type",
value: "SETPOINT"
},
{
key: "mc_iterm_relax",
value: "RP"
@ -1233,10 +1153,6 @@ presets.presets = [
{
key: "throttle_idle",
value: 12
},
{
key: "dterm_setpoint_weight",
value: 0.700
}
],
type: 'multirotor'
@ -1257,6 +1173,18 @@ presets.presets = [
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 1)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"
@ -1289,6 +1217,18 @@ presets.presets = [
presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 4)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"
@ -1346,6 +1286,18 @@ presets.presets = [
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1600)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"
@ -1403,6 +1355,18 @@ presets.presets = [
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1550)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"
@ -1460,6 +1424,18 @@ presets.presets = [
presets.elementHelper("RC_tuning", "dynamic_THR_breakpoint", 1500)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"
@ -1519,6 +1495,18 @@ presets.presets = [
presets.elementHelper("RC_tuning", "pitch_rate", 120)
],
settings: [
{
key: "gyro_hardware_lpf",
value: "256HZ"
},
{
key: "gyro_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
},
{
key: "platform_type",
value: "AIRPLANE"

2
manifest.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
"version": "2.6.0",
"version": "2.7.0",
"author": "Several",
"name": "INAV - Configurator",
"short_name": "INAV",

2
package.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"name": "inav-configurator",
"description": "INAV Configurator",
"version": "2.6.0",
"version": "2.7.0",
"main": "main.html",
"default_locale": "en",
"scripts": {

4
tabs/configuration.html
Unescape Escape View File

@ -12,8 +12,8 @@
<div class="spacer_box_title" data-i18n="configurationSystem"></div>
</div>
<div class="spacer_box">
<div id="gyrolpf-info" class="info-box"></div>
<div class="select">
<div id="gyrolpf-info" class="info-box is-hidden"></div>
<div class="select is-hidden">
<select id="gyro-lpf"></select>
<label for="gyro-lpf"> <span data-i18n="configurationGyroLpfTitle"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationGyroLpfHelp"></div>

5
tabs/osd.js
Unescape Escape View File

@ -772,6 +772,11 @@ OSD.constants = {
id: 106,
min_version: '2.3.0',
preview: FONT.symbol(SYM.RPM) + '983',
},
{
name: 'VERSION',
id: 119,
preview: 'INAV 2.7.0'
}
]
},

Write Preview
Loading…
Cancel
Save