Merge pull request #4 from opentx/2.3

Merge from Original
opentx · Apr 19, 2021 · 2fc68b1 · 2fc68b1
2 parents e762c23 + 3d5f8b2
commit 2fc68b1
Show file tree

Hide file tree

Showing 552 changed files with 48,373 additions and 16,092 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,8 @@ addons:
       - libmpc3
       - libfox-1.6-dev
       - libgtest-dev
+      - lib32stdc++6
+      - libclang-common-6.0-dev
       - clang-6.0
       - python3-pip
 
@@ -44,6 +46,8 @@ before_install:
   - sudo ln -s /opt/gcc-arm-none-eabi/bin/arm-none-eabi-size /usr/bin/arm-none-eabi-size
   - 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
   - sudo ln -sf /usr/bin/python3 /usr/bin/python
+  - python3 -m pip install pip==20.3.3
+  - sudo apt-get install python3-setuptools
   - python3 -m pip install pillow clang
 
 script:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,11 +2,11 @@ project(OpenTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "3")
-set(VERSION_REVISION "10")
+set(VERSION_REVISION "12")
 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 "0029")
+set(SDCARD_REVISION "0036")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
 cmake_minimum_required(VERSION 2.8)