Merge pull request #523 from cleanflight/merge-bf-10.3.1

Merge BF 10.3.1 changes.

.github/stale.yml

@@ -0,0 +1,55 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
+
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - BUG
+  - Feature Request
+  - Pinned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking as stale
+staleLabel: Inactive
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue / pull request has been automatically marked as stale because it
+  has not had recent activity. It will be closed if no further activity occurs
+  within a week.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+  Automatically closing as inactive.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.travis.yml

@@ -1,12 +1,45 @@
+os:
+  - linux
+  - osx
+
+sudo: false
+
+dist: trusty
+
+addons:
+  apt:
+    packages:
+      - rpm
+
+git:
+  depth: 5
+
 language: node_js
 
+node_js:
+  - 8.11.2
+
+addons:
+  chrome: stable
+
 before_install:
+  - npm i -g [email protected]
   - npm install gulp -g
 
 script:
-  - npm install
+  - npm test
   - gulp release
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then gulp release --chromeos; fi
 
 cache:
   directories:
   - 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

README.md

@@ -58,6 +58,10 @@ Linux build is disabled currently because of unmet dependecies with some distros
 2. Change to project folder and run `npm install`.
 3. Run `npm start`.
 
+### Running tests
+
+`npm test`
+
 ### App build and release
 
 The tasks are defined in `gulpfile.js` and can be run either via `gulp <task-name>` (if the command is in PATH or via `../node_modules/gulp/bin/gulp.js <task-name>`:

assets/linux/copyright

@@ -1,4 +1,27 @@
-This package was created by the Cleanflight open source flight controller firmware project (https://github.com/cleanflight/cleanflight).
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Cleanflight Configurator
+Source: https://github.com/betaflight/betaflight-configurator
 
-All of the code is covered under the terms of the GPL version 3. See the
-file /usr/share/common-licenses/GPL-3 for more information.
+Files: betaflight-*
+Copyright: Copyright 2018 The Betaflight open source project
+License: GPL-3
+
+Files: cleanflight-*
+Copyright: Copyright 2018 The Cleanflight open source project
+License: GPL-3
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3'.

assets/windows/installer.nsi

@@ -53,6 +53,7 @@ OutFile "..\..\${DEST_FOLDER}\${FILE_NAME_INSTALLER}"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Korean"
 !insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Portuguese"
 !insertmacro MUI_LANGUAGE "SimpChinese"
 !insertmacro MUI_LANGUAGE "Spanish"
 

changelog.html

@@ -1,5 +1,43 @@
+<span>2018.07.16 - 2.3.0 - Cleanflight</span>
+<ul>
+    <li>Merge in BF 10.3.0 changes</li>
+</ul>
+
+<span>2018.06.23 - 10.3.0 - BetaFlight</span>
+<ul>
+	<li>added support for customised OSD boot logo</li>
+	<li>fixed MSP_RX controls</li>
+	<li>added current / consumption information into the 'Motors' tab</li>
+	<li>added translations for Japanese and Portugese</li>
+	<li>added support for moving the artificial horizon / crosshairs to OSD, and other OSD improvements</li>
+	<li>added local caching for downloaded firmware files</li>
+	<li>added support for tab completion for commands in the CLI</li>
+	<li>added support for downloading / installing development builds / builds for special version branches (e.g. AKK/RDQ support) from the CI server</li>
+	<li>changed the installation to be uncompressed to achieve faster startup</li>
+</ul>
+
 <span>2018.03.04 - 2.2.0 - Cleanflight</span>
+<ul>
     <li>Merge in BF 10.2.0 changes</li>
+</ul>
+
+<span>2018.02.28 - 10.2.0 - BetaFlight</span>
+<ul>
+	<li>added support for 6 rateprofiles</li>
+	<li>removed setting to disallow disarming on throttle above low</li>
+        <li>added disabling of runaway takeoff prevention</li>
+        <li>added peripheral device entry 'Benewake LIDAR'</li>
+        <li>added Dshot beacon configuration</li>
+        <li>added markdown processing for GitHub release notes</li>
+        <li>made language user selectable in the application</li>
+        <li>added translations for Chinese, Italian, and Latvian</li>
+        <li>added installers for RedHat linux</li>
+        <li>added markdown processing for GitHub release notes. Lots of fixes to the standalone applications</li>
+</ul>
+
+<span>2018.01.16 - 10.1.0 - BetaFlight</span>
+<ul>
+    <li>Lots of fixes to the standalone applications</li>
     <li>Fixed CLI hanging on exit</li>
     <li>Fixed stick position indicator in the rates curve</li>
     <li>Fixed restoring of window size / position on restart</li>