diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 000000000..9b710e30d
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,399 @@
+'use strict';
+
+var child_process = require('child_process');
+var fs = require('fs');
+var path = require('path');
+var minimist = require('minimist');
+
+var archiver = require('archiver');
+var del = require('del');
+var NwBuilder = require('nw-builder');
+var semver = require('semver');
+
+var gulp = require('gulp');
+var concat = require('gulp-concat');
+
+// Each key in the *sources* variable must be an array of
+// the source files that will be combined into a single
+// file and stored in *outputDir*. Each key in *sources*
+// must be also present in *output*, whose value indicates
+// the filename for the output file which combines the
+// contents of the source files.
+//
+// Keys must be camel cased and end with either 'Css' or
+// 'Js' (e.g. someSourcesCss or someSourcesJs). For each
+// key, a build task will be generated named by prepending
+// 'build-' and converting the key to dash-separated words
+// (e.g. someSourcesCss will generate build-some-sources-css).
+//
+// Tasks with names ending with '-js' will be executed by the
+// build-all-js task, while the ones ending with '-css' will
+// be done by build-all-css. There's also a build task which
+// runs both build-all-css and build-all-js.
+//
+// The watch task will monitor any files mentioned in the *sources*
+// variable and regenerate the corresponding output file when
+// they change.
+//
+// See README.md for details on the other tasks.
+
+var sources = {};
+
+sources.css = [
+ './main.css',
+ './js/libraries/jquery.nouislider.min.css',
+ './js/libraries/jquery.nouislider.pips.min.css',
+ './js/libraries/flightindicators.css',
+ './src/css/tabs/*.css',
+ './src/css/opensans_webfontkit/fonts.css',
+ './src/css/font-awesome/css/font-awesome.css',
+ './src/css/dropdown-lists/css/style_lists.css',
+ './js/libraries/switchery/switchery.css',
+ './js/libraries/jbox/jBox.css',
+ './node_modules/openlayers/dist/ol.css',
+ './src/css/logic.css',
+ './src/css/defaults_dialog.css',
+];
+
+sources.js = [
+ './js/libraries/google-analytics-bundle.js',
+ './node_modules/jquery/dist/jquery.min.js',
+ './node_modules/jquery-ui-npm/jquery-ui.min.js',
+ './node_modules/marked/lib/marked.js',
+ './js/libraries/d3.min.js',
+ './js/libraries/jquery.nouislider.all.min.js',
+ './node_modules/three/build/three.min.js',
+ './node_modules/three/examples/js/loaders/GLTFLoader.js',
+ './node_modules/three/examples/js/controls/OrbitControls.js',
+ './js/libraries/nw-dialog.js',
+ './js/libraries/bundle_xml2js.js',
+ './js/libraries/Projector.js',
+ './js/libraries/CanvasRenderer.js',
+ './js/libraries/jquery.flightindicators.js',
+ './js/libraries/semver.js',
+ './js/libraries/jbox/jBox.min.js',
+ './js/libraries/switchery/switchery.js',
+ './js/libraries/jquery.ba-throttle-debounce.js',
+ './js/helpers.js',
+ './node_modules/inflection/inflection.min.js',
+ './node_modules/bluebird/js/browser/bluebird.min.js',
+ './js/presets.js',
+ './js/injected_methods.js',
+ './js/intervals.js',
+ './js/timeouts.js',
+ './js/pid_controller.js',
+ './js/simple_smooth_filter.js',
+ './js/walking_average_filter.js',
+ './js/gui.js',
+ './js/msp/MSPCodes.js',
+ './js/msp/MSPHelper.js',
+ './js/msp/MSPchainer.js',
+ './js/port_handler.js',
+ './js/connection/connection.js',
+ './js/connection/connectionBle.js',
+ './js/connection/connectionSerial.js',
+ './js/connection/connectionTcp.js',
+ './js/connection/connectionUdp.js',
+ './js/servoMixRule.js',
+ './js/motorMixRule.js',
+ './js/logicCondition.js',
+ './js/settings.js',
+ './js/outputMapping.js',
+ './js/model.js',
+ './js/serial_backend.js',
+ './js/data_storage.js',
+ './js/fc.js',
+ './js/msp.js',
+ './js/protocols/stm32.js',
+ './js/protocols/stm32usbdfu.js',
+ './js/localization.js',
+ './js/boards.js',
+ './js/servoMixerRuleCollection.js',
+ './js/motorMixerRuleCollection.js',
+ './js/logicConditionsCollection.js',
+ './js/logicConditionsStatus.js',
+ './js/globalVariablesStatus.js',
+ './js/programmingPid.js',
+ './js/programmingPidCollection.js',
+ './js/programmingPidStatus.js',
+ './js/vtx.js',
+ './main.js',
+ './js/tabs.js',
+ './tabs/*.js',
+ './js/eventFrequencyAnalyzer.js',
+ './js/periodicStatusUpdater.js',
+ './js/serial_queue.js',
+ './js/msp_balanced_interval.js',
+ './tabs/advanced_tuning.js',
+ './js/peripherals.js',
+ './js/appUpdater.js',
+ './js/feature_framework.js',
+ './js/defaults_dialog.js',
+ './js/safehomeCollection.js',
+ './js/safehome.js',
+ './js/waypointCollection.js',
+ './js/waypoint.js',
+ './node_modules/openlayers/dist/ol.js',
+ './js/libraries/plotly-latest.min.js',
+];
+
+sources.receiverCss = [
+ './src/css/tabs/receiver_msp.css',
+ './src/css/opensans_webfontkit/fonts.css',
+ './js/libraries/jquery.nouislider.min.css',
+ './js/libraries/jquery.nouislider.pips.min.css',
+];
+
+sources.receiverJs = [
+ './node_modules/jquery/dist/jquery.min.js',
+ './node_modules/jquery-ui-npm/jquery-ui.min.js',
+ './js/libraries/jquery.nouislider.all.min.js',
+ './tabs/receiver_msp.js'
+];
+
+sources.debugTraceJs = [
+ './js/debug_trace.js'
+];
+
+sources.hexParserJs = [
+ './js/workers/hex_parser.js',
+];
+
+var output = {
+ css: 'styles.css',
+ js: 'script.js',
+ receiverCss: 'receiver-msp.css',
+ receiverJs: 'receiver-msp.js',
+ debugTraceJs: 'debug-trace.js',
+ hexParserJs: 'hex_parser.js',
+};
+
+
+var outputDir = './build/';
+var distDir = './dist/';
+var appsDir = './apps/';
+
+function get_task_name(key) {
+ return 'build-' + key.replace(/([A-Z])/g, function($1){return "-"+$1.toLowerCase();});
+}
+
+function getArguments() {
+ return minimist(process.argv.slice(2));
+}
+
+function getPlatforms() {
+ const defaultPlatforms = ['win32', 'win64', 'osx64', 'linux32', 'linux64'];
+ const platform = getArguments().platform;
+ if (platform) {
+ if (defaultPlatforms.indexOf(platform) < 0) {
+ throw new Error(`Invalid platform "${platform}". Available ones are: ${defaultPlatforms}`)
+ }
+ return [platform];
+ }
+ return defaultPlatforms;
+}
+
+function execSync() {
+ const cmd = arguments[0];
+ const args = Array.prototype.slice.call(arguments, 1);
+ const result = child_process.spawnSync(cmd, args, {stdio: 'inherit'});
+ if (result.error) {
+ throw result.error;
+ }
+}
+
+// Define build tasks dynamically based on the sources
+// and output variables.
+var buildCssTasks = [];
+var buildJsTasks = [];
+(function() {
+ // Convers fooBarBaz to foo-bar-baz
+ for (var k in output) {
+ (function (key) {
+ var name = get_task_name(key);
+ if (name.endsWith('-css')) {
+ buildCssTasks.push(name);
+ } else if (name.endsWith('-js')) {
+ buildJsTasks.push(name);
+ } else {
+ throw 'Invalid task name: "' + name + '": must end with -css or -js';
+ }
+ gulp.task(name, function() {
+ return gulp.src(sources[key])
+ .pipe(concat(output[key]))
+ .pipe(gulp.dest(outputDir));
+ });
+ })(k);
+ }
+})();
+
+gulp.task('build-all-js', gulp.parallel(buildJsTasks))
+gulp.task('build-all-css', gulp.parallel(buildCssTasks));
+gulp.task('build', gulp.parallel('build-all-css', 'build-all-js'));
+
+gulp.task('clean', function() { return del(['./build/**', './dist/**'], {force: true}); });
+
+// Real work for dist task. Done in another task to call it via
+// run-sequence.
+gulp.task('dist-build', gulp.series('build', function() {
+ var distSources = [
+ './package.json', // For NW.js
+ './manifest.json', // For Chrome app
+ './eventPage.js',
+ './*.html',
+ './tabs/*.html',
+ './images/**/*',
+ './_locales/**/*',
+ './build/*',
+ './src/css/font-awesome/webfonts/*',
+ './src/css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
+ './resources/*.json',
+ './resources/models/*',
+ './resources/osd/*.mcm',
+ './resources/motor_order/*.svg',
+ ];
+ return gulp.src(distSources, { base: '.' })
+ .pipe(gulp.dest(distDir));
+}));
+
+gulp.task('dist', gulp.series('clean', 'dist-build'));
+
+// Create app directories in ./apps
+gulp.task('apps', gulp.series('dist', function(done) {
+ var builder = new NwBuilder({
+ files: './dist/**/*',
+ buildDir: appsDir,
+ platforms: getPlatforms(),
+ flavor: 'normal',
+ macIcns: './images/inav.icns',
+ winIco: './images/inav.ico',
+ version: get_nw_version()
+ });
+ builder.on('log', console.log);
+ builder.build(function (err) {
+ if (err) {
+ console.log("Error building NW apps:" + err);
+ done();
+ return;
+ }
+ // Package apps as .zip files
+ done();
+ });
+}));
+
+function get_nw_version() {
+ return semver.valid(semver.coerce(require('./package.json').dependencies.nw));
+}
+
+function get_release_filename(platform, ext) {
+ var pkg = require('./package.json');
+ return 'INAV-Configurator_' + platform + '_' + pkg.version + '.' + ext;
+}
+
+gulp.task('release-win32', function() {
+ var pkg = require('./package.json');
+ var src = path.join(appsDir, pkg.name, 'win32');
+ var output = fs.createWriteStream(path.join(appsDir, get_release_filename('win32', 'zip')));
+ var archive = archiver('zip', {
+ zlib: { level: 9 }
+ });
+ archive.on('warning', function(err) { throw err; });
+ archive.on('error', function(err) { throw err; });
+ archive.pipe(output);
+ archive.directory(src, 'INAV Configurator');
+ return archive.finalize();
+});
+
+gulp.task('release-win64', function() {
+ var pkg = require('./package.json');
+ var src = path.join(appsDir, pkg.name, 'win64');
+ var output = fs.createWriteStream(path.join(appsDir, get_release_filename('win64', 'zip')));
+ var archive = archiver('zip', {
+ zlib: { level: 9 }
+ });
+ archive.on('warning', function(err) { throw err; });
+ archive.on('error', function(err) { throw err; });
+ archive.pipe(output);
+ archive.directory(src, 'INAV Configurator');
+ return archive.finalize();
+});
+
+gulp.task('release-osx64', function(done) {
+ var pkg = require('./package.json');
+ var src = path.join(appsDir, pkg.name, 'osx64', pkg.name + '.app');
+ // Check if we want to sign the .app bundle
+ if (getArguments().codesign) {
+ // macapptool can be downloaded from
+ // https://github.com/fiam/macapptool
+ //
+ // Make sure the bundle is well formed
+ execSync('macapptool', '-v', '1', 'fix', src);
+ // Sign
+ const codesignArgs = ['macapptool', '-v', '1', 'sign'];
+ const codesignIdentity = getArguments()['codesign-identity'];
+ if (codesignIdentity) {
+ codesignArgs.push('-i', codesignIdentity);
+ }
+ codesignArgs.push('-e', 'entitlements.plist');
+ codesignArgs.push(src)
+ execSync.apply(this, codesignArgs);
+ }
+ const zipFilename = path.join(appsDir, get_release_filename('macOS', 'zip'));
+ var output = fs.createWriteStream(zipFilename);
+ var archive = archiver('zip', {
+ zlib: { level: 9 }
+ });
+ archive.on('warning', function(err) { throw err; });
+ archive.on('error', function(err) { throw err; });
+ archive.pipe(output);
+ archive.directory(src, 'INAV Configurator.app');
+ output.on('close', function() {
+ if (getArguments().notarize) {
+ const notarizeArgs = ['macapptool', '-v', '1', 'notarize'];
+ const notarizationUsername = getArguments()['notarization-username'];
+ if (notarizationUsername) {
+ notarizeArgs.push('-u', notarizationUsername)
+ }
+ const notarizationPassword = getArguments()['notarization-password'];
+ if (notarizationPassword) {
+ notarizeArgs.push('-p', notarizationPassword)
+ }
+ notarizeArgs.push(zipFilename)
+ execSync.apply(this, notarizeArgs);
+ }
+ done();
+ });
+ archive.finalize();
+});
+
+function releaseLinux(bits) {
+ return function() {
+ var dirname = 'linux' + bits;
+ var pkg = require('./package.json');
+ var src = path.join(appsDir, pkg.name, dirname);
+ var output = fs.createWriteStream(path.join(appsDir, get_release_filename(dirname, 'tar.gz')));
+ var archive = archiver('tar', {
+ zlib: { level: 9 },
+ gzip: true
+ });
+ archive.on('warning', function(err) { throw err; });
+ archive.on('error', function(err) { throw err; });
+ archive.pipe(output);
+ archive.directory(src, 'INAV Configurator');
+ return archive.finalize();
+ }
+}
+
+gulp.task('release-linux32', releaseLinux(32));
+gulp.task('release-linux64', releaseLinux(64));
+
+// Create distributable .zip files in ./apps
+gulp.task('release', gulp.series('apps', getPlatforms().map(function(v) { return 'release-' + v; })));
+
+gulp.task('watch', function () {
+ for(var k in output) {
+ gulp.watch(sources[k], gulp.series(get_task_name(k)));
+ }
+});
+
+gulp.task('default', gulp.series('build'));
diff --git a/js/presetFramework.js b/js/presetFramework.js
new file mode 100644
index 000000000..d4fbe81df
--- /dev/null
+++ b/js/presetFramework.js
@@ -0,0 +1,111 @@
+'use strict';
+
+var presets = (function () {
+
+ let publicScope = {},
+ privateScope = {};
+
+ let data = [
+ {
+ id: 1,
+ type: "filter",
+ name: "Multirotor 5\" Default",
+ description: "INAV default filter preset. Works great with 5\" multirotors and similar. Might be suboptimal for light builds and bigger quaads.",
+ author: "DzikuVx",
+ settings: {
+ "gyro_hardware_lpf": "256HZ",
+ "gyro_anti_aliasing_lpf_hz": 250,
+ "gyro_anti_aliasing_lpf_type": "PT1",
+ "gyro_main_lpf_hz": 110,
+ "gyro_main_lpf_type": "PT1",
+ "dterm_lpf_hz": 110,
+ "dterm_lpf_type": "PT3",
+ "dterm_lpf2_hz": 0,
+ "dterm_lpf2_type": "PT1",
+ "dynamic_gyro_notch_enabled": "ON",
+ "dynamic_gyro_notch_q": 250,
+ "dynamic_gyro_notch_min_hz": 120,
+ "setpoint_kalman_enabled": "ON",
+ "setpoint_kalman_q": 200,
+ "smith_predictor_delay": 1.5
+ }
+ },
+ {
+ id: 2,
+ type: "filter",
+ name: "Multirotor 7\" Freestyle",
+ description: "Works great on 7\" multirotors and similar. Might be suboptimal for light builds and smaller quaads.",
+ author: "DzikuVx",
+ settings: {
+ "gyro_hardware_lpf": "256HZ",
+ "gyro_anti_aliasing_lpf_hz": 500,
+ "gyro_anti_aliasing_lpf_type": "PT1",
+ "gyro_main_lpf_hz": 90,
+ "gyro_main_lpf_type": "PT1",
+ "dterm_lpf_hz": 85,
+ "dterm_lpf_type": "PT3",
+ "dterm_lpf2_hz": 0,
+ "dterm_lpf2_type": "PT1",
+ "dynamic_gyro_notch_enabled": "ON",
+ "dynamic_gyro_notch_q": 250,
+ "dynamic_gyro_notch_min_hz": 70,
+ "setpoint_kalman_enabled": "ON",
+ "setpoint_kalman_q": 200,
+ "smith_predictor_delay": 1.5
+ }
+ }
+ ];
+
+ //Returns all presets by type
+ publicScope.getByType = function (type) {
+ return data.filter(function (preset) {
+ return preset.type === type;
+ });
+ };
+
+ //Returns all presets
+ publicScope.getAll = function () {
+ return data;
+ };
+
+ //returns preset by id
+ publicScope.getById = function (id) {
+ return data.find(function (preset) {
+ return preset.id === id;
+ });
+ };
+
+ publicScope.apply = function (id, callback) {
+ let preset = publicScope.getById(id);
+
+ if (preset) {
+
+ let settings = Object.keys(preset.settings)
+ .map(function(s) {
+ return {
+ key: s,
+ value: preset.settings[s]
+ }
+ });
+
+ Promise.mapSeries(settings, function (input, ii) {
+ return mspHelper.getSetting(input.key);
+ }).then(function () {
+
+ Promise.mapSeries(settings, function (input, ii) {
+ return mspHelper.setSetting(input.key, input.value);
+ }).then(function () {
+ if (callback && typeof callback === "function") {
+ callback();
+ }
+ });
+
+ });
+ }
+
+ }
+
+ return publicScope;
+})();
+
+module.exports = presets;
\ No newline at end of file
diff --git a/locale/en/messages.json b/locale/en/messages.json
old mode 100644
new mode 100755
index c5e53172e..5b53c6425
--- a/locale/en/messages.json
+++ b/locale/en/messages.json
@@ -5191,6 +5191,9 @@
"showAdvancedPIDs": {
"message": "Show advanced PID controllers"
},
+ "filterPresets": {
+ "message": "Filter presets"
+ },
"rc_filter_lpf_hz": {
"message": "Manual LPF Hz"
},
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 9da4d855a..187731375 100644
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -644,6 +644,9 @@
+
@@ -917,6 +920,22 @@
+
+
+