Merge remote-tracking branch 'betaflight/master' into merge-bf-changes

.travis.yml

@@ -36,10 +36,8 @@ cache:
   - node_modules
 
 notifications:
-  slack: betaflightgroup:LQSj02nsBEdefcO5UQcLgB0U
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/0c20f7a1a7e311499a88
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: always     # options: [always|never|change] default: always
+  irc:
+    channels:
+      - "chat.freenode.net#cleanflight"
+    use_notice: true
+    skip_join: true

README.md

@@ -34,8 +34,8 @@ Please note - the application will automatically update itself when new versions
 
 ### Alternative way, Chrome app:
 
-1. Clone the configurator repository (from Github) to any local directory or download it as zip.
-2. Extract to a folder and not the folder.
+1. Clone the repo to any local directory or download it as zip.
+2. If downloaded as a zip, extract it into a new directory.
 3. Start Google Chrome.
 4. Click the 3-dots on the far right of the URL bar.
 5. Select "More Tools"
@@ -44,14 +44,10 @@ Please note - the application will automatically update itself when new versions
 8. Click on load unpacked extension.
 9. Point it to the folder you extracted the zip to.
 
-## How to use
-
 You can find the Cleanflight Configurator icon in your application tab "Apps"
 
 ## Native app build via NW.js
 
-Linux build is disabled currently because of unmet dependecies with some distros, it can be enabled in the `gulpfile.js`.
-
 ### Development
 
 1. Install node.js

assets/windows/installer.nsi

@@ -54,8 +54,10 @@ OutFile "..\..\${DEST_FOLDER}\${FILE_NAME_INSTALLER}"
 !insertmacro MUI_LANGUAGE "Korean"
 !insertmacro MUI_LANGUAGE "Latvian"
 !insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "Russian"
 !insertmacro MUI_LANGUAGE "SimpChinese"
 !insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "Swedish"
 
 # detect default install folder
 Function .onInit

changelog.html

@@ -1,3 +1,43 @@
+<span>2018.10.01 - 2.5.0 - Cleanflight</span>
+<ul>
+    <li>Merge in BF 10.4.1 changes</li>
+</ul>
+
+<span>2018.08.15 - 10.4.1 - BetaFlight</span>
+<ul>
+    <li>fixed bug in Chrome web app version</li>
+</ul>
+
+<span>2018.08.14 - 10.4.0 - BetaFlight</span>
+<ul>
+    <li>fixed backup / restore</li>
+    <li>fixed problems with some elements in OSD</li>
+    <li>fixed problems with wrong settings displayed when Dshot is selected</li>
+    <li>fixed display of GPS altitude</li>
+    <li>fixed Adjustments tab</li>
+    <li>various other UI fixes</li>
+    <li>feed forward PID control</li>
+    <li>acro trainer</li>
+    <li>throttle boost</li>
+    <li>absolute control</li>
+    <li>anti gravity</li>
+    <li>RC smoothing</li>
+    <li>added support downloading / flashing development / maintenance builds</li>
+    <li>added reopening of last active tab on reconnect</li>
+    <li>added support for hiding unused modes in modes tab</li>
+    <li>added 'Vision' font to OSD</li>
+    <li>improved support for custom boot logos</li>
+    <li>added statistics collection</li>
+    <li>added file type descriptions for open / save dialogs</li>
+    <li>added setting of the flight controller's real time clock when connected to the configurator</li>
+</ul>
+
+<span>2018.07.27 - 10.3.1 - BetaFlight</span>
+<ul>
+    <li>Fixed problem with configurator crashing on startup when running on systems with German or Portugese language settings</li>
+    <li>Fixed bug causing the gyro lowpass filter to be always stored as disabled when using older firmware versions</li>
+</ul>
+
 <span>2018.07.16 - 2.4.0 - Cleanflight</span>
 <ul>
     <li>Merge in BF 10.3.0 changes</li>

gulpfile.js

@@ -23,14 +23,15 @@ const install = require("gulp-install");
 const rename = require('gulp-rename');
 const os = require('os');
 const removeTrailingPathSeparator = require('remove-trailing-path-separator');
+const git = require('gulp-git');
 
 const DIST_DIR = './dist/';
 const APPS_DIR = './apps/';
 const DEBUG_DIR = './debug/';
 const RELEASE_DIR = './release/';
 
 var nwBuilderOptions = {
-    version: '0.31.0',
+    version: '0.32.2',
     files: './dist/**/*',
     macIcns: './src/images/cf_icon.icns',
     macPlist: { 'CFBundleDisplayName': 'Cleanflight Configurator'},
@@ -61,13 +62,16 @@ gulp.task('clean-release', clean_release);
 
 gulp.task('clean-cache', clean_cache);
 
-var distBuild = gulp.series(clean_dist, dist_src, dist_locale, dist_libraries, dist_resources);
-gulp.task('dist', distBuild);
+gulp.task('get-changeset-id', getChangesetId);
 
-var appsBuild = gulp.series(gulp.parallel(clean_apps, distBuild), apps, gulp.parallel(listPostBuildTasks(APPS_DIR)));
+var distBuild = gulp.series(dist_src, dist_locale, dist_libraries, dist_resources, getChangesetId);
+var distRebuild = gulp.series(clean_dist, distBuild);
+gulp.task('dist', distRebuild);
+
+var appsBuild = gulp.series(gulp.parallel(clean_apps, distRebuild), apps, gulp.parallel(listPostBuildTasks(APPS_DIR)));
 gulp.task('apps', appsBuild);
 
-var debugBuild = gulp.series(gulp.parallel(clean_debug, distBuild), debug, gulp.parallel(listPostBuildTasks(DEBUG_DIR)), start_debug)
+var debugBuild = gulp.series(distBuild, debug, gulp.parallel(listPostBuildTasks(DEBUG_DIR)), start_debug)
 gulp.task('debug', debugBuild);
 
 var releaseBuild = gulp.series(gulp.parallel(clean_release, appsBuild), gulp.parallel(listReleaseTasks()));
@@ -433,6 +437,23 @@ function buildNWApps(platforms, flavor, dir, done) {
     }
 }
 
+function getChangesetId(done) {
+    git.exec({args : 'log -1 --format="%h"'}, function (err, stdout) {
+        var version;
+        if (err) {
+            version = 'unsupported';
+        } else {
+            version = stdout.trim();
+        }
+
+        var versionData = { gitChangesetId: version }
+        var destFile = path.join(DIST_DIR, 'version.json');
+
+        fs.writeFile(destFile, JSON.stringify(versionData) , function () {
+            done();
+        });
+    });
+}
 
 function start_debug(done) {