diff options
author | Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com> | 2017-04-03 16:15:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-03 16:15:08 +0300 |
commit | 0a01e5f3910edc48125e401f47d740a2c87bb7a2 (patch) | |
tree | 1e5a85af7bc4599658edee40a722c6929fdd3d69 | |
parent | 7285023ea3e2875523ff1356d2483b7183e6e553 (diff) | |
parent | 3fb9dcc58dbdb872902ee8f4fea1180b3e495270 (diff) |
Merge pull request #171 from iNavFlight/presets-update1.6.3
Presets update
-rw-r--r-- | build/script.js | 41 | ||||
-rw-r--r-- | tabs/profiles.js | 41 |
2 files changed, 78 insertions, 4 deletions
diff --git a/build/script.js b/build/script.js index 48349c54..419406b3 100644 --- a/build/script.js +++ b/build/script.js @@ -20830,7 +20830,7 @@ presets.presets = [ { name: '5" Racer', description: "210-250 class racer with F3/F4 CPU on 4S battery<br>" + - "<span>400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, no GPS capabilities</span>", + "<span>400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, acro flight optimized</span>", features: [ "Asynchronous processing", "OneShot125 at 2kHz", @@ -20868,6 +20868,44 @@ presets.presets = [ type: 'multirotor' }, { + name: '5" GPS', + description: "210-250 class quadcopter with F1/F3/F4 CPU on 3S or 4S battery<br>" + + "<span>500g-700g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, GPS optimized</span>", + features: [ + "OneShot125 at 1kHz", + "500dps rates", + "Dterm and gyro notch filter", + "Increased LPF cutoff frequencies", + "Improved PID defaults" + ], + applyDefaults: ["PIDs", "INAV_PID_CONFIG", "ADVANCED_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG", "FC_CONFIG"], + settings: [ + presets.elementHelper("BF_CONFIG", "mixerConfiguration", 3), + presets.elementHelper("INAV_PID_CONFIG", "asynchronousMode", 0), + presets.elementHelper("FC_CONFIG", "loopTime", 2000), + presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 1), + presets.elementHelper("ADVANCED_CONFIG", "gyroSyncDenominator", 2), + presets.elementHelper("ADVANCED_CONFIG", "gyroSync", 1), + presets.elementHelper("ADVANCED_CONFIG", "motorPwmProtocol", 1), + presets.elementHelper("ADVANCED_CONFIG", "motorPwmRate", 1000), + presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 90), + presets.elementHelper("FILTER_CONFIG", "dtermLpfHz", 80), + presets.elementHelper("RC_tuning", "roll_rate", 500), + presets.elementHelper("RC_tuning", "pitch_rate", 500), + presets.elementHelper("RC_tuning", "yaw_rate", 450), + presets.elementHelper("FILTER_CONFIG", "dtermNotchHz", 260), + presets.elementHelper("FILTER_CONFIG", "dtermNotchCutoff", 160), + presets.elementHelper("FILTER_CONFIG", "gyroNotchHz1", 400), + presets.elementHelper("FILTER_CONFIG", "gyroNotchCutoff1", 300), + presets.elementHelper("FILTER_CONFIG", "gyroNotchHz2", 200), + presets.elementHelper("FILTER_CONFIG", "gyroNotchCutoff2", 100), + presets.elementHelper("PIDs", 0, [43, 40, 20]), //ROLL PIDs + presets.elementHelper("PIDs", 1, [58, 50, 22]), //PITCH PIDs + presets.elementHelper("PIDs", 2, [70, 45, 0]) //YAW PIDs + ], + type: 'multirotor' + }, + { name: '10" General Purpose', description: "450-600 class general purpose multirotor <br><span>1.0kg - 1.4kg weight, 10 inch propellers, <br>F1, F3 or F4 CPU, MPU6000 or MPU6050 gyro, GPS optional.</span>", features: [ @@ -21217,7 +21255,6 @@ TABS.profiles.initialize = function (callback, scrollPosition) { window[setting.group][setting.field] = setting.value; } } - saveChainer.execute(); } diff --git a/tabs/profiles.js b/tabs/profiles.js index 9f916666..d1595706 100644 --- a/tabs/profiles.js +++ b/tabs/profiles.js @@ -73,7 +73,7 @@ presets.presets = [ { name: '5" Racer', description: "210-250 class racer with F3/F4 CPU on 4S battery<br>" + - "<span>400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, no GPS capabilities</span>", + "<span>400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, acro flight optimized</span>", features: [ "Asynchronous processing", "OneShot125 at 2kHz", @@ -111,6 +111,44 @@ presets.presets = [ type: 'multirotor' }, { + name: '5" GPS', + description: "210-250 class quadcopter with F1/F3/F4 CPU on 3S or 4S battery<br>" + + "<span>500g-700g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, GPS optimized</span>", + features: [ + "OneShot125 at 1kHz", + "500dps rates", + "Dterm and gyro notch filter", + "Increased LPF cutoff frequencies", + "Improved PID defaults" + ], + applyDefaults: ["PIDs", "INAV_PID_CONFIG", "ADVANCED_CONFIG", "RC_tuning", "PID_ADVANCED", "FILTER_CONFIG", "FC_CONFIG"], + settings: [ + presets.elementHelper("BF_CONFIG", "mixerConfiguration", 3), + presets.elementHelper("INAV_PID_CONFIG", "asynchronousMode", 0), + presets.elementHelper("FC_CONFIG", "loopTime", 2000), + presets.elementHelper("INAV_PID_CONFIG", "gyroscopeLpf", 1), + presets.elementHelper("ADVANCED_CONFIG", "gyroSyncDenominator", 2), + presets.elementHelper("ADVANCED_CONFIG", "gyroSync", 1), + presets.elementHelper("ADVANCED_CONFIG", "motorPwmProtocol", 1), + presets.elementHelper("ADVANCED_CONFIG", "motorPwmRate", 1000), + presets.elementHelper("FILTER_CONFIG", "gyroSoftLpfHz", 90), + presets.elementHelper("FILTER_CONFIG", "dtermLpfHz", 80), + presets.elementHelper("RC_tuning", "roll_rate", 500), + presets.elementHelper("RC_tuning", "pitch_rate", 500), + presets.elementHelper("RC_tuning", "yaw_rate", 450), + presets.elementHelper("FILTER_CONFIG", "dtermNotchHz", 260), + presets.elementHelper("FILTER_CONFIG", "dtermNotchCutoff", 160), + presets.elementHelper("FILTER_CONFIG", "gyroNotchHz1", 400), + presets.elementHelper("FILTER_CONFIG", "gyroNotchCutoff1", 300), + presets.elementHelper("FILTER_CONFIG", "gyroNotchHz2", 200), + presets.elementHelper("FILTER_CONFIG", "gyroNotchCutoff2", 100), + presets.elementHelper("PIDs", 0, [43, 40, 20]), //ROLL PIDs + presets.elementHelper("PIDs", 1, [58, 50, 22]), //PITCH PIDs + presets.elementHelper("PIDs", 2, [70, 45, 0]) //YAW PIDs + ], + type: 'multirotor' + }, + { name: '10" General Purpose', description: "450-600 class general purpose multirotor <br><span>1.0kg - 1.4kg weight, 10 inch propellers, <br>F1, F3 or F4 CPU, MPU6000 or MPU6050 gyro, GPS optional.</span>", features: [ @@ -460,7 +498,6 @@ TABS.profiles.initialize = function (callback, scrollPosition) { window[setting.group][setting.field] = setting.value; } } - saveChainer.execute(); } |