Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNavFlight/inav-configurator.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--changelog.html5
-rw-r--r--gulpfile.js13
-rwxr-xr-xjs/data_storage.js2
-rw-r--r--js/fc.js6
-rw-r--r--manifest.json2
-rw-r--r--package-lock.json466
-rwxr-xr-xpackage.json5
-rw-r--r--src/css/tabs/landing.css76
-rw-r--r--tabs/configuration.js13
-rw-r--r--tabs/landing.html36
-rw-r--r--tabs/landing.js26
11 files changed, 477 insertions, 173 deletions
diff --git a/changelog.html b/changelog.html
deleted file mode 100644
index db0f34da..00000000
--- a/changelog.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<span>1.0.2</span>
-<ul>
- <li>PID scaling in Configurator removed</li>
- <li>Improved anonymous tracking</li>
-</ul>
diff --git a/gulpfile.js b/gulpfile.js
index 2528f8e8..159340bd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,6 +8,7 @@ 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');
@@ -237,6 +238,7 @@ gulp.task('apps', gulp.series('dist', function(done) {
flavor: 'normal',
macIcns: './images/inav.icns',
winIco: './images/inav.ico',
+ version: get_nw_version()
});
builder.on('log', console.log);
builder.build(function (err) {
@@ -250,6 +252,10 @@ gulp.task('apps', gulp.series('dist', function(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;
@@ -307,9 +313,10 @@ function releaseLinux(bits) {
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, 'zip')));
- var archive = archiver('zip', {
- zlib: { level: 9 }
+ 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; });
diff --git a/js/data_storage.js b/js/data_storage.js
index b2bced3a..17cfddd1 100755
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -3,7 +3,7 @@
var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.2.0',
- 'maxFirmwareVersionAccepted': '2.4.0', // COndition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
+ 'maxFirmwareVersionAccepted': '2.5.0', // COndition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'connectionValid': false,
'connectionValidCliOnly': false,
'cliActive': false,
diff --git a/js/fc.js b/js/fc.js
index 97aa3ca4..964dbf97 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -942,10 +942,10 @@ var FC = {
return ["NONE", "AUTO", "HMC5883", "AK8975", "GPSMAG", "MAG3110", "AK8963", "IST8310", "QMC5883", "MPU9250", "IST8308", "LIS3MDL", "FAKE"];
},
getBarometerNames: function () {
- if (semver.gte(CONFIG.flightControllerVersion, "2.3.0")) {
- return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "FAKE"];
+ if (semver.gte(CONFIG.flightControllerVersion, "2.4.0")) {
+ return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "BMP388", "FAKE"];
} else {
- return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "FAKE"];
+ return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "FAKE"];
}
},
getPitotNames: function () {
diff --git a/manifest.json b/manifest.json
index 964be735..84ff12eb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
- "version": "2.3.1",
+ "version": "2.3.2",
"author": "Several",
"name": "INAV - Configurator",
"short_name": "INAV",
diff --git a/package-lock.json b/package-lock.json
index 606c7c29..dbf853f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "inav-configurator",
- "version": "2.3.1",
+ "version": "2.3.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -2186,19 +2186,140 @@
"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
"optional": true,
"requires": {
- "nan": "2.12.1"
+ "nan": "2.14.0",
+ "node-pre-gyp": "0.12.0"
},
"dependencies": {
+ "abbrev": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "bundled": true,
+ "optional": true
+ },
+ "are-we-there-yet": {
+ "version": "1.1.5",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "delegates": "1.0.0",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "bundled": true
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "bundled": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "chownr": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "bundled": true
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
"debug": {
"version": "4.1.1",
"bundled": true,
+ "optional": true,
"requires": {
"ms": "2.1.1"
}
},
+ "deep-extend": {
+ "version": "0.6.0",
+ "bundled": true,
+ "optional": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "detect-libc": {
+ "version": "1.0.3",
+ "bundled": true,
+ "optional": true
+ },
+ "fs-minipass": {
+ "version": "1.2.5",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "minipass": "2.3.5"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "aproba": "1.2.0",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.3"
+ }
+ },
+ "glob": {
+ "version": "7.1.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "bundled": true,
+ "optional": true
+ },
"iconv-lite": {
"version": "0.4.24",
"bundled": true,
+ "optional": true,
"requires": {
"safer-buffer": "2.1.2"
}
@@ -2206,51 +2327,317 @@
"ignore-walk": {
"version": "3.0.1",
"bundled": true,
+ "optional": true,
"requires": {
"minimatch": "3.0.4"
}
},
- "ms": {
- "version": "2.1.1",
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true
+ },
+ "ini": {
+ "version": "1.3.5",
+ "bundled": true,
+ "optional": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "bundled": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
+ },
+ "minimist": {
+ "version": "0.0.8",
"bundled": true
},
- "nan": {
- "version": "2.12.1",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
- "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
+ "minipass": {
+ "version": "2.3.5",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
+ }
+ },
+ "minizlib": {
+ "version": "1.2.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "minipass": "2.3.5"
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "bundled": true,
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "bundled": true,
"optional": true
},
"needle": {
"version": "2.3.0",
"bundled": true,
+ "optional": true,
"requires": {
"debug": "4.1.1",
"iconv-lite": "0.4.24",
"sax": "1.2.4"
}
},
+ "node-pre-gyp": {
+ "version": "0.12.0",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "detect-libc": "1.0.3",
+ "mkdirp": "0.5.1",
+ "needle": "2.3.0",
+ "nopt": "4.0.1",
+ "npm-packlist": "1.4.1",
+ "npmlog": "4.1.2",
+ "rc": "1.2.8",
+ "rimraf": "2.6.3",
+ "semver": "5.7.0",
+ "tar": "4.4.8"
+ }
+ },
+ "nopt": {
+ "version": "4.0.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "abbrev": "1.1.1",
+ "osenv": "0.1.5"
+ }
+ },
"npm-bundled": {
"version": "1.0.6",
- "bundled": true
+ "bundled": true,
+ "optional": true
},
"npm-packlist": {
"version": "1.4.1",
"bundled": true,
+ "optional": true,
"requires": {
"ignore-walk": "3.0.1",
"npm-bundled": "1.0.6"
}
},
+ "npmlog": {
+ "version": "4.1.2",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "are-we-there-yet": "1.1.5",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "bundled": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true,
+ "optional": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "process-nextick-args": {
+ "version": "2.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "rc": {
+ "version": "1.2.8",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "deep-extend": "0.6.0",
+ "ini": "1.3.5",
+ "minimist": "1.2.0",
+ "strip-json-comments": "2.0.1"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.0",
+ "bundled": true,
+ "optional": true
+ }
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.6",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.2",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "rimraf": {
+ "version": "2.6.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "glob": "7.1.3"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "bundled": true
+ },
"safer-buffer": {
"version": "2.1.2",
- "bundled": true
+ "bundled": true,
+ "optional": true
},
"sax": {
"version": "1.2.4",
- "bundled": true
+ "bundled": true,
+ "optional": true
},
"semver": {
"version": "5.7.0",
+ "bundled": true,
+ "optional": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "bundled": true,
+ "optional": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "bundled": true,
+ "requires": {
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "bundled": true,
+ "optional": true
+ },
+ "tar": {
+ "version": "4.4.8",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "chownr": "1.1.1",
+ "fs-minipass": "1.2.5",
+ "minipass": "2.3.5",
+ "minizlib": "1.2.1",
+ "mkdirp": "0.5.1",
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "bundled": true,
+ "optional": true
+ },
+ "wide-align": {
+ "version": "1.1.3",
+ "bundled": true,
+ "optional": true,
+ "requires": {
+ "string-width": "1.0.2"
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true
+ },
+ "yallist": {
+ "version": "3.0.3",
"bundled": true
}
}
@@ -3779,6 +4166,12 @@
"resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
"integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="
},
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "optional": true
+ },
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -3859,8 +4252,15 @@
"requires": {
"hosted-git-info": "2.7.1",
"resolve": "1.10.0",
- "semver": "5.6.0",
+ "semver": "5.7.1",
"validate-npm-package-license": "3.0.4"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ }
}
},
"normalize-path": {
@@ -3925,7 +4325,7 @@
"merge": "1.2.1",
"multimeter": "0.1.1",
"rimraf": "2.6.3",
- "semver": "5.6.0",
+ "semver": "5.7.1",
"yargs": "3.32.0"
},
"dependencies": {
@@ -3934,6 +4334,11 @@
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
},
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ },
"yargs": {
"version": "3.32.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
@@ -3973,7 +4378,7 @@
"recursive-readdir-sync": "1.0.6",
"request": "2.88.0",
"rimraf": "2.6.3",
- "semver": "5.6.0",
+ "semver": "5.7.1",
"simple-glob": "0.2.0",
"tar-fs": "1.16.3",
"temp": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
@@ -4002,6 +4407,12 @@
"supports-color": "5.5.0"
}
},
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4279,7 +4690,15 @@
"got": "6.7.1",
"registry-auth-token": "3.4.0",
"registry-url": "3.1.0",
- "semver": "5.6.0"
+ "semver": "5.7.1"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"parse-filepath": {
@@ -5064,9 +5483,10 @@
}
},
"semver": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
- "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
},
"semver-diff": {
"version": "2.1.0",
@@ -5074,7 +5494,15 @@
"integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
"dev": true,
"requires": {
- "semver": "5.6.0"
+ "semver": "5.7.1"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
}
},
"semver-greatest-satisfied-range": {
diff --git a/package.json b/package.json
index 81fa67f4..150928c1 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "inav-configurator",
"description": "INAV Configurator",
- "version": "2.3.1",
+ "version": "2.3.2",
"main": "main.html",
"default_locale": "en",
"scripts": {
@@ -41,6 +41,7 @@
"xml2js": "^0.4.19"
},
"devDependencies": {
- "nw-builder": "^3.5.7"
+ "nw-builder": "^3.5.7",
+ "semver": "6.3.0"
}
}
diff --git a/src/css/tabs/landing.css b/src/css/tabs/landing.css
index 14ee3217..d0815031 100644
--- a/src/css/tabs/landing.css
+++ b/src/css/tabs/landing.css
@@ -122,7 +122,7 @@
margin-bottom: 15px;
font-weight: normal;
font-family: 'open_sansregular', Arial,serif;
- font-size: 12px;
+ font-size: 1.2em;
color: #c2efff;
}
@@ -155,11 +155,11 @@
}
.tab-landing .content_mid .text1 {
- width: 37%;
+ width: 47%;
}
.tab-landing .content_mid .text2 {
- width: 40%;
+ width: 47%;
}
.tab-landing .content_mid .text2 ul {
@@ -189,74 +189,4 @@
.tab-landing .content_mid .text3 .donate {
margin-top: 10px;
text-align: center;
-}
-
-/* changelog block */
-#changelog {
- width: 250px;
- height: 100%;
- position: fixed;
- right: -245px;
- top: 0;
- background: white;
-}
-
-#changelog .wrapper {
- height: 100%;
- padding: 0 20px;
- border-left: 5px solid #3394b5;
- overflow-y: auto;
- display: none;
-}
-
-#changelog .button {
- transform: rotate(270deg);
- top: 50px;
- right: 215px;
- position: absolute;
- background: #3394b5;
- border-radius: 5px 5px 0 0;
- border-bottom: none;
- height: 30px;
-}
-
-#changelog .button a {
- display: block;
- padding: 5px 10px;
- width: 70px;
- text-align: center;
- color: white;
-}
-
-#changelog .title {
- margin: 20px 0;
- font-size: 16px;
-}
-
-#changelog .wrapper {
- display: block;
-}
-
-#changelog .log {
- line-height: 17px;
-}
-
-#changelog .log span {
- display: block;
- font-weight: bold;
- padding-bottom: 5px;
- border-bottom: 1px solid #ddd;
-}
-
-#changelog .log ul {
- margin: 5px 0 20px 10px;
-}
-
-#changelog .log li {
- font-weight: normal;
- margin-bottom: 5px;
-}
-
-#changelog .log p {
- margin-bottom: 20px;
} \ No newline at end of file
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 7056ff8c..7b4b5180 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -580,11 +580,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
}
$('a.save').click(function () {
- // gather data that doesn't have automatic change event bound
- BF_CONFIG.board_align_roll = Math.round(parseFloat($('input[name="board_align_roll"]').val()) * 10);
- BF_CONFIG.board_align_pitch = Math.round(parseFloat($('input[name="board_align_pitch"]').val()) * 10);
- BF_CONFIG.board_align_yaw = Math.round(parseFloat($('input[name="board_align_yaw"]').val()) * 10);
-
MISC.mag_declination = parseFloat($('#mag_declination').val());
ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val());
@@ -607,9 +602,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
MISC.battery_capacity_critical = parseInt($('#battery_capacity_critical').val() * MISC.battery_capacity / 100);
MISC.battery_capacity_unit = $('#battery_capacity_unit').val();
- BF_CONFIG.currentscale = parseInt($('#currentscale').val());
- BF_CONFIG.currentoffset = Math.round(parseFloat($('#currentoffset').val()) * 10);
-
_3D.deadband3d_low = parseInt($('#3ddeadbandlow').val());
_3D.deadband3d_high = parseInt($('#3ddeadbandhigh').val());
_3D.neutral3d = parseInt($('#3dneutral').val());
@@ -663,6 +655,11 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
helper.features.reset();
helper.features.fromUI($('.tab-configuration'));
helper.features.execute(function () {
+ BF_CONFIG.board_align_roll = Math.round(parseFloat($('input[name="board_align_roll"]').val()) * 10);
+ BF_CONFIG.board_align_pitch = Math.round(parseFloat($('input[name="board_align_pitch"]').val()) * 10);
+ BF_CONFIG.board_align_yaw = Math.round(parseFloat($('input[name="board_align_yaw"]').val()) * 10);
+ BF_CONFIG.currentscale = parseInt($('#currentscale').val());
+ BF_CONFIG.currentoffset = Math.round(parseFloat($('#currentoffset').val()) * 10);
saveChainer.execute();
});
});
diff --git a/tabs/landing.html b/tabs/landing.html
index 1c7e784c..2746770d 100644
--- a/tabs/landing.html
+++ b/tabs/landing.html
@@ -12,39 +12,18 @@
<ul class="communityRCGroupsSupport"><a href="https://www.rcgroups.com/forums/showthread.php?2495732-Cleanflight-iNav-%28navigation-rewrite%29-project" target="_blank"><i class="fa fa-users" aria-hidden="true"></i><span i18n="communityRCGroupsSupport"></span></a></ul>
</div>
<div class="content_mid">
- <div class="column third_left text1">
+ <div class="column half text1">
<div class="wrap">
<h2>Hardware</h2>
<div i18n="defaultWelcomeText"></div>
</div>
</div>
- <div class="column third_center text2">
+ <div class="column half text2">
<div class="wrap">
<h2 i18n="defaultContributingHead"></h2>
<div i18n="defaultContributingText"></div>
</div>
</div>
- <div class="column third_right text3">
- <div class="wrap2">
- <h3 i18n="defaultDonateHead"></h3>
- <div i18n="defaultDonateText"></div>
- <div class="donate">
- <a href="https://www.paypal.me/KonstantinSharlaimov"
- target="_blank" title="Donate"><img src="./images/btn-paypal.png" alt="Paypal"
- height="30" /></a>
- </div>
- <div class="donate">
- <a href="https://www.patreon.com/inavflight"
- target="_blank" title="Support on Patreon"><img src="./images/btn-patreon.png" alt="Patreon"
- height="30" /></a>
- </div>
- <div class="donate">
- <a href="https://money.yandex.ru/to/410013985315067"
- target="_blank" title="Поддержать через Яндекс.Деньги"><img src="./images/btn-yandex.png" alt="Яндекс.Деньги"
- height="55" /></a>
- </div>
- </div>
- </div>
</div>
<div class="content_foot">
<div class="sponsors">
@@ -58,15 +37,4 @@
</div>
</div>
</div>
- <div id="changelog">
- <div class="button">
- <a id="changelog_toggle" href="#">Changelog</a>
- </div>
- <div class="wrapper">
- <div class="title" i18n="defaultChangelogHead"></div>
- <div class="log">
- <!-- changelog content will be loaded here -->
- </div>
- </div>
- </div>
</div>
diff --git a/tabs/landing.js b/tabs/landing.js
index 1ff50f3d..45c5636e 100644
--- a/tabs/landing.js
+++ b/tabs/landing.js
@@ -1,9 +1,8 @@
'use strict';
-/*global $*/
+/*global $,TABS,GUI,googleAnalytics*/
TABS.landing = {};
TABS.landing.initialize = function (callback) {
- var self = this;
if (GUI.active_tab != 'landing') {
GUI.active_tab = 'landing';
@@ -11,33 +10,12 @@ TABS.landing.initialize = function (callback) {
}
$('#content').load("./tabs/landing.html", function () {
- // translate to user-selected language
localize();
- // load changelog content
- $('#changelog .log').load('./changelog.html');
-
- $('div.welcome a, div.sponsors a').click(function () {
+ $('.tab-landing a').click(function () {
googleAnalytics.sendEvent('ExternalUrls', 'Click', $(this).prop('href'));
});
- /** changelog trigger **/
- $("#changelog_toggle").on('click', function() {
- var state = $(this).data('state2');
- if (state) {
- $("#changelog").animate({right: -245}, 200, function () {
- $("#content").removeClass('log_open');
- });
- state = false;
- } else {
- $("#changelog").animate({right: 0}, 200);
- $("#content").addClass('log_open');
- state = true;
- }
- $(this).text(state ? 'Close' : 'Changelog');
- $(this).data('state2', state);
- });
-
GUI.content_ready(callback);
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 18:28:19 +0300