From c6dccdefb498cea74f9ebb3791f5fe809cc47565 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Sun, 12 Mar 2017 09:53:22 +0100 Subject: [PATCH 1/2] proreess --- tabs/profiles.js | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tabs/profiles.js b/tabs/profiles.js index 9f916666..0bdca6da 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
" + - "400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, no GPS capabilities", + "400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, acro flight optimized", features: [ "Asynchronous processing", "OneShot125 at 2kHz", @@ -110,6 +110,44 @@ presets.presets = [ ], type: 'multirotor' }, + { + name: '5" GPS', + description: "210-250 class quadcopter with F1/F3/F4 CPU on 3S or 4S battery
" + + "500g-700g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, GPS optimized", + 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", 0), + presets.elementHelper("ADVANCED_CONFIG", "gyroSync", 1), + presets.elementHelper("ADVANCED_CONFIG", "gyroSyncDenominator", 2), + 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
1.0kg - 1.4kg weight, 10 inch propellers,
F1, F3 or F4 CPU, MPU6000 or MPU6050 gyro, GPS optional.", From 3fb9dcc58dbdb872902ee8f4fea1180b3e495270 Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Wed, 15 Mar 2017 19:01:21 +0100 Subject: [PATCH 2/2] updated GPS 5" profile --- build/script.js | 41 +++++++++++++++++++++++++++++++++++++++-- tabs/profiles.js | 5 ++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/build/script.js b/build/script.js index 33f6f874..7d9a005b 100644 --- a/build/script.js +++ b/build/script.js @@ -20758,7 +20758,7 @@ presets.presets = [ { name: '5" Racer', description: "210-250 class racer with F3/F4 CPU on 4S battery
" + - "400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, no GPS capabilities", + "400g-650g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, acro flight optimized", features: [ "Asynchronous processing", "OneShot125 at 2kHz", @@ -20795,6 +20795,44 @@ presets.presets = [ ], type: 'multirotor' }, + { + name: '5" GPS', + description: "210-250 class quadcopter with F1/F3/F4 CPU on 3S or 4S battery
" + + "500g-700g weight, 2000KV - 2600KV motors, 5 inch propellers, MPU6000 or MPU6050 gyro, GPS optimized", + 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
1.0kg - 1.4kg weight, 10 inch propellers,
F1, F3 or F4 CPU, MPU6000 or MPU6050 gyro, GPS optional.", @@ -21145,7 +21183,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 0bdca6da..d1595706 100644 --- a/tabs/profiles.js +++ b/tabs/profiles.js @@ -126,9 +126,9 @@ presets.presets = [ 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", 0), - presets.elementHelper("ADVANCED_CONFIG", "gyroSync", 1), + 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), @@ -498,7 +498,6 @@ TABS.profiles.initialize = function (callback, scrollPosition) { window[setting.group][setting.field] = setting.value; } } - saveChainer.execute(); }