PPM out from backport

.circleci/config.yml

@@ -0,0 +1,76 @@
+version: 2.1
+
+executors:
+  opentx-i6x:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.5.0
+
+jobs:
+  build:
+    executor: opentx-i6x
+    parameters:
+      boards:
+        type: string
+        default: "-bI6X"
+      lang:
+        type: string
+        default: ALL
+    steps:
+      - checkout
+      - run:
+          name: Build OpenI6X
+          command: |
+            python3 ./tools/build-flysky.py << parameters.boards >> -t<< parameters.lang >> $PWD/
+      - store_artifacts:
+          path: output
+
+workflows:
+  openi6x-release:
+    jobs:
+      # EN-only build for feature branches
+      - build:
+          name: build-en
+          boards: "-bI6X_DFPLAYER -bI6X_HELI -bI6X"
+          lang: EN
+          filters:
+            branches:
+              ignore:
+                - master
+                - /.*-maintenance/
+
+      # Full builds for release branches
+      - build:
+          name: build-std
+          boards: "-bI6X"
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+
+      - build:
+          name: build-std-dfplayer
+          boards: "-bI6X_DFPLAYER"
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+
+      - build:
+          name: build-heli
+          boards: "-bI6X_HELI"
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+
+      - build:
+          name: build-heli-dfplayer
+          boards: "-bI6X_HELI_DFPLAYER"
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help the OpenTX team to improve OpenTX
+
+---
+*Before submitting,  search the open issue if there is already a report of the bug*
+
+Also often minor bugs are already fixed in nightly builds, often it is
+a good idea to test (in a controlled environment like a bench setup)
+with a nightly firmware to see if the bug still exists.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**General information**
+ - OpenI6X version (e.g. 1.8.0)
+ - Hardware (e.g. external module model)

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,16 @@
+---
+name: Help
+about: Problems or question of using OpenTX
+
+--- 
+
+The issue tracker here is for devlopment of OpenTX. This is not a
+support site, only a bug tracking system. Please use support groups
+like [rcgroups](https://rcgroups.com/) or
+[openrcforum](https://www.openrcforums.com/forum/). See also our
+[manual](https://opentx.gitbooks.io/manual-for-opentx-2-2/).
+
+For quick questions you can also join our general chat.
+
+Issues that fall into the category of asking for help, will be
+generally closed as invalid without an answer.

.github/ISSUE_TEMPLATE/newfeature.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project to make OpenTX even better
+
+---
+*Before suggesting a new feature here, please search the open issue if there is already a request for the feature*
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -4,7 +4,20 @@
 /.autotools
 /*.user
 /*.user.*
-/doc/
 build*/
 cmake-build-*/
 /debian/
+/CMakeFiles/*
+radio/src/CmakeFiles/*
+/.vscode/
+*.cmake
+*.make
+*.marks
+/nbproject/
+*.bin
+/radio/src/CMakeFiles/firmware.dir/link.txt
+.push.settings.jsonc
+build.sh
+firm.sh
+flash.sh
+*.patch

.travis.yml

@@ -1,23 +1,16 @@
 sudo: required
 dist: trusty
-language: python
+language: cpp
 compiler: gcc
 
-virtualenv:
-  system_site_packages: true
-
-python:
-  - 3.4
-
 env:
   global:
-    - QT_BASE=53
+    # - QT_BASE=53
     # - QT_BASE=54
     # - QT_BASE=55
     # - QT_BASE=56
-    # - QT_BASE=57
-    #- GCC_ARM=/opt/gcc-arm-none-eabi/bin
-    - AVR_FLAVORS="AVR9X 9X GRUVIN9X MEGA2560"
+    - QT_BASE=57
+    # - GCC_ARM=/opt/gcc-arm-none-eabi/bin
     - PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages
   matrix:
     #
@@ -26,10 +19,6 @@ env:
     #
     # - FLAVOR=ALL
     - FLAVOR=DEFAULT
-    - FLAVOR=AVR9X
-    # - FLAVOR=9X
-    # - FLAVOR=GRUVIN9X
-    # - FLAVOR=MEGA2560
     - FLAVOR=ARM9X
     # - FLAVOR=AR9X
     # - FLAVOR=SKY9X
@@ -55,23 +44,16 @@ before_install:
   - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi
   - if [ "$QT_BASE" = "57" ]; then sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y; fi
   - sudo apt-get update -qq
+  - pyenv uninstall -f 2.7.6 && pyenv install 3.5.4 && pyenv global 3.5.4
+  - pip install pillow
 
 install:
-  - sudo apt-get --yes --force-yes install python3-pyqt5 curl libmpfr4 libmpc3 libfox-1.6-dev libgtest-dev
-  - |
-    if [[ " ${AVR_FLAVORS} " =~ " ${FLAVOR} " || ${FLAVOR} == "ALL" ]]; then
-      wget --quiet https://launchpad.net/ubuntu/+source/gcc-avr/1:4.9.2+Atmel3.5.0-1/+build/8403710/+files/gcc-avr_4.9.2+Atmel3.5.0-1_amd64.deb
-      wget --quiet https://launchpad.net/ubuntu/+source/avr-libc/1:1.8.0+Atmel3.5.0-1/+build/8435473/+files/avr-libc_1.8.0+Atmel3.5.0-1_all.deb
-      wget --quiet https://launchpad.net/ubuntu/+source/binutils-avr/2.25+Atmel3.5.0-2/+build/8435474/+files/binutils-avr_2.25+Atmel3.5.0-2_amd64.deb
-      sudo dpkg --install gcc-avr_4.9.2+Atmel3.5.0-1_amd64.deb avr-libc_1.8.0+Atmel3.5.0-1_all.deb binutils-avr_2.25+Atmel3.5.0-2_amd64.deb
-    fi
-    if [[ ! " ${AVR_FLAVORS} " =~ " ${FLAVOR} " || ${FLAVOR} == "ALL" ]]; then
-      sudo apt-get --yes --force-yes install gcc-arm-none-eabi
-      # Trying to build with gcc-arm 4.7 isn't working because it can't find the compiler, despite adding to PATH (in commit-tests.sh) by defining GCC_ARM above 
+  - sudo apt-get --yes --force-yes install curl libmpfr4 libmpc3 libfox-1.6-dev libgtest-dev
+  - sudo apt-get --yes --force-yes install gcc-arm-none-eabi
+      # Trying to build with gcc-arm 4.7 isn't working because it can't find the compiler, despite adding to PATH (in commit-tests.sh) by defining GCC_ARM above
       # - wget --quiet https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
       # - tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
       # - mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi
-    fi
   - sudo apt-get install --yes --force-yes -qq qt${QT_BASE}base qt${QT_BASE}multimedia qt${QT_BASE}svg qt${QT_BASE}tools; source /opt/qt${QT_BASE}/bin/qt${QT_BASE}-env.sh
 
 script:

CMakeLists.txt

@@ -2,14 +2,15 @@ project(OpenTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "2")
-set(VERSION_REVISION "2")
+set(VERSION_REVISION "0")
+string(TIMESTAMP BUILD_YEAR "%Y")
 set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
-set(SDCARD_REVISION "0015")
+set(SDCARD_REVISION "0018")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0020 NEW)
 cmake_policy(SET CMP0023 OLD)
 if(POLICY CMP0042)
@@ -43,7 +44,7 @@ today(DATE)
 now(TIME)
 git_id(GIT_STR)
 
-message(STATUS "OpenTX ${VERSION} @${GIT_STR}")
+message(STATUS "OpenI6X ${VERSION} @${GIT_STR}")
 
 # options shared by all targets
 
@@ -72,9 +73,13 @@ else()
   set(LUA NO)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")  # regular Clang or AppleClang
+  set(CLANG TRUE)
+endif()
+
 option(DISABLE_COMPANION "Disable building companion and simulators" OFF)
 
-if(NOT DISABLE_COMPANION)
+if(NOT DISABLE_COMPANION)  # FIXME cosmetics/style
 find_package(Qt5Core)
 find_package(Qt5Widgets)
 find_package(Qt5Xml)
@@ -114,6 +119,9 @@ if(Qt5Core_FOUND)
   list(APPEND APP_COMMON_DEFINES -DQXT_STATIC)
   list(APPEND APP_COMMON_DEFINES -DQT_USE_QSTRINGBUILDER)  # more efficient QString construction using % operator
 
+  if(MSVC)
+    list(APPEND APP_COMMON_DEFINES -D__STDC_LIMIT_MACROS)
+  endif()
   if(APP_CUSTOM_DBG_HANDLER)
     # provide full qDebug log context to our custom handler. This may also affect libsimulator, which is why it is here
     list(APPEND APP_COMMON_DEFINES -DQT_MESSAGELOGCONTEXT)
@@ -153,7 +161,7 @@ if(Qt5Core_FOUND OR FOX_FOUND)
     message(STATUS "SDL not found! Simulator audio, and joystick inputs, will not work.")
   endif()
 endif()
-endif()
+endif(NOT DISABLE_COMPANION)
 
 # Check for a file that is typically left from a OpenTX 2.1 build and abort if found
 if (EXISTS ${RADIO_SRC_DIRECTORY}/stamp.h OR EXISTS ${RADIO_SRC_DIRECTORY}/translations/en.h)

CREDITS.txt

@@ -1395,3 +1395,99 @@ Giuseppe Esposito
 Stefano Boggia
 Manuel Peon
 Mark Bennett
+Nicholas Platts
+Carol B Meravi
+Norman Hunt
+Raymond Henderson
+Christopher Marshall
+Christopher Prinos
+AntiSocial Engineering
+Pierre Duvezin-Caubet
+Hermann Haberer
+Guy Poignonec
+Robin Lauff
+Renato Müller
+Hannes Mössler
+Cédric Lagoutte
+Alexander Mathis
+Barry Andersen
+Philippe Glur
+Felix Tang
+Heiko Polig
+Pierre Marty
+Dirk Weiler
+Eddie Ehlin
+John Clarke
+Laurent Thibaudet
+James A Davey
+Stuart Olson
+claudio Piccinini
+Kenneth Kriegel
+Evening Shade Pottery
+Raymond Henderson
+Clifton Hipsher 
+François Carton
+Olivier Portron
+Didier Hochedez
+Julien Gérard
+Christian Syrbe
+Juan Luis Guerrero Portero
+Jonathan Badley
+Ms Place
+Heart of NM LLC
+Daniele Gnesutta
+Erik Peterson
+SkyRaccoon
+James Lummel
+Jürgen Husske
+Marko Domagoj Zic
+Fabrice Debonnet 
+Ms Place
+Jörg Hammer
+Rapid Informatics LLC
+Renaud Perriguey
+Edmond Dufresne
+Jaroslav Gazik
+Philippe Desrichard
+Vincent Heron
+Marcel Schäfer
+Stefano Pascucci
+Frédéric Bourgois
+Stefan Hufnagl
+Jean Philippe Bonacci
+Jack Mitchell
+Santiago Iglesias Garcia
+Steve Kurywchak
+Tore Skjefstad
+Sergio Digiandco di Molino
+Xavier Delepine
+Miles Shearman
+Bernard Teyssier
+Entel Consulting BVBA
+Stuart Olson
+Maximilian Wechselberger
+Kenneth Crump
+Ken Elder
+Darko Perković
+Martin Krueger
+Jack Lopes
+Huguette Viale
+Didier Christien
+Pascal Roublot
+Arnaud Sourisse
+Aldo Midali
+Sidney Gates
+Serhiy Semenenko 
+Miguel Esquer Ramiro
+Stefan Grunenberg
+Ferenc Kunkli
+Stefano Boggia
+Lee Bennett
+Morgantech
+Marek Přikryl
+Peter Scott
+Ernst Camenzind
+Steve Robbins
+Jean Noel Berlan
+Walter Szempruch
+Petr Kysela