Revert sync at 1000Hz, it is too CPU taxing: #474

cleanup, naming
cleanup
2025-05-04 12:09:31 +02:00 · 2025-04-19 18:35:24 +02:00 · 2025-04-19 10:40:02 +02:00 · 2025-04-13 18:36:41 +02:00 · 2025-04-10 21:55:57 +02:00 · 2025-04-10 21:51:24 +02:00
424 changed files with 8016 additions and 46112 deletions
@@ -2,90 +2,87 @@
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1

-parameters:
-  build-version:
-    type: string
-    default: "1.4.0"
-
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  build-elrsv2:
-    machine:
-      image: ubuntu-2004:202111-02
-    steps:
-     - checkout
-     - run: |
-         git rev-parse --short=8 HEAD > git_tag.txt
-         docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO PPM_UNIT=PERCENT_PREC0 DEBUG=NO PCBI6X_ELRSV2=YES" -v $PWD:/opentx vitass/opentx-fw-build
-     - store_artifacts:
-        path: opentx-i6x-<< pipeline.parameters.build-version >>.bin
-        destination: openi6x-<< pipeline.parameters.build-version >>-elrsv2.bin
-  build-standard:
-    machine:
-      image: ubuntu-2004:202111-02
-    steps:
-      - checkout
-      - run: |
-          git rev-parse --short=8 HEAD > git_tag.txt
-          docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO PPM_UNIT=PERCENT_PREC0 DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build
-      - store_artifacts:
-          path: opentx-i6x-<< pipeline.parameters.build-version >>.bin
-          destination: openi6x-<< pipeline.parameters.build-version >>.bin
-  build-heli:
-    machine:
-      image: ubuntu-2004:202111-02
-    steps:
-      - checkout
-      - run: |
-          git rev-parse --short=8 HEAD > git_tag.txt
-          docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=YES GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO PPM_UNIT=PERCENT_PREC0 DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build
-      - store_artifacts:
-          path: opentx-i6x-<< pipeline.parameters.build-version >>.bin
-          destination: openi6x-<< pipeline.parameters.build-version >>-heli.bin
-  publish-github-release:
+  build-std:
    docker:
-      - image: cibuilds/github:0.13
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
    steps:
-      - attach_workspace:
-          at: /tmp
-      - run:
-          name: "Publish Release on GitHub"
-          command: |
-            ls -la
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete nightly-latest $CIRCLE_ARTIFACTS/
-# Invoke jobs via workflows
-# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-std-dfplayer:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_DFPLAYER -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-heli:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_HELI -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-heli-dfplayer:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_HELI_DFPLAYER -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-en:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_DFPLAYER -bI6X_HELI -bI6X -tEN $PWD/
+      - store_artifacts:
+          path: output
+
 workflows:
  openi6x-release-workflow:
    jobs:
-      - build-elrsv2 #:
-#          filters:
-#            branches:
-#              only:
-#                - master
-#              ignore: /.*/
-#            tags:
-#              only: /openi6x-*$/
-      - build-standard #:
-#          filters:
-#            branches:
-#              only: /master$/
-#              ignore: /.*/
-#            tags:
-#              only: /openi6x-*$/
-      - build-heli #:
-#          filters:
-#            branches:
-#              only: /master$/
-#              ignore: /.*/
-#            tags:
-#              only: /openi6x-*$/
-#      - publish-github-release:
-##          filters:
-##            branches:
-##              only: master
-#          requires:
-#            - build-elrsv2
-#            - build-gvars
-#            - build-heli
+      - build-en:
+          filters:
+            branches:
+              ignore:
+                - master
+                - /.*-maintenance/
+      - build-std:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-std-dfplayer:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-heli:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-heli-dfplayer:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
@@ -26,6 +26,5 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.

 **General information**
- - OpenTX version (e.g. 2.1.23 or N123)
- - Hardware (e.g. Frsky X9D+ or 9X Pro)
- - OpenTX Companion (e.g. 2.1.23 on Ubuntu 16.04)
+ - OpenI6X version (e.g. 1.8.0)
+ - Hardware (e.g. external module model)
@@ -21,4 +21,3 @@ build.sh
 firm.sh
 flash.sh
 *.patch
-git_tag.txt
@@ -0,0 +1,7 @@
+# .gitpod.yml
+image:
+  file: Dockerfile
+
+tasks:
+  - init: echo 'Welcome!'
+  - command: mkdir build && cd build
@@ -1,7 +1,7 @@
 project(OpenTX)

-set(VERSION_MAJOR "1")
-set(VERSION_MINOR "4")
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "1")
 set(VERSION_REVISION "0")
 set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
@@ -9,7 +9,7 @@ set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFI
 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,15 +43,7 @@ today(DATE)
 now(TIME)
 git_id(GIT_STR)

-set(GIT_TAG_FILE "${PROJECT_SOURCE_DIR}/git_tag.txt")
-if(EXISTS ${GIT_TAG_FILE})
-  FILE(READ ${GIT_TAG_FILE} GIT_STR)
-  string(REPLACE "\n" "" GIT_STR ${GIT_STR})
-else()
-  message("${GIT_TAG_FILE} not found")
-endif()
-
-message(STATUS "OpenTX ${VERSION} @${GIT_STR}")
+message(STATUS "OpenI6X ${VERSION} @${GIT_STR}")

 # options shared by all targets

@@ -0,0 +1,46 @@
+# Dockerfile
+FROM archlinux:base
+RUN pacman -Syu --noconfirm
+
+# Install misc packages
+RUN pacman -S --noconfirm \
+    7zip \
+	arm-none-eabi-gcc \
+	arm-none-eabi-newlib \
+	base-devel \
+	bc \
+	cmake \
+	cpio \
+	curl \
+	dos2unix \
+	erofs-utils \
+	git \
+	less \
+	nano \
+	python \
+	python-pip \
+	python-pilkit \
+	screen \
+	tree \
+	unzip \
+	vim \
+	wget \
+	zip
+
+# HACK: Allow base-devel to run with root user
+RUN sed -i '/E_ROOT/d' /usr/bin/makepkg
+
+# Install yay
+RUN git clone https://aur.archlinux.org/yay-bin.git /tmp/yay-bin && \
+    cd /tmp/yay-bin && \
+	makepkg -si --noconfirm && \
+	cd && rm -rf /tmp/yay-bin
+
+#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0
+#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4
+
+# Personal dir dotfiles
+#ADD home /home/
+
+# Personal uploader scripts
+#ADD root/bin /usr/local/bin/
@@ -1,76 +1,59 @@
-# OpenI6X
-
-![OpenI6X](https://circleci.com/gh/OpenI6X/opentx.svg?style=shield)
-[![Release](https://img.shields.io/github/v/release/OpenI6X/opentx?include_prereleases)](https://github.com/OpenI6X/opentx/releases)
+[![Release](https://img.shields.io/github/v/release/OpenI6X/opentx?include_prereleases)](https://github.com/OpenI6X/opentx/releases/latest)
 [![GitHub all releases](https://img.shields.io/github/downloads/OpenI6X/opentx/total)](https://github.com/OpenI6X/opentx/releases)
+[![GitHub license](https://img.shields.io/github/license/OpenI6X/opentx)](https://github.com/openi6x/opentx/blob/master/LICENSE)
+![OpenI6X](https://circleci.com/gh/OpenI6X/opentx.svg?style=shield)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/openi6x/opentx/tree/master)
+[![Discord](https://img.shields.io/discord/973289741862727741.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/3vKfYNTVa2)

-**OpenTX** port for the venerable Flysky FS-i6X RC radio transmitter.
+![Banner](https://github.com/OpenI6X/opentx/blob/master/doc/flysky/banner.png?raw=true)

+# Custom OpenTX / EdgeTX for Flysky FS-i6X

-You can find instructions and videos contributed by fellow early adopters in the [RCGroups thread](https://www.rcgroups.com/forums/showthread.php?3916435-FlySky-I6X-port-of-OpenTX), [Telegram group](https://t.me/otx_flysky_i6x) and [Rakish Rc](https://www.youtube.com/c/RakishRc) youtube channel. 
+Join our [Discord](https://discord.gg/3vKfYNTVa2), [RCGroups](https://www.rcgroups.com/forums/showthread.php?3916435-FlySky-I6X-port-of-OpenTX) or [Telegram](https://t.me/otx_flysky_i6x) to contribute, discuss or get help.<br> 

-New contributions are highly welcome! See [developers guide](https://github.com/OpenI6X/opentx/wiki/Contribute).
+## Instructions

-### Nightly builds
-If you want to have all the latest features, fixes (and bugs) you can download latest build here:
-1. Go to: https://github.com/OpenI6X/opentx.
-2. Click on <span style="color:green;font-weight:700;font-size:20px">✓</span> icon next to latest commit id.
-3. Click on "Details" next to build of your choice.
-4. Click on "ARTIFACTS" tab.
-5. Download .bin file.
+- [FlySky i6X user interface](https://github.com/OpenI6X/opentx/wiki/Manual) and other differences to official EdgeTX/OpenTX devices.<br>
+- [EdgeTX manual](https://manual.edgetx.org/bw-radios)
+- [How to install, upgrade or restore firmware](https://github.com/OpenI6X/opentx/wiki/Flashing-&-Upgrading)<br>
+- [Developers guide, how to build](https://github.com/OpenI6X/opentx/wiki/Development)<br>
+- [Modifications](https://github.com/OpenI6X/opentx/wiki/Modifications)<br>

-## Installation
+## Comparison

-Go to the [wiki](https://github.com/OpenI6X/opentx/wiki) for detailed steps.
+| Feature                   | FlySky i6X | OpenI6X                      |
+|---------------------------|------------|------------------------------|
+| Channels                  | 6/10       | 16                           |
+| Mixers                    | 3          | 32                           |
+| Models                    | 20         | 20 / unlimited<sup>[1]</sup> |
+| Protocols                 | AFHDS, AFHDS2A, PPM | AFHDS2A + 16Ch modes, PPM, CRSF |
+| Trainer                   | PPM        | PPM, SBUS                    |
+| Timers                    | _          | ✓                            |
+| Voice annoucements        | _          | ✓<sup>[2]</sup>              |
+| Variometer                | _          | ✓                            |
+| ExpressLRS ready          | _          | ✓ Configurator built-in (no need for LUA) |
+| Adjustable screen brightness | _       | ✓<sup>[3]</sup>              |
+| USB Modes                 | Joystick   | Joystick, Storage, Serial (Telemetry mirror, Debug) |
+| AUX Serial port           | _          | ✓ SBUS Trainer, Telemetry mirror, Debug |
+| FlySky FS-HZCZ03-ADJ Gimbal support | _   | ✓<sup>[4]</sup>    |
+| Languages                 | EN, CN      | PL, EN, CZ, DE, ES, FI, FR, IT, NL, PT, SE |

-## Features 
+<sub>[1] Unlimited by using USB mass storage mode eeprom backup/restore.</sub><br>
+<sub>[2] By adding DFPlayer, see [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#dfplayer) in wiki.</sub><br>
+<sub>[3] By wiring 2 pads, see [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#adjustable-backlight-level) in wiki.</sub><br>
+<sub>[4] See [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#flysky-fs-hzcz03-adj-gimbal) in wiki.</sub>
+  
+## Credits

-* Protocols:
-  * AFHDS2A with SBUS, IBUS and extended SBUS16, IBUS16 - 16 channels modes
-  * PPM in/out
-  * CRSF with ExpressLRS and Crossfire modules, CRSFshot enabled
-    * MEGA Bauds up to 1.8M
-    * ExpressLRS V2 configuration (ELRSV2.lua port)
-* 16 channels
-* Telemetry, up to 26 sensors
-* Audio tones, alarms and vario sound custom implementation
-* DFU bootloader - Start by pushing trims to the center, like regular OpenTX one
-* USB Joystick & Storage modes (To enable on standard cable: General Settings > USB Detect: Once)
-
-## Navigation
-
-| Key | Function                                                                           |
-| --- |------------------------------------------------------------------------------------|
-| UP     | Up. Hold on main screen for stats.                                                 |                              
-| DOWN   | Down. Hold on main screen for telemetry                                            |                                  
-| OK     | Confirm. Hold on main screen for model menu.                                       |
-| CANCEL | Exit.                                                                              |                      
-| BIND   | Scroll pages right or left (long press), go right in a line. Hold on main screen for general menu. |
-| LEFT POT | Change edited value.                                                               |
-
-
-## Shutdown
-
-Do not switch off you device when you see small square icon in top right corner of main screen - it indicates that there are settings not yet stored. Wait until it disappears or use graceful shutdown method.
-
-FlySky FS-i6X don't have graceful shutdown button like other OpenTX devices, but you can trigger it by holding CANCEL button until screen turns off, then use switch.
-
-When to use this method:
-* With USB connected - when USB is connected then settings are not stored with standard delay.
-* To save timers.
-
-## Mode 1
-
-With Mode 1 radio you may experience inverted gimbal movement and swapped gimbals on main screen. To fix this swap gimbal connectors (red-white one with black-white one).
-
-## Hardware connections (optional)
-
-![hw](https://github.com/OpenI6X/opentx/raw/master/doc/flysky/openi6x_hardware.jpeg?raw=true)
-
-## Contributors
-
-* ExpressLRS V2 config, USB support, sound support, bootloader, backporting, bugfixing - Janek ([ajjjjjjjj](https://github.com/ajjjjjjjj)) ongoing collaboration.
-* All the RF code was taken from the great KotelloRC's [erfly6: Er9X for i6 and i6x](https://bitbucket.org/KotelloRC/erfly6/src/master/).
+* Janek ([ajjjjjjjj](https://github.com/ajjjjjjjj)), continues Kuba's and Mariano's work, added sound, USB, ExpressLRS V2/V3 configuration, telemetry mirror, SBUS trainer, new/fixed drivers, ports, bugfixes.
+* Mariano ([marianomd](https://github.com/marianomd)), continued Kuba's work and made it up to useable condition! Added gimbals, buttons, AFHDS2A, PPM, CRSF.
+* Kuba ([qba667](https://github.com/qba667)), started this work and made this project possible, it is forked from his repo.
+* Wilhelm ([wimalopaan](https://github.com/wimalopaan)) added 16 channels SBUS16 / IBUS16 modes.
+* Rafael ([rafolg](https://github.com/rafolg)), ported FlySky Hall Gimbal support from EdgeTX.
+* Tom ([tmcadam](https://github.com/tmcadam)) fixed AFHDS2A PWM mode selection.
+* The internal RF code was taken from the great KotelloRC's [erfly6: Er9X for i6 and i6x](https://bitbucket.org/KotelloRC/erfly6/src/master/).
+* Some of the internal RF fixes are a result of analysing [pascallanger's](https://github.com/pascallanger) [DIY-Multiprotocol-TX-Module](https://github.com/pascallanger/DIY-Multiprotocol-TX-Module).
+* ExpressLRS configurator is based on elrsV2/V3.lua from [ExpressLRS](https://github.com/ExpressLRS/ExpressLRS).
+* Some of the ports are from [EdgeTX](https://github.com/EdgeTX/edgetx/).
 * ADC code taken from [OpenGround](https://github.com/fishpepper/OpenGround).
-* This work is based on Jakub's ([qba667](https://github.com/qba667)) work and is forked from his repo.
 * All the contributors of [OpenTX](https://github.com/opentx/opentx/). 
@@ -161,24 +161,24 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
  if (func <= FuncInstantTrim) {
    return QString("%1").arg(param);
  }
-  else if (func==FuncLogs) {
+  else if (func == FuncLogs) {
    return QString("%1").arg(param/10.0) + tr("s");
  }
-  else if (func==FuncPlaySound) {
+  else if (func == FuncPlaySound) {
    CustomFunctionData::populatePlaySoundParams(qs);
    if (param>=0 && param<(int)qs.count())
      return qs.at(param);
    else
      return tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
-  else if (func==FuncPlayHaptic) {
+  else if (func == FuncPlayHaptic) {
    CustomFunctionData::populateHapticParams(qs);
    if (param>=0 && param<(int)qs.count())
      return qs.at(param);
    else
      return tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
-  else if (func==FuncReset) {
+  else if (func == FuncReset) {
    QComboBox cb;
    CustomFunctionData::populateResetParams(model, &cb);
    int pos = cb.findData(param);
@@ -187,11 +187,11 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
    else
      return tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
-  else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
+  else if (func == FuncVolume || func == FuncPlayValue || func == FuncBacklight) {
    RawSource item(param);
    return item.toString(model);
  }
-  else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
+  else if (func == FuncPlayPrompt || func == FuncPlayBoth) {
    if ( getCurrentFirmware()->getCapability(VoicesAsNumbers)) {
      return QString("%1").arg(param);
    }
@@ -199,7 +199,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
      return paramarm;
    }
  }
-  else if ((func>=FuncAdjustGV1) && (func<FuncCount)) {
+  else if (func >= FuncAdjustGV1 && func < FuncCount) {
    switch (adjustMode) {
      case FUNC_ADJUST_GVAR_CONSTANT:
        return tr("Value ")+QString("%1").arg(param);
@@ -239,11 +239,12 @@ QString CustomFunctionData::repeatToString() const

 QString CustomFunctionData::enabledToString() const
 {
-  if ((func>=FuncOverrideCH1 && func<=FuncOverrideCH32) ||
-      (func>=FuncAdjustGV1 && func<=FuncAdjustGVLast) ||
-      (func==FuncReset) ||
-      (func>=FuncSetTimer1 && func<=FuncSetTimer2) ||
-      (func==FuncVolume) ||
+  if ((func >= FuncOverrideCH1 && func <= FuncOverrideCH32) ||
+      (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast) ||
+      (func == FuncReset) ||
+      (func >= FuncSetTimer1 && func <= FuncSetTimer2) ||
+      (func == FuncVolume) ||
+      (func == FuncBacklight) ||
      (func <= FuncInstantTrim)) {
    if (!enabled) {
      return tr("DISABLED");
@@ -257,7 +258,7 @@ void CustomFunctionData::convert(RadioDataConversionState & cstate)
  cstate.setComponent(tr("CFN"), 8);
  cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
  swtch.convert(cstate);
-  if (func == FuncVolume || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
+  if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
    param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
  }
 }
@@ -58,8 +58,11 @@ class SensorData {
      TELEM_CELL_INDEX_4,
      TELEM_CELL_INDEX_5,
      TELEM_CELL_INDEX_6,
+//      TELEM_CELL_INDEX_7, // PCBI6X: uses RAM and I don't think someone will use 8S with i6X
+//      TELEM_CELL_INDEX_8,
      TELEM_CELL_INDEX_HIGHEST,
      TELEM_CELL_INDEX_DELTA,
+      TELEM_CELL_INDEX_LAST = TELEM_CELL_INDEX_DELTA
    };

    enum
@@ -717,28 +717,28 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
 {
  QStringList qs;
  b->setModel(new QStandardItemModel(b));  // clear combo box but not any shared item model
-  if (function==FuncPlaySound) {
+  if (function == FuncPlaySound) {
    CustomFunctionData::populatePlaySoundParams(qs);
    b->addItems(qs);
    b->setCurrentIndex(value);
  }
-  else if (function==FuncPlayHaptic) {
+  else if (function == FuncPlayHaptic) {
    CustomFunctionData::populateHapticParams(qs);
    b->addItems(qs);
    b->setCurrentIndex(value);
  }
-  else if (function==FuncReset) {
+  else if (function == FuncReset) {
    CustomFunctionData::populateResetParams(model, b, value);
  }
-  else if (function==FuncVolume) {
+  else if (function == FuncVolume || function == FuncBacklight) {
    b->setModel(rawSrcInputsItemModel);
    b->setCurrentIndex(b->findData(value));
  }
-  else if (function==FuncPlayValue) {
+  else if (function == FuncPlayValue) {
    b->setModel(rawSrcAllItemModel);
    b->setCurrentIndex(b->findData(value));
  }
-  else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
+  else if (function >= FuncAdjustGV1 && function <= FuncAdjustGVLast) {
    switch (adjustmode) {
      case 1:
        b->setModel(rawSrcInputsItemModel);
@@ -1 +0,0 @@
-/settings.sh
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-# in this file define ssh options (like private key)
-source ~/.opentx-jenkins-settings
-
-function download() {
-  # $1 is release directory name
-  mkdir -p ${1}
-  scp ${SCP_OPT} ${USERNAME}@jenkins.open-tx.org:/home/opentx/${1}/*.sh ${1}/
-  #chmod 774 ${1}/*.sh
-}
-
-download release-20
-download nightly-21
-download release-21
-download nightly-22
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-source ./version.sh
-
-# release all components
-./release-companion.sh
-./release-firmware.sh
-
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-DESTDIR=/var/www/html/downloads-${version}/nightly/companion
-
-# clean radio source
-cd opentx/radio/src
-make clean
-
-# create companion rpm
-rm -rf   ${DIR}/companion-build/
-mkdir -p ${DIR}/companion-build/
-cd       ${DIR}/companion-build/
-cmake ../opentx/companion/src
-make package
-cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}
-
-make stamp
-chmod -Rf g+w . || true
-
-# request companion compilation on Windows
-cd ${DESTDIR}
-wget -qO- http://winbox.open-tx.org/companion-builds/compile21.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
-wget -O companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
-mv ${DIR}/opentx/companion/companion.stamp ./companion-windows.stamp
-
-chmod -Rf g+w . || true
-
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-# make the stamp
-cd opentx/radio/src
-make clean
-make opentx-stamp
-
-# create the sources tgz in the release directory
-cd ../../..
-tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
-
-# make lua fields for all radio variants
-cd opentx/radio/src
-make lua_exports_taranis.inc lua_exports_taranis_x9e.inc
-
-DESTDIR=/var/www/html/downloads-${version}/nightly/firmware
-
-# copy the stamp and the release-notes to the http server
-cd ${DIR}
-cp opentx/radio/src/stamp-opentx.txt ${DESTDIR}
-cp opentx/radio/releasenotes.txt     ${DESTDIR}
-cp opentx/radio/src/lua_fields_*.txt ${DESTDIR}
-echo ${OPENTX_VERSION_SUFFIX} >      ${DESTDIR}/suffix.txt
-
-# erase all previous builds
-rm -f ${DESTDIR}/binaries/opentx*.hex
-rm -f ${DESTDIR}/binaries/opentx*.bin
-
-# clean the sources
-cd opentx/radio/src
-make clean
-
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-source ./version.sh
-
-# pull the latest changes
-cd opentx
-git fetch
-git checkout $branch
-git reset --hard origin/$branch
-chmod -Rf g+w . || true
-
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# make stamp header and extract OpenTX version (ie 2.1.2)
-make -C opentx/radio/src stamp_header
-rel=`grep "VERS_STR" opentx/radio/src/stamp-opentx.h | cut -d' ' -f3 | tr -d '"'`
-release=${rel%$OPENTX_VERSION_SUFFIX}
-echo ${release}
-
-version=21
-branch=master
-winboxurl=http://winbox.open-tx.org/voice-builds
-
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-source ./version.sh
-
-# release all components
-./release-companion.sh
-./release-firmware.sh
-
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-DESTDIR=/var/www/html/downloads-${version}/nightlies/companion
-
-# clean radio source
-cd opentx/radio/src
-make clean
-
-# create companion rpm
-rm -rf   ${DIR}/companion-build/
-mkdir -p $_
-cd       $_
-cmake -DPCB=TARANIS ../opentx
-make package
-cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}/linux
-chmod -Rf g+w ${DESTDIR}/linux/companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm
-
-# request companion compilation on Windows
-cd ${DESTDIR}
-wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
-wget -O windows/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
-chmod -Rf g+w windows/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
-
-# update windows stamp
-cp $DIR/companion-build/version.h ./companion-windows.stamp
-chmod -Rf g+w ./companion-windows.stamp
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-# make the stamp
-cd opentx/radio/src
-make clean
-make stamp.h
-
-# create the sources tgz in the release directory
-cd ../../..
-tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
-
-# make lua fields for all radio variants
-cd opentx/radio/src
-make lua/lua_exports_taranis.inc lua/lua_exports_taranis_x9e.inc lua/lua_exports_horus.inc
-
-DESTDIR=/var/www/html/downloads-${version}/nightlies/firmware
-
-# copy the stamp and the release-notes to the http server
-cd $DIR
-cp opentx/radio/src/stamp.h              ${DESTDIR}/stamp-opentx.txt
-cp opentx/radio/releasenotes.txt         ${DESTDIR}
-cp opentx/radio/src/lua/lua_fields_*.txt ${DESTDIR}
-echo ${OPENTX_VERSION_SUFFIX} >          ${DESTDIR}/suffix.txt
-
-# erase all previous builds
-rm -f ${DESTDIR}/binaries/opentx*.hex
-rm -f ${DESTDIR}/binaries/opentx*.bin
-
-# clean the sources
-cd opentx/radio/src
-make clean
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-source ./version.sh
-
-# pull the latest changes
-cd opentx
-git fetch
-git checkout $branch
-git reset --hard origin/$branch
-chmod -Rf g+w . || true
-
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# make stamp header and extract OpenTX version (ie 2.1.2)
-make -C opentx/radio/src stamp.h
-rel=`grep "VERSION" opentx/radio/src/stamp.h | cut -d' ' -f3 | tr -d '"'`
-release=${rel%$OPENTX_VERSION_SUFFIX}
-echo ${release}
-
-version=22
-branch=next
-winboxurl=http://winbox.open-tx.org/voice-builds
-
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-cd ~opentx/release-20/
-
-# release all components
-./release-companion.sh
-#./release-voices.sh
-#./release-lua.sh
-./release-firmware.sh
-
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-cd ~opentx/release-20/
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve the version number
-cd opentx/radio/src
-line=`grep "VERSION = " Makefile`
-version=`expr "$line" : 'VERSION = \([0-9]\..*\)'`
-
-# create companion rpm
-rm -rf ~opentx/release-20/companion-build/
-mkdir -p $_
-cd $_
-cmake ../opentx/companion/src
-make package
-
-cp ./companion-$version-i686.rpm /var/www/html/downloads-20/companion/
-make stamp
-chmod -Rf g+w . || true
-
-# request companion compilation on Windows
-cd /var/www/html/downloads-20/companion/
-wget -qO- http://winbox.open-tx.org/companion-builds/compile20.php?branch=2.0
-wget -O companionInstall_$version.exe http://winbox.open-tx.org/companion-builds/companionInstall_$version.exe
-mv ~opentx/release-20/opentx/companion/companion.stamp ./companion-windows.stamp
-
-chmod -Rf g+w . || true
-
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-cd ~opentx/release-20/
-
-# pull the latest changes
-./update-repo.sh
-
-# make the stamp
-cd opentx/radio/src
-make clean
-make opentx-stamp
-make lua_exports.cpp
-
-# create the sources tgz in the release directory
-cd ../../..
-tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
-
-# copy the stamp and the release-notes to the http server
-cd ~opentx/release-20/
-cp opentx/radio/src/stamp-opentx.txt /var/www/html/downloads-20/firmware/
-cp opentx/radio/releasenotes.txt /var/www/html/downloads-20/firmware/
-cp opentx/radio/src/lua_fields.txt /var/www/html/downloads-20/firmware/
-
-# erase all previous builds
-rm -f /var/www/html/downloads-20/firmware/binaries/opentx*.hex
-rm -f /var/www/html/downloads-20/firmware/binaries/opentx*.bin
-
-# clean the sources
-cd opentx/radio/src
-make clean
-
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-cd ~opentx/release-20/
-
-# pull the latest changes
-./update-repo.sh
-
-# make the stamp
-cd opentx/radio/wizard/
-zip -r /var/www/html/lua-20/wizard.zip *.lua *.bmp
-
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# get voice packs
-wget -O /dev/null http://winbox.open-tx.org/voice-packs/compile.php
-cd /var/www/html/voices-20/opentx-taranis/en/
-wget -O english-irish-taranis.zip http://winbox.open-tx.org/voice-packs/english-irish-taranis.zip
-wget -O english-scottish-taranis.zip http://winbox.open-tx.org/voice-packs/english-scottish-taranis.zip
-wget -O english-american-taranis.zip http://winbox.open-tx.org/voice-packs/english-american-taranis.zip
-wget -O english-australian-taranis.zip http://winbox.open-tx.org/voice-packs/english-australian-taranis.zip
-# wget -O english-taranis.csv http://winbox.open-tx.org/voice-packs/english-irish-taranis.csv
-cd /var/www/html/voices-20/opentx-taranis/fr/
-wget -O french-taranis.zip http://winbox.open-tx.org/voice-packs/french-taranis.zip
-# wget -O french-taranis.csv http://winbox.open-tx.org/voice-packs/french-taranis.csv
-
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-cd ~opentx/release-20/
-
-# pull the latest changes
-cd opentx
-git fetch
-git checkout 2.0
-git reset --hard origin/2.0
-chmod -Rf g+w . || true
-
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-source ./version.sh
-
-# release all components
-./release-companion.sh
-./release-voices.sh
-./release-lua.sh
-./release-firmware.sh
-
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-DESTDIR=/var/www/html/downloads-${version}/companion
-
-# clean radio source
-cd opentx/radio/src
-make clean
-
-# create companion rpm
-rm -rf   ${DIR}/companion-build/
-mkdir -p ${DIR}/companion-build/
-cd       ${DIR}/companion-build/
-cmake ../opentx/companion/src
-make package
-cp ./companion${version}-${release}-i686.rpm ${DESTDIR}
-make stamp
-chmod -Rf g+w . || true
-
-# request companion compilation on Windows
-cd ${DESTDIR}
-wget -qO- http://winbox.open-tx.org/companion-builds/compile21.php?branch=${branch}
-wget -O companion-windows-${release}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}.exe
-mv ${DIR}/opentx/companion/companion.stamp ./companion-windows.stamp
-
-chmod -Rf g+w . || true
-
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-# make the stamp
-cd opentx/radio/src
-make clean
-make opentx-stamp
-
-# create the sources tgz in the release directory
-cd ../../..
-tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
-
-# make lua fields for all radio variants
-cd opentx/radio/src
-make lua_exports_taranis.inc lua_exports_taranis_x9e.inc
-
-DESTDIR=/var/www/html/downloads-${version}/firmware
-
-# copy the stamp and the release-notes to the http server
-cd ${DIR}
-cp opentx/radio/src/stamp-opentx.txt ${DESTDIR}
-cp opentx/radio/releasenotes.txt     ${DESTDIR}
-cp opentx/radio/src/lua_fields_*.txt ${DESTDIR}
-
-# erase all previous builds
-rm -f ${DESTDIR}/binaries/opentx*.hex
-rm -f ${DESTDIR}/binaries/opentx*.bin
-
-# clean the sources
-cd opentx/radio/src
-make clean
-
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# pull the latest changes
-./update-repo.sh
-
-# retrieve release after the repo update
-source ./version.sh
-
-# release wizard
-cd opentx/radio/wizard/
-zip -r /var/www/html/lua-${version}/wizard.zip *.lua *.bmp
-
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd ${DIR}
-
-# retrieve release after the repo update
-source ./version.sh
-
-# build voice packs
-wget -O /dev/null ${winboxurl}/compile.php?branch=${branch}
-
-# get voice packs
-cd /var/www/html/voices-${version}/opentx-taranis/en/
-wget -O english-irish-taranis.zip      ${winboxurl}/english-irish-taranis.zip
-wget -O english-scottish-taranis.zip   ${winboxurl}/english-scottish-taranis.zip
-wget -O english-american-taranis.zip   ${winboxurl}/english-american-taranis.zip
-wget -O english-australian-taranis.zip ${winboxurl}/english-australian-taranis.zip
-# wget -O english-taranis.csv ${winboxurl}/english-irish-taranis.csv # doesn't seem to work
-
-cd /var/www/html/voices-${version}/opentx-taranis/fr/
-wget -O french-taranis.zip             ${winboxurl}/french-taranis.zip
-# wget -O french-taranis.csv ${winboxurl}/french-taranis.csv #outdated
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-set -x
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-source ./version.sh
-
-# pull the latest changes
-cd opentx
-git fetch
-git checkout $branch
-git reset --hard origin/$branch
-chmod -Rf g+w . || true
-
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# make stamp header and extract OpenTX version (ie 2.1.2)
-make -C opentx/radio/src stamp_header
-rel=`grep "VERS_STR" opentx/radio/src/stamp-opentx.h | cut -d' ' -f3 | tr -d '"'`
-release=${rel%$OPENTX_VERSION_SUFFIX}
-echo ${release}
-
-version=21
-branch=master
-winboxurl=http://winbox.open-tx.org/voice-builds
-
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-# in this file define ssh options (like private key)
-source ~/.opentx-jenkins-settings
-
-function upload() {
-  # $1 is release directory name
-  # copy scripts to server
-  scp ${SCP_OPT} ${1}/*.sh ${USERNAME}@jenkins.open-tx.org:/home/opentx/${1}/
-}
-
-upload release-20
-upload nightly-21
-upload release-21
-upload nightly-22
@@ -1,12 +0,0 @@
-opentx-companion22 (2.2.1~ppa01~artful) artful; urgency=low
-
-  * New release 2.2.1~ppa01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:37 +0100
-
-opentx-companion22 (2.2.1~N432+test01~artful) artful; urgency=low
-
-  * New release 2.2.1~N432+test01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Fri, 10 Nov 2017 18:36:11 +0100
-
@@ -1,6 +0,0 @@
-opentx-companion22 (2.2.1~ppa01~bionic) bionic; urgency=low
-
-  * New release 2.2.1~ppa01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:37 +0100
-
@@ -1 +0,0 @@
-/suffix
@@ -1,21 +0,0 @@
-Source: opentx-companion22
-Section: utils
-Priority: optional
-Maintainer: projectkk2glider <projectkk2glider@gmail.com>
-Build-Depends: cmake,
-               build-essential,
-               python,
-               python-qt4,
-               qt5-default,
-               qttools5-dev-tools,
-               qtmultimedia5-dev,
-               qttools5-dev,
-               libsdl1.2-dev,
-               libqt5svg5-dev
-Homepage: http://www.open-tx.org/
-
-Package: opentx-companion22
-Architecture: any
-Depends: ${shlibs:Depends}, libqt5multimedia5-plugins
-Description: OpenTX Companion
- Models and settings editor for the OpenTX open source firmware
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-
-BUILDDIR = build_dir
-COMMON_OPTIONS = -DCMAKE_INSTALL_PREFIX=../debian/tmp/usr \
-                 -DSIMULATOR_INSTALL_PREFIX=/usr \
-                 -DFIRMWARE_TARGET=NO \
-                 -DGVARS=YES \
-                 -DHELI=YES \
-                 -DALLOW_NIGHTLY_BUILDS=NO \
-                 -DVERSION_SUFFIX=__VERSION_SUFFIX__
-
-STM32_OPTIONS = -DLUA=YES
-
-# secondly called by launchpad
-build:
-	mkdir $(BUILDDIR);
-
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) -DPCB=9X       ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) -DPCB=GRUVIN9X ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) -DPCB=MEGA2560 ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) -DPCB=SKY9X    ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) -DPCB=9XRPRO   ../ ; make libsimulator
-
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X7    ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X9D   ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X9D+  ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X9E   ../ ; make libsimulator
-	cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X12S ../ ; make libsimulator
-
-	make -C $(BUILDDIR) companion22 simulator22
-
-# thirdly called by launchpad
-binary: binary-indep binary-arch
-
-binary-indep:
-	# nothing to be done
-
-binary-arch:
-	# final cmake neede in order to find all simulators
-	cd $(BUILDDIR); cmake ../
-	cd $(BUILDDIR); cmake -P cmake_install.cmake
-	mkdir debian/tmp/DEBIAN
-	dpkg-shlibdeps debian/tmp/usr/bin/companion22 debian/tmp/usr/bin/simulator22 debian/tmp/usr/lib/companion22/*
-	dpkg-gencontrol -popentx-companion22
-	dpkg --build debian/tmp ..
-
-# firstly called by launchpad
-clean:
-	rm -rf $(BUILDDIR)
-
-.PHONY: binary binary-arch binary-indep clean
@@ -1,72 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-# $1 is distribution "trusty" OR "yakkety"
-#
-# Option "-n" or "--nightly" can be used to configure build script to produce a Companion with DALLOW_NIGHTLY_BUILDS=YES flag
-
-
-cd `dirname ${0}`
-
-nightly_build=0
-
-while [ $# -gt 0 ]
-do
-  case "$1" in
-    --nightly*)
-      nightly_build=1;;
-    -n*)
-      nightly_build=1;;
-    -*)
-      echo >&2 "usage: $0 [-n|--nightly] DISTRO"
-      exit 1;;
-    *)
-      break;;   # terminate while loop
-  esac
-  shift
-done
-
-
-distro=${1%/}
-
-. common/suffix
-
-if [ -z ${distro} ] ; then
-  echo "Missing distribution name"
-  exit 1
-fi
-
-if [ ! -d ${distro} ] ; then
-  echo "Files for ${distro} not found. Most likely unsupported distribution. Aborting..."
-  exit 1
-fi
-
-echo "Preparing sources for ${distro}..."
-
-# prepare debian directory
-rm -f ../debian/*
-mkdir -p ../debian/
-cp common/* ../debian/
-cp ${distro}/* ../debian/
-
-
-if [ ${nightly_build} -gt 0 ] ; then
-  echo "Editing rules to set version suffix to \"${suffix}\""
-  sed -i "s/__VERSION_SUFFIX__/${suffix}/g" ../debian/rules
-  echo "Setting nightly build flag"
-  sed -i "s/DALLOW_NIGHTLY_BUILDS=YES/DALLOW_NIGHTLY_BUILDS=YES/g" ../debian/rules
-else
-  sed -i "s/__VERSION_SUFFIX__//g" ../debian/rules
-  sed -i "s/DALLOW_NIGHTLY_BUILDS=YES/DALLOW_NIGHTLY_BUILDS=NO/g" ../debian/rules
-fi
-
-# remove old package and prepare new one
-cd ..
-rm -f  ../opentx-companion22_*${distro}*
-debuild -S -sa -I -Ijenkins -Ilaunchpad -Idoc -Ibuild -I*.luac
-
-echo "Use this command to upload to launchpad (nightly builds):"
-echo "  dput ppa:opentx-test/ppa opentx-companion22_<version>.changes"
-echo "OR releases:"
-echo "  dput ppa:opentx-test/rel opentx-companion22_<version>.changes"
@@ -1,108 +0,0 @@
-# Launchpad instructions
-
-## General description
-
-This directory contains files and scripts that help to prepare the files needed by the Launchpad.net server to build the Debian packages of OpentX Companion for Ubuntu.
-
-Each supported release of Ubuntu has its own sub-directory, but most of the files reside in the common directory. When preparing a source for certain Ubuntu release always use its the directory name.
-
-There are several step to release a new version of Companion on Launchpad:
- * update the Debian changelog
- * package the source
- * upload the source to Launchpad
-
-The steps above should be repeated for every Ubuntu release. The example below will work with Ubuntu `trusty`
-
-## Prerequisites
-
- * you must have launchpad.net account and be a member of the team
- * create and configure your GPG signing key
-
-## Prepare your GPG key
-
-Create GPG key using **name** and **email* that will later appear in the changelog. This will be the key
-that will be used to sign the package before uploading it to Launchpad.
-```
-gpg --gen-key
-```
-
-Upload your GPG key (public part) to the Ubuntu key-server. First get the KEY ID (8 characters) of your key:
-```
-gpg --list-keys
-```
-
-Then upload it (replace <KEY ID> with your key ID):
-```
-gpg --send-keys --keyserver keyserver.ubuntu.com <KEY ID>
-```
-
-## Create a Launchpad account
- * Go to https://launchpad.net/ and sign-in or register.
- * Associate your GPG key with your launchpad account. You will need your keys fingerprint (<fingerprint looks like E448 37D6 EF6E F13C 30C0  415C E7A0 818F 4864 9459>), get it with:
-```
-gpg --fingerprint
-```
- * Join OpenTX team on launchpad (one of admins will add you to the team).
-
-
-## Step 1: update the Debian changelog
-
-You can edit changelog manually, but it is simpler to use a script that creates a generic entry in the changelog. You can always edit it later if needed.
-
-The script is `update-changelog.sh` and it takes 4 parameters:
- * email address in the form of `name <email@address>`, since it contains a space it must be enclosed in quotation marks. The email addres must be the same as the one in your GPG key!
- * Ubuntu release (directory name)
- * OpenTX version
- * OpenTX sub-version (Nxxx for nightly builds)
-
-Example:
-```
-cd opentx/launchpad
-./update-changelog.sh "projectkk2glider <projectkk2glider@gmail.com>" trusty 2.2.0 N363
-```
-
-If there is an error and you need to build another version of the same OpenTX release, then just add `.n` to the sub-version like so:
-```
-N363.1
-N363.2
-etc
-```
-
-The script will append new section to the existing file in this case `trusty/changelog`. Now you have a chance to edit the file manually if needed.
-
-## Step 2: prepare files for upload (package the source)
-
-First make sure you don't have any files that you don't want included in the opentx directory. Then use the script `prepare.sh` with the name of release as the first parameter:
-
-```
-cd opentx/launchpad
-./prepare.sh trusty
-```
-
-The result of this script are three files which are placed outside the OpenTX source tree at the same level as `opentx` directory:
-```
-ls -1 ../../opentx-companion22_2.2.0~N363*
-../../opentx-companion22_2.2.0~N363~trusty.dsc
-../../opentx-companion22_2.2.0~N363~trusty_source.build
-../../opentx-companion22_2.2.0~N363~trusty_source.changes
-../../opentx-companion22_2.2.0~N363~trusty.tar.gz
-```
-
-You should now make sure that the just build source archive `opentx-companion22_2.2.0~N363~trusty.tar.gz` does not contain any files or directories that you don;t want to share with the world, because this is one of the files that will be uploaded to the Launchpad server. Currently clean OpenTX tree produces this file with approximate size of 16.8MB.
-
-## Upload the source to the Launchpad
-
-Last step it to upload the new release to the Launchpad server and wait for it to be built. Use `dput` command with two arguments:
- * name of the PPA `ppa:opentx-test/ppa` (your public key must be associated with that PPA)
- * name of the release file `<dsfsfggg>.changes`
-
-Upload to nightly PPA:
-```
-dput ppa:opentx-test/ppa ../../opentx-companion22_2.2.0~N363~trusty_source.changes
-```
-
-Upload to release PPA:
-```
-dput ppa:opentx-test/rel ../../opentx-companion22_2.2.0~N363~trusty_source.changes
-```
-
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-# $1 is changelog user and email, example "projectkk2glider <projectkk2glider@gmail.com>"
-# $2 is distribution "trusty" OR "yakkety"
-# $3 is version, example "2.2.1"
-# $4 is suffix (optional, used for nightly builds, example "N360")
-
-email=${1}
-distro=${2%/}
-version=${3}
-suffix=${4}
-
-echo "Updating changelog for ${distro}"
-
-cd `dirname ${0}`
-
-[ -z ${distro} ] && echo "Missing distribution name" && exit 1;
-[ ! -z ${suffix} ] && version=${version}~${suffix}
-
-if [ ! -d ${distro} ] ; then
-  echo "${distro} changelog not found. Most likely unsupported distribution. Aborting..."
-  exit 1
-fi
-
-echo "opentx-companion22 (${version}~${distro}) ${distro}; urgency=low" > tmp-changelog
-echo "" >> tmp-changelog
-echo "  * New release ${version}" >> tmp-changelog
-echo "" >> tmp-changelog
-echo " -- ${email}  "`date -R` >> tmp-changelog
-echo "" >> tmp-changelog
-
-cat tmp-changelog ${distro}/changelog > new-changelog
-mv new-changelog ${distro}/changelog
-rm tmp-changelog
-
-echo "suffix=${suffix}" > common/suffix
-
-echo "Result:"
-cat ${distro}/changelog | head -n 20
@@ -1,23 +0,0 @@
-opentx-companion22 (2.2.1~ppa01~xenial) xenial; urgency=low
-
-  * New release 2.2.1~ppa01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:44 +0100
-
-opentx-companion22 (2.2.1~N432+test01~xenial) xenial; urgency=low
-
-  * New release 2.2.1~N432+test01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Fri, 10 Nov 2017 18:55:08 +0100
-
-opentx-companion22 (2.2.0~ppa02~xenial) xenial; urgency=low
-
-  * New release 2.2.0~ppa02
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Wed, 31 May 2017 22:37:54 +0200
-
-opentx-companion22 (2.2.0~ppa01~xenial) xenial; urgency=low
-
-  * OpenTX version 2.2.0
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Wed, 31 May 2017 21:50:57 +0200
@@ -1,12 +0,0 @@
-opentx-companion22 (2.2.1~ppa01~zesty) zesty; urgency=low
-
-  * New release 2.2.1~ppa01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Sun, 17 Dec 2017 17:32:48 +0100
-
-opentx-companion22 (2.2.1~N432+test01~zesty) zesty; urgency=low
-
-  * New release 2.2.1~N432+test01
-
- -- projectkk2glider <projectkk2glider@gmail.com>  Fri, 10 Nov 2017 18:37:33 +0100
-
@@ -3,7 +3,8 @@ include(Bitmaps)

 set(PCB_TYPES X7 XLITE X9D X9D+ X9E X10 X12S SKY9X 9XRPRO AR9X I6X)
 set(GUI_LANGUAGES CZ DE EN ES FR IT PT SK SE PL HU NL)
-set(TTS_LANGUAGES CZ DE EN ES FR IT PT SK SE PL HU NL RU)
+#set(TTS_LANGUAGES CZ DE EN ES FR IT PT SK SE PL HU NL RU)
+set(TTS_LANGUAGES EN) # i6X dfplayer

 set(PCB "X9D+" CACHE STRING "Radio type, one of: ${PCB_TYPES}")
 set_property(CACHE PCB PROPERTY STRINGS ${PCB_TYPES})
@@ -11,8 +12,6 @@ set(TRANSLATIONS "EN" CACHE STRING "Radio language, one of: ${GUI_LANGUAGES}")
 set_property(CACHE TRANSLATIONS PROPERTY STRINGS ${GUI_LANGUAGES})
 set(SPLASH "DEFAULT" CACHE STRING "Splash (DEFAULT/OFF/FRSKY)")
 set_property(CACHE SPLASH PROPERTY STRINGS DEFAULT OFF FRSKY)
-set(PPM_UNIT "PERCENT_PREC1" CACHE STRING "PPM display unit (US/PERCENT_PREC1/PERCENT_PREC0)")
-set_property(CACHE PPM_UNIT PROPERTY STRINGS US PERCENT_PREC1 PERCENT_PREC0)
 set(DEFAULT_MODE "" CACHE STRING "Default sticks mode")
 set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
 set_property(CACHE FONT PROPERTY STRINGS SQT5)
@@ -48,7 +47,8 @@ option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF)
 option(NANO "Use nano newlib and binalloc")
 option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF)
 option(MODULE_R9M_FLEX_FW "Add R9M options for non certified firmwwares" OFF)
-option(PXX2 "Enable PXX v2 support" OFF)
+option(EXTPWR_INVERT "Enable inverted pwr enable on PC13" OFF)
+option(CRSF_FULLDUPLEX "Enable CRSF full duplex mode with RX on PA15" OFF)

 # since we reset all default CMAKE compiler flags for firmware builds, provide an alternate way for user to specify additional flags.
 set(FIRMWARE_C_FLAGS "" CACHE STRING "Additional flags for firmware target c compiler (note: all CMAKE_C_FLAGS[_*] are ignored for firmware/bootloader).")
@@ -272,14 +272,6 @@ if(SHUTDOWN_CONFIRMATION)
  add_definitions(-DSHUTDOWN_CONFIRMATION)
 endif()

-if(PPM_UNIT STREQUAL US)
-  add_definitions(-DPPM_UNIT_US)
-elseif(PPM_UNIT STREQUAL PERCENT_PREC1)
-  add_definitions(-DPPM_UNIT_PERCENT_PREC1)
-else()
-  add_definitions(-DPPM_UNIT_PERCENT_PREC0)
-endif()
-
 if(PPM_CENTER_ADJUSTABLE)
  add_definitions(-DPPM_CENTER_ADJUSTABLE)
 endif()
@@ -334,8 +326,12 @@ if(MODULE_R9M_FLEX_FW)
  add_definitions(-DMODULE_R9M_FLEX_FW)
 endif()

-if(PXX2)
-  add_definitions(-DPXX2)
+if(EXTPWR_INVERT)
+  add_definitions(-DEXTPWR_INVERT)
+endif()
+
+if(CRSF_FULLDUPLEX)
+  add_definitions(-DCRSF_FULLDUPLEX)
 endif()

 set(SRC
@@ -348,7 +344,7 @@ set(SRC
  mixer_scheduler.cpp
  stamp.cpp
  timers.cpp
-  trainer_input.cpp
+  trainer.cpp
  )

 if(GUI)
@@ -379,10 +375,8 @@ foreach(FILE ${PULSES_SRC})
  set(SRC ${SRC} pulses/${FILE})
 endforeach()

-add_definitions(-DCORRECT_NEGATIVE_SHIFTS)
-
 if(NOT MSVC)
-  set(WARNING_FLAGS "${WARNING_FLAGS} -Wall -Wno-strict-aliasing -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits")
+  set(WARNING_FLAGS "${WARNING_FLAGS} -Wall -Wno-address-of-packed-member -Wno-strict-aliasing -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits")
  if(WARNINGS_AS_ERRORS)
    set(WARNING_FLAGS "${WARNING_FLAGS} -Werror")
  endif(WARNINGS_AS_ERRORS)
@@ -450,14 +444,14 @@ if(NOT MSVC)
    set(CMAKE_SYSTEM_VERSION 1)
    set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -o <OBJECT> <SOURCE>")

-    set(COMMON_FLAGS "-mcpu=${MCU} -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=firmware.lst -O${OPT} -gdwarf-2 -DHSE_VALUE=${HSE_VALUE} -fno-exceptions -fdata-sections -ffunction-sections ${WARNING_FLAGS}")
+    set(COMMON_FLAGS "-mcpu=${MCU} -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=firmware.lst -O${OPT} -flto=auto -gdwarf-2 -DHSE_VALUE=${HSE_VALUE} -fno-exceptions -fdata-sections -ffunction-sections ${WARNING_FLAGS}")
    set(COMMON_FLAGS "${COMMON_FLAGS} ${FPU_FLAGS}")

    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS} -Wimplicit")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")

    # these are in addition to CMAKE_CXX_FLAGS
-    set(CMAKE_EXE_LINKER_FLAGS "-lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections")
+    set(CMAKE_EXE_LINKER_FLAGS "-lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--no-warn-rwx-segments,--gc-sections")

    if(SEMIHOSTING)
      add_definitions(-DSEMIHOSTING)
@@ -181,10 +181,6 @@ const char * const audioFilenames[] = {
  "servoko",
  "rxko",
  "modelpwr",
-#if defined(PCBSKY9X)
-  "highmah",
-  "hightemp",
-#endif
  "error",
  "warning1",
  "warning2",
@@ -1077,10 +1073,6 @@ void audioEvent(unsigned int index)
        audioQueue.playTone(2250, 80, 20, PLAY_REPEAT(2));
        break;
      case AU_TX_BATTERY_LOW:
-#if defined(PCBSKY9X)
-      case AU_TX_MAH_HIGH:
-      case AU_TX_TEMP_HIGH:
-#endif
        audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
        audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
        break;
@@ -564,10 +564,6 @@ void audioTimerCountdown(uint8_t timer, int value);
 #define AUDIO_WARNING1()         AUDIO_BUZZER(audioEvent(AU_WARNING1), beep(3))
 #define AUDIO_WARNING2()         AUDIO_BUZZER(audioEvent(AU_WARNING2), beep(2))
 #define AUDIO_TX_BATTERY_LOW()   AUDIO_BUZZER(audioEvent(AU_TX_BATTERY_LOW), beep(4))
-#if defined(PCBSKY9X)
-#define AUDIO_TX_MAH_HIGH()      audioEvent(AU_TX_MAH_HIGH)
-#define AUDIO_TX_TEMP_HIGH()     audioEvent(AU_TX_TEMP_HIGH)
-#endif
 #define AUDIO_ERROR()            AUDIO_BUZZER(audioEvent(AU_ERROR), beep(4))
 #define AUDIO_TIMER_COUNTDOWN(idx, val) audioTimerCountdown(idx, val)
 #define AUDIO_TIMER_ELAPSED(idx) AUDIO_BUZZER(audioEvent(AU_TIMER1_ELAPSED+idx), beep(3))
@@ -588,8 +584,6 @@ void audioTimerCountdown(uint8_t timer, int value);
 #define AUDIO_TRAINER_LOST()     audioEvent(AU_TRAINER_LOST)
 #define AUDIO_TRAINER_BACK()     audioEvent(AU_TRAINER_BACK)

-#define AUDIO_HEARTBEAT()
-
 enum AutomaticPromptsCategories {
  SYSTEM_AUDIO_CATEGORY,
  MODEL_AUDIO_CATEGORY,
@@ -116,11 +116,11 @@ void bluetoothProcessTrainerFrame(const uint8_t * bluetoothBuffer)

  for (uint8_t channel=0, i=1; channel<8; channel+=2, i+=3) {
    // +-500 != 512, but close enough.
-    ppmInput[channel] = bluetoothBuffer[i] + ((bluetoothBuffer[i+1] & 0xf0) << 4) - 1500;
-    ppmInput[channel+1] = ((bluetoothBuffer[i+1] & 0x0f) << 4) + ((bluetoothBuffer[i+2] & 0xf0) >> 4) + ((bluetoothBuffer[i+2] & 0x0f) << 8) - 1500;
+    trainerInput[channel] = bluetoothBuffer[i] + ((bluetoothBuffer[i+1] & 0xf0) << 4) - 1500;
+    trainerInput[channel+1] = ((bluetoothBuffer[i+1] & 0x0f) << 4) + ((bluetoothBuffer[i+2] & 0xf0) >> 4) + ((bluetoothBuffer[i+2] & 0x0f) << 8) - 1500;
  }

-  ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
+  trainerInputValidityTimer = TRAINER_IN_VALID_TIMEOUT;
 }

 void bluetoothAppendTrainerByte(uint8_t data)
@@ -280,7 +280,7 @@ void bluetoothWakeup(void)
        uint8_t len = ZLEN(g_eeGeneral.bluetoothName);
        if (len > 0) {
          for (int i = 0; i < len; i++) {
-            *cur++ = idx2char(g_eeGeneral.bluetoothName[i]);
+            *cur++ = zchar2char(g_eeGeneral.bluetoothName[i]);
          }
        }
        else {
@@ -380,7 +380,7 @@ void bluetoothWakeup()
      uint8_t len = ZLEN(g_eeGeneral.bluetoothName);
      if (len > 0) {
        for (int i = 0; i < len; i++) {
-          *cur++ = idx2char(g_eeGeneral.bluetoothName[i]);
+          *cur++ = zchar2char(g_eeGeneral.bluetoothName[i]);
        }
      }
      else {
@@ -20,14 +20,12 @@

 #include "opentx.h"

+#if !defined(DFPLAYER)
 #define pushPrompt(value)
 #define pushCustomPrompt(value)
 #define pushNumberPrompt(value)

-void audioEvent(unsigned int index){
-//  TRACE("audioEvent %u", index);
-}
-
-bool isPlaying(){
+bool isPlaying(uint8_t id){
 	return false;
 }
+#endif
@@ -21,19 +21,119 @@
 #ifndef _BUZZER_H_
 #define _BUZZER_H_

+enum FragmentTypes {
+  FRAGMENT_EMPTY,
+  FRAGMENT_TONE,
+  FRAGMENT_FILE,
+};

-extern void pushPrompt(uint16_t prompt);
-extern void pushUnit(uint8_t unit, uint8_t idx, uint8_t id);
-extern bool isPlaying();
-extern void audioEvent(unsigned int index);
+extern bool isPlaying(uint8_t id = 0);

 #if defined(HAPTIC)
 extern uint8_t hapticTick;
 #endif /* HAPTIC */

-void buzzerEvent(unsigned int index);
+void audioEvent(unsigned int index);

-#define AUDIO_ERROR_MESSAGE(e)   buzzerEvent(e)
+#if defined(DFPLAYER)
+extern Fifo<uint16_t, 16> dfplayerFifo;
+extern uint32_t getAudioFileIndex(uint32_t i);
+extern bool isAudioFileReferenced(uint32_t i);
+void audioPlay(unsigned int index);
+
+#define AUDIO_ERROR_MESSAGE(e)   audioEvent(e)
+#define AUDIO_TIMER_MINUTE(t)    playDuration(t, 0, 0)
+
+#define AUDIO_KEY_PRESS()        audioKeyPress()
+#define AUDIO_KEY_ERROR()        audioKeyError()
+
+#define AUDIO_HELLO()            audioPlay(AUDIO_HELLO)
+#define AUDIO_BYE()              //
+#define AUDIO_WARNING1()         audioEvent(AU_WARNING1)
+#define AUDIO_WARNING2()         audioEvent(AU_WARNING2)
+#define AUDIO_TX_BATTERY_LOW()   audioEvent(AU_TX_BATTERY_LOW)
+#define AUDIO_ERROR()            audioEvent(AU_ERROR)
+#define AUDIO_TIMER_COUNTDOWN(idx, val) audioTimerCountdown(idx, val)
+#define AUDIO_TIMER_ELAPSED(idx) audioEvent(AU_TIMER1_ELAPSED+idx)
+#define AUDIO_INACTIVITY()       audioEvent(AU_INACTIVITY)
+#define AUDIO_MIX_WARNING(x)     audioEvent(AU_MIX_WARNING_1+x-1)
+#define AUDIO_POT_MIDDLE(x)      audioEvent(AU_STICK1_MIDDLE+x)
+#define AUDIO_TRIM_MIDDLE()      audioEvent(AU_TRIM_MIDDLE)
+#define AUDIO_TRIM_MIN()         audioEvent(AU_TRIM_MIN)
+#define AUDIO_TRIM_MAX()         audioEvent(AU_TRIM_MAX)
+#define AUDIO_TRIM_PRESS(val)    audioTrimPress(val)
+#define AUDIO_PLAY(p)            audioEvent(p)
+#define AUDIO_VARIO(fq, t, p, f) playTone(fq, t, p, f)
+#define AUDIO_RSSI_ORANGE()      audioEvent(AU_RSSI_ORANGE)
+#define AUDIO_RSSI_RED()         audioEvent(AU_RSSI_RED)
+#define AUDIO_RAS_RED()          audioEvent(AU_RAS_RED)
+#define AUDIO_TELEMETRY_LOST()   audioEvent(AU_TELEMETRY_LOST)
+#define AUDIO_TELEMETRY_BACK()   audioEvent(AU_TELEMETRY_BACK)
+#define AUDIO_TRAINER_LOST()     audioEvent(AU_TRAINER_LOST)
+#define AUDIO_TRAINER_BACK()     audioEvent(AU_TRAINER_BACK)
+
+// enum AutomaticPromptsCategories {
+//   SYSTEM_AUDIO_CATEGORY,
+//   MODEL_AUDIO_CATEGORY,
+//   PHASE_AUDIO_CATEGORY,
+//   SWITCH_AUDIO_CATEGORY,
+//   LOGICAL_SWITCH_AUDIO_CATEGORY,
+// };
+
+// enum AutomaticPromptsEvents {
+//   AUDIO_EVENT_OFF,
+//   AUDIO_EVENT_ON,
+//   AUDIO_EVENT_MID,
+// };
+
+ enum {
+   // IDs for special functions [0:64]
+   // IDs for global functions [64:128]
+   ID_PLAY_PROMPT_BASE = 179,
+   ID_PLAY_FROM_SD_MANAGER = 255,
+ };
+
+extern void pushPrompt(uint16_t prompt, uint8_t id=0);
+extern void pushUnit(uint8_t unit, uint8_t idx, uint8_t id);
+extern void playModelName();
+extern void playModelEvent(uint8_t category, uint8_t index, event_t event=0);
+
+#define PLAY_PHASE_OFF(phase)         //playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_OFF)
+#define PLAY_PHASE_ON(phase)          //playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_ON)
+#define PLAY_SWITCH_MOVED(sw)         //playModelEvent(SWITCH_AUDIO_CATEGORY, sw)
+#define PLAY_LOGICAL_SWITCH_OFF(sw)   //playModelEvent(LOGICAL_SWITCH_AUDIO_CATEGORY, sw, AUDIO_EVENT_OFF)
+#define PLAY_LOGICAL_SWITCH_ON(sw)    //playModelEvent(LOGICAL_SWITCH_AUDIO_CATEGORY, sw, AUDIO_EVENT_ON)
+#define PLAY_MODEL_NAME()
+#define START_SILENCE_PERIOD()
+#define IS_SILENCE_PERIOD_ELAPSED()   (true)
+
+#define PROMPT_CUSTOM_BASE      0
+#define PROMPT_I18N_BASE        0
+#define PROMPT_SYSTEM_BASE      0
+
+#define I18N_PLAY_FUNCTION(lng, x, ...) void lng ## _ ## x(__VA_ARGS__, uint8_t id)
+#define PLAY_FUNCTION(x, ...)           void x(__VA_ARGS__, uint8_t id)
+
+#define PUSH_CUSTOM_PROMPT(p, id)       pushPrompt(PROMPT_CUSTOM_BASE+(p))
+#define PUSH_NUMBER_PROMPT(p)           pushPrompt((EN_PROMPT_NUMBERS_BASE + p), id)
+#define PUSH_UNIT_PROMPT(p, i)          pushUnit((EN_PROMPT_UNITS_BASE + ((p - 1/*RAW index*/) * 2)), (i), id)
+#define PLAY_NUMBER(n, u, a)            playNumber((n), (u), (a), id)
+#define PLAY_DURATION(d, att)           playDuration((d), (att), id) 		
+#define PLAY_TIME                       1
+#define IS_PLAY_TIME()                  (flags&PLAY_TIME)
+#define IS_PLAYING(id)                  isPlaying((id))
+#define PLAY_VALUE(v, id)        		    playValue((v), (id))
+#define PLAY_FILE(f, id)                dfPlayerQueuePlayFile((f))
+#define AUDIO_FLUSH()               //audioQueue.flush()
+
+#define setScaledVolume(v)
+
+#else // buzzer
+
+extern void pushPrompt(uint16_t prompt);
+extern void pushUnit(uint8_t unit, uint8_t idx, uint8_t id);
+
+#define AUDIO_ERROR_MESSAGE(e)   audioEvent(e)
 #define AUDIO_TIMER_MINUTE(t)    

 #define AUDIO_KEY_PRESS()        audioKeyPress()
@@ -41,32 +141,28 @@ void buzzerEvent(unsigned int index);

 #define AUDIO_HELLO()            PUSH_SYSTEM_PROMPT(AUDIO_HELLO)
 #define AUDIO_BYE()              
-#define AUDIO_WARNING1()         buzzerEvent(AU_WARNING1)
-#define AUDIO_WARNING2()         buzzerEvent(AU_WARNING2)
-#define AUDIO_TX_BATTERY_LOW()   buzzerEvent(AU_TX_BATTERY_LOW)
-#if defined(PCBSKY9X)
-#define AUDIO_TX_MAH_HIGH()      buzzerEvent(AU_TX_MAH_HIGH)
-#define AUDIO_TX_TEMP_HIGH()     buzzerEvent(AU_TX_TEMP_HIGH)
-#endif
-#define AUDIO_ERROR()            buzzerEvent(AU_ERROR)
+#define AUDIO_WARNING1()         audioEvent(AU_WARNING1)
+#define AUDIO_WARNING2()         audioEvent(AU_WARNING2)
+#define AUDIO_TX_BATTERY_LOW()   audioEvent(AU_TX_BATTERY_LOW)
+#define AUDIO_ERROR()            audioEvent(AU_ERROR)
 #define AUDIO_TIMER_COUNTDOWN(idx, val) audioTimerCountdown(idx, val)
-#define AUDIO_TIMER_ELAPSED(idx) buzzerEvent(AU_TIMER1_ELAPSED+idx)
-#define AUDIO_INACTIVITY()       buzzerEvent(AU_INACTIVITY)
-#define AUDIO_MIX_WARNING(x)     buzzerEvent(AU_MIX_WARNING_1+x-1)
-#define AUDIO_POT_MIDDLE(x)      buzzerEvent(AU_STICK1_MIDDLE+x)
-#define AUDIO_TRIM_MIDDLE()      buzzerEvent(AU_TRIM_MIDDLE)
-#define AUDIO_TRIM_MIN()         buzzerEvent(AU_TRIM_MIN)
-#define AUDIO_TRIM_MAX()         buzzerEvent(AU_TRIM_MAX)
+#define AUDIO_TIMER_ELAPSED(idx) audioEvent(AU_TIMER1_ELAPSED+idx)
+#define AUDIO_INACTIVITY()       audioEvent(AU_INACTIVITY)
+#define AUDIO_MIX_WARNING(x)     audioEvent(AU_MIX_WARNING_1+x-1)
+#define AUDIO_POT_MIDDLE(x)      audioEvent(AU_STICK1_MIDDLE+x)
+#define AUDIO_TRIM_MIDDLE()      audioEvent(AU_TRIM_MIDDLE)
+#define AUDIO_TRIM_MIN()         audioEvent(AU_TRIM_MIN)
+#define AUDIO_TRIM_MAX()         audioEvent(AU_TRIM_MAX)
 #define AUDIO_TRIM_PRESS(val)    audioTrimPress(val)
-#define AUDIO_PLAY(p)            buzzerEvent(p)
+#define AUDIO_PLAY(p)            audioEvent(p)
 #define AUDIO_VARIO(fq, t, p, f) playTone(fq, t, p, f)
-#define AUDIO_RSSI_ORANGE()      buzzerEvent(AU_RSSI_ORANGE)
-#define AUDIO_RSSI_RED()         buzzerEvent(AU_RSSI_RED)
-#define AUDIO_RAS_RED()          buzzerEvent(AU_RAS_RED)
-#define AUDIO_TELEMETRY_LOST()   buzzerEvent(AU_TELEMETRY_LOST)
-#define AUDIO_TELEMETRY_BACK()   buzzerEvent(AU_TELEMETRY_BACK)
-#define AUDIO_TRAINER_LOST()     buzzerEvent(AU_TRAINER_LOST)
-#define AUDIO_TRAINER_BACK()     buzzerEvent(AU_TRAINER_BACK)
+#define AUDIO_RSSI_ORANGE()      audioEvent(AU_RSSI_ORANGE)
+#define AUDIO_RSSI_RED()         audioEvent(AU_RSSI_RED)
+#define AUDIO_RAS_RED()          audioEvent(AU_RAS_RED)
+#define AUDIO_TELEMETRY_LOST()   audioEvent(AU_TELEMETRY_LOST)
+#define AUDIO_TELEMETRY_BACK()   audioEvent(AU_TELEMETRY_BACK)
+#define AUDIO_TRAINER_LOST()     audioEvent(AU_TRAINER_LOST)
+#define AUDIO_TRAINER_BACK()     audioEvent(AU_TRAINER_BACK)

 #define AUDIO_RESET()
 #define AUDIO_FLUSH()
@@ -78,6 +174,7 @@ void buzzerEvent(unsigned int index);
 #define PLAY_LOGICAL_SWITCH_ON(sw)
 #define PLAY_MODEL_NAME()
 #define START_SILENCE_PERIOD()
+#define IS_SILENCE_PERIOD_ELAPSED()   (true)

 #define PROMPT_CUSTOM_BASE      0
 #define PROMPT_I18N_BASE        256
@@ -94,10 +191,11 @@ void buzzerEvent(unsigned int index);
 #define PLAY_DURATION(d, att)    		{}
 #define PLAY_TIME
 #define IS_PLAY_TIME()                  (0)
-#define IS_PLAYING(id)                  isPlaying()
+#define IS_PLAYING(id)                  isPlaying((id))
 #define PLAY_VALUE(v, id)        		playValue((v), (id))

 #define setScaledVolume(v)

+#endif // DFPLAYER

 #endif // _BUZZER_H_
@@ -709,9 +709,7 @@ int cliTrace(const char ** argv)

 int cliStackInfo(const char ** argv)
 {
-  #if !defined(PCBI6X)
  serialPrint("[MAIN] %d available / %d", stackAvailable(), stackSize() * 4);  // stackSize() returns size in 32bit chunks
-  #endif
  serialPrint("[MENUS] %d available / %d", menusStack.available(), menusStack.size());
  serialPrint("[MIXER] %d available / %d", mixerStack.available(), mixerStack.size());
  #if defined(AUDIO)
@@ -20,8 +20,6 @@

 #include "opentx.h"

-uint8_t s_curveChan;
-
 int8_t * curveEnd[MAX_CURVES];
 void loadCurves()
 {
@@ -317,8 +315,8 @@ int applyCustomCurve(int x, uint8_t idx)
 point_t getPoint(uint8_t i)
 {
  point_t result = {0, 0};
-  CurveInfo & crv = g_model.curves[s_curveChan];
-  int8_t * points = curveAddress(s_curveChan);
+  CurveInfo & crv = g_model.curves[s_currIdxSubMenu];
+  int8_t * points = curveAddress(s_currIdxSubMenu);
  bool custom = (crv.type == CURVE_TYPE_CUSTOM);
  uint8_t count = 5+crv.points;
  if (i < count) {
@@ -333,5 +331,5 @@ point_t getPoint(uint8_t i)

 int applyCurrentCurve(int x)
 {
-  return applyCustomCurve(x, s_curveChan);
+  return applyCustomCurve(x, s_currIdxSubMenu);
 }
@@ -58,29 +58,18 @@
  #define MAX_INPUTS                   32
  #define MAX_TRAINER_CHANNELS         16
  #define MAX_TELEMETRY_SENSORS        32
-#elif defined(PCBSKY9X)
-  #define MAX_MODELS                   60
-  #define MAX_OUTPUT_CHANNELS          32 // number of real output channels CH1-CH32
-  #define MAX_FLIGHT_MODES             9
-  #define MAX_MIXERS                   64
-  #define MAX_EXPOS                    32
-  #define MAX_LOGICAL_SWITCHES         64
-  #define MAX_SPECIAL_FUNCTIONS        64 // number of functions assigned to switches
-  #define MAX_INPUTS                   32
-  #define MAX_TRAINER_CHANNELS         16
-  #define MAX_TELEMETRY_SENSORS        32
 #elif defined(PCBI6X)
-  #define MAX_MODELS                   16
+  #define MAX_MODELS                   20
  #define MAX_OUTPUT_CHANNELS          16 // number of real output channels CH1-CH16
  #define MAX_FLIGHT_MODES             5
  #define MAX_MIXERS                   32 
  #define MAX_EXPOS                    14
  #define MAX_LOGICAL_SWITCHES         12
-  #define MAX_SPECIAL_FUNCTIONS        11 // number of functions assigned to switches
-  #define MAX_TRAINER_CHANNELS         8
+  #define MAX_SPECIAL_FUNCTIONS        18 // number of functions assigned to switches, 20B each
+  #define MAX_TRAINER_CHANNELS         16
  #define MAX_INPUTS                   16
-  #define MAX_TELEMETRY_SENSORS        26 // 48b each
-  #define MAX_SCRIPTS				           0
+  #define MAX_TELEMETRY_SENSORS        30 // 48B each
+  #define MAX_SCRIPTS				   0
 #else
  #define MAX_MODELS                   16
  #define MAX_OUTPUT_CHANNELS          16 // number of real output channels CH1-CH16
@@ -145,7 +134,7 @@ enum CurveType {
  #define MAX_CURVE_POINTS             512
 #endif

-#if defined(PCBTARANIS) || defined(PCBSKY9X) || defined(PCBHORUS) || defined(PCBI6X)
+#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X)
  #define NUM_MODULES                  2
 #else
  #define NUM_MODULES                  1
@@ -153,16 +142,8 @@ enum CurveType {

 #define XPOTS_MULTIPOS_COUNT           6

-#if defined(PCBSKY9X) && defined(REVX)
-  #define MAX_ROTARY_ENCODERS          1
-  #define NUM_ROTARY_ENCODERS          0
-#elif defined(PCBSKY9X)
-  #define MAX_ROTARY_ENCODERS          1
-  #define NUM_ROTARY_ENCODERS          1
-#else
-  #define MAX_ROTARY_ENCODERS          0
-  #define NUM_ROTARY_ENCODERS          0
-#endif
+#define MAX_ROTARY_ENCODERS          0
+#define NUM_ROTARY_ENCODERS          0

 #if defined(COLORLCD)
 enum MainViews {
@@ -207,9 +188,19 @@ enum BeeperMode {
    TRAINER_MODULE,
    FLASHING_MODULE,
  };
+
+  enum ArmingMode {
+  ARMING_MODE_FIRST = 0,
+  ARMING_MODE_CH5 = ARMING_MODE_FIRST,
+  ARMING_MODE_SWITCH = 1,
+  ARMING_MODE_LAST = ARMING_MODE_SWITCH,
+};
+
  enum TrainerMode {
    TRAINER_MODE_MASTER_TRAINER_JACK,
+#if !defined(PCBI6X)
    TRAINER_MODE_SLAVE,
+#endif
 #if defined(PCBTARANIS)
    TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
    TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
@@ -220,26 +211,24 @@ enum BeeperMode {
    TRAINER_MODE_SLAVE_BLUETOOTH,
 #endif
  };
-#elif defined(PCBSKY9X)
-  enum ModuleIndex {
-    EXTERNAL_MODULE,
-    EXTRA_MODULE,
-    TRAINER_MODULE
-  };
 #endif

 #if defined(BLUETOOTH)
  #define TRAINER_MODE_MAX()             TRAINER_MODE_SLAVE_BLUETOOTH
 #elif defined(PCBX7) || defined(PCBXLITE)
  #define TRAINER_MODE_MAX()             TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE
+#elif defined(PCBI6X)
+  #if defined(SBUS_TRAINER)
+    #define TRAINER_MODE_MAX()             TRAINER_MODE_MASTER_BATTERY_COMPARTMENT
+  #else
+    #define TRAINER_MODE_MAX()             TRAINER_MODE_MASTER_TRAINER_JACK
+  #endif
 #else
  #define TRAINER_MODE_MAX()             HAS_WIRELESS_TRAINER_HARDWARE() ? TRAINER_MODE_MASTER_BATTERY_COMPARTMENT : TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE
 #endif

 #if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X)
 #define IS_INTERNAL_MODULE_ENABLED() (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE)
-#elif defined(PCBSKY9X)
-  #define IS_INTERNAL_MODULE_ENABLED() (false)
 #endif
 #define IS_EXTERNAL_MODULE_ENABLED() (g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_NONE)

@@ -251,15 +240,17 @@ enum UartModes {
  UART_MODE_NONE,
 #endif
  UART_MODE_TELEMETRY_MIRROR,
-  UART_MODE_TELEMETRY,
-  UART_MODE_SBUS_TRAINER,
-  UART_MODE_LUA,
-  UART_MODE_COUNT,
 #if !defined(PCBI6X)
-  UART_MODE_MAX = UART_MODE_COUNT-1
-#else
-  UART_MODE_MAX = UART_MODE_COUNT-1-3 // only off/debug or mirror
+  UART_MODE_TELEMETRY,
 #endif
+#if defined(SBUS_TRAINER)
+  UART_MODE_SBUS_TRAINER,
+#endif
+#if defined(LUA)
+  UART_MODE_LUA,
+#endif
+  UART_MODE_COUNT,
+  UART_MODE_MAX = UART_MODE_COUNT-1
 };

 #if defined(PCBHORUS)
@@ -341,6 +332,8 @@ enum TelemetryScreenType {
  TELEMETRY_SCREEN_TYPE_SCRIPT,
 #if defined(LUA)
  TELEMETRY_SCREEN_TYPE_MAX = TELEMETRY_SCREEN_TYPE_SCRIPT
+#elif defined(PCBI6X)
+  TELEMETRY_SCREEN_TYPE_MAX = TELEMETRY_SCREEN_TYPE_SCRIPT
 #else
  TELEMETRY_SCREEN_TYPE_MAX = TELEMETRY_SCREEN_TYPE_BARS
 #endif
@@ -489,10 +482,6 @@ enum SwitchSources {
  SWSRC_TrimT6Up,
 #endif

-#if defined(PCBSKY9X)
-  SWSRC_REa,
-#endif
-
  SWSRC_FIRST_LOGICAL_SWITCH,
  SWSRC_SW1 = SWSRC_FIRST_LOGICAL_SWITCH,
  SWSRC_SW2,
@@ -599,11 +588,6 @@ enum MixSources {
  MIXSRC_MOUSE2,                        LUA_EXPORT("jsy", "Joystick Y")
 #endif

-#if defined(PCBSKY9X)
-  MIXSRC_REa,
-  MIXSRC_LAST_ROTARY_ENCODER = MIXSRC_REa,
-#endif
-
  MIXSRC_MAX,

  MIXSRC_FIRST_HELI,
@@ -750,8 +734,8 @@ enum Functions {
  // then the other functions
  FUNC_FIRST_WITHOUT_ENABLE,
  FUNC_PLAY_SOUND = FUNC_FIRST_WITHOUT_ENABLE,
-//  FUNC_PLAY_TRACK,
-//  FUNC_PLAY_VALUE,
+  FUNC_PLAY_TRACK,
+  FUNC_PLAY_VALUE,
  FUNC_RESERVE4,
  FUNC_PLAY_SCRIPT,
  FUNC_RESERVE5,
@@ -782,7 +766,7 @@ enum TimerModes {
 enum CountDownModes {
  COUNTDOWN_SILENT,
  COUNTDOWN_BEEPS,
-#if defined(VOICE)
+#if defined(VOICE) || defined(DFPLAYER)
  COUNTDOWN_VOICE,
 #endif
 #if defined(HAPTIC)
@@ -824,4 +808,11 @@ enum BluetoothModes {
  BLUETOOTH_TRAINER,
 };

+// PPM Units
+enum PPMUnit {
+    PPM_PERCENT_PREC0,
+    PPM_PERCENT_PREC1,
+    PPM_US
+};
+
 #endif // _DATACONSTANTS_H_
@@ -154,21 +154,26 @@ PACK(struct CustomFunctionData {
  int16_t swtch : 9;
  uint16_t func : 7;
  PACK(union {
+#if !defined(PCBI6X) // SDCARD + VOICE
    NOBACKUP(PACK(struct {
      char name[LEN_FUNCTION_NAME];
    }) play);
-
+#endif
    PACK(struct {
      int16_t val;
      uint8_t mode;
      uint8_t param;
+#if !defined(PCBI6X) // SDCARD + VOICE
      NOBACKUP(CFN_SPARE_TYPE spare);
+#endif
    })
    all;

    NOBACKUP(PACK(struct {
      int32_t val1;
+#if !defined(PCBI6X) // SDCARD + VOICE
      NOBACKUP(CFN_SPARE_TYPE val2);
+#endif
    }) clear);
  });
  uint8_t active;
@@ -406,18 +411,15 @@ PACK(struct TelemetrySensor {
 #define MM_RF_CUSTOM_SELECTED 0xff

 PACK(struct ModuleData {
-  uint8_t type : 4;
-  int8_t rfProtocol : 4;
+  uint8_t type; // : 4; // use full byte to reduce code size on PCBI6X
+  int8_t rfProtocol; //  : 4
  uint8_t channelsStart;
  int8_t channelsCount;      // 0=8 channels
  uint8_t failsafeMode : 4;  // only 3 bits used
  uint8_t subType : 3;
  uint8_t invertedSerial : 1;  // telemetry serial inverted from standard
-#if defined(PCBI6X)
-  uint8_t rxID[4];
-  uint16_t servoFreq;
-#endif
  int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
+
  union {
    struct {
      int8_t delay : 6;
@@ -433,21 +435,20 @@ PACK(struct ModuleData {
      uint8_t lowPowerMode : 1;
      int8_t optionValue;
    } multi);
-    NOBACKUP(struct {
-      uint8_t power : 2;  // 0=10 mW, 1=100 mW, 2=500 mW, 3=1W
-      uint8_t spare1 : 2;
-      uint8_t receiver_telem_off : 1;     // false = receiver telem enabled
-      uint8_t receiver_channel_9_16 : 1;  // false = pwm out 1-8, true 9-16
-      uint8_t external_antenna : 1;       // false = internal antenna, true = external antenna
-      uint8_t fast : 1;                   // TODO: to be used later by external module (fast means serial @ high speed)
-      uint8_t spare2;
-    } pxx);
    NOBACKUP(struct {
      uint8_t spare1 : 6;
      uint8_t noninverted : 1;
      uint8_t spare2 : 1;
      int8_t refreshRate;  // definition as framelength for ppm (* 5 + 225 = time in 1/10 ms)
    } sbus);
+    NOBACKUP(struct {
+      uint16_t servoFreq; // 50 - 400
+    } afhds2a);
+    NOBACKUP(struct {
+      uint8_t crsfArmingMode:1;
+      int16_t crsfArmingTrigger:10;
+      int16_t spare1:5;
+    } crsf);
  };

  // Helper functions to set both of the rfProto protocol at the same time
@@ -576,15 +577,6 @@ PACK(struct CustomScreenData {
  uint8_t potsWarnEnabled;                         \
  int8_t potsWarnPosition[NUM_POTS + NUM_SLIDERS]; \
  uint8_t rxBattAlarms[2];
-#elif defined(PCBSKY9X)
-#define MODELDATA_EXTRA                            \
-  uint8_t spare : 6;                               \
-  uint8_t potsWarnMode : 2;                        \
-  ModuleData moduleData[NUM_MODULES + 1];          \
-  char inputNames[MAX_INPUTS][LEN_INPUT_NAME];     \
-  uint8_t potsWarnEnabled;                         \
-  int8_t potsWarnPosition[NUM_POTS + NUM_SLIDERS]; \
-  uint8_t rxBattAlarms[2];
 #else
 #define MODELDATA_EXTRA
 #endif
@@ -661,12 +653,6 @@ PACK(struct TrainerData {
  NOBACKUP(TrainerMix mix[4]);
 });

-#if defined(PCBHORUS)
-#define SPLASH_MODE uint8_t splashSpares : 3
-#else
-#define SPLASH_MODE int8_t splashMode : 3
-#endif
-
 #define EXTRA_GENERAL_FIELDS_ARM                       \
  NOBACKUP(uint8_t backlightBright);                   \
  NOBACKUP(uint32_t globalTimer);                      \
@@ -677,7 +663,8 @@ PACK(struct TrainerData {
  NOBACKUP(uint8_t jitterFilter : 1); /* 0 - active */ \
  NOBACKUP(uint8_t disableRssiPoweroffAlarm : 1);      \
  NOBACKUP(uint8_t USBMode : 2);                       \
-  NOBACKUP(uint8_t spareExtraArm : 3);                 \
+  NOBACKUP(uint8_t spare : 1);                         \
+  NOBACKUP(uint8_t ppmunit : 2);                       \
  NOBACKUP(char ttsLanguage[2]);                       \
  NOBACKUP(int8_t beepVolume : 4);                     \
  NOBACKUP(int8_t wavVolume : 4);                      \
@@ -714,27 +701,12 @@ PACK(struct TrainerData {
  uint8_t auxSerialMode : 4;                                        \
  uint8_t slidersConfig : 4;                                        \
  uint8_t potsConfig; /* two bits per pot */                        \
-  uint8_t backlightColor;                                           \
  swarnstate_t switchUnlockStates;                                  \
  swconfig_t switchConfig;                                          \
  char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME];                  \
  char anaNames[NUM_STICKS + NUM_POTS + NUM_SLIDERS][LEN_ANA_NAME]; \
+  uint8_t receiverId[16][4]; /* AFHDS2A RxNum */                    \
  BLUETOOTH_FIELDS
-#elif defined(PCBSKY9X)
-#define EXTRA_GENERAL_FIELDS                                        \
-  EXTRA_GENERAL_FIELDS_ARM                                          \
-  int8_t txCurrentCalibration;                                      \
-  int8_t temperatureWarn;                                           \
-  uint8_t mAhWarn;                                                  \
-  uint16_t mAhUsed;                                                 \
-  int8_t temperatureCalib;                                          \
-  uint8_t optrexDisplay;                                            \
-  uint8_t sticksGain;                                               \
-  uint8_t rotarySteps;                                              \
-  char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME];                  \
-  char anaNames[NUM_STICKS + NUM_POTS + NUM_SLIDERS][LEN_ANA_NAME]; \
-                                                                    \
-#define EXTRA_GENERAL_FIELDS EXTRA_GENERAL_FIELDS_ARM
 #endif

 #if defined(PCBHORUS)
@@ -755,7 +727,7 @@ PACK(struct TrainerData {

 PACK(struct RadioData {
  NOBACKUP(uint8_t version);
-  NOBACKUP(uint16_t variant);
+  NOBACKUP(uint16_t variant); // not used on PCBI6X, reuse for swconfig_t?
  CalibData calib[NUM_CALIBRATED_ANALOGS];
  NOBACKUP(uint16_t chkSum);
  N_HORUS_FIELD(int8_t currModel);
@@ -776,7 +748,7 @@ PACK(struct RadioData {
  NOBACKUP(uint8_t adjustRTC : 1);
  NOBACKUP(uint8_t inactivityTimer);
  uint8_t telemetryBaudrate : 3;
-  SPLASH_MODE;                      /* 3bits */
+  int8_t splashMode : 3;
  NOBACKUP(int8_t hapticMode : 2);  // -2=quiet, -1=only alarms, 0=no keys, 1=all
  int8_t switchesDelay;
  NOBACKUP(uint8_t lightAutoOff);
@@ -804,7 +776,6 @@ PACK(struct RadioData {
 #undef TELEMETRY_DATA
 #undef MODELDATA_EXTRA
 #undef CUSTOM_SCREENS_DATA
-#undef SPLASH_MODE
 #undef EXTRA_GENERAL_FIELDS
 #undef THEME_DATA
 #undef NOBACKUP
@@ -874,24 +845,11 @@ static inline void check_struct() {
  CHKSIZE(CurveData, 4);
  CHKSIZE(CustomScreenData, 610);
  CHKSIZE(Topbar::PersistentData, 216);
-#elif defined(PCBSKY9X)
-  CHKSIZE(MixData, 20);
-  CHKSIZE(ExpoData, 17);
-  CHKSIZE(LimitData, 11);
-  CHKSIZE(CustomFunctionData, 9);
-  CHKSIZE(FlightModeData, 38);
-  CHKSIZE(TimerData, 11);
-  CHKSIZE(SwashRingData, 8);
-  CHKSIZE(FrSkyBarData, 5);
-  CHKSIZE(FrSkyLineData, 2);
-  CHKSIZE(FrSkyTelemetryData, 88);
-  CHKSIZE(ModelHeader, 12);
-  CHKTYPE(CurveData, 4);
 #elif defined(PCBI6X)
  CHKSIZE(LimitData, 11);
  CHKSIZE(MixData, 20);
  CHKSIZE(ExpoData, 17);
-  CHKSIZE(CustomFunctionData, 9);
+  CHKSIZE(CustomFunctionData, 7);
  CHKSIZE(FlightModeData, 36);
  CHKSIZE(TimerData, 11);
  CHKSIZE(SwashRingData, 8);
@@ -924,18 +882,17 @@ static inline void check_struct() {
  CHKSIZE(LogicalSwitchData, 9);
  CHKSIZE(TelemetrySensor, 14);

-#if defined(PCBI6X)
-  CHKSIZE(ModuleData, 44);
-#else
-  CHKSIZE(ModuleData, 70);
-#endif
+  CHKSIZE(ModuleData, 7 + (2 * MAX_OUTPUT_CHANNELS));

  CHKSIZE(GVarData, 7);

  CHKSIZE(RssiAlarmData, 2);
  CHKSIZE(TrainerData, 16);

-#if defined(PCBXLITE)
+#if defined(PCBI6X)
+  CHKSIZE(RadioData, 318);
+  CHKSIZE(ModelData, 2848);
+#elif defined(PCBXLITE)
  CHKSIZE(RadioData, 844);
  CHKSIZE(ModelData, 6025);
 #elif defined(PCBX7)
@@ -947,9 +904,6 @@ static inline void check_struct() {
 #elif defined(PCBX9D)
  CHKSIZE(RadioData, 872);
  CHKSIZE(ModelData, 6507);
-#elif defined(PCBSKY9X)
-  CHKSIZE(RadioData, 727);
-  CHKSIZE(ModelData, 5188);
 #elif defined(PCBHORUS)
  CHKSIZE(RadioData, 847);
  CHKSIZE(ModelData, 9380);
@@ -22,6 +22,8 @@
 #define _DEFINITIONS_H_

 #include <inttypes.h>
+#include <stdbool.h>
+#include <stddef.h>

 #if !defined(UNUSED)
  #define UNUSED(x)           ((void)(x)) /* to avoid warnings */
@@ -65,4 +67,8 @@
  #define CONVERT_UINT_PTR(x) ((uint32_t *)(x))
 #endif

+#if !defined(DIM)
+  #define DIM(__arr) (sizeof((__arr)) / sizeof((__arr)[0]))
+#endif
+
 #endif // _DEFINITIONS_H_
@@ -27,8 +27,8 @@ template <int N>
 class DMAFifo
 {
  public:
-    DMAFifo(DMA_Stream_TypeDef * stream):
-      stream(stream),
+    explicit DMAFifo(DMA_Channel_TypeDef * channel):
+      channel(channel),
      ridx(0)
    {
    }
@@ -45,7 +45,7 @@ class DMAFifo

    uint8_t last(int index)
    {
-      return fifo[(2*N - stream->NDTR - index) & (N-1)];
+      return fifo[(2*N - channel->CNDTR - index) & (N-1)];
    }

    bool isEmpty()
@@ -53,7 +53,7 @@ class DMAFifo
 #if defined(SIMU)
      return true;
 #endif
-      return (ridx == N - stream->NDTR);
+      return (ridx == N - channel->CNDTR);
    }

    bool pop(uint8_t & element)
@@ -73,9 +73,9 @@ class DMAFifo
      return fifo;
    }

+    DMA_Channel_TypeDef * channel;
  protected:
    uint8_t fifo[N];
-    DMA_Stream_TypeDef * stream;
    volatile uint32_t ridx;
 };

@@ -30,7 +30,7 @@ uint8_t dumpPosition;

 void dumpStart(unsigned int size)
 {
-  dumpPrintf("DUMP %d bytes ...\n\r", size);
+  dumpPrintf("DUMP %d b\n\r", size);
  dumpPosition = 0;
 }

@@ -21,6 +21,8 @@
 #ifndef _FIFO_H_
 #define _FIFO_H_

+#include <inttypes.h>
+
 template <class T, int N>
 class Fifo
 {
@@ -40,7 +42,7 @@ class Fifo

    void push(T element)
    {
-      uint32_t next = (widx+1) & (N-1);
+      uint32_t next = nextIndex(widx);
      if (next != ridx) {
        fifo[widx] = element;
        widx = next;
@@ -54,7 +56,7 @@ class Fifo
      }
      else {
        element = fifo[ridx];
-        ridx = (ridx+1) & (N-1);
+        ridx = nextIndex(ridx);
        return true;
      }
    }
@@ -64,23 +66,23 @@ class Fifo
      return (ridx == widx);
    }

-    bool isFull()
+    bool isFull() const
    {
-      uint32_t next = (widx+1) & (N-1);
+      uint32_t next = nextIndex(widx);
      return (next == ridx);
    }

    void flush()
    {
-      while (!isEmpty()) {};
+      while (!isEmpty());
    }

    uint32_t size() const
    {
-      return (N + widx - ridx) & (N-1);
+      return (N + widx - ridx) & (N - 1);
    }

-    uint32_t hasSpace(uint32_t n) const
+    bool hasSpace(uint32_t n) const
    {
      return (N > (size() + n));
    }
@@ -100,6 +102,11 @@ class Fifo
    T fifo[N];
    volatile uint32_t widx;
    volatile uint32_t ridx;
+
+    static inline uint32_t nextIndex(uint32_t idx)
+    {
+      return (idx + 1) & (N - 1);
+    }
 };

 #endif // _FIFO_H_
@@ -36,6 +36,7 @@ void testFunc()
 }
 #endif

+#if !defined(PCBI6X) || defined(DFPLAYER)
 PLAY_FUNCTION(playValue, source_t idx)
 {
  if (IS_FAI_FORBIDDEN(idx))
@@ -86,6 +87,7 @@ PLAY_FUNCTION(playValue, source_t idx)
    PLAY_NUMBER(val, 0, 0);
  }
 }
+#endif

 #if defined(VOICE)
 void playCustomFunctionFile(const CustomFunctionData * sd, uint8_t id)
@@ -99,6 +101,14 @@ void playCustomFunctionFile(const CustomFunctionData * sd, uint8_t id)
    PLAY_FILE(filename, sd->func == FUNC_BACKGND_MUSIC ? PLAY_BACKGROUND : 0, id);
  }
 }
+#elif defined(DFPLAYER)
+void playCustomFunctionFile(const CustomFunctionData * sd, uint8_t id)
+{
+  uint16_t val = sd->all.val;
+ if (val != 0) { // Custom files start at DFPLAYER_CUSTOM_FILE_INDEX
+    PLAY_FILE(val, id);
+ }
+}
 #endif

 #if defined(VOICE) || defined(PCBI6X)
@@ -130,26 +140,30 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
  MASK_FUNC_TYPE newActiveFunctions  = 0;
  MASK_CFN_TYPE  newActiveSwitches = 0;

+#if defined(DFPLAYER)
  uint8_t playFirstIndex = (functions == g_model.customFn ? 1 : 1+MAX_SPECIAL_FUNCTIONS);
  #define PLAY_INDEX   (i+playFirstIndex)
+#else
+  #define PLAY_INDEX   0
+#endif

 #if defined(ROTARY_ENCODERS) && defined(GVARS)
  static rotenc_t rePreviousValues[ROTARY_ENCODERS];
 #endif

 #if defined(OVERRIDE_CHANNEL_FUNCTION)
-  for (uint8_t i=0; i<MAX_OUTPUT_CHANNELS; i++) {
+  for (uint32_t i=0; i<MAX_OUTPUT_CHANNELS; i++) {
    safetyCh[i] = OVERRIDE_CHANNEL_UNDEFINED;
  }
 #endif

 #if defined(GVARS)
-  for (uint8_t i=0; i<NUM_TRIMS; i++) {
+  for (uint32_t i=0; i<NUM_TRIMS; i++) {
    trimGvar[i] = -1;
  }
 #endif

-  for (uint8_t i=0; i<MAX_SPECIAL_FUNCTIONS; i++) {
+  for (uint32_t i=0; i<MAX_SPECIAL_FUNCTIONS; i++) {
    const CustomFunctionData * cfn = &functions[i];
    swsrc_t swtch = CFN_SWITCH(cfn);
    if (swtch) {
@@ -161,7 +175,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
        active &= (bool)CFN_ACTIVE(cfn);
      }

-      if (active || IS_PLAY_BOTH_FUNC(CFN_FUNC(cfn))) {
+      if (active) {

        switch (CFN_FUNC(cfn)) {

@@ -239,7 +253,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
          {
            unsigned int moduleIndex = CFN_PARAM(cfn);
            if (moduleIndex < NUM_MODULES) {
-              moduleFlag[moduleIndex] = 1 + CFN_FUNC(cfn) - FUNC_RANGECHECK;
+              moduleState[moduleIndex].mode = 1 + CFN_FUNC(cfn) - FUNC_RANGECHECK;
            }
            break;
          }
@@ -274,7 +288,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
            }
            break;
 #endif
-
+#if !defined(PCBI6X)
          case FUNC_VOLUME:
          {
            getvalue_t raw = getValue(CFN_PARAM(cfn));
@@ -285,11 +299,13 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
            requiredSpeakerVolume = ((1024 + requiredSpeakerVolumeRawLast) * VOLUME_LEVEL_MAX) / 2048;
            break;
          }
-
+#endif
 #if defined(SDCARD) || defined(PCBI6X)
          case FUNC_PLAY_SOUND:
-          // case FUNC_PLAY_TRACK:
-          // case FUNC_PLAY_VALUE:
+#if defined(DFPLAYER)
+          case FUNC_PLAY_TRACK:
+          case FUNC_PLAY_VALUE:
+#endif
 #if defined(HAPTIC)
          case FUNC_HAPTIC:
 #endif
@@ -305,39 +321,43 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
                    AUDIO_PLAY(AU_SPECIAL_SOUND_FIRST + CFN_PARAM(cfn));
                  }
                }
-//                 else if (CFN_FUNC(cfn) == FUNC_PLAY_VALUE) {
-//                   PLAY_VALUE(CFN_PARAM(cfn), PLAY_INDEX);
-//                 }
-// #if defined(HAPTIC)
-//                 else if (CFN_FUNC(cfn) == FUNC_HAPTIC) {
-//                   haptic.event(AU_SPECIAL_SOUND_LAST+CFN_PARAM(cfn));
-//                 }
-// #endif
-//                 else {
-//                   playCustomFunctionFile(cfn, PLAY_INDEX);
-//                 }
+#if defined(DFPLAYER)
+                else if (CFN_FUNC(cfn) == FUNC_PLAY_VALUE) {
+                  PLAY_VALUE(CFN_PARAM(cfn), PLAY_INDEX);
+                }
+#endif
+#if defined(HAPTIC)
+                else if (CFN_FUNC(cfn) == FUNC_HAPTIC) {
+                  haptic.event(AU_SPECIAL_SOUND_LAST+CFN_PARAM(cfn));
+                }
+#endif
+                else {
+#if defined(DFPLAYER)
+                  playCustomFunctionFile(cfn, PLAY_INDEX);
+#endif
+                }
              }
            }
            break;
          }
+#if !defined(PCBI6X)
+          case FUNC_BACKGND_MUSIC:
+            if (!(newActiveFunctions & (1 << FUNCTION_BACKGND_MUSIC))) {
+              newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC);
+              if (!IS_PLAYING(PLAY_INDEX)) {
+                playCustomFunctionFile(cfn, PLAY_INDEX);
+              }
+            }
+            break;

-          // case FUNC_BACKGND_MUSIC:
-          //   if (!(newActiveFunctions & (1 << FUNCTION_BACKGND_MUSIC))) {
-          //     // newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC);
-          //     // if (!IS_PLAYING(PLAY_INDEX)) {
-          //     //   playCustomFunctionFile(cfn, PLAY_INDEX);
-          //     // }
-          //   }
-          //   break;
-
-          // case FUNC_BACKGND_MUSIC_PAUSE:
-          //   // newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC_PAUSE);
-          //   break;
-
+          case FUNC_BACKGND_MUSIC_PAUSE:
+            newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC_PAUSE);
+            break;
+#endif
 #else
          case FUNC_PLAY_SOUND:
-          // case FUNC_PLAY_TRACK:
-          // case FUNC_PLAY_VALUE:
+          case FUNC_PLAY_TRACK:
+          case FUNC_PLAY_VALUE:
          {
            tmr10ms_t tmr10ms = get_tmr10ms();
            uint8_t repeatParam = CFN_PLAY_REPEAT(cfn);
@@ -347,15 +367,16 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
              if (CFN_FUNC(cfn) == FUNC_PLAY_SOUND) {
                AUDIO_PLAY(AU_SPECIAL_SOUND_FIRST+param);
              }
-//               else if (CFN_FUNC(cfn) == FUNC_PLAY_VALUE) {
-//                 PLAY_VALUE(param, PLAY_INDEX);
-//               }
-//               else {
-// #if defined(GVARS)
-//                 if (CFN_FUNC(cfn) == FUNC_PLAY_TRACK && param > 250)
-//                   param = GVAR_VALUE(param-251, getGVarFlightMode(mixerCurrentFlightMode, param-251));
-// #endif
-//               }
+              else if (CFN_FUNC(cfn) == FUNC_PLAY_VALUE) {
+                PLAY_VALUE(param, PLAY_INDEX);
+              }
+              else {
+#if defined(GVARS)
+                if (CFN_FUNC(cfn) == FUNC_PLAY_TRACK && param > 250)
+                  param = GVAR_VALUE(param-251, getGVarFlightMode(mixerCurrentFlightMode, param-251));
+#endif
+                PUSH_CUSTOM_PROMPT(active ? param : param+1, PLAY_INDEX);
+              }
            }
            if (!active) {
              // PLAY_BOTH would change activeFnSwitches otherwise
@@ -363,11 +384,11 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
            }
            break;
          }
-#endif
+#endif // PCBI6X || SDCARD

 #if defined(TELEMETRY_FRSKY) && defined(VARIO)
          case FUNC_VARIO:
-            newActiveFunctions |= (1 << FUNCTION_VARIO);
+            newActiveFunctions |= (1u << FUNCTION_VARIO);
            break;
 #endif

@@ -375,15 +396,28 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
 #if defined(SDCARD)
          case FUNC_LOGS:
            if (CFN_PARAM(cfn)) {
-              newActiveFunctions |= (1 << FUNCTION_LOGS);
+              newActiveFunctions |= (1u << FUNCTION_LOGS);
              logDelay = CFN_PARAM(cfn);
            }
            break;
 #endif

          case FUNC_BACKLIGHT:
-            newActiveFunctions |= (1 << FUNCTION_BACKLIGHT);
+          {
+            newActiveFunctions |= (1u << FUNCTION_BACKLIGHT);
+            if (!CFN_PARAM(cfn)) {  // When no source is set, backlight works like original backlight and turn on regardless of backlight settings
+              requiredBacklightBright = BACKLIGHT_FORCED_ON;
+              break;
+            }
+
+            getvalue_t raw = getValue(CFN_PARAM(cfn));
+#if defined(COLORLCD)
+            requiredBacklightBright = (1024 - raw) * (BACKLIGHT_LEVEL_MAX - BACKLIGHT_LEVEL_MIN) / 2048;
+#else
+            requiredBacklightBright = (1024 - raw) * 100 / 2048;
+#endif
            break;
+          }

 #if defined(PCBTARANIS)
          case FUNC_SCREENSHOT:
@@ -392,7 +426,6 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
            }
            break;
 #endif
-
 #if defined(DEBUG)
          case FUNC_TEST:
            testFunc();
@@ -412,7 +445,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
            {
              unsigned int moduleIndex = CFN_PARAM(cfn);
              if (moduleIndex < NUM_MODULES) {
-                moduleFlag[moduleIndex] = 0;
+                moduleState[moduleIndex].mode = 0;
              }
              break;
            }
@@ -427,7 +460,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
  functionsContext.activeFunctions  = newActiveFunctions;

 #if defined(ROTARY_ENCODERS) && defined(GVARS)
-  for (uint8_t i=0; i<ROTARY_ENCODERS; i++) {
+  for (uint32_t i=0; i<ROTARY_ENCODERS; i++) {
    rePreviousValues[i] = (rotencValue[i] / ROTARY_ENCODER_GRANULARITY);
  }
 #endif
@@ -35,9 +35,6 @@
  #define HEADER_LINE_COLUMNS          0,
 #endif

-#define COLUMN_X                       0
-#define drawFieldLabel(x, y, str)      lcdDrawTextAlignedLeft(y, str)
-
 #define NUM_BODY_LINES                 (LCD_LINES-1)
 #define MENU_HEADER_HEIGHT             FH
 #define MENU_INIT_VPOS                 0
@@ -53,21 +50,9 @@ extern uint8_t noHighlightCounter;
 #define NO_HIGHLIGHT()        (noHighlightCounter > 0)
 #define START_NO_HIGHLIGHT()  do { noHighlightCounter = 25; } while(0)

-
+void drawSlider(coord_t x, coord_t y, uint8_t width, uint8_t value, uint8_t max, uint8_t attr);
 void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr);

-#if defined(NAVIGATION_POT1)
-extern int16_t p1valdiff;
-#else
-  #define p1valdiff 0
-#endif
-
-#if defined(NAVIGATION_POT2)
-extern int8_t p2valdiff;
-#else
-  #define p2valdiff 0
-#endif
-
 extern int8_t checkIncDec_Ret;  // global helper vars

 #define EDIT_SELECT_MENU               -1
@@ -225,8 +210,22 @@ void title(const char * s);

 typedef int choice_t;

-choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event);
-uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char * label, LcdFlags attr, event_t event);
+choice_t editChoice(coord_t x, coord_t y, const char *label,
+                    const char *values, choice_t value, choice_t min,
+                    choice_t max, LcdFlags attr, event_t event);
+choice_t editChoice(coord_t x, coord_t y, const char *label,
+                    const char *values, choice_t value, choice_t min,
+                    choice_t max, LcdFlags attr, event_t event, coord_t lblX);
+choice_t editChoice(coord_t x, coord_t y, const char *label,
+                    const char *values, choice_t value, choice_t min,
+                    choice_t max, LcdFlags attr, event_t event, coord_t lblX,
+                    IsValueAvailable isValueAvailable);
+
+uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char * label, 
+                     LcdFlags attr, event_t event);
+uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label,
+                     LcdFlags attr, event_t event, coord_t lblX);
+
 int8_t editSwitch(coord_t x, coord_t y, int8_t value, LcdFlags attr, event_t event);

 #define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event)
@@ -263,10 +262,6 @@ void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8
 uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay);
 #define EDIT_DELAY(x, y, event, attr, str, delay) editDelay(y, event, attr, str, delay)

-#define WARNING_TYPE_ASTERISK          0
-#define WARNING_TYPE_CONFIRM           1
-#define WARNING_TYPE_INPUT             2
-
 extern const char * warningText;
 extern const char * warningInfoText;
 extern uint8_t         warningInfoLength;
@@ -279,7 +274,7 @@ extern uint8_t s_copyMode;
 extern int8_t s_copySrcRow;
 extern int8_t s_copyTgtOfs;
 extern uint8_t s_currIdx;
-extern uint8_t s_curveChan;
+extern uint8_t s_currIdxSubMenu;
 extern uint8_t s_copySrcIdx;
 extern uint8_t s_copySrcCh;
 extern int8_t s_currCh;
@@ -372,6 +367,8 @@ void doMainScreenGraphics();
 void drawProgressBar(const char * label, int num, int den);
 void drawSleepBitmap();

+void drawChannelValue(coord_t x, coord_t y, uint8_t ch, int16_t value, LcdFlags flags);
+
 void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible);
 void drawGauge(coord_t x, coord_t y, coord_t w, coord_t h, int32_t val, int32_t max);

@@ -379,6 +376,7 @@ void drawGauge(coord_t x, coord_t y, coord_t w, coord_t h, int32_t val, int32_t
 void drawAlertBox(const char * title, const char * text, const char * action);
 #endif

+void drawAlertBox(const char * title, const char * text, const char * action);
 void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound);

 #define SET_SCROLLBAR_X(x)
@@ -386,7 +384,7 @@ void showAlertBox(const char * title, const char * text, const char * action , u

 #define IS_MAIN_VIEW_DISPLAYED()       menuHandlers[0] == menuMainView
 #if defined(TELEMETRY_FRSKY)
-#define IS_TELEMETRY_VIEW_DISPLAYED()  menuHandlers[0] == menuViewTelemetryFrsky
+#define IS_TELEMETRY_VIEW_DISPLAYED()  menuHandlers[0] == menuViewTelemetry
 #else
 #define IS_TELEMETRY_VIEW_DISPLAYED()  false
 #endif
@@ -66,7 +66,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
      }
      else if (i<=width) {
        uint8_t skip = true;
-        for (uint8_t j=0; j<lines; j++) {
+        for (uint32_t j=0; j<lines; j++) {
          b[j] = *(pattern++); /*top byte*/
          if (b[j] != 0xff) {
            skip = false;
@@ -74,7 +74,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
        }
        if (skip) {
          if (flags & FIXEDWIDTH) {
-            for (uint8_t j=0; j<lines; j++) {
+            for (uint32_t j=0; j<lines; j++) {
              b[j] = 0;
            }
          }
@@ -129,7 +129,7 @@ uint8_t getPatternWidth(const PatternData * pattern)
  uint8_t lines = (pattern->height+7)/8;
  const uint8_t * data = pattern->data;
  for (int8_t i=0; i<pattern->width; i++) {
-    for (uint8_t j=0; j<lines; j++) {
+    for (uint32_t j=0; j<lines; j++) {
      if (data[j] != 0xff) {
        result += 1;
        break;
@@ -292,7 +292,7 @@ uint8_t getTextWidth(const char * s, uint8_t len, LcdFlags flags)
 {
  uint8_t width = 0;
  for (int i=0; len==0 || i<len; ++i) {
-    unsigned char c = (flags & ZCHAR) ? idx2char(*s) : *s;
+    unsigned char c = (flags & ZCHAR) ? zchar2char(*s) : *s;
    if (!c) {
      break;
    }
@@ -328,7 +328,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const char * s, uint8_t len, LcdFlag
    switch (flags & ZCHAR) {
 #if !defined(BOOT)
      case ZCHAR:
-        c = idx2char(*s);
+        c = zchar2char(*s);
        break;
 #endif
      default:
@@ -409,6 +409,11 @@ void lcdDrawTextAlignedLeft(coord_t y, const char * s)
  lcdDrawText(0, y, s);
 }

+void lcdDrawTextIndented(coord_t y, const char * s)
+{
+  lcdDrawText(INDENT_WIDTH, y, s);
+}
+
 #if !defined(BOOT)
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s,uint8_t idx, LcdFlags flags)
 {
@@ -588,10 +593,10 @@ void drawTelemetryTopBar()
 {
  putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
  uint8_t att = (IS_TXBATT_WARNING() ? BLINK : 0);
-  putsVBat(14*FW,0,att);
+  putsVBat(10*FW-1,0,att);
  if (g_model.timers[0].mode) {
    att = (timersStates[0].val<0 ? BLINK : 0);
-    drawTimer(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
+    drawTimer(13*FW+5, 0, timersStates[0].val, att, att);
  }
  lcdInvertLine(0);
 }
@@ -694,11 +699,11 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
    idx = idx - MIXSRC_Rud;
    if (ZEXIST(g_eeGeneral.anaNames[idx])) {
      if (idx < MIXSRC_FIRST_POT-MIXSRC_Rud )
-        lcdDrawChar(x, y, '\307', att); // stick symbol
+        lcdDrawText(x, y, "\307", att); // stick symbol
      else if (idx <= MIXSRC_LAST_POT-MIXSRC_Rud )
-        lcdDrawChar(x, y, '\310', att); // pot symbol
+        lcdDrawText(x, y, "\310", att); // pot symbol
      else
-        lcdDrawChar(x, y, '\311', att); // slider symbol
+        lcdDrawText(x, y, "\311", att); // slider symbol
      lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att);
    }
    else {
@@ -708,7 +713,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
  else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
    idx = idx-MIXSRC_FIRST_SWITCH;
    if (ZEXIST(g_eeGeneral.switchNames[idx])) {
-      lcdDrawChar(x, y, '\312', att); //switch symbol
+      lcdDrawText(x, y, "\312", att); //switch symbol
      lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att);
    }
    else {
@@ -770,7 +775,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att)
 void drawSwitch(coord_t x, coord_t y, swsrc_t idx, LcdFlags flags, bool autoBold)
 {
  char s[8];
-  getSwitchString(s, idx);
+  getSwitchPositionName(s, idx);
  if (autoBold && idx != SWSRC_NONE && getSwitch(idx))
    flags |= BOLD;
  lcdDrawText(x, y, s, flags);
@@ -838,7 +843,7 @@ void putsRotaryEncoderMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, Lcd
 }
 #endif

-void drawValueWithUnit(coord_t x, coord_t y, int val, uint8_t unit, LcdFlags att)
+void drawValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags att)
 {
  // convertUnit(val, unit);
  lcdDrawNumber(x, y, val, att & (~NO_UNIT));
@@ -869,21 +874,28 @@ void drawGPSCoord(coord_t x, coord_t y, int32_t value, const char * direction, L
      lcdLastRightPos += 3;
    }
  }
+#if !defined(PCBI6X) // GPS format setting disabled
  else {
    absvalue /= 10000;
    lcdDrawNumber(lcdLastRightPos+FW, y, absvalue, att|LEFT|PREC2); // mm.mmm
  }
+#endif
  lcdDrawSizedText(lcdLastRightPos+1, y, direction + (value>=0 ? 0 : 1), 1);
 }

+void drawTime(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags att)
+{
+  lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0, 2);
+  lcdDrawText(lcdNextPos, y, ":", att);
+  lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0, 2);
+  lcdDrawText(lcdNextPos, y, ":", att);
+  lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0, 2);
+}
+
 void drawDate(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags att)
 {
  if (BLINK_ON_PHASE) {
-     lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0, 2);
-     lcdDrawText(lcdNextPos, y, ":", att);
-     lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0, 2);
-     lcdDrawText(lcdNextPos, y, ":", att);
-     lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0, 2);
+     drawTime(x, y, telemetryItem, att);
  }
  else {
    lcdDrawNumber(x, y, telemetryItem.datetime.year, att|LEADING0|LEFT, 4);
@@ -938,11 +950,7 @@ void drawTelemScreenDate(coord_t x, coord_t y, source_t sensor, LcdFlags att)
  sensor = (sensor-MIXSRC_FIRST_TELEM) / 3;
 	TelemetryItem & telemetryItem = telemetryItems[sensor];

-  lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0, 2);
-  lcdDrawText(lcdNextPos, y, ":", att);
-  lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0, 2);
-  lcdDrawText(lcdNextPos, y, ":", att);
-  lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0, 2);
+  drawTime(x, y, telemetryItem, att);

  lcdDrawNumber(x-29, y, telemetryItem.datetime.month, att|LEADING0|LEFT, 2);
  lcdDrawChar(lcdNextPos, y, '-', att);
@@ -952,7 +960,7 @@ void drawTelemScreenDate(coord_t x, coord_t y, source_t sensor, LcdFlags att)
 void drawGPSPosition(coord_t x, coord_t y, int32_t longitude, int32_t latitude, LcdFlags flags)
 {
  if (flags & DBLSIZE) {
-    x -= (g_eeGeneral.gpsFormat == 0 ? 62 : 61);
+    x -= 62; // (g_eeGeneral.gpsFormat == 0 ? 62 : 61);
    flags &= ~0x0F00; // TODO constant
    drawGPSCoord(x, y, latitude, "NS", flags);
    drawGPSCoord(x, y+FH, longitude, "EW", flags);
@@ -983,7 +991,7 @@ void lcdDraw1bitBitmap(coord_t x, coord_t y, const uint8_t * img, uint8_t idx, L
  uint8_t hb = ((*q++) + 7) / 8;
  bool inv = (att & INVERS) ? true : (att & BLINK ? BLINK_ON_PHASE : false);
  q += idx*w*hb;
-  for (uint8_t yb = 0; yb < hb; yb++) {
+  for (uint32_t yb = 0; yb < hb; yb++) {
    uint8_t *p = &displayBuf[(y / 8 + yb) * LCD_W + x];
    for (coord_t i=0; i<w; i++){
      uint8_t b = *q++;
@@ -44,7 +44,7 @@ typedef uint8_t display_t;
 #define BLINK                          0x01
 #define INVERS                         0x02
 #if defined(BOLD_FONT)
-  #define BOLD                         0x40
+  #define BOLD                         0x40u
 #else
  #define BOLD                         0x00
 #endif
@@ -53,10 +53,9 @@ typedef uint8_t display_t;
 #define CENTERED                       0x20
 #define CONDENSED                      0x08
 #define FIXEDWIDTH                     0x10
-/* lcd puts flags */
 /* no 0x80 here because of "GV"1 which is aligned LEFT */
 /* no 0x10 here because of "MODEL"01 which uses LEADING0 */
-#define ZCHAR                          0x80
+#define ZCHAR                          0x80u

 /* lcdDrawNumber additional flags */
 #define LEADING0                       0x10
@@ -98,11 +97,6 @@ extern coord_t lcdNextPos;
 #define DISPLAY_END                    (displayBuf + DISPLAY_BUFFER_SIZE)
 #define ASSERT_IN_DISPLAY(p)           assert((p) >= displayBuf && (p) < DISPLAY_END)

-#if defined(PCBSKY9X)
-  extern volatile uint8_t lcdLock ;
-  extern volatile uint32_t lcdInputs ;
-#endif
-
 void lcdDrawChar(coord_t x, coord_t y, const unsigned char c);
 void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags flags);
 void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags flags);
@@ -111,6 +105,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len, L
 void lcdDrawText(coord_t x, coord_t y, const char * s);
 void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len);
 void lcdDrawTextAlignedLeft(coord_t y, const char * s);
+void lcdDrawTextIndented(coord_t y, const char * s);
 void drawTimerWithMode(coord_t x, coord_t y, uint8_t index, LcdFlags att);

  void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
@@ -46,3 +46,4 @@ void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8
 }

 uint8_t s_currIdx;
+uint8_t s_currIdxSubMenu;
@@ -67,8 +67,8 @@ void menuModelNotes(event_t event)
 {
  if (event == EVT_ENTRY) {
 #if defined(SDCARD)
-    strcpy(s_text_file, MODELS_PATH "/");
-    char *buf = strcat_modelname(&s_text_file[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
+    strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
+    char *buf = strcat_modelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
    strcpy(buf, TEXT_EXT);
 #endif
  }
@@ -65,7 +65,7 @@ inline MenuHandlerFunc lastPopMenu()
 void onMainViewMenu(const char * result);
 void menuFirstCalib(event_t event);
 void menuMainView(event_t event);
-void menuViewTelemetryFrsky(event_t event);
+void menuViewTelemetry(event_t event);
 void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomFunctionsContext * functionsContext);

 enum MenuRadioIndexes
@@ -50,8 +50,8 @@ void runPopupCurvePreset(event_t event)

  if (warningResult) {
    warningResult = 0;
-    CurveInfo & crv = g_model.curves[s_curveChan];
-    int8_t * points = curveAddress(s_curveChan);
+    CurveInfo & crv = g_model.curves[s_currIdxSubMenu];
+    int8_t * points = curveAddress(s_currIdxSubMenu);
    int k = 25 * reusableBuffer.curveEdit.preset;
    int dx = 2000 / (5+crv.points-1);
    for (uint8_t i=0; i<5+crv.points; i++) {
@@ -71,14 +71,14 @@ void onCurveOneMenu(const char * result)
    POPUP_INPUT(STR_PRESET, runPopupCurvePreset);
  }
  else if (result == STR_MIRROR) {
-    CurveInfo & crv = g_model.curves[s_curveChan];
-    int8_t * points = curveAddress(s_curveChan);
+    CurveInfo & crv = g_model.curves[s_currIdxSubMenu];
+    int8_t * points = curveAddress(s_currIdxSubMenu);
    for (int i=0; i<5+crv.points; i++)
      points[i] = -points[i];
  }
  else if (result == STR_CLEAR) {
-    CurveInfo & crv = g_model.curves[s_curveChan];
-    int8_t * points = curveAddress(s_curveChan);
+    CurveInfo & crv = g_model.curves[s_currIdxSubMenu];
+    int8_t * points = curveAddress(s_currIdxSubMenu);
    for (int i=0; i<5+crv.points; i++)
      points[i] = 0;
    if (crv.type == CURVE_TYPE_CUSTOM) {
@@ -89,10 +89,10 @@ void onCurveOneMenu(const char * result)

 void menuModelCurveOne(event_t event)
 {
-  CurveData & crv = g_model.curves[s_curveChan];
-  int8_t * points = curveAddress(s_curveChan);
+  CurveData & crv = g_model.curves[s_currIdxSubMenu];
+  int8_t * points = curveAddress(s_currIdxSubMenu);

-  drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, STR_CV, s_curveChan+1);
+  drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, STR_CV, s_currIdxSubMenu+1);
  
  SIMPLE_SUBMENU(STR_MENUCURVES, 4 + 5+crv.points + (crv.type==CURVE_TYPE_CUSTOM ? 5+crv.points-2 : 0));

@@ -108,9 +108,9 @@ void menuModelCurveOne(event_t event)
    uint8_t newType = checkIncDecModelZero(event, crv.type, CURVE_TYPE_LAST);
    if (newType != crv.type) {
      for (int i = 1; i < 4 + crv.points; i++) {
-        points[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5 + crv.points, i)), s_curveChan));
+        points[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5 + crv.points, i)), s_currIdxSubMenu));
      }
-      if (moveCurve(s_curveChan, checkIncDec_Ret > 0 ? 3 + crv.points : -3 - crv.points)) {
+      if (moveCurve(s_currIdxSubMenu, checkIncDec_Ret > 0 ? 3 + crv.points : -3 - crv.points)) {
        if (newType == CURVE_TYPE_CUSTOM) {
          resetCustomCurveX(points, 5 + crv.points);
        }
@@ -131,8 +131,8 @@ void menuModelCurveOne(event_t event)
      newPoints[0] = points[0];
      newPoints[4 + count] = points[4 + crv.points];
      for (int i = 1; i < 4 + count; i++)
-        newPoints[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5 + count, i)), s_curveChan));
-      if (moveCurve(s_curveChan, checkIncDec_Ret * (crv.type == CURVE_TYPE_CUSTOM ? 2 : 1))) {
+        newPoints[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5 + count, i)), s_currIdxSubMenu));
+      if (moveCurve(s_currIdxSubMenu, checkIncDec_Ret * (crv.type == CURVE_TYPE_CUSTOM ? 2 : 1))) {
        for (int i = 0; i < 5 + count; i++) {
          points[i] = newPoints[i];
          if (crv.type == CURVE_TYPE_CUSTOM && i != 0 && i != 4 + count)
@@ -37,8 +37,8 @@ void onModelCustomScriptMenu(const char *result)
      POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
    }
  }
-  else {
-    // The user choosed a lua file in the list
+  else if (result) {
+    // The user chosen a lua file in the list
    copySelection(sd.file, result, sizeof(sd.file));
    memset(sd.inputs, 0, sizeof(sd.inputs));
    storageDirty(EE_MODEL);
@@ -50,13 +50,15 @@ enum MenuModelDisplayItems {
 #else
  #define DISPLAY_COL2                (8*FW)
 #endif
-#define DISPLAY_COL3                  (17*FW+2)
+#define DISPLAY_COL3                  (15*FW+2)

 inline uint8_t SCREEN_TYPE_COLUMNS(uint8_t screenIndex)
 {
+#if defined(LUA)
  if (TELEMETRY_SCREEN_TYPE(screenIndex) == TELEMETRY_SCREEN_TYPE_SCRIPT)
    return 1;
  else
+#endif
    return 0;
 }

@@ -96,8 +98,8 @@ void onTelemetryScriptFileSelectionMenu(const char * result)
      POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
    }
  }
-  else {
-    // The user choosed a file in the list
+  else if (result != STR_EXIT) {
+    // The user chosen a file in the list
    memcpy(g_model.frsky.screens[screenIndex].script.file, result, sizeof(g_model.frsky.screens[screenIndex].script.file));
    storageDirty(EE_MODEL);
    LUA_LOAD_MODEL_SCRIPTS();
@@ -128,7 +130,7 @@ void menuModelDisplay(event_t event)

  int8_t sub = menuVerticalPosition - HEADER_LINE;

-  for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
+  for (uint32_t i=0; i<NUM_BODY_LINES; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    int k = i + menuVerticalOffset;
    SKIP_HIDDEN_MENU_ROWS(k);
@@ -242,10 +244,10 @@ void menuModelDisplay(event_t event)
                }
                break;
              case 1:
-                bar.barMin = checkIncDec(event, bar.barMin, barMin, bar.barMax, EE_MODEL|NO_INCDEC_MARKS);
+                bar.barMin = checkIncDec(event, bar.barMin, barMin, barMax, EE_MODEL|NO_INCDEC_MARKS);
                break;
              case 2:
-                bar.barMax = checkIncDec(event, bar.barMax, bar.barMin, barMax, EE_MODEL|NO_INCDEC_MARKS);
+                bar.barMax = checkIncDec(event, bar.barMax, barMin, barMax, EE_MODEL|NO_INCDEC_MARKS);
                break;
            }
          }
@@ -253,11 +255,11 @@ void menuModelDisplay(event_t event)
        else {
          for (int c=0; c<NUM_LINE_ITEMS; c++) {
            LcdFlags cellAttr = (menuHorizontalPosition==c ? attr : 0);
-            source_t & value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c];
+            source_t * value = &g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c];
            const coord_t pos[] = {DISPLAY_COL1, DISPLAY_COL2, DISPLAY_COL3};
-            drawSource(pos[c], y, value, cellAttr);
+            drawSource(pos[c], y, *value, cellAttr);
            if (cellAttr && s_editMode>0) {
-              value = checkIncDec(event, value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable);
+              *value = checkIncDec(event, *value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable);
            }
          }
          if (attr && menuHorizontalPosition == NUM_LINE_ITEMS) {
@@ -83,16 +83,17 @@ void menuModelFlightModeOne(event_t event)
  int8_t editMode = s_editMode;

 #if defined(GVARS) && !defined(PCBSTD)
-  if (s_currIdx == 0 && sub>=ITEM_MODEL_FLIGHT_MODE_SWITCH) sub += VERTICAL_SHIFT;
+  if (s_currIdx == 0 && sub>=ITEM_MODEL_FLIGHT_MODE_SWITCH)
+    sub += VERTICAL_SHIFT;

-  for (uint8_t k=0; k<LCD_LINES-1; k++) {
+  for (uint32_t k=0; k<LCD_LINES-1; k++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + k*FH;
    int8_t i = k + menuVerticalOffset;

    if (s_currIdx == 0 && i>=ITEM_MODEL_FLIGHT_MODE_SWITCH) i += VERTICAL_SHIFT;
    uint8_t attr = (sub==i ? (editMode>0 ? BLINK|INVERS : INVERS) : 0);
 #else
-  for (uint8_t i=0, k=0, y=PHASE_ONE_FIRST_LINE; i<ITEM_MODEL_FLIGHT_MODE_MAX; i++, k++, y+=FH) {
+  for (uint32_t i=0, k=0, y=PHASE_ONE_FIRST_LINE; i<ITEM_MODEL_FLIGHT_MODE_MAX; i++, k++, y+=FH) {
    if (s_currIdx == 0 && i==ITEM_MODEL_FLIGHT_MODE_SWITCH) i = ITEM_MODEL_FLIGHT_MODE_FADE_IN;
    uint8_t attr = (sub==k ? (editMode>0 ? BLINK|INVERS : INVERS) : 0);
 #endif
@@ -107,7 +108,7 @@ void menuModelFlightModeOne(event_t event)

      case ITEM_MODEL_FLIGHT_MODE_TRIMS:
        lcdDrawTextAlignedLeft(y, STR_TRIMS);
-        for (uint8_t t = 0; t < NUM_STICKS; t++) {
+        for (uint32_t t = 0; t < NUM_STICKS; t++) {
          drawTrimMode(MIXES_2ND_COLUMN + (t*2*FW), y, s_currIdx, t, menuHorizontalPosition == t ? attr : 0);
 #if defined(NAVIGATION_9X)
          if (s_editMode > 0 && attr && menuHorizontalPosition == t) {
@@ -125,7 +126,7 @@ void menuModelFlightModeOne(event_t event)
        lcdDrawTextAlignedLeft(y, STR_ROTARY_ENCODER);
        for (uint8_t t=0; t<NUM_ROTARY_ENCODERS; t++) {
          putsRotaryEncoderMode(MIXES_2ND_COLUMN+(t*FW), y, s_currIdx, t, menuHorizontalPosition==t ? attr : 0);
-          if (attr && menuHorizontalPosition==t && ((editMode>0) || p1valdiff)) {
+          if (attr && menuHorizontalPosition==t && (editMode > 0)) {
            int16_t v = flightModeAddress(s_currIdx)->rotaryEncoders[t];
            if (v < ROTARY_ENCODER_MAX) v = ROTARY_ENCODER_MAX;
            v = checkIncDec(event, v, ROTARY_ENCODER_MAX, ROTARY_ENCODER_MAX+MAX_FLIGHT_MODES-1, EE_MODEL);
@@ -161,7 +162,7 @@ void menuModelFlightModeOne(event_t event)
        drawStringWithIndex(INDENT_WIDTH, y, STR_GV, idx+1, posHorz==0 ? attr : 0);
        lcdDrawSizedText(4*FW, y,g_model.gvars[idx].name, LEN_GVAR_NAME, ZCHAR);
        if (attr && editMode>0 && posHorz==0) {
-          s_currIdx = sub - ITEM_MODEL_FLIGHT_MODE_GV1;
+          s_currIdxSubMenu = sub - ITEM_MODEL_FLIGHT_MODE_GV1;
          editMode = 0;
          pushMenu(menuModelGVarOne);
        }
@@ -174,7 +175,7 @@ void menuModelFlightModeOne(event_t event)
        else {
          lcdDrawText(9*FW, y, STR_OWN, posHorz==1 ? attr : 0);
        }
-        if (attr && s_currIdx>0 && posHorz==1 && (editMode>0 || p1valdiff)) {
+        if (attr && s_currIdx>0 && posHorz==1 && editMode > 0) {
          if (v < GVAR_MAX) v = GVAR_MAX;
          v = checkIncDec(event, v, GVAR_MAX, GVAR_MAX+MAX_FLIGHT_MODES-1, EE_MODEL);
          if (checkIncDec_Ret) {
@@ -249,7 +250,7 @@ void menuModelFlightModesAll(event_t event)
    lcdDrawSizedText(4*FW+NAME_OFS, y, p->name, sizeof(p->name), ZCHAR);
 #endif
    if (i == 0) {
-      for (uint8_t t=0; t<NUM_STICKS; t++) {
+      for (uint32_t t=0; t<NUM_STICKS; t++) {
 #if defined(PCBTARANIS) || defined(PCBI6X)
        drawTrimMode(TRIMS_POS+t*FW*2, y, i, t, 0);
 #else
@@ -260,12 +261,12 @@ void menuModelFlightModesAll(event_t event)
    else {
 #if defined(PCBTARANIS) || defined(PCBI6X)
      drawSwitch(SWITCH_POS, y, p->swtch, 0);
-      for (uint8_t t=0; t<NUM_STICKS; t++) {
+      for (uint32_t t=0; t<NUM_STICKS; t++) {
        drawTrimMode(TRIMS_POS+t*FW*2, y, i, t, 0);
      }
 #else
      drawSwitch((4+LEN_FLIGHT_MODE_NAME)*FW+SWITCH_OFS, y, p->swtch, 0);
-      for (uint8_t t=0; t<NUM_STICKS; t++) {
+      for (uint32_t t=0; t<NUM_STICKS; t++) {
        drawShortTrimMode((9+LEN_FLIGHT_MODE_NAME+t)*FW+TRIMS_OFS, y, i, t, 0);
      }
 #endif
@@ -23,28 +23,28 @@
 void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags)
 {
  FlightModeData * fm = &g_model.flightModeData[flightMode];
-  gvar_t & v = fm->gvars[gvar];
+  gvar_t * v = &fm->gvars[gvar];
  int16_t vmin, vmax;
-  if (v > GVAR_MAX) {
-    uint8_t fm = v - GVAR_MAX - 1;
+  if (*v > GVAR_MAX) {
+    uint8_t fm = *v - GVAR_MAX - 1;
    if (fm >= flightMode) fm++;
    drawFlightMode(x, y, fm + 1, flags&(~LEFT));
    vmin = GVAR_MAX + 1;
    vmax = GVAR_MAX + MAX_FLIGHT_MODES - 1;
  }
  else {
-    drawGVarValue(x, y, gvar, v, flags);
+    drawGVarValue(x, y, gvar, *v, flags);
    vmin = GVAR_MIN + g_model.gvars[gvar].min;
    vmax = GVAR_MAX - g_model.gvars[gvar].max;
  }

  if (flags & INVERS) {
    if (event == EVT_KEY_LONG(KEY_ENTER) && flightMode > 0) {
-      v = (v > GVAR_MAX ? 0 : GVAR_MAX+1);
+      *v = (*v > GVAR_MAX ? 0 : GVAR_MAX+1);
      storageDirty(EE_MODEL);
    }
    else if (s_editMode > 0) {
-      v = checkIncDec(event, v, vmin, vmax, EE_MODEL);
+      *v = checkIncDec(event, *v, vmin, vmax, EE_MODEL);
    }
  }
 }
@@ -64,10 +64,10 @@ enum GVarFields {

 void menuModelGVarOne(event_t event)
 {
-  GVarData * gvar = &g_model.gvars[s_currIdx];
+  GVarData * gvar = &g_model.gvars[s_currIdxSubMenu];

-  drawStringWithIndex(PSIZE(TR_GVARS)*FW+FW, 0, STR_GV, s_currIdx+1, 0);
-  drawGVarValue(32*FW, 0, s_currIdx, getGVarValue(s_currIdx, getFlightMode()));
+  drawStringWithIndex(PSIZE(TR_GVARS)*FW+FW, 0, STR_GV, s_currIdxSubMenu+1, 0);
+  drawGVarValue(32*FW, 0, s_currIdxSubMenu, getGVarValue(s_currIdxSubMenu, getFlightMode()));
  lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID);

  SIMPLE_SUBMENU(STR_GVARS, GVAR_FIELD_LAST);
@@ -91,14 +91,14 @@ void menuModelGVarOne(event_t event)
        break;

      case GVAR_FIELD_MIN:
-        lcdDrawText(0, y, STR_MIN);
-        drawGVarValue(GVAR_2ND_COLUMN, y, s_currIdx, GVAR_MIN+gvar->min, LEFT|attr);
+        lcdDrawTextAlignedLeft(y, STR_MIN);
+        drawGVarValue(GVAR_2ND_COLUMN, y, s_currIdxSubMenu, GVAR_MIN+gvar->min, LEFT|attr);
        if (attr) gvar->min = checkIncDec(event, GVAR_MIN+gvar->min, GVAR_MIN, GVAR_MAX-gvar->max, EE_MODEL) - GVAR_MIN;
        break;

      case GVAR_FIELD_MAX:
-        lcdDrawText(0, y, STR_MAX);
-        drawGVarValue(GVAR_2ND_COLUMN, y, s_currIdx, GVAR_MAX-gvar->max, LEFT|attr);
+        lcdDrawTextAlignedLeft(y, STR_MAX);
+        drawGVarValue(GVAR_2ND_COLUMN, y, s_currIdxSubMenu, GVAR_MAX-gvar->max, LEFT|attr);
        if (attr) gvar->max = GVAR_MAX - checkIncDec(event, GVAR_MAX-gvar->max, GVAR_MIN+gvar->min, GVAR_MAX, EE_MODEL);
        break;

@@ -108,7 +108,7 @@ void menuModelGVarOne(event_t event)

      default:
        drawStringWithIndex(0, y, STR_FM, k-GVAR_FIELD_FM0);
-        editGVarValue(GVAR_2ND_COLUMN, y, event, s_currIdx, k-GVAR_FIELD_FM0, LEFT|attr);
+        editGVarValue(GVAR_2ND_COLUMN, y, event, s_currIdxSubMenu, k-GVAR_FIELD_FM0, LEFT|attr);
        break;
    }
  }
@@ -21,7 +21,6 @@
 #include "opentx.h"

 #define EXPO_ONE_2ND_COLUMN (7*FW+3*FW+2)
-#define EXPO_ONE_FM_WIDTH   (5*FW)

 int expoFn(int x)
 {
@@ -40,6 +39,7 @@ void drawFunction(FnFuncP fn, uint8_t offset)

  for (int xv=-CURVE_SIDE_WIDTH; xv<=CURVE_SIDE_WIDTH; xv++) {
    coord_t yv = (LCD_H-1) - (((uint16_t)RESX + fn(xv * (RESX/CURVE_SIDE_WIDTH))) / 2 * (LCD_H-1) / RESX);
+    yv = limit (0, yv, LCD_H-1);
    if (prev_yv != (coord_t)-1) {
      if (abs((int8_t)yv-prev_yv) <= 1) {
        lcdDrawPoint(CURVE_CENTER_X+xv-offset-1, prev_yv, FORCE);
@@ -111,14 +111,14 @@ void menuModelExpoOne(event_t event)
        break;

      case EXPO_FIELD_SOURCE:
-        lcdDrawTextAlignedLeft(y, NO_INDENT(STR_SOURCE));
+        lcdDrawTextAlignedLeft(y, STR_SOURCE);
        drawSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, RIGHT|STREXPANDED|attr);
-        if (attr) ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isInputSourceAvailable);
+        if (attr) ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailableInInputs);
        break;

      case EXPO_FIELD_SCALE:
        lcdDrawTextAlignedLeft(y, STR_SCALE);
-        drawSensorCustomValue(EXPO_ONE_2ND_COLUMN, y, (ed->srcRaw - MIXSRC_FIRST_TELEM)/3, convertTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1, ed->scale), attr);
+        drawSensorCustomValue(EXPO_ONE_2ND_COLUMN, y, (ed->srcRaw - MIXSRC_FIRST_TELEM)/3, convertTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1, ed->scale),  RIGHT | attr);
        if (attr) ed->scale = checkIncDec(event, ed->scale, 0, maxTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1), EE_MODEL);
        break;

@@ -128,7 +128,7 @@ void menuModelExpoOne(event_t event)
        break;

      case EXPO_FIELD_OFFSET:
-        lcdDrawTextAlignedLeft(y, NO_INDENT(STR_OFFSET));
+        lcdDrawTextAlignedLeft(y, STR_OFFSET);
        ed->offset = GVAR_MENU_ITEM(EXPO_ONE_2ND_COLUMN, y, ed->offset, -100, 100, RIGHT | attr, 0, event);
        break;

@@ -114,7 +114,7 @@ void insertExpoMix(uint8_t expo, uint8_t idx)
    memmove(mix+1, mix, (MAX_MIXERS-(idx+1))*sizeof(MixData));
    memclear(mix, sizeof(MixData));
    mix->destCh = s_currCh-1;
-    mix->srcRaw = (s_currCh > 4 ? MIXSRC_Rud - 1 + s_currCh : MIXSRC_Rud - 1 + channel_order(s_currCh));
+    mix->srcRaw = (s_currCh > 4 ? MIXSRC_Rud - 1 + s_currCh : MIXSRC_Rud - 1 + channelOrder(s_currCh));
    mix->weight = 100;
  }
  resumeMixerCalculations();
@@ -240,7 +240,7 @@ void menuModelExpoOne(event_t event)

  coord_t y = MENU_HEADER_HEIGHT + 1;

-  for (uint8_t i=0; i<EXPO_FIELD_MAX+1; i++) {
+  for (uint32_t i=0; i<EXPO_FIELD_MAX+1; i++) {
    uint8_t attr = (sub==i ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0);
    switch (i) {
      case EXPO_FIELD_NAME:
@@ -271,7 +271,7 @@ void menuModelExpoOne(event_t event)
            CHECK_INCDEC_MODELVAR_ZERO(event, ed->curveParam, CURVE_BASE+MAX_CURVES-1);
            if (ed->curveParam) ed->curveMode = MODE_CURVE;
            if (ed->curveParam>=CURVE_BASE && event==EVT_KEY_LONG(KEY_ENTER)) {
-              s_curveChan = ed->curveParam - CURVE_BASE;
+              s_currIdxSubMenu = ed->curveParam - CURVE_BASE;
              pushMenu(menuModelCurveOne);
            }
          }
@@ -361,13 +361,13 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
  }
  lcdDrawSolidVerticalLine(x+GAUGE_WIDTH/2-1, y, GAUGE_HEIGHT+1);
  if (barMin == -101) {
-    for (uint8_t i=0; i<3; ++i) {
+    for (uint32_t i=0; i<3; ++i) {
      lcdDrawPoint(x+i, y+4-i);
      lcdDrawPoint(x+3+i, y+4-i);
    }
  }
  if (barMax == 101) {
-    for (uint8_t i=0; i<3; ++i) {
+    for (uint32_t i=0; i<3; ++i) {
      lcdDrawPoint(x+GAUGE_WIDTH-8+i, y+4-i);
      lcdDrawPoint(x+GAUGE_WIDTH-5+i, y+4-i);
    }
@@ -404,17 +404,17 @@ void menuModelMixOne(event_t event)
        editSingleName(COLUMN_X+MIXES_2ND_COLUMN, y, STR_MIXNAME, md2->name, sizeof(md2->name), event, attr);
        break;
      case MIX_FIELD_SOURCE:
-        drawFieldLabel(COLUMN_X, y, NO_INDENT(STR_SOURCE));
+        lcdDrawTextAlignedLeft(y, STR_SOURCE);
        drawSource(COLUMN_X+MIXES_2ND_COLUMN, y, md2->srcRaw, STREXPANDED|attr);
        if (attr) CHECK_INCDEC_MODELSOURCE(event, md2->srcRaw, 1, MIXSRC_LAST);
        break;
      case MIX_FIELD_WEIGHT:
-        drawFieldLabel(COLUMN_X, y, STR_WEIGHT);
+        lcdDrawTextAlignedLeft(y, STR_WEIGHT);
        gvarWeightItem(COLUMN_X+MIXES_2ND_COLUMN, y, md2, attr|LEFT, event);
        break;
      case MIX_FIELD_OFFSET:
      {
-        drawFieldLabel(COLUMN_X, y, NO_INDENT(STR_OFFSET));
+        lcdDrawTextAlignedLeft(y, STR_OFFSET);
        u_int8int16_t offset;
        MD_OFFSET_TO_UNION(md2, offset);
        offset.word = GVAR_MENU_ITEM(COLUMN_X+MIXES_2ND_COLUMN, y, offset.word, GV_RANGELARGE_OFFSET_NEG, GV_RANGELARGE_OFFSET, attr|LEFT, 0, event);
@@ -427,7 +427,7 @@ void menuModelMixOne(event_t event)
      {
        uint8_t not_stick = (md2->srcRaw > NUM_STICKS);
        int8_t carryTrim = -md2->carryTrim;
-        drawFieldLabel(COLUMN_X, y, STR_TRIM);
+        lcdDrawTextAlignedLeft(y, STR_TRIM);
        lcdDrawTextAtIndex((not_stick ? COLUMN_X+MIXES_2ND_COLUMN : COLUMN_X+6*FW-3), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, menuHorizontalPosition==0 ? attr : 0);
        if (attr && menuHorizontalPosition==0 && (not_stick || editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
        if (!not_stick) {
@@ -443,13 +443,13 @@ void menuModelMixOne(event_t event)

      case MIX_FIELD_CURVE:
      {
-        drawFieldLabel(COLUMN_X, y, STR_CURVE);
+        lcdDrawTextAlignedLeft(y, STR_CURVE);
        int8_t curveParam = md2->curveParam;
        if (md2->curveMode == MODE_CURVE) {
          drawCurveName(COLUMN_X+MIXES_2ND_COLUMN, y, curveParam, attr);
          if (attr) {
            if (event==EVT_KEY_LONG(KEY_ENTER) && (curveParam<0 || curveParam>=CURVE_BASE)){
-              s_curveChan = (curveParam<0 ? -curveParam-1 : curveParam-CURVE_BASE);
+              s_currIdxSubMenu = (curveParam<0 ? -curveParam-1 : curveParam-CURVE_BASE);
              pushMenu(menuModelCurveOne);
            }
            else {
@@ -482,7 +482,7 @@ void menuModelMixOne(event_t event)
        md2->swtch = editSwitch(COLUMN_X+MIXES_2ND_COLUMN, y, md2->swtch, attr, event);
        break;
      case MIX_FIELD_WARNING:
-        drawFieldLabel(COLUMN_X+MIXES_2ND_COLUMN, y, STR_MIXWARNING);
+        lcdDrawTextAlignedLeft(y, STR_MIXWARNING);
        if (md2->mixWarn)
          lcdDrawNumber(COLUMN_X+MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
        else
@@ -234,26 +234,20 @@ void onLogicalSwitchesMenu(const char *result)
    s_currIdx = sub;
    pushMenu(menuModelLogicalSwitchOne);
  }
-#if defined(SDCARD)
-  if (result == STR_COPY) {
-
+#if defined(CLIPBOARD)
+  else if (result == STR_COPY) {
    clipboard.type = CLIPBOARD_TYPE_CUSTOM_SWITCH;
    clipboard.data.csw = *cs;
-
  }
  else if (result == STR_PASTE) {
-
    *cs = clipboard.data.csw;
    storageDirty(EE_MODEL);
-
  }
-  else 
 #endif
-  if (result == STR_CLEAR) {
+  else if (result == STR_CLEAR) {
    memset(cs, 0, sizeof(LogicalSwitchData));
    storageDirty(EE_MODEL);
  }
-
 }

 void menuModelLogicalSwitches(event_t event)
@@ -264,14 +258,14 @@ void menuModelLogicalSwitches(event_t event)
  uint8_t k = 0;
  int8_t sub = menuVerticalPosition - HEADER_LINE;

-  if (event==EVT_KEY_FIRST(KEY_ENTER)) {
+  if (event == EVT_KEY_FIRST(KEY_ENTER)) {
    killEvents(event);
    LogicalSwitchData * cs = lswAddress(sub);
    if (cs->func)
      s_currIdx = sub;
    if (sub >= 0)
      POPUP_MENU_ADD_ITEM(STR_EDIT);
-#if defined(SDCARD)
+#if defined(CLIPBOARD)
    if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw)
      POPUP_MENU_ADD_ITEM(STR_COPY);
    if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_SWITCH)
@@ -279,10 +273,18 @@ void menuModelLogicalSwitches(event_t event)
 #endif
    if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw)
      POPUP_MENU_ADD_ITEM(STR_CLEAR);
-    POPUP_MENU_START(onLogicalSwitchesMenu);
+    if (popupMenuItemsCount == 1) {
+      popupMenuItemsCount = 0;
+      s_currIdx = sub;
+      pushMenu(menuModelLogicalSwitchOne);
+    }
+    else {
+      s_editMode = 0; // Was set in 'check' function.
+      POPUP_MENU_START(onLogicalSwitchesMenu);
+    }
  }

-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1; i++) {
    y = 1 + (i+1)*FH;
    k = i + menuVerticalOffset;
    LogicalSwitchData * cs = lswAddress(k);
@@ -70,13 +70,13 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
  }
  lcdDrawSolidVerticalLine(x+gaugeWidth/2-1, y, gaugeHeight+1);
  if (barMin == -101) {
-    for (uint8_t i=0; i<3; ++i) {
+    for (uint32_t i=0; i<3; ++i) {
      lcdDrawPoint(x+i, y+4-i);
      lcdDrawPoint(x+3+i, y+4-i);
    }
  }
  if (barMax == 101) {
-    for (uint8_t i=0; i<3; ++i) {
+    for (uint32_t i=0; i<3; ++i) {
      lcdDrawPoint(x+gaugeWidth-8+i, y+4-i);
      lcdDrawPoint(x+gaugeWidth-5+i, y+4-i);
    }
@@ -121,7 +121,7 @@ void menuModelMixOne(event_t event)
        break;

      case MIX_FIELD_SOURCE:
-        lcdDrawTextAlignedLeft(y, NO_INDENT(STR_SOURCE));
+        lcdDrawTextAlignedLeft(y, STR_SOURCE);
        drawSource(MIXES_2ND_COLUMN, y, md2->srcRaw, STREXPANDED|attr);
        if (attr) CHECK_INCDEC_MODELSOURCE(event, md2->srcRaw, 1, MIXSRC_LAST);
        break;
@@ -133,7 +133,7 @@ void menuModelMixOne(event_t event)

      case MIX_FIELD_OFFSET:
      {
-        lcdDrawTextAlignedLeft(y, NO_INDENT(STR_OFFSET));
+        lcdDrawTextAlignedLeft(y, STR_OFFSET);
        u_int8int16_t offset;
        MD_OFFSET_TO_UNION(md2, offset);
        offset.word = GVAR_MENU_ITEM(MIXES_2ND_COLUMN, y, offset.word, GV_RANGELARGE_OFFSET_NEG, GV_RANGELARGE_OFFSET, attr|LEFT, 0, event);
@@ -165,7 +165,7 @@ void menuModelMixOne(event_t event)
        break;

      case MIX_FIELD_WARNING:
-        drawFieldLabel(MIXES_2ND_COLUMN, y, STR_MIXWARNING);
+        lcdDrawTextAlignedLeft(y, STR_MIXWARNING);
        if (md2->mixWarn)
          lcdDrawNumber(MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
        else
@@ -33,14 +33,6 @@ enum MenuModelOutputsItems {
  ITEM_OUTPUTS_MAXROW = ITEM_OUTPUTS_COUNT-1
 };

-#if defined(PPM_UNIT_US)
-  #define LIMITS_MIN_POS          12*FW+1
-  #define PREC_THRESHOLD          804
-#else
-  #define LIMITS_MIN_POS          12*FW-2
-  #define PREC_THRESHOLD          0
-#endif
-
 #define LIMITS_OFFSET_POS         8*FW-1

 #if defined(PPM_LIMITS_SYMETRICAL)
@@ -70,14 +62,6 @@ enum MenuModelOutputsItems {
 #define CONVERT_US_MIN_MAX(x) ((int16_t(x)*128)/25)
 #define MIN_MAX_ATTR          attr

-#if defined(PPM_UNIT_US)
-  #define SET_MIN_MAX(x, val)   x = ((val)*250)/128
-  #define MIN_MAX_DISPLAY(x)    CONVERT_US_MIN_MAX(x)
-#else
-  #define MIN_MAX_DISPLAY(x)    (x)
-  #define SET_MIN_MAX(x, val)   x = (val)
-#endif
-
 enum MenuModelOutputsOneItems {
  ITEM_OUTPUTONE_CH_NAME,
  ITEM_OUTPUTONE_OFFSET,
@@ -96,6 +80,13 @@ enum MenuModelOutputsOneItems {

 #define LIMITS_ONE_2ND_COLUMN (13*FW)

+int32_t minMaxDisplay(int32_t val)
+{
+  if (g_eeGeneral.ppmunit == PPM_US)
+    val = CONVERT_US_MIN_MAX(val);
+  return val;
+}
+
 void menuModelLimitsOne(event_t event)
 {
  TITLE(STR_MENULIMITS);
@@ -113,7 +104,7 @@ void menuModelLimitsOne(event_t event)
    coord_t y = MENU_HEADER_HEIGHT + 1 + k*FH;
    uint8_t i = k + menuVerticalOffset;
    uint8_t attr = (sub==i ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0);
-    uint8_t active = (attr && (s_editMode>0 || p1valdiff)) ;
+    uint8_t active = (attr && s_editMode > 0) ;
    int limit = (g_model.extendedLimits ? LIMIT_EXT_MAX : 1000);

    switch (i) {
@@ -132,7 +123,7 @@ void menuModelLimitsOne(event_t event)
           ld->min = GVAR_MENU_ITEM(LIMITS_ONE_2ND_COLUMN, y, ld->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, attr|PREC1, 0, event);
           break;
        }
-        lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1);
+        lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, minMaxDisplay(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1);
        if (active) {
          ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000);
        }
@@ -144,7 +135,7 @@ void menuModelLimitsOne(event_t event)
            ld->max = GVAR_MENU_ITEM(LIMITS_ONE_2ND_COLUMN, y, ld->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, attr|PREC1, 0, event);
            break;
        }
-        lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1);
+        lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, minMaxDisplay(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1);
        if (active) {
          ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000);
        }
@@ -228,13 +219,14 @@ void menuModelLimits(event_t event)

  SIMPLE_MENU(STR_MENULIMITS, menuTabModel, MENU_MODEL_OUTPUTS, HEADER_LINE+MAX_OUTPUT_CHANNELS+1);

-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i+menuVerticalOffset;
    LcdFlags attr = (sub==MAX_OUTPUT_CHANNELS) ? INVERS : 0;

    if (sub==k && event==EVT_KEY_FIRST(KEY_ENTER) && !READ_ONLY() && (k != MAX_OUTPUT_CHANNELS) ) {
      killEvents(event);
+      s_editMode = 0;
      POPUP_MENU_ADD_ITEM(STR_EDIT);
      POPUP_MENU_ADD_ITEM(STR_RESET);
      POPUP_MENU_ADD_ITEM(STR_COPY_TRIMS_TO_OFS);
@@ -265,39 +257,42 @@ void menuModelLimits(event_t event)
      lcdDrawSizedText(0, y, ld->name, sizeof(ld->name), ((sub==k) ? INVERS : 0) | ZCHAR | LEFT);
    }

+    coord_t limitsMinPos = (g_eeGeneral.ppmunit == PPM_US) ? 12*FW+1 : 12*FW-2;
+    int precThreshold = (g_eeGeneral.ppmunit == PPM_US) ? 804 : 0;
+
    for (uint8_t j=0; j<ITEM_OUTPUTS_COUNT; j++) {
      switch (j) {
        case ITEM_OUTPUTS_OFFSET:
-#if defined(PPM_UNIT_US)
-          lcdDrawNumber(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, PREC1|RIGHT);
-#else
+          if (g_eeGeneral.ppmunit == PPM_US) {
+            lcdDrawNumber(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, PREC1|RIGHT);
+          } else {
 #if defined(GVARS)
-          if (GV_IS_GV_VALUE(ld->offset, -GV_RANGELARGE, GV_RANGELARGE)) {
-            drawGVarName(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1|RIGHT);
-            break;
-          }
+            if (GV_IS_GV_VALUE(ld->offset, -GV_RANGELARGE, GV_RANGELARGE)) {
+              drawGVarName(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1|RIGHT);
+              break;
+            }
 #endif
-          if (abs(ld->offset) >= 1000) {
-            lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset/10, RIGHT);
+            if (abs(ld->offset) >= 1000) {
+              lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset/10, RIGHT);
+            }
+            else {
+              lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset, PREC1|RIGHT);
+            }
          }
-          else {
-            lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset, PREC1|RIGHT);
-          }
-#endif
          break;

        case ITEM_OUTPUTS_MIN:
 #if defined(GVARS)
          if (GV_IS_GV_VALUE(ld->min, -GV_RANGELARGE, GV_RANGELARGE)) {
-            drawGVarName(LIMITS_MIN_POS, y, ld->min, attr|PREC1|RIGHT);
+            drawGVarName(limitsMinPos, y, ld->min, attr|PREC1|RIGHT);
            break;
          }
 #endif
-          if (ld->min <= PREC_THRESHOLD) {
-            lcdDrawNumber(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET)/10, RIGHT);
+          if (ld->min <= precThreshold) {
+            lcdDrawNumber(limitsMinPos, y, minMaxDisplay(ld->min-LIMITS_MIN_MAX_OFFSET)/10, RIGHT);
          }
          else {
-            lcdDrawNumber(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT);
+            lcdDrawNumber(limitsMinPos, y, minMaxDisplay(ld->min-LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT);
          }
          break;

@@ -308,11 +303,11 @@ void menuModelLimits(event_t event)
            break;
          }
 #endif
-          if (ld->max >= -PREC_THRESHOLD) {
-            lcdDrawNumber(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET)/10, RIGHT);
+          if (ld->max >= -precThreshold) {
+            lcdDrawNumber(LIMITS_MAX_POS, y, minMaxDisplay(ld->max+LIMITS_MIN_MAX_OFFSET)/10, RIGHT);
          }
          else {
-            lcdDrawNumber(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT);
+            lcdDrawNumber(LIMITS_MAX_POS, y, minMaxDisplay(ld->max+LIMITS_MIN_MAX_OFFSET), attr|PREC1|RIGHT);
          }
          break;

@@ -55,7 +55,7 @@ void onModelSelectMenu(const char * result)
    SET_WARNING_INFO(modelHeaders[sub].name, sizeof(g_model.header.name), ZCHAR);
  }
 #if defined(SDCARD)
-  else {
+  else if (result != STR_EXIT) {
    // The user choosed a file on SD to restore
    storageCheck(true);
    POPUP_WARNING(eeRestoreModel(sub, (char *)result));
@@ -86,12 +86,6 @@ void menuModelSelect(event_t event)

  check_submenu_simple(_event_, MAX_MODELS - HEADER_LINE);

-#if defined(NAVIGATION_POT2)
-  if (event==0 && p2valdiff<0) {
-    event = EVT_KEY_FIRST(KEY_RIGHT);
-  }
-#endif
-
  if (s_editMode > 0) s_editMode = 0;


@@ -299,14 +293,10 @@ void menuModelSelect(event_t event)
      break;
  }

-#if defined(EEPROM_RLC)
+#if defined(EEPROM_RLC) && !defined(PCBI6X) // should not be reached and warning will be raised anyway on low mem
  lcdDrawText(9*FW-(LEN_FREE-4)*FW-4, 0, STR_FREE);
  if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
  lcdDrawNumber(lcdLastRightPos+3, 0, reusableBuffer.modelsel.eepromfree, LEFT);
-#elif defined(EEPROM_RLC)
-  lcdDrawText(9*FW-(LEN_FREE-4)*FW, 0, STR_FREE);
-  if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
-  lcdDrawNumber(17*FW, 0, reusableBuffer.modelsel.eepromfree, RIGHT);
 #endif

 #if defined(PCBX7)
@@ -319,7 +309,7 @@ void menuModelSelect(event_t event)

  TITLE(STR_MENUMODELSEL);

-  for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
+  for (uint32_t i=0; i<NUM_BODY_LINES; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i+menuVerticalOffset;

@@ -89,6 +89,10 @@ enum MenuModelSetupItems {
 #endif
  ITEM_MODEL_EXTERNAL_MODULE_LABEL,
  ITEM_MODEL_EXTERNAL_MODULE_MODE,
+  #if defined(CROSSFIRE)
+  ITEM_MODEL_SETUP_EXTERNAL_MODULE_ARMING_MODE,
+  ITEM_MODEL_SETUP_EXTERNAL_MODULE_ARMING_TRIGGER,
+  #endif
 #if defined(MULTIMODULE)
  ITEM_MODEL_EXTERNAL_MODULE_SUBTYPE,
  ITEM_MODEL_EXTERNAL_MODULE_STATUS,
@@ -96,31 +100,23 @@ enum MenuModelSetupItems {
 #endif
  ITEM_MODEL_EXTERNAL_MODULE_CHANNELS,
  ITEM_MODEL_EXTERNAL_MODULE_BIND,
-#if defined(PCBSKY9X) && defined(REVX)
-  ITEM_MODEL_EXTERNAL_MODULE_OUTPUT_TYPE,
-#endif
  ITEM_MODEL_EXTERNAL_MODULE_OPTIONS,
 #if defined(MULTIMODULE)
  ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND,
 #endif
  ITEM_MODEL_EXTERNAL_MODULE_POWER,
-#if defined(PCBSKY9X) && !defined(REVA)
-  ITEM_MODEL_EXTRA_MODULE_LABEL,
-  ITEM_MODEL_EXTRA_MODULE_CHANNELS,
-  ITEM_MODEL_EXTRA_MODULE_BIND,
-#endif
  ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
-#if defined(PCBX7)
+#if defined(SBUS_TRAINER)
  ITEM_MODEL_TRAINER_LABEL,
  ITEM_MODEL_TRAINER_MODE,
+#endif
+#if defined(PCBX7) || defined(PCBX3)
 #if defined(BLUETOOTH)
  ITEM_MODEL_TRAINER_BLUETOOTH,
 #endif
  ITEM_MODEL_TRAINER_CHANNELS,
  ITEM_MODEL_TRAINER_PARAMS,
 #elif defined(PCBXLITE)
-  ITEM_MODEL_TRAINER_LABEL,
-  ITEM_MODEL_TRAINER_MODE,
  ITEM_MODEL_TRAINER_BLUETOOTH,
  ITEM_MODEL_TRAINER_CHANNELS,
 #endif
@@ -132,14 +128,18 @@ enum MenuModelSetupItems {
 #define MODEL_SETUP_RANGE_OFS            4*FW+3
 #define MODEL_SETUP_SET_FAILSAFE_OFS     7*FW-2

-#if defined(PCBTARANIS)
+#if defined(SBUS_TRAINER)
  #define CURRENT_MODULE_EDITED(k)       (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE))
-#elif defined(PCBSKY9X) && !defined(REVA)
-  #define CURRENT_MODULE_EDITED(k)       (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE)
-#elif defined(PCBI6X)
-  #define CURRENT_MODULE_EDITED(k)       (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE)
 #else
-  #define CURRENT_MODULE_EDITED(k)       (EXTERNAL_MODULE)
+  #define CURRENT_MODULE_EDITED(k)       (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE)
+#endif
+
+#if defined(CROSSFIRE)
+#define IF_MODULE_ARMED(module, xxx) (CRSF_ELRS_MIN_VER(4, 0) ? (uint8_t)(xxx) : HIDDEN_ROW)
+#define IF_MODULE_ARMED_TRIGGER(module, xxx) ((CRSF_ELRS_MIN_VER(4, 0) && g_model.moduleData[EXTERNAL_MODULE].crsf.crsfArmingMode) ? (uint8_t)(xxx) : HIDDEN_ROW)
+#else
+#define IF_MODULE_ARMED(module, xxx)
+#define IF_MODULE_ARMED_TRIGGER(module, xxx)
 #endif

 #if defined(PCBXLITE)
@@ -155,13 +155,10 @@ enum MenuModelSetupItems {
  #define IF_INTERNAL_MODULE_ON(x)       (IS_INTERNAL_MODULE_ENABLED()? (uint8_t)(x) : HIDDEN_ROW)
  #define IF_EXTERNAL_MODULE_ON(x)       (IS_EXTERNAL_MODULE_ENABLED()? (uint8_t)(x) : HIDDEN_ROW)
  #define INTERNAL_MODULE_CHANNELS_ROWS  IF_INTERNAL_MODULE_ON(1)
-  #define EXTERNAL_MODULE_BIND_ROWS()    ((isModuleXJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) || isModuleSBUS(EXTERNAL_MODULE)) ? (uint8_t)1 : (isModulePPM(EXTERNAL_MODULE) || isModulePXX(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE) || isModuleMultimodule(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW
+  #define EXTERNAL_MODULE_BIND_ROWS()    ((isModuleXJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) || isModuleSBUS(EXTERNAL_MODULE)) ? (uint8_t)1 : (isModulePPM(EXTERNAL_MODULE) || isModulePXX(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE) || isModuleMultimodule(EXTERNAL_MODULE)) ? (uint8_t)2 : (isModuleCrossfire(EXTERNAL_MODULE)) ? (uint8_t)0 : HIDDEN_ROW

-#if defined(PCBSKY9X) && defined(REVX)
-  #define OUTPUT_TYPE_ROWS()             (isModulePPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) ,
-#else
  #define OUTPUT_TYPE_ROWS()
-#endif
+
  #define PORT_CHANNELS_ROWS(x)          (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : 0)

  #define EXTERNAL_MODULE_MODE_ROWS      (isModulePXX(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE) || isModuleMultimodule(EXTERNAL_MODULE) || isModuleCrossfire(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0
@@ -171,11 +168,7 @@ enum MenuModelSetupItems {
  #define POT_WARN_ITEMS()               ((g_model.potsWarnMode) ? (uint8_t)(NUM_POTS+NUM_SLIDERS) : (uint8_t)0)
  #define TIMER_ROWS(x)                  2, 0, 0, 0, g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 : (uint8_t)0
  #define TIMERS_ROWS                    TIMER_ROWS(0), TIMER_ROWS(1), TIMER_ROWS(2)
-#if defined(PCBSKY9X) && !defined(REVA)
-  #define EXTRA_MODULE_ROWS              LABEL(ExtraModule), 1, 2,
-#else
  #define EXTRA_MODULE_ROWS
-#endif

 #if defined(PCBX7)
 #define ANTENNA_ROW
@@ -187,8 +180,10 @@ enum MenuModelSetupItems {
  #define TRAINER_BLUETOOTH_ROW
 #endif
 #define TRAINER_CHANNELS_ROW             (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW)
-#define TRAINER_PARAMS_ROW               (IS_SLAVE_TRAINER() ? (uint8_t)2 : HIDDEN_ROW)
+#define TRAINER_PARAMS_ROW               (g_model.trainerData.mode == TRAINER_MODE_SLAVE ? (uint8_t)2 : HIDDEN_ROW)
 #define TRAINER_ROWS                     LABEL(Trainer), 0, TRAINER_BLUETOOTH_ROW TRAINER_CHANNELS_ROW, TRAINER_PARAMS_ROW
+#elif defined(PCBI6X)
+#define TRAINER_ROWS                     LABEL(Trainer), 0, HIDDEN_ROW, HIDDEN_ROW
 #elif defined(PCBXLITE)
  #define ANTENNA_ROW                    IF_INTERNAL_MODULE_ON(0),
  #define IF_BT_TRAINER_ON(x)            (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW)
@@ -222,6 +217,7 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event)
  }
 }

+#if defined(PCBTARANIS)
 void onBindMenu(const char * result)
 {
  uint8_t moduleIdx = CURRENT_MODULE_EDITED(menuVerticalPosition);
@@ -246,8 +242,9 @@ void onBindMenu(const char * result)
    return;
  }

-  moduleFlag[moduleIdx] = MODULE_BIND;
+  moduleState[moduleIdx].mode = MODULE_MODE_BIND;
 }
+#endif


 void menuModelSetup(event_t event)
@@ -261,6 +258,7 @@ void menuModelSetup(event_t event)
 #endif

  int8_t old_editMode = s_editMode;
+  int8_t old_posHorz = menuHorizontalPosition;

 #if defined(PCBTARANIS)
  MENU_TAB({
@@ -336,6 +334,8 @@ void menuModelSetup(event_t event)
    IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)),
    LABEL(ExternalModule),
    EXTERNAL_MODULE_MODE_ROWS,
+    IF_MODULE_ARMED(EXTERNAL_MODULE, 0),           /* Arming Mode */
+    IF_MODULE_ARMED_TRIGGER(EXTERNAL_MODULE, 0),   /* Arming TRIGGER */
    MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE)
    MULTIMODULE_STATUS_ROWS
    EXTERNAL_MODULE_CHANNELS_ROWS,
@@ -353,23 +353,25 @@ void menuModelSetup(event_t event)

 #if (defined(DSM2) || defined(PXX))
  if (menuEvent) {
-    moduleFlag[0] = 0;
+    moduleState[0].mode = 0;
 #if NUM_MODULES > 1
-    moduleFlag[1] = 0;
+    moduleState[1].mode = 0;
 #endif
  }
 #endif

  TITLE(STR_MENUSETUP);

+#if defined(PXX)
  if (event == EVT_ENTRY) {
    reusableBuffer.modelsetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
  }
+#endif

  uint8_t sub = menuVerticalPosition - HEADER_LINE;
  int8_t editMode = s_editMode;

-  for (uint8_t i=0; i<NUM_BODY_LINES; ++i) {
+  for (uint32_t i=0; i<NUM_BODY_LINES; ++i) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i + menuVerticalOffset;
    for (int j=0; j<=k; j++) {
@@ -397,7 +399,7 @@ void menuModelSetup(event_t event)
        drawStringWithIndex(0*FW, y, STR_TIMER, timerIdx+1);
        drawTimerMode(MODEL_SETUP_2ND_COLUMN, y, timer->mode, menuHorizontalPosition==0 ? attr : 0);
        drawTimer(MODEL_SETUP_2ND_COLUMN+5*FW-2+5*FWNUM+1, y, timer->start, RIGHT | (menuHorizontalPosition==1 ? attr : 0), menuHorizontalPosition==2 ? attr : 0);
-        if (attr && (editMode > 0 || p1valdiff)) {
+        if (attr && editMode > 0) {
          div_t qr = div(timer->start, 60);
          switch (menuHorizontalPosition) {
            case 0:
@@ -425,7 +427,7 @@ void menuModelSetup(event_t event)
              break;
            case 2:
              qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
-              timer->start -= qr.rem ;
+              timer->start -= qr.rem;
              if ((int16_t)timer->start < 0) timer->start=0;
              if ((int16_t)timer->start > 5999) timer->start=32399; // 8:59:59
              break;
@@ -480,7 +482,7 @@ void menuModelSetup(event_t event)
          s_editMode = 0;
          if (event==EVT_KEY_LONG(KEY_ENTER)) {
            START_NO_HIGHLIGHT();
-            for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
+            for (uint32_t i=0; i<MAX_FLIGHT_MODES; i++) {
              memclear(&g_model.flightModeData[i], TRIMS_ARRAY_SIZE);
            }
            storageDirty(EE_MODEL);
@@ -577,7 +579,10 @@ void menuModelSetup(event_t event)
                  break;

                case EVT_KEY_LONG(KEY_ENTER):
-                  if (menuHorizontalPosition < 0 || menuHorizontalPosition >= NUM_SWITCHES) {
+#if !defined(PCBI6X)
+                  if (menuHorizontalPosition < 0 || menuHorizontalPosition >= NUM_SWITCHES)
+#endif
+                  {
                    START_NO_HIGHLIGHT();
                    getMovedSwitch();
                    g_model.switchWarningState = switches_states;
@@ -590,13 +595,11 @@ void menuModelSetup(event_t event)
            }
          }

-          LcdFlags line = attr;
-
          int current = 0;
-          for (int i=0; i<NUM_SWITCHES; i++) {
+          for (int i = 0; i < NUM_SWITCHES; i++) {
            if (SWITCH_WARNING_ALLOWED(i)) {
              div_t qr = div(current, 5);
-              if (!READ_ONLY() && event==EVT_KEY_BREAK(KEY_ENTER) && line && l_posHorz==current) {
+              if (!READ_ONLY() && event==EVT_KEY_BREAK(KEY_ENTER) && attr && l_posHorz == current && old_posHorz >= 0) {
                g_model.switchWarningEnable ^= (1 << i);
                storageDirty(EE_MODEL);
 #if defined(PCBXLITE)
@@ -605,14 +608,14 @@ void menuModelSetup(event_t event)
              }
              uint8_t swactive = !(g_model.switchWarningEnable & (1<<i));
              c = "\300-\301"[states & 0x03];
-              //lcdDrawChar(MODEL_SETUP_2ND_COLUMN+qr.rem*(2*FW+1), y+FH*qr.quot, 'A'+i, line && (menuHorizontalPosition==current) ? INVERS : 0);
-              lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN + qr.rem*((2*FW)+1), y+FH*qr.quot, FIRSTSW_STR+(i*length)+3, 1, line && (menuHorizontalPosition==current) ? INVERS : 0);
+              // lcdDrawChar(MODEL_SETUP_2ND_COLUMN+qr.rem*(2*FW+1), y+FH*qr.quot, 'A'+i, attr && (menuHorizontalPosition==current) ? INVERS : 0);
+              lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN + qr.rem*((2*FW)+1), y+FH*qr.quot, FIRSTSW_STR+(i*length)+3, 1, attr && (menuHorizontalPosition==current) ? INVERS : 0);
              if (swactive) lcdDrawChar(lcdNextPos, y+FH*qr.quot, c);
              ++current;
            }
            states >>= 2;
          }
-          if (attr && ((menuHorizontalPosition < 0) || menuHorizontalPosition >= NUM_SWITCHES)) {
+          if (attr && (/*(menuHorizontalPosition < 0) ||*/ menuHorizontalPosition >= NUM_SWITCHES)) {
            lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, 8*(2*FW+1), 1+FH*((current+4)/5));
          }
 #else //PCBTARANIS
@@ -645,9 +648,8 @@ void menuModelSetup(event_t event)
            }
          }
        }
-        LcdFlags line = attr;

-        for (uint8_t i=0; i<NUM_SWITCHES-1/*not on TRN switch*/; i++) {
+        for (uint32_t i=0; i<NUM_SWITCHES-1/*not on TRN switch*/; i++) {
          uint8_t swactive = !(g_model.switchWarningEnable & 1 << i);
          attr = 0;

@@ -661,11 +663,11 @@ void menuModelSetup(event_t event)
            c = *(STR_VSWITCHES - 2 + 9 + (3*(i+1)));
            states >>= 1;
          }
-          if (line && (menuHorizontalPosition == i)) {
+          if (attr && (menuHorizontalPosition == i)) {
            attr = BLINK | INVERS;
          }
          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive) ? c : '-', attr);
-          lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? line : 0);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? attr : 0);
        }
 #endif
        break;
@@ -721,13 +723,13 @@ void menuModelSetup(event_t event)

      case ITEM_MODEL_BEEP_CENTER:
        lcdDrawTextAlignedLeft(y, STR_BEEPCTR);
-        for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS; i++) {
+        for (uint32_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS; i++) {
          // TODO flash saving, \001 not needed in STR_RETA123
          coord_t x = MODEL_SETUP_2ND_COLUMN+i*FW;
          lcdDrawTextAtIndex(x, y, STR_RETA123, i, ((menuHorizontalPosition==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && CURSOR_ON_LINE())) ? INVERS : 0 ) );
        }
        if (attr && CURSOR_ON_CELL) {
-          if (event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff) {
+          if (event==EVT_KEY_BREAK(KEY_ENTER)) {
            if (READ_ONLY_UNLOCKED()) {
              s_editMode = 0;
              g_model.beepANACenter ^= ((BeepANACenter)1<<menuHorizontalPosition);
@@ -767,29 +769,22 @@ void menuModelSetup(event_t event)
 #if defined(PCBI6X) 
      case ITEM_MODEL_INTERNAL_MODULE_MODE:
        lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
-        lcdDrawTextAtIndex(
-          MODEL_SETUP_2ND_COLUMN, 
-          y, 
-          STR_I6X_PROTOCOLS, 
-          1+g_model.moduleData[INTERNAL_MODULE].rfProtocol, 
-          attr);
+        lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_I6X_PROTOCOLS, 1+g_model.moduleData[INTERNAL_MODULE].rfProtocol, attr);
        if (attr) {
          g_model.moduleData[INTERNAL_MODULE].rfProtocol = 
-          checkIncDec(event, 
-                      g_model.moduleData[INTERNAL_MODULE].rfProtocol, 
-                      RF_I6X_PROTO_OFF, 
-                      RF_I6X_PROTO_LAST, 
-                      EE_MODEL, 
-                      isRfProtocolAvailable);
+          checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, RF_I6X_PROTO_OFF, RF_I6X_PROTO_LAST, EE_MODEL, isRfProtocolAvailable);
          if (checkIncDec_Ret) { // modified?
            g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_AFHDS2A_SPI;
+            g_model.moduleData[INTERNAL_MODULE].channelsStart = 0;
+            g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_OUTPUT_CHANNELS - 8; // 16
+            g_model.moduleData[INTERNAL_MODULE].afhds2a.servoFreq = 50;
            if (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF){
              g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE;
            }
          }
        }
        break;
-        case ITEM_MODEL_INTERNAL_MODULE_SUBTYPE:
+      case ITEM_MODEL_INTERNAL_MODULE_SUBTYPE:
        lcdDrawTextAlignedLeft(y, INDENT "Subtype");
        lcdDrawTextAtIndex(
          MODEL_SETUP_2ND_COLUMN, 
@@ -808,21 +803,16 @@ void menuModelSetup(event_t event)
        }
        break;
        case ITEM_MODEL_INTERNAL_MODULE_SERVOFREQ:
-        lcdDrawTextAlignedLeft(y, INDENT "Servo freq");
-        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[INTERNAL_MODULE].servoFreq, attr|LEADING0|LEFT, 3);
+        lcdDrawTextAlignedLeft(y, INDENT "Servo rate");
+        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[INTERNAL_MODULE].afhds2a.servoFreq, attr|LEFT);
+//        lcdDrawText(lcdLastRightPos, y, STR_MS, attr);
        if (attr) {
-          CHECK_INCDEC_MODELVAR(event, g_model.moduleData[INTERNAL_MODULE].servoFreq, 50, 400);
+          CHECK_INCDEC_MODELVAR(event, g_model.moduleData[INTERNAL_MODULE].afhds2a.servoFreq, 50, 400);
        }
        break;
  
 #endif

-#if defined(PCBSKY9X)
-      case ITEM_MODEL_EXTRA_MODULE_LABEL:
-        lcdDrawTextAlignedLeft(y, "RF Port 2 (PPM)");
-        break;
-#endif
-
      case ITEM_MODEL_EXTERNAL_MODULE_LABEL:
        lcdDrawTextAlignedLeft(y, TR_EXTERNALRF);
        break;
@@ -830,6 +820,7 @@ void menuModelSetup(event_t event)
      case ITEM_MODEL_EXTERNAL_MODULE_MODE:
        lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
        lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
+#if !defined(PCBI6X)
        if (isModuleXJT(EXTERNAL_MODULE))
          lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, menuHorizontalPosition==1 ? attr : 0);
        else if (isModuleDSM2(EXTERNAL_MODULE))
@@ -837,6 +828,7 @@ void menuModelSetup(event_t event)
        else if (isModuleR9M(EXTERNAL_MODULE)){
          lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_R9M_REGION, g_model.moduleData[EXTERNAL_MODULE].subType, (menuHorizontalPosition==1 ? attr : 0));
        }
+#endif
 #if defined(MULTIMODULE)
        else if (isModuleMultimodule(EXTERNAL_MODULE)) {
          int multi_rfProto = g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false);
@@ -846,7 +838,7 @@ void menuModelSetup(event_t event)
            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_MULTI_PROTOCOLS, multi_rfProto, menuHorizontalPosition==1 ? attr : 0);
        }
 #endif
-        if (attr && (editMode>0 || p1valdiff)) {
+        if (attr && editMode > 0) {
          switch (menuHorizontalPosition) {
            case 0:
              g_model.moduleData[EXTERNAL_MODULE].type = checkIncDec(
@@ -870,6 +862,7 @@ void menuModelSetup(event_t event)
                  SET_DEFAULT_PPM_FRAME_LENGTH(EXTERNAL_MODULE);
              }
              break;
+#if !defined(PCBI6X) // no second column on i6X external module line
            case 1:
              if (isModuleDSM2(EXTERNAL_MODULE))
                CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, DSM2_PROTO_LP45, DSM2_PROTO_DSMX);
@@ -910,6 +903,7 @@ void menuModelSetup(event_t event)
                g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
                g_model.moduleData[EXTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(EXTERNAL_MODULE);
              }
+#endif // PCBI6X
          }
        }
        break;
@@ -928,7 +922,7 @@ void menuModelSetup(event_t event)
          if (pdef->subTypeString != nullptr)
            lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, pdef->subTypeString, g_model.moduleData[EXTERNAL_MODULE].subType, attr);
        }
-        if (attr && (editMode > 0 || p1valdiff)) {
+        if (attr && editMode > 0) {
          switch (menuHorizontalPosition) {
            case 0:
              if (multi_rfProto == MM_RF_CUSTOM_SELECTED)
@@ -946,7 +940,22 @@ void menuModelSetup(event_t event)
      break;
 #endif

-#if defined(PCBTARANIS)
+#if defined(CROSSFIRE)
+      case ITEM_MODEL_SETUP_EXTERNAL_MODULE_ARMING_MODE:
+        g_model.moduleData[EXTERNAL_MODULE].crsf.crsfArmingMode =
+          editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_CRSF_ARMING_MODE, STR_CRSF_ARMING_MODES,
+          g_model.moduleData[EXTERNAL_MODULE].crsf.crsfArmingMode, ARMING_MODE_FIRST, ARMING_MODE_LAST, attr, event, INDENT_WIDTH);
+        break;
+
+      case ITEM_MODEL_SETUP_EXTERNAL_MODULE_ARMING_TRIGGER:
+        lcdDrawTextIndented(y, STR_SWITCH);
+        drawSwitch(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].crsf.crsfArmingTrigger, attr);
+        if (attr)
+          CHECK_INCDEC_SWITCH(event, g_model.moduleData[EXTERNAL_MODULE].crsf.crsfArmingTrigger, SWSRC_FIRST, SWSRC_LAST, EE_MODEL, isSwitchAvailableForArming);
+        break;
+#endif
+
+#if defined(PCBTARANIS) || defined(SBUS_TRAINER)
      case ITEM_MODEL_TRAINER_LABEL:
        lcdDrawTextAlignedLeft(y, STR_TRAINER);
        break;
@@ -973,7 +982,7 @@ void menuModelSetup(event_t event)
            s_editMode = 0;
          }
          if (bluetoothDistantAddr[0]) {
-            lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE);
+            lcdDrawTextIndented(y+1, bluetoothDistantAddr, TINSIZE);
            if (bluetoothState != BLUETOOTH_STATE_CONNECTED) {
              lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Bind"), menuHorizontalPosition == 0 ? attr : 0);
              lcdDrawText(MODEL_SETUP_2ND_COLUMN+5*FW, y, BUTTON("Clear"), menuHorizontalPosition == 1 ? attr : 0);
@@ -992,7 +1001,7 @@ void menuModelSetup(event_t event)
            }
          }
          else {
-            lcdDrawText(INDENT_WIDTH, y, "---");
+            lcdDrawTextIndented(y, "---");
            if (bluetoothState < BLUETOOTH_STATE_IDLE)
              lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Init"), attr);
            else
@@ -1007,9 +1016,9 @@ void menuModelSetup(event_t event)
        }
        else {
          if (bluetoothDistantAddr[0])
-            lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE);
+            lcdDrawTextIndented(y+1, bluetoothDistantAddr, TINSIZE);
          else
-            lcdDrawText(INDENT_WIDTH, y, "---");
+            lcdDrawTextIndented(y, "---");
          lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, bluetoothState == BLUETOOTH_STATE_CONNECTED ? "Connected" : "!Connected");
        }
        break;
@@ -1018,9 +1027,6 @@ void menuModelSetup(event_t event)
 #if defined(PCBTARANIS)
      case ITEM_MODEL_TRAINER_CHANNELS:
      case ITEM_MODEL_INTERNAL_MODULE_CHANNELS:
-#endif
-#if defined(PCBSKY9X)
-      case ITEM_MODEL_EXTRA_MODULE_CHANNELS:
 #endif
      case ITEM_MODEL_EXTERNAL_MODULE_CHANNELS:
      {
@@ -1032,7 +1038,7 @@ void menuModelSetup(event_t event)
          lcdDrawNumber(lcdLastRightPos, y, moduleData.channelsStart+1, LEFT | (menuHorizontalPosition==0 ? attr : 0));
          lcdDrawChar(lcdLastRightPos, y, '-');
          lcdDrawNumber(lcdLastRightPos + FW+1, y, moduleData.channelsStart+sentModuleChannels(moduleIdx), LEFT | (menuHorizontalPosition==1 ? attr : 0));
-          if (attr && (editMode>0 || p1valdiff)) {
+          if (attr && editMode > 0) {
            switch (menuHorizontalPosition) {
              case 0:
                CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.channelsStart, 32-8-moduleData.channelsCount);
@@ -1054,9 +1060,6 @@ void menuModelSetup(event_t event)
 #endif
 #if defined(PCBTARANIS) || defined(PCBI6X)
      case ITEM_MODEL_INTERNAL_MODULE_BIND:
-#endif
-#if defined(PCBSKY9X)
-      case ITEM_MODEL_EXTRA_MODULE_BIND:
 #endif
      case ITEM_MODEL_EXTERNAL_MODULE_BIND:
      {
@@ -1065,11 +1068,11 @@ void menuModelSetup(event_t event)
        if (isModulePPM(moduleIdx)) {
          lcdDrawTextAlignedLeft(y, STR_PPMFRAME);
          lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppm.frameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppm.frameLength * PPM_STEP_SIZE + PPM_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT);
          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (moduleData.ppm.delay*50)+300, RIGHT | ((CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0));
          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, moduleData.ppm.pulsePol ? '+' : '-', (CURSOR_ON_LINE() || menuHorizontalPosition==2) ? attr : 0);
-          if (attr && (editMode>0 || p1valdiff)) {
+          if (attr && editMode > 0) {
            switch (menuHorizontalPosition) {
              case 0:
                CHECK_INCDEC_MODELVAR(event, moduleData.ppm.frameLength, -20, 35);
@@ -1085,14 +1088,14 @@ void menuModelSetup(event_t event)
        }
        else if (isModuleSBUS(moduleIdx)) {
          lcdDrawTextAlignedLeft(y, STR_REFRESHRATE);
-          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppm.frameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.sbus.refreshRate * SBUS_STEPSIZE + SBUS_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT);
          lcdDrawText(lcdLastRightPos, y, STR_MS);
          lcdDrawText(MODEL_SETUP_2ND_COLUMN+5*FW+2, y, moduleData.sbus.noninverted ? "no inv" : "normal", (CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0);

          if (attr && s_editMode>0) {
            switch (menuHorizontalPosition) {
              case 0:
-                CHECK_INCDEC_MODELVAR(event, moduleData.ppm.frameLength, -33, 35);
+                CHECK_INCDEC_MODELVAR(event, moduleData.sbus.refreshRate, (SBUS_MIN_PERIOD - SBUS_DEF_PERIOD) / SBUS_STEPSIZE, (SBUS_MAX_PERIOD - SBUS_DEF_PERIOD) / SBUS_STEPSIZE);
                break;
              case 1:
                CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.sbus.noninverted, 1);
@@ -1106,18 +1109,23 @@ void menuModelSetup(event_t event)
            xOffsetBind = 0;
            lcdDrawTextAlignedLeft(y, STR_RECEIVER);
            if (attr) l_posHorz += 1;
+//          } else if (isModuleCrossfire(moduleIdx)) {
+//            lcdDrawTextAlignedLeft(y, STR_RECEIVER);
          } else {
-            lcdDrawTextAlignedLeft(y, STR_RECEIVER_NUM);
+            lcdDrawTextAlignedLeft(y, STR_RECEIVER);
          }
-          if (isModulePXX(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx) || isModuleA7105(moduleIdx)) {
+          if (isModulePXX(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx) || isModuleCrossfire(moduleIdx) || isModuleA7105(moduleIdx)) {
            if (xOffsetBind)
              lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
            if (attr && l_posHorz == 0) {
-              if (editMode>0 || p1valdiff) {
+              if (editMode > 0) {
                CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], MAX_RX_NUM(moduleIdx));
                if (checkIncDec_Ret) {
+                  if (isModuleCrossfire(moduleIdx))
+                    moduleState[EXTERNAL_MODULE].counter = CRSF_FRAME_MODELID;
                  modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx];
                }
+#if !defined(PCBI6X)
                else if (event == EVT_KEY_LONG(KEY_ENTER)) {
                  killEvents(event);
                  uint8_t newVal = findNextUnusedModelId(g_eeGeneral.currModel, moduleIdx);
@@ -1126,8 +1134,11 @@ void menuModelSetup(event_t event)
                    storageDirty(EE_MODEL);
                  }
                }
+#endif
              }
            }
+          }
+          if (isModuleA7105(moduleIdx)) { // isModuleBindRangeAvailable
            lcdDrawText(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0);
 #if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6X)
            lcdDrawText(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0);
@@ -1146,8 +1157,6 @@ void menuModelSetup(event_t event)
                  if (isModuleR9M(moduleIdx) || (isModuleXJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol==RF_PROTO_X16)) {
 #if defined(PCBXLITE)
                    if (EVT_KEY_MASK(event) == KEY_ENTER) {
-#elif defined(PCBSKY9X) || defined(AR9X)
-                    if (event ==  EVT_KEY_FIRST(KEY_ENTER)) {
 #else
                    if (event == EVT_KEY_BREAK(KEY_ENTER)) {
 #endif
@@ -1175,8 +1184,8 @@ void menuModelSetup(event_t event)
                      POPUP_MENU_START(onBindMenu);
                      continue;
                    }
-                    if (moduleFlag[moduleIdx] == MODULE_BIND) {
-                      newFlag = MODULE_BIND;
+                    if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
+                      newFlag = MODULE_MODE_BIND;
                    }
                    else {
                      if (!popupMenuItemsCount) {
@@ -1185,26 +1194,26 @@ void menuModelSetup(event_t event)
                    }
                  }
                  else {
-                    newFlag = MODULE_BIND;
+                    newFlag = MODULE_MODE_BIND;
                  }
                }
                else if (l_posHorz == 2) {
-                  newFlag = MODULE_RANGECHECK;
+                  newFlag = MODULE_MODE_RANGECHECK;
                }
              }
            }
 #else
            if (attr && l_posHorz>0 && s_editMode>0) {
              if (l_posHorz == 1)
-                newFlag = MODULE_BIND;
+                newFlag = MODULE_MODE_BIND;
              else if (l_posHorz == 2)
-                newFlag = MODULE_RANGECHECK;
+                newFlag = MODULE_MODE_RANGECHECK;
            }
 #endif
-            moduleFlag[moduleIdx] = newFlag;
+            moduleState[moduleIdx].mode = newFlag;

 #if defined(MULTIMODULE)
-            if (newFlag == MODULE_BIND) {
+            if (newFlag == MODULE_MODE_BIND) {
              multiBindStatus = MULTI_BIND_INITIATED;
            }
 #endif
@@ -1213,16 +1222,6 @@ void menuModelSetup(event_t event)
        break;
      }

-#if defined(PCBSKY9X) && defined(REVX)
-      case ITEM_MODEL_EXTERNAL_MODULE_OUTPUT_TYPE:
-      {
-        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
-        ModuleData & moduleData = g_model.moduleData[moduleIdx];
-        moduleData.ppm.outputType = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_OUTPUT_TYPE, STR_VOUTPUT_TYPE, moduleData.ppm.outputType, 0, 1, attr, event);
-        break;
-      }
-#endif
-
 #if defined(PCBTARANIS) || defined(PCBI6X)
      case ITEM_MODEL_INTERNAL_MODULE_FAILSAFE:
 #endif
@@ -1237,7 +1236,7 @@ void menuModelSetup(event_t event)
          if (moduleData.failsafeMode != FAILSAFE_CUSTOM)
            menuHorizontalPosition = 0;
          if (menuHorizontalPosition == 0) {
-            if (editMode > 0 || p1valdiff) {
+            if (editMode > 0) {
              CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.failsafeMode, FAILSAFE_LAST);
              if (checkIncDec_Ret) SEND_FAILSAFE_NOW(moduleIdx);
            }
@@ -1322,7 +1321,7 @@ void menuModelSetup(event_t event)
        }
        break;
      }
-
+#if !defined(PCBI6X)
      case ITEM_MODEL_EXTERNAL_MODULE_POWER:
      {
        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
@@ -1361,7 +1360,7 @@ void menuModelSetup(event_t event)
 #endif
      }
      break;
-
+#endif // PCBI6X
 #if defined(MULTIMODULE)
      case ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND:
        if (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(true) == MM_RF_PROTO_DSM2)
@@ -1388,60 +1387,13 @@ void menuModelSetup(event_t event)
        break;
      }
 #endif
-
-
-#if 0
-      case ITEM_MODEL_PPM2_PROTOCOL:
-        lcdDrawTextAlignedLeft(y, "Port2");
-        lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VPROTOS, 0, 0);
-        lcdDrawText(MODEL_SETUP_2ND_COLUMN+4*FW+3, y, STR_CH, menuHorizontalPosition<=0 ? attr : 0);
-        lcdDrawNumber(lcdLastRightPos, y, g_model.moduleData[1].channelsStart+1, LEFT | (menuHorizontalPosition<=0 ? attr : 0));
-        lcdDrawChar(lcdLastRightPos, y, '-');
-        lcdDrawNumber(lcdLastRightPos + FW+1, y, g_model.moduleData[1].channelsStart+8+g_model.moduleData[1].channelsCount, LEFT | (menuHorizontalPosition!=0 ? attr : 0));
-        if (attr && (editMode>0 || p1valdiff)) {
-          switch (menuHorizontalPosition) {
-            case 0:
-              CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[1].channelsStart, 32-8-g_model.moduleData[1].channelsCount);
-              SET_DEFAULT_PPM_FRAME_LENGTH(1);
-              break;
-            case 1:
-              CHECK_INCDEC_MODELVAR(event, g_model.moduleData[1].channelsCount, -4, min<int8_t>(8, 32-8-g_model.moduleData[1].channelsStart));
-              SET_DEFAULT_PPM_FRAME_LENGTH(1);
-              break;
-          }
-        }
-        break;
-
-      case ITEM_MODEL_PPM2_PARAMS:
-        lcdDrawTextAlignedLeft(y, STR_PPMFRAME);
-        lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.moduleData[1].ppmFrameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1 | LEFT);
-        lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.moduleData[1].ppmDelay*50)+300, RIGHT | ((menuHorizontalPosition < 0 || menuHorizontalPosition==1) ? attr : 0));
-        lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.moduleData[1].ppmPulsePol ? '+' : '-', (menuHorizontalPosition < 0 || menuHorizontalPosition==2) ? attr : 0);
-        if (attr && (editMode>0 || p1valdiff)) {
-          switch (menuHorizontalPosition) {
-            case 0:
-              CHECK_INCDEC_MODELVAR(event, g_model.moduleData[1].ppmFrameLength, -20, 35);
-              break;
-            case 1:
-              CHECK_INCDEC_MODELVAR(event, g_model.moduleData[1].ppmDelay, -4, 10);
-              break;
-            case 2:
-              CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[1].ppmPulsePol, 1);
-              break;
-          }
-        }
-        break;
-#endif
-
    }
  }

-#if defined(PXX) || defined(PCBI6X)
-  if (IS_RANGECHECK_ENABLE()) {
-    showMessageBox("RSSI: ");
-    lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
+#if defined(AFHDS2A)
+  if (isModuleInRangeCheckMode()) {
+    showMessageBox("RQly");
+    lcdDrawNumber(WARNING_LINE_X, 5*FH, TELEMETRY_RSSI(), BOLD);
  }
 #endif

@@ -1449,21 +1401,17 @@ void menuModelSetup(event_t event)
  if (old_editMode > 0 && s_editMode == 0) {
    switch(menuVerticalPosition) {
 #if defined(PCBTARANIS) || defined(PCBI6X)
-    case ITEM_MODEL_INTERNAL_MODULE_BIND:
+    case ITEM_MODEL_INTERNAL_MODULE_BIND + 1: // for some reason index is off by one
      if (menuHorizontalPosition == 0)
        checkModelIdUnique(g_eeGeneral.currModel, INTERNAL_MODULE);
      break;
 #endif
-#if defined(PCBSKY9X)
-    case ITEM_MODEL_EXTRA_MODULE_BIND:
-      if (menuHorizontalPosition == 0)
-        checkModelIdUnique(g_eeGeneral.currModel, EXTRA_MODULE);
-      break;
-#endif
+#if !defined(PCBI6X)
      case ITEM_MODEL_EXTERNAL_MODULE_BIND:
      if (menuHorizontalPosition == 0)
        checkModelIdUnique(g_eeGeneral.currModel, EXTERNAL_MODULE);
      break;
+#endif
    }
  }
 }
@@ -1473,9 +1421,8 @@ void menuModelFailsafe(event_t event)
  const uint8_t channelStart = g_model.moduleData[g_moduleIdx].channelsStart;
  const int lim = (g_model.extendedLimits ? (512 * LIMIT_EXT_PERCENT / 100) : 512) * 2;
  uint8_t wbar = LCD_W - FW * 4 - FWNUM * 4;
-#if defined(PPM_UNIT_PERCENT_PREC1)
+  if (g_eeGeneral.ppmunit == PPM_PERCENT_PREC1)
  wbar -= 6;
-#endif

  if (event == EVT_KEY_LONG(KEY_ENTER)) {
    killEvents(event);
@@ -1487,13 +1434,13 @@ void menuModelFailsafe(event_t event)
        s_editMode = 0;
      }
      else {
-        int16_t & failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition];
-        if (failsafe < FAILSAFE_CHANNEL_HOLD)
-          failsafe = FAILSAFE_CHANNEL_HOLD;
-        else if (failsafe == FAILSAFE_CHANNEL_HOLD)
-          failsafe = FAILSAFE_CHANNEL_NOPULSE;
+        int16_t * failsafe = &g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition];
+        if (*failsafe < FAILSAFE_CHANNEL_HOLD)
+          *failsafe = FAILSAFE_CHANNEL_HOLD;
+        else if (*failsafe == FAILSAFE_CHANNEL_HOLD)
+          *failsafe = FAILSAFE_CHANNEL_NOPULSE;
        else
-          failsafe = 0;
+          *failsafe = 0;
      }
    }
    else {
@@ -1549,17 +1496,11 @@ void menuModelFailsafe(event_t event)
      failsafeValue = 0;
    }
    else {
-#if defined(PPM_UNIT_US)
-      lcdDrawNumber(xValue, y, PPM_CH_CENTER(ch)+failsafeValue/2, RIGHT|flags);
-#elif defined(PPM_UNIT_PERCENT_PREC1)
-      lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue), RIGHT|PREC1|flags);
-#else
-      lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue)/10, RIGHT|flags);
-#endif
+      drawChannelValue(xValue, y, ch, failsafeValue, RIGHT|flags);
    }

    // Gauge
-#if !defined(PCBX7)  // X7 LCD doesn't like too many horizontal lines
+#if !defined(PCBX7) && !defined(PCBI6X) // X7  & i6X LCD doesn't like too many horizontal lines
    lcdDrawRect(x+LCD_W-3-wbar, y, wbar+1, 6);
 #endif
    const uint8_t lenChannel = limit<uint8_t>(1, (abs(channelValue) * wbar/2 + lim/2) / lim, wbar/2);
@@ -24,11 +24,7 @@
 #define MODEL_SPECIAL_FUNC_2ND_COLUMN          (4*FW-1)
 #define MODEL_SPECIAL_FUNC_3RD_COLUMN          (15*FW-3)
 #define MODEL_SPECIAL_FUNC_4TH_COLUMN          (20*FW)
-#if defined(GRAPHICS)
-  #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF  (20*FW)
-#else
-  #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF  (18*FW+2)
-#endif
+#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF    (20*FW)

 #if defined(SDCARD)
 void onCustomFunctionsFileSelectionMenu(const char * result)
@@ -61,15 +57,15 @@ void onCustomFunctionsFileSelectionMenu(const char * result)
      POPUP_WARNING(func==FUNC_PLAY_SCRIPT ? STR_NO_SCRIPTS_ON_SD : STR_NO_SOUNDS_ON_SD);
    }
  }
-  else {
-    // The user choosed a file in the list
+  else if (result != STR_EXIT) {
+    // The user chosen a file in the list
    memcpy(cfn->play.name, result, sizeof(cfn->play.name));
    storageDirty(eeFlags);
  }
 }
 #endif // SDCARD

-#if defined(PCBTARANIS)
+#if defined(PCBTARANIS) || defined(PCBI6X)

 void onAdjustGvarSourceLongEnterPress(const char * result)
 {
@@ -95,7 +91,7 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
    CFN_PARAM(cfn) = 0;
    storageDirty(EE_MODEL);
  }
-  else {
+  else if (result != STR_EXIT) {
    onSourceLongEnterPress(result);
  }
 }
@@ -115,19 +111,18 @@ void onCustomFunctionsMenu(const char * result)
    eeFlags = EE_GENERAL;
  }

+#if defined(CLIPBOARD)
  if (result == STR_COPY) {
-	#if defined(SDCARD)
    clipboard.type = CLIPBOARD_TYPE_CUSTOM_FUNCTION;
    clipboard.data.cfn = *cfn;
-	#endif
  }
  else if (result == STR_PASTE) {
-	#if defined(SDCARD)
    *cfn = clipboard.data.cfn;
    storageDirty(eeFlags);
-	#endif
  }
-  else if (result == STR_CLEAR) {
+  else
+#endif
+  if (result == STR_CLEAR) {
    memset(cfn, 0, sizeof(CustomFunctionData));
    storageDirty(eeFlags);
  }
@@ -142,7 +137,7 @@ void onCustomFunctionsMenu(const char * result)
    storageDirty(eeFlags);
  }
 }
-#endif // PCBTARANIS
+#endif // PCBTARANIS, PCBI6X

 void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomFunctionsContext * functionsContext)
 {
@@ -150,19 +145,23 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF

  uint8_t eeFlags = (functions == g_model.customFn) ? EE_MODEL : EE_GENERAL;

-#if defined(PCBTARANIS)
-#if defined(PCBXLITE)
+#if defined(PCBTARANIS) || defined(PCBI6X)
+#if defined(PCBXLITE) || defined(PCBI6X)
  if (menuHorizontalPosition==0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
+#if !defined(PCBI6X)
    killEvents(KEY_ENTER);
-    if (IS_SHIFT_PRESSED()) { // ENT LONG on xlite brings up switch type menu, so this menu is activated with SHIT + ENT LONG
+   if (IS_SHIFT_PRESSED()) { // ENT LONG on xlite brings up switch type menu, so this menu is activated with SHIT + ENT LONG
+#else
+  s_editMode = 0;
+#endif // PCBI6X
 #else
  if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
 #endif
    killEvents(event);
    CustomFunctionData *cfn = &functions[sub];
+#if defined(CLIPBOARD)
    if (!CFN_EMPTY(cfn))
      POPUP_MENU_ADD_ITEM(STR_COPY);
-#if defined(SDCARD)
    if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_FUNCTION && isAssignableFunctionAvailable(clipboard.data.cfn.func))
      POPUP_MENU_ADD_ITEM(STR_PASTE);
 #endif
@@ -181,17 +180,17 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
 #if defined(PCBXLITE)
  }
 #endif
-#endif // PCBTARANIS
+#endif // PCBTARANIS, PCBI6X

-  for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
+  for (uint32_t i=0; i<NUM_BODY_LINES; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i+menuVerticalOffset;

    CustomFunctionData * cfn = &functions[k];
    uint8_t func = CFN_FUNC(cfn);
-    for (uint8_t j=0; j<5; j++) {
+    for (uint32_t j=0; j<5; j++) {
      uint8_t attr = ((sub==k && menuHorizontalPosition==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
-      uint8_t active = (attr && (s_editMode>0 || p1valdiff));
+      uint8_t active = (attr && s_editMode > 0);
      switch (j) {
        case 0:
          if (sub==k && menuHorizontalPosition < 1 && CFN_SWITCH(cfn) == SWSRC_NONE) {
@@ -281,10 +280,12 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
            lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
          }
 #endif // OVERRIDE_CHANNEL_FUNCTION
-          else if (func >= FUNC_SET_FAILSAFE && func <= FUNC_BIND) {
+#if defined(DANGEROUS_MODULE_FUNCTIONS)
+          else if (func >= FUNC_RANGECHECK && func <= FUNC_BIND) {
            val_max = NUM_MODULES-1;
            lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr);
          }
+#endif
          else if (func == FUNC_SET_TIMER) {
            getMixSrcRange(MIXSRC_FIRST_TIMER, val_min, val_max);
            drawTimer(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT, attr);
@@ -326,6 +327,15 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
            }
            break;
          }
+#endif // SDCARD
+#if defined(DFPLAYER)
+          else if (func == FUNC_PLAY_TRACK) {
+            val_min = DFPLAYER_CUSTOM_FILE_INDEX;
+            val_max = DFPLAYER_LAST_FILE_INDEX;
+            if (val_displayed < val_min) val_displayed = val_min;
+            // lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+            editChoice(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "", audioNames, val_displayed, DFPLAYER_CUSTOM_FILE_INDEX, DFPLAYER_LAST_FILE_INDEX, attr, event);
+          }
          else if (func == FUNC_PLAY_VALUE) {
            val_max = MIXSRC_LAST_TELEM;
            drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
@@ -334,7 +344,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
              INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
            }
          }
-#endif // SDCARD
+#endif // SDCARD || DFPLAYER
+#if !defined(PCBI6X)
          else if (func == FUNC_VOLUME) {
            val_max = MIXSRC_LAST_CH;
            drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
@@ -343,6 +354,15 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
              INCDEC_ENABLE_CHECK(isSourceAvailable);
            }
          }
+#endif // PCBI6X
+          else if (func == FUNC_BACKLIGHT) {
+            val_max = MIXSRC_LAST_CH;
+            drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
+            if (active) {
+              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
+              INCDEC_ENABLE_CHECK(isSourceAvailable);
+            }
+          }
 #if defined(SDCARD)
          else if (func == FUNC_LOGS) {
            if (val_displayed) {
@@ -105,6 +105,8 @@ enum MenuModelTelemetryFrskyItems {

 #if defined (PCBTARANIS)
  #define TELEMETRY_TYPE_SHOW_TELEMETRY  (! IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW
+#elif defined(PCBI6X) // no telemetry input implemented
+  #define TELEMETRY_TYPE_SHOW_TELEMETRY  HIDDEN_ROW
 #else
  #define TELEMETRY_TYPE_SHOW_TELEMETRY  (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW
 #endif
@@ -133,7 +135,9 @@ enum SensorFields {
  SENSOR_FIELD_ONLYPOSITIVE,
  SENSOR_FIELD_FILTER,
  SENSOR_FIELD_PERSISTENT,
+#if defined(SDCARD)
  SENSOR_FIELD_LOGS,
+#endif
  SENSOR_FIELD_MAX
 };

@@ -162,7 +166,7 @@ void menuModelSensor(event_t event)

  int8_t sub = menuVerticalPosition;

-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i + menuVerticalOffset;

@@ -296,7 +300,7 @@ void menuModelSensor(event_t event)
      case SENSOR_FIELD_PARAM2:
        if (sensor->type == TELEM_TYPE_CALCULATED) {
          if (sensor->formula == TELEM_FORMULA_CELL) {
-            sensor->cell.index = editChoice(SENSOR_2ND_COLUMN, y, STR_CELLINDEX, STR_VCELLINDEX, sensor->cell.index, 0, 8, attr, event);
+            sensor->cell.index = editChoice(SENSOR_2ND_COLUMN, y, STR_CELLINDEX, STR_VCELLINDEX, sensor->cell.index, TELEM_CELL_INDEX_LOWEST, TELEM_CELL_INDEX_LAST, attr, event);
            break;
          }
          else if (sensor->formula == TELEM_FORMULA_DIST) {
@@ -315,7 +319,7 @@ void menuModelSensor(event_t event)
          break;
        }
        else {
-          lcdDrawTextAlignedLeft(y, NO_INDENT(STR_OFFSET));
+          lcdDrawTextAlignedLeft(y, STR_OFFSET);
          if (attr) CHECK_INCDEC_MODELVAR(event, sensor->custom.offset, -30000, +30000);
          if (sensor->prec > 0) attr |= (sensor->prec == 2 ? PREC2 : PREC1);
          lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
@@ -328,17 +332,17 @@ void menuModelSensor(event_t event)

      case SENSOR_FIELD_PARAM4:
      {
-        drawStringWithIndex(0, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1);
-        int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1];
+        drawStringWithIndex(0, y, STR_SOURCE, k-SENSOR_FIELD_PARAM1+1);
+        int8_t * source = &sensor->calc.sources[k-SENSOR_FIELD_PARAM1];
        if (attr) {
-          source = checkIncDec(event, source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
+          *source = checkIncDec(event, *source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
        }
-        if (source < 0) {
+        if (*source < 0) {
          lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr);
-          drawSource(lcdNextPos, y, MIXSRC_FIRST_TELEM+3*(-1-source), attr);
+          drawSource(lcdNextPos, y, MIXSRC_FIRST_TELEM+3*(-1-*source), attr);
        }
        else {
-          drawSource(SENSOR_2ND_COLUMN, y, source ? MIXSRC_FIRST_TELEM+3*(source-1) : 0, attr);
+          drawSource(SENSOR_2ND_COLUMN, y, *source ? MIXSRC_FIRST_TELEM+3*(*source-1) : 0, attr);
        }
        break;
      }
@@ -362,14 +366,14 @@ void menuModelSensor(event_t event)
        }
        break;

+#if defined(SDCARD)
      case SENSOR_FIELD_LOGS:
        ON_OFF_MENU_ITEM(sensor->logs, SENSOR_2ND_COLUMN, y, STR_LOGS, attr, event);
        if (attr && checkIncDec_Ret) {
-#if defined(SDCARD)
          logsClose();
-#endif
        }
        break;
+#endif

    }
  }
@@ -434,7 +438,7 @@ void menuModelTelemetryFrsky(event_t event)
      break;
  }

-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i + menuVerticalOffset;
    for (int j=0; j<=k; j++) {
@@ -456,6 +460,9 @@ void menuModelTelemetryFrsky(event_t event)
      if (telemetryItems[index].isFresh()) {
        lcdDrawChar(17*FW, y, '*');
      }
+#if 0 // draw telemetry sensor ID
+      lcdDrawNumber(LCD_W, y, g_model.telemetrySensors[index].instance, RIGHT);
+#endif
      TelemetryItem & telemetryItem = telemetryItems[index];
      if (telemetryItem.isAvailable()) {
        bool isOld = telemetryItem.isOld();
@@ -485,6 +492,7 @@ void menuModelTelemetryFrsky(event_t event)
    else

    switch (k) {
+#if !defined(PCBI6X) // no telemetry input implemented
      case ITEM_TELEMETRY_PROTOCOL_TYPE:
        lcdDrawTextAlignedLeft(y, STR_TELEMETRY_TYPE);
        lcdDrawTextAtIndex(TELEM_COL2, y, STR_TELEMETRY_PROTOCOLS, g_model.telemetryProtocol, attr);
@@ -492,7 +500,7 @@ void menuModelTelemetryFrsky(event_t event)
          g_model.telemetryProtocol = checkIncDec(event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable);
        }
        break;
-
+#endif
 #if defined(REVX)
      case ITEM_TELEMETRY_INVERTED_SERIAL:
        ON_OFF_MENU_ITEM(g_model.moduleData[EXTERNAL_MODULE].invertedSerial, TELEM_COL2, y, STR_INVERTED_SERIAL, attr, event);
@@ -512,7 +520,7 @@ void menuModelTelemetryFrsky(event_t event)
        break;

      case ITEM_TELEMETRY_NEW_SENSOR:
-        lcdDrawText(0, y, STR_TELEMETRY_NEWSENSOR, attr);
+        lcdDrawText(INDENT_WIDTH, y, STR_TELEMETRY_NEWSENSOR, attr);
        if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
          s_editMode = 0;
          int res = availableTelemetryIndex();
@@ -543,19 +551,13 @@ void menuModelTelemetryFrsky(event_t event)


      case ITEM_TELEMETRY_RSSI_LABEL:
-#if defined(MULTIMODULE)
-        if (telemetryProtocol == PROTOCOL_MULTIMODULE &&
-          g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MM_RF_PROTO_FS_AFHDS2A)
-          lcdDrawTextAlignedLeft(y, "RSNR");
-        else
-#endif
-        lcdDrawTextAlignedLeft(y, "RSSI");
+        lcdDrawTextAlignedLeft(y, "RQly");
        break;

      case ITEM_TELEMETRY_RSSI_ALARM1:
      case ITEM_TELEMETRY_RSSI_ALARM2: {
        bool warning = (k==ITEM_TELEMETRY_RSSI_ALARM1);
-        lcdDrawTextAlignedLeft(y, (warning ? STR_LOWALARM : STR_CRITICALALARM));
+        lcdDrawTextIndented(y, (warning ? STR_LOWALARM : STR_CRITICALALARM));
        lcdDrawNumber(LCD_W, y, warning? g_model.rssiAlarms.getWarningRssi() : g_model.rssiAlarms.getCriticalRssi(), RIGHT | attr, 3);
        if (attr && s_editMode>0) {
          if (warning)
@@ -575,7 +577,7 @@ void menuModelTelemetryFrsky(event_t event)
        break;

      case ITEM_TELEMETRY_VARIO_SOURCE:
-        lcdDrawTextAlignedLeft(y, STR_SOURCE);
+        lcdDrawTextIndented(y, STR_SOURCE);
        drawSource(TELEM_COL2, y, g_model.frsky.varioSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.varioSource-1) : 0, attr);
        if (attr) {
          g_model.frsky.varioSource = checkIncDec(event, g_model.frsky.varioSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
@@ -583,13 +585,13 @@ void menuModelTelemetryFrsky(event_t event)
        break;

      case ITEM_TELEMETRY_VARIO_RANGE:
-        lcdDrawTextAlignedLeft(y, STR_RANGE);
+        lcdDrawTextIndented(y, STR_RANGE);
        if (attr && CURSOR_ON_LINE()) {
          lcdDrawSolidFilledRect(TELEM_COL2-1, y-1, LCD_W-TELEM_COL2+1, FH+1);
        }
        lcdDrawNumber(TELEM_COL2, y, -10+g_model.frsky.varioMin, ((CURSOR_ON_LINE() || menuHorizontalPosition==0) ? attr : 0)|LEFT);
        lcdDrawNumber(TELEM_COL2+4*FW, y, 10+g_model.frsky.varioMax, ((CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0)|LEFT);
-        if (attr && (s_editMode>0 || p1valdiff)) {
+        if (attr && s_editMode > 0) {
          switch (menuHorizontalPosition) {
            case 0:
              CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioMin, -7, 7);
@@ -602,11 +604,11 @@ void menuModelTelemetryFrsky(event_t event)
        break;

      case ITEM_TELEMETRY_VARIO_CENTER:
-        lcdDrawTextAlignedLeft(y, STR_CENTER);
+        lcdDrawTextIndented(y, STR_CENTER);
        lcdDrawNumber(TELEM_COL2, y, -5+g_model.frsky.varioCenterMin, ((CURSOR_ON_LINE() || menuHorizontalPosition==0) ? attr : 0)|PREC1|LEFT);
        lcdDrawNumber(TELEM_COL2+4*FW, y, 5+g_model.frsky.varioCenterMax, ((CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0)|PREC1|LEFT);
        lcdDrawTextAtIndex(TELEM_COL2+8*FW, y, STR_VVARIOCENTER, g_model.frsky.varioCenterSilent, (menuHorizontalPosition==2 ? attr : 0));
-        if (attr && (s_editMode>0 || p1valdiff)) {
+        if (attr && s_editMode > 0) {
          switch (menuHorizontalPosition) {
            case 0:
              CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioCenterMin, -16, 5+min<int8_t>(10, g_model.frsky.varioCenterMax+5));
@@ -40,7 +40,7 @@ void menuModelTemplates(event_t event)

  coord_t y = MENU_HEADER_HEIGHT + 1;
  uint8_t k = 0;
-  for (uint8_t i=0; i<LCD_LINES-1 && k<TMPL_COUNT; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1 && k<TMPL_COUNT; i++) {
    k = i+menuVerticalOffset;
    lcdDrawNumber(3*FW, y, k, (sub==k ? INVERS : 0)|LEADING0, 2);
    lcdDrawTextAtIndex(4*FW, y, STR_VTEMPLATES, k, (sub==k ? INVERS  : 0));
@@ -30,8 +30,8 @@ uint8_t         warningInfoFlags = ZCHAR;

 void drawMessageBox()
 {
-  lcdDrawFilledRect(10, 16, LCD_W-20, 40, SOLID, ERASE);
-  lcdDrawRect(10, 16, LCD_W-20, 40);
+  lcdDrawFilledRect(MESSAGEBOX_X - 1, MESSAGEBOX_Y - 1, MESSAGEBOX_W + 2, 48 + 2, SOLID, ERASE);
+  lcdDrawRect(MESSAGEBOX_X, MESSAGEBOX_Y, MESSAGEBOX_W, 48);
  lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, warningText, WARNING_LINE_LEN);
  // could be a place for a warningInfoText
 }
@@ -51,11 +51,12 @@ const unsigned char ASTERISK_BITMAP[]  = {
 void drawAlertBox(const char * title, const char * text, const char * action)
 {
  lcdClear();
-#if !defined(PCBI6X)
-  lcdDraw1bitBitmap(2, 0, ASTERISK_BITMAP, 0, 0);
-#else
+
+#if defined(DEBUG) || (defined(PCBI6X_ELRS) && defined(TRANSLATIONS_PT)) // saves ~140B
  lcdDrawRect(2, 2, 32 - 4, 32 - 4);
-  lcdDrawText(11, 6, "x", DBLSIZE);
+  lcdDrawChar(11, 6, 'x', DBLSIZE);
+#else
+  lcdDraw1bitBitmap(2, 0, ASTERISK_BITMAP, 0, 0);
 #endif

 #define MESSAGE_LCD_OFFSET   6*FW
@@ -87,8 +88,8 @@ void showAlertBox(const char * title, const char * text, const char * action , u
  
  lcdRefresh();
  lcdSetContrast();
-  clearKeyEvents();
-  backlightOn();
+  waitKeysReleased();
+  resetBacklightTimeout();
  checkBacklight();
 }

@@ -97,9 +98,10 @@ void runPopupWarning(event_t event)
  warningResult = false;
  drawMessageBox();
  if (warningInfoText) {
-    lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS);
+    lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, warningInfoFlags);
  }
-  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT);
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+4*FH+2, warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT);
+  
  switch (event) {
    case EVT_KEY_BREAK(KEY_ENTER):
      if (warningType == WARNING_TYPE_ASTERISK)
@@ -21,65 +21,160 @@
 #ifndef _POPUPS_H_
 #define _POPUPS_H_

-#define MENU_X                         10
-#define MENU_Y                         16
-#define MENU_W                         LCD_W-(2*MENU_X)
-#define WARNING_LINE_LEN               20
-#define WARNING_LINE_X                 16
-#define WARNING_LINE_Y                 3*FH
+#include <inttypes.h>
+#include "buzzer.h"

+extern const char * warningText;
+extern const char * warningInfoText;
+extern uint8_t      warningInfoLength;
+extern uint8_t      warningResult;
+extern uint8_t      warningType;
+extern uint8_t      warningInfoFlags;
+
+#define MESSAGEBOX_X                   8
+#define MESSAGEBOX_Y                   8
+#define MESSAGEBOX_W                   (LCD_W - 15)
+
+#define MENU_X                         MESSAGEBOX_X
+#define MENU_Y                         MESSAGEBOX_Y
+#define MENU_W                         MESSAGEBOX_W
+
+#define WARNING_LINE_LEN               24
+#define WARNING_LINE_X                 12
+#define WARNING_LINE_Y                 MESSAGEBOX_Y + 2
+
+#define POPUP_MENU_MAX_LINES         12
+#define MENU_MAX_DISPLAY_LINES       6
+#define MENU_LINE_LENGTH             (LEN_MODEL_NAME+12)
+
+enum {
+  MENU_OFFSET_INTERNAL,
+  MENU_OFFSET_EXTERNAL
+};
+
+typedef void         (* PopupFunc)(event_t event);
+extern PopupFunc popupFunc;
+extern uint8_t popupMenuOffsetType;
+
+extern uint16_t popupMenuOffset;
+extern const char * popupMenuItems[POPUP_MENU_MAX_LINES];
+extern uint16_t popupMenuItemsCount;
+typedef void         (* PopupMenuHandler)(const char * result);
+extern PopupMenuHandler popupMenuHandler;
+extern const char * popupMenuTitle;
+extern uint8_t popupMenuSelectedItem;
+
+// Message box
+void drawMessageBoxBackground(coord_t top, coord_t height);
 void drawMessageBox();
 void showMessageBox(const char * title);
+
+// Popup menu
+const char * runPopupMenu(event_t event);
 void runPopupWarning(event_t event);

-#define DRAW_MESSAGE_BOX(title)        (warningText = title, drawMessageBox(), warningText = NULL)
-
-extern void (*popupFunc)(event_t event);
-extern uint8_t warningInfoFlags;
+enum
+{
+  WARNING_TYPE_WAIT,
+  WARNING_TYPE_INFO,
+  WARNING_TYPE_ASTERISK,
+  WARNING_TYPE_CONFIRM,
+  WARNING_TYPE_INPUT
+};

 #if !defined(GUI)
  #define DISPLAY_WARNING(...)
  #define POPUP_WARNING(...)
  #define POPUP_CONFIRMATION(...)
  #define POPUP_INPUT(...)
-  #define WARNING_INFO_FLAGS           0
  #define SET_WARNING_INFO(...)
 #else
-  #define DISPLAY_WARNING              (*popupFunc)
-  #define POPUP_WARNING(s)             (warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
-  #define POPUP_CONFIRMATION(s)        (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
-  #define POPUP_INPUT(s, func)         (warningText = s, popupFunc = func)
-  #define WARNING_INFO_FLAGS           warningInfoFlags
-  #define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
+  #define DISPLAY_WARNING(evt)              (*popupFunc)(evt)
+  // #define POPUP_CONFIRMATION(s)        (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
+  // #define POPUP_INPUT(s, func)         (warningText = s, popupFunc = func)
 #endif

+
+  inline void POPUP_WARNING(const char * s)
+  {
+    // killAllEvents();
+    warningText = s;
+    warningInfoText = nullptr;
+    warningType = WARNING_TYPE_ASTERISK;
+    popupFunc = runPopupWarning;
+  }
+
+ inline void POPUP_CONFIRMATION(const char * s/*, PopupMenuHandler handler*/)
+  {
+    if (s != warningText) {
+      // killAllEvents();
+      warningText = s;
+      warningInfoText = nullptr;
+      warningType = WARNING_TYPE_CONFIRM;
+      popupFunc = runPopupWarning;
+      // popupMenuHandler = handler;
+    }
+  }
+
+  inline void POPUP_INPUT(const char * s, PopupFunc func)
+  {
+    // killAllEvents();
+    warningText = s;
+    warningInfoText = nullptr;
+    warningType = WARNING_TYPE_INPUT;
+    popupFunc = func;
+  }
+
+  inline void SET_WARNING_INFO(const char * info, uint8_t length, uint8_t flags)
+  {
+    warningInfoText = info;
+    warningInfoLength = length;
+    warningInfoFlags = flags;
+  }
+
+  inline bool isEventCaughtByPopup()
+  {
+    if (warningText /*&& warningType != WARNING_TYPE_WAIT*/)
+      return true;
+
+    if (popupMenuItemsCount > 0)
+      return true;
+
+    return false;
+  }
+
+  inline void POPUP_MENU_ADD_ITEM(const char * s)
+  {
+    popupMenuOffsetType = MENU_OFFSET_INTERNAL;
+    if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) {
+      popupMenuItems[popupMenuItemsCount++] = s;
+    }
+  }
+
 #if defined(SDCARD)
  #define POPUP_MENU_ADD_SD_ITEM(s)    POPUP_MENU_ADD_ITEM(s)
 #else
  #define POPUP_MENU_ADD_SD_ITEM(s)
 #endif

-  #define NAVIGATION_MENUS
-  #define POPUP_MENU_ADD_ITEM(s)       do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuItemsCount++] = s; } while (0)
-  #define POPUP_MENU_SELECT_ITEM(s)    s_menu_item =  (s > 0 ? (s < popupMenuItemsCount ? s : popupMenuItemsCount) : 0)
-  #define POPUP_MENU_START(func)       do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while (0)
-  #define POPUP_MENU_MAX_LINES         12
-  #define MENU_MAX_DISPLAY_LINES       6
-  #define MENU_LINE_LENGTH             (LEN_MODEL_NAME+12)
+inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
+{
+  popupMenuSelectedItem =  (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount) : 0);
+}

-  enum {
-    MENU_OFFSET_INTERNAL,
-    MENU_OFFSET_EXTERNAL
-  };
-  extern uint8_t popupMenuOffsetType;
-  extern uint8_t s_menu_item;
+inline void POPUP_MENU_TITLE(const char * s)
+{
+  popupMenuTitle = s;
+}
+
+inline void POPUP_MENU_START(PopupMenuHandler handler)
+{
+  if (handler != popupMenuHandler) {
+    // killAllEvents();
+    AUDIO_KEY_PRESS();
+    popupMenuHandler = handler;
+  }
+}

-#if defined(NAVIGATION_MENUS)
-  extern uint16_t popupMenuOffset;
-  extern const char * popupMenuItems[POPUP_MENU_MAX_LINES];
-  extern uint16_t popupMenuItemsCount;
-  const char * runPopupMenu(event_t event);
-  extern void (*popupMenuHandler)(const char * result);
-#endif

 #endif // _POPUPS_H_
@@ -33,7 +33,7 @@ enum CalibrationState {

 void menuCommonCalib(event_t event)
 {
-  for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) { // get low and high vals for sticks and trims
+  for (uint32_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) { // get low and high vals for sticks and trims
    int16_t vt = anaIn(i);
    reusableBuffer.calib.loVals[i] = min(vt, reusableBuffer.calib.loVals[i]);
    reusableBuffer.calib.hiVals[i] = max(vt, reusableBuffer.calib.hiVals[i]);
@@ -101,7 +101,7 @@ void menuCommonCalib(event_t event)
      // SET MIDPOINT
      lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS);
      lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
-      for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
+      for (uint32_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
        reusableBuffer.calib.loVals[i] = 15000;
        reusableBuffer.calib.hiVals[i] = -15000;
 #if defined(PCBTARANIS)
@@ -120,7 +120,7 @@ void menuCommonCalib(event_t event)
      // MOVE STICKS/POTS
      lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS);
      lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
-      for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
+      for (uint32_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
        if (abs(reusableBuffer.calib.loVals[i]-reusableBuffer.calib.hiVals[i]) > 50) {
          g_eeGeneral.calib[i].mid = reusableBuffer.calib.midVals[i];
          int16_t v = reusableBuffer.calib.midVals[i] - reusableBuffer.calib.loVals[i];
@@ -133,7 +133,7 @@ void menuCommonCalib(event_t event)

    case CALIB_STORE:
 #if defined(PCBTARANIS)
-      for (uint8_t i=POT1; i<=POT_LAST; i++) {
+      for (uint32_t i=POT1; i<=POT_LAST; i++) {
        int idx = i - POT1;
        int count = reusableBuffer.calib.xpotsCalib[idx].stepsCount;
        if (IS_POT_MULTIPOS(i)) {
@@ -24,17 +24,11 @@
 void menuRadioDiagAnalogs(event_t event)
 {
 // TODO enum
-#if defined(TX_CAPACITY_MEASUREMENT)
-  #define ANAS_ITEMS_COUNT 3
-#elif defined(PCBSKY9X)
-  #define ANAS_ITEMS_COUNT 2
-#else
  #define ANAS_ITEMS_COUNT 1
-#endif

  SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, HEADER_LINE+ANAS_ITEMS_COUNT);

-  for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
+  for (uint32_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
 #if (NUM_STICKS+NUM_POTS+NUM_SLIDERS) > 9
    coord_t y = MENU_HEADER_HEIGHT + 1 + (i/3)*FH;
    const uint8_t x_coord[] = {0, 70, 154};
@@ -47,27 +41,10 @@ void menuRadioDiagAnalogs(event_t event)
    drawStringWithIndex(x, y, "A", i+1);
    lcdDrawChar(lcdNextPos, y, ':');
 #endif
-    lcdDrawHexNumber(x+3*FW-1, y, anaIn(i));
+    lcdDrawNumber(x+3*FW-1, y, anaIn(i), LEADING0|LEFT, 4);
    lcdDrawNumber(x+10*FW-1, y, (int16_t)calibratedAnalogs[CONVERT_MODE(i)]*25/256, RIGHT);
  }

-  // RAS
-#if defined(PCBTARANIS)
-  if (isModuleXJT(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON()) {
-    coord_t y = MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 1 * FH + 2;
-    lcdDrawText(1, y, "RAS:");
-    lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
-  }
-#else
-  if (isModuleXJT(EXTERNAL_MODULE)) {
-    coord_t y = MENU_HEADER_HEIGHT + 1 + ((NUM_STICKS+NUM_POTS+NUM_SLIDERS)/2)*FH;
-    uint8_t x = ((NUM_STICKS+NUM_POTS+NUM_SLIDERS) & 1) ? (LCD_W/2)+FW : 0;
-
-    lcdDrawText(x, y, "RAS:");
-    lcdDrawNumber(x + 4*FW, y, telemetryData.swr.value, LEFT);
-  }
-#endif
-
 #if (NUM_PWMSTICKS > 0) && !defined(SIMU)
  lcdDrawTextAlignedLeft(7*FH, STICKS_PWM_ENABLED() ? "Sticks: PWM" : "Sticks: ANA");
 #endif
@@ -41,7 +41,7 @@ void menuRadioDiagKeys(event_t event)

  lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);

-  for (uint8_t i=0; i<9; i++) {
+  for (uint32_t i=0; i<9; i++) {
    coord_t y;

    if (i < NUM_TRIMS_KEYS) {
@@ -87,7 +87,7 @@ void menuRadioDiagKeys(event_t event)
  }

 #if defined(ROTARY_ENCODER_NAVIGATION)
-  for (uint8_t i=0; i<DIM(rotencValue); i++) {
+  for (uint32_t i=0; i<DIM(rotencValue); i++) {

 #if defined(PCBX7)
    coord_t y = MENU_HEADER_HEIGHT + FH;
@@ -20,83 +20,19 @@

 #include "opentx.h"

-#if defined(PCBSKY9X)
-#define HW_SETTINGS_COLUMN (2+(15*FW))
-enum MenuRadioHardwareItems {
-  ITEM_RADIO_HARDWARE_OPTREX_DISPLAY,
-  ITEM_RADIO_HARDWARE_STICKS_GAINS_LABELS,
-  ITEM_RADIO_HARDWARE_STICK_LV_GAIN,
-  ITEM_RADIO_HARDWARE_STICK_LH_GAIN,
-  ITEM_RADIO_HARDWARE_STICK_RV_GAIN,
-  ITEM_RADIO_HARDWARE_STICK_RH_GAIN,
-  IF_ROTARY_ENCODERS(ITEM_RADIO_HARDWARE_ROTARY_ENCODER)
-  CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BT_BAUDRATE)
-  ITEM_RADIO_HARDWARE_MAX
-};
+#define HW_SETTINGS_COLUMN1            30
+#define HW_SETTINGS_COLUMN2            (HW_SETTINGS_COLUMN1 + 5*FW)
+#define HW_SETTINGS_COLUMN3            HW_SETTINGS_COLUMN2 + FW

-void menuRadioHardware(event_t event)
-{
-  MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) CASE_BLUETOOTH(0)});
-
-  uint8_t sub = menuVerticalPosition - 1;
-
-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
-    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
-    uint8_t k = i+menuVerticalOffset;
-    uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
-    uint8_t attr = (sub == k ? blink : 0);
-
-    switch(k) {
-      case ITEM_RADIO_HARDWARE_OPTREX_DISPLAY:
-        g_eeGeneral.optrexDisplay = editChoice(HW_SETTINGS_COLUMN, y, STR_LCD, STR_VLCD, g_eeGeneral.optrexDisplay, 0, 1, attr, event);
-        break;
-
-      case ITEM_RADIO_HARDWARE_STICKS_GAINS_LABELS:
-        lcdDrawTextAlignedLeft(y, "Sticks");
-        break;
-
-      case ITEM_RADIO_HARDWARE_STICK_LV_GAIN:
-      case ITEM_RADIO_HARDWARE_STICK_LH_GAIN:
-      case ITEM_RADIO_HARDWARE_STICK_RV_GAIN:
-      case ITEM_RADIO_HARDWARE_STICK_RH_GAIN:
-      {
-        lcdDrawTextAtIndex(INDENT_WIDTH, y, "\002LVLHRVRH", k-ITEM_RADIO_HARDWARE_STICK_LV_GAIN, 0);
-        lcdDrawText(INDENT_WIDTH+3*FW, y, "Gain");
-        uint8_t mask = (1<<(k-ITEM_RADIO_HARDWARE_STICK_LV_GAIN));
-        uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0);
-        lcdDrawChar(HW_SETTINGS_COLUMN, y, val ? '2' : '1', attr);
-        if (attr) {
-          CHECK_INCDEC_GENVAR(event, val, 0, 1);
-          if (checkIncDec_Ret) {
-            g_eeGeneral.sticksGain ^= mask;
-            setSticksGain(g_eeGeneral.sticksGain);
-          }
-        }
-        break;
-      }
-
-#if defined(ROTARY_ENCODERS)
-      case ITEM_RADIO_HARDWARE_ROTARY_ENCODER:
-        g_eeGeneral.rotarySteps = editChoice(HW_SETTINGS_COLUMN, y, "Rotary Encoder", "\0062steps4steps", g_eeGeneral.rotarySteps, 0, 1, attr, event);
-        break;
+#if defined(BATTGRAPH)
+  #define CASE_BATTGRAPH(x) x,
+#else
+  #define CASE_BATTGRAPH(x)
 #endif

-#if defined(BLUETOOTH)
-      case ITEM_RADIO_HARDWARE_BT_BAUDRATE:
-        g_eeGeneral.bluetoothBaudrate = editChoice(HW_SETTINGS_COLUMN, y, STR_BAUDRATE, "\005115k 9600 19200", g_eeGeneral.bluetoothBaudrate, 0, 2, attr, event);
-        if (attr && checkIncDec_Ret) {
-          btInit();
-        }
-        break;
-#endif
-    }
-  }
-}
-#endif // PCBSKY9X
-
 #if defined(PCBTARANIS) || defined(PCBI6X)
-enum MenuRadioHardwareItems {
-  ITEM_RADIO_HARDWARE_LABEL_STICKS,
+enum {
+  ITEM_RADIO_HARDWARE_LABEL_STICKS = 0,
  ITEM_RADIO_HARDWARE_STICK1,
  ITEM_RADIO_HARDWARE_STICK2,
  ITEM_RADIO_HARDWARE_STICK3,
@@ -115,13 +51,8 @@ enum MenuRadioHardwareItems {
 #if NUM_SWITCHES >= 6
  ITEM_RADIO_HARDWARE_SH,
 #endif
+  CASE_BATTGRAPH(ITEM_RADIO_HARDWARE_BATT_RANGE)
  ITEM_RADIO_HARDWARE_BATTERY_CALIB,
-#if defined(TX_CAPACITY_MEASUREMENT)
-  ITEM_RADIO_HARDWARE_CAPACITY_CALIB,
-#endif
-#if defined(PCBSKY9X)
-  ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB,
-#endif
  ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
 #if defined(BLUETOOTH)
  ITEM_RADIO_HARDWARE_BLUETOOTH_MODE,
@@ -138,7 +69,7 @@ enum MenuRadioHardwareItems {
  ITEM_RADIO_HARDWARE_DEBUG,
 #endif
 #if defined(EEPROM_RLC)
-#if !defined(PCBI6X)
+#if defined(SDCARD)
  ITEM_RADIO_BACKUP_EEPROM,
 #endif
  ITEM_RADIO_FACTORY_RESET,
@@ -169,17 +100,12 @@ enum MenuRadioHardwareItems {
 #else
 #define BLUETOOTH_ROWS
 #endif
-#if defined(PCBXLITE)
+#if defined(PCBXLITE) || defined(PCBI6X)
 #define SWITCH_TYPE_MAX(sw)            (SWITCH_3POS)
-#elif defined(PCBI6X)
-#define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SC-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_3POS : SWITCH_2POS)
 #else
 #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
 #endif

-#define HW_SETTINGS_COLUMN1            30
-#define HW_SETTINGS_COLUMN2            (30 + 5*FW)
-
 #if defined(EEPROM_RLC)
 void onFactoryResetConfirm(const char result)
 {
@@ -205,26 +131,23 @@ void menuRadioHardware(event_t event)
      POTS_ROWS,
    LABEL(Switches),
      SWITCHES_ROWS,
+    CASE_BATTGRAPH(1) 
    0 /* battery calib */,
-#if defined(TX_CAPACITY_MEASUREMENT)
-    0,
-#endif
-#if defined(PCBSKY9X)
-    0,
-#endif
-#if defined(CROSSFIRE) //&& SPORT_MAX_BAUDRATE < 400000
+#if defined(CROSSFIRE)
    0 /* max bauds */,
 #endif
+    0 /* Aux serial mode */,
    BLUETOOTH_ROWS
    0 /*jitter filter*/,
 #if defined(MENU_DIAG_ANAS_KEYS)
    1 /* debugs */,
 #endif
+    0 /* factory reset */
  });

  uint8_t sub = menuVerticalPosition - HEADER_LINE;

-  for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
+  for (uint32_t i=0; i<NUM_BODY_LINES; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i+menuVerticalOffset;
    for (int j=0; j<=k; j++) {
@@ -260,7 +183,7 @@ void menuRadioHardware(event_t event)
        int idx = k - ITEM_RADIO_HARDWARE_POT1;
        uint8_t shift = (2*idx);
        uint8_t mask = (0x03 << shift);
-        lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+idx+1, menuHorizontalPosition < 0 ? attr : 0);
+        lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+idx+1, /*menuHorizontalPosition < 0 ? attr :*/ 0);
        if (ZEXIST(g_eeGeneral.anaNames[NUM_STICKS+idx]) || (attr && s_editMode > 0 && menuHorizontalPosition == 0))
          editName(HW_SETTINGS_COLUMN1, y, g_eeGeneral.anaNames[NUM_STICKS+idx], LEN_ANA_NAME, event, attr && menuHorizontalPosition == 0);
        else
@@ -289,7 +212,7 @@ void menuRadioHardware(event_t event)
      {
        int index = k-ITEM_RADIO_HARDWARE_SA;
        int config = SWITCH_CONFIG(index);
-        lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, MIXSRC_FIRST_SWITCH-MIXSRC_Rud+index+1, menuHorizontalPosition < 0 ? attr : 0);
+        lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, MIXSRC_FIRST_SWITCH-MIXSRC_Rud+index+1, /*menuHorizontalPosition < 0 ? attr :*/ 0);
        if (ZEXIST(g_eeGeneral.switchNames[index]) || (attr && s_editMode > 0 && menuHorizontalPosition == 0))
          editName(HW_SETTINGS_COLUMN1, y, g_eeGeneral.switchNames[index], LEN_SWITCH_NAME, event, menuHorizontalPosition == 0 ? attr : 0);
        else
@@ -302,56 +225,38 @@ void menuRadioHardware(event_t event)
        break;
      }

-      case ITEM_RADIO_HARDWARE_BATTERY_CALIB:
-#if defined(PCBTARANIS) || defined(PCBI6X)
-        lcdDrawTextAlignedLeft(y, STR_BATT_CALIB);
-        putsVolts(HW_SETTINGS_COLUMN2, y, getBatteryVoltage(), attr|PREC2|LEFT);
-#elif defined(PCBSKY9X)
-        lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1+4*FH, STR_BATT_CALIB);
-        static int32_t adcBatt;
-        // TODO board.cpp
-        adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8;
-        uint32_t batCalV = (adcBatt + adcBatt*(g_eeGeneral.txVoltageCalibration)/128) * 4191;
-        batCalV /= 55296;
-        putsVolts(HW_SETTINGS_COLUMN2, y, batCalV, (menuVerticalPosition==HEADER_LINE ? INVERS : 0));
-#else
-        lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH, STR_BATT_CALIB);
-        putsVolts(HW_SETTINGS_COLUMN2, y, g_vbat100mV, attr|LEFT);
+#if defined(BATTGRAPH)
+      case ITEM_RADIO_HARDWARE_BATT_RANGE:
+        lcdDrawTextAlignedLeft(y, STR_BATTERY_RANGE);
+        putsVolts(HW_SETTINGS_COLUMN3, y, 90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|NO_UNIT);
+        lcdDrawChar(lcdNextPos, y, '-');
+        putsVolts(lcdNextPos, y, 120+g_eeGeneral.vBatMax, (menuHorizontalPosition>0 ? attr : 0)|NO_UNIT);
+        if (attr && s_editMode>0) {
+          if (menuHorizontalPosition==0)
+            CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMin, -60, g_eeGeneral.vBatMax+29); // min=3.0V
+          else
+            CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMax, g_eeGeneral.vBatMin-29, +40); // max=16.0V
+        }
+        break;
 #endif
+
+      case ITEM_RADIO_HARDWARE_BATTERY_CALIB:
+        lcdDrawTextAlignedLeft(y, STR_BATT_CALIB);
+        putsVolts(HW_SETTINGS_COLUMN3, y, getBatteryVoltage(), attr|PREC2|LEFT);
        if (attr) {
          CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
        }
        break;

-#if defined(TX_CAPACITY_MEASUREMENT)
-      case ITEM_RADIO_HARDWARE_BATTERY_CALIB:
-        lcdDrawTextAlignedLeft(y, STR_CURRENT_CALIB);
-        drawValueWithUnit(HW_SETTINGS_COLUMN2, y, getCurrent(), UNIT_MILLIAMPS, attr) ;
-        if (attr) {
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49);
-        }
-        break;
-#endif
-
-#if defined(PCBSKY9X)
-      case ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB:
-        lcdDrawTextAlignedLeft(y, STR_TEMP_CALIB);
-        drawValueWithUnit(HW_SETTINGS_COLUMN2, y, getTemperature(), UNIT_TEMPERATURE, attr) ;
-        if (attr) {
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100);
-        }
-        break;
-#endif
-
-#if defined(CROSSFIRE) //&& SPORT_MAX_BAUDRATE < 400000
+#if defined(CROSSFIRE)
      case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE:
-        g_eeGeneral.telemetryBaudrate = editChoice(HW_SETTINGS_COLUMN2, y, STR_MAXBAUDRATE, "\0041.8M921k400k115k", g_eeGeneral.telemetryBaudrate, 0, DIM(CROSSFIRE_BAUDRATES) - 1, attr, event);
+        g_eeGeneral.telemetryBaudrate = editChoice(HW_SETTINGS_COLUMN2, y, STR_MAXBAUDRATE, "\005400k 115k 921k 1.87M3.75M5.25M", g_eeGeneral.telemetryBaudrate, 0, DIM(CROSSFIRE_BAUDRATES) - 1, attr, event);
        if (attr) {
+          storageDirty(EE_GENERAL);
          if (checkIncDec_Ret && IS_EXTERNAL_MODULE_ON()) {
            pauseMixerCalculations();
            pausePulses();
            EXTERNAL_MODULE_OFF();
-            storageDirty(EE_GENERAL);
            RTOS_WAIT_MS(20); // 20ms so that the pulses interrupt will reinit the frame rate
            telemetryProtocol = 255; // force telemetry port + module reinitialization
            EXTERNAL_MODULE_ON();
@@ -362,39 +267,6 @@ void menuRadioHardware(event_t event)
        break;
 #endif

-#if defined(BLUETOOTH)
-      case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
-        lcdDrawTextAlignedLeft(y, STR_BLUETOOTH);
-        lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr);
-        if (g_eeGeneral.bluetoothMode != BLUETOOTH_OFF && !IS_BLUETOOTH_CHIP_PRESENT()) {
-          g_eeGeneral.bluetoothMode = BLUETOOTH_OFF;
-        }
-        if (attr) {
-          g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER);
-        }
-        break;
-
-      case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE:
-        lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_PIN_CODE);
-        lcdDrawText(HW_SETTINGS_COLUMN2, y, "0000");
-        break;
-
-      case ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR:
-        lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_LOCAL_ADDR);
-        lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothLocalAddr[0] == '\0' ? "---" : bluetoothLocalAddr);
-        break;
-
-      case ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR:
-        lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_DIST_ADDR);
-        lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothDistantAddr[0] == '\0' ? "---" : bluetoothDistantAddr);
-        break;
-
-      case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME:
-        lcdDrawText(INDENT_WIDTH, y, STR_NAME);
-        editName(HW_SETTINGS_COLUMN2, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, attr);
-        break;
-#endif
-
 #if defined(AUX_SERIAL)
      case ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE:
        g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN2, y, STR_AUX_SERIAL_MODE, STR_AUX_SERIAL_MODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event);
@@ -425,15 +297,15 @@ void menuRadioHardware(event_t event)
        }
        break;
 #endif // MENU_DIAG_ANAS_KEYS
-#if !defined(PCBI6X)
+#if defined(SDCARD)
      case ITEM_RADIO_BACKUP_EEPROM:
-        lcdDrawText(0, y, BUTTON(STR_EEBACKUP), attr);
+        lcdDrawTextAlignedLeft(y, BUTTON(STR_EEBACKUP), attr);
        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
          s_editMode = EDIT_SELECT_FIELD;
          eepromBackup();
        }
        break;
-#endif // PCBI6X
+#endif
      case ITEM_RADIO_FACTORY_RESET:
        onFactoryResetConfirm(warningResult);
        if (LCD_W < 212)
@@ -26,15 +26,13 @@ const unsigned char sticks[]  = {
 #include "sticks.lbm"
 };

-#define RADIO_SETUP_2ND_COLUMN  (LCD_W-7*FW-3)
-#define RADIO_SETUP_DATE_COLUMN (FW*15+7)
-#define RADIO_SETUP_TIME_COLUMN (RADIO_SETUP_2ND_COLUMN + 2 * FWNUM)
+#define RADIO_SETUP_2ND_COLUMN  79

-  #define SLIDER_5POS(y, value, label, event, attr) { \
-    int8_t tmp = value; \
-    drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \
-    value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, nullptr, tmp, -2, +2, attr, event); \
-  }
+int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const char* title)
+{
+  drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, 2+value, 4, attr);
+  return editChoice(RADIO_SETUP_2ND_COLUMN, y, title, nullptr, value, -2, +2, attr, event, INDENT_WIDTH);
+}

 #if defined(SPLASH)
  #define CASE_SPLASH_PARAM(x) x,
@@ -42,16 +40,9 @@ const unsigned char sticks[]  = {
  #define CASE_SPLASH_PARAM(x)
 #endif

-#if defined(BATTGRAPH)
-  #define CASE_BATTGRAPH(x) x,
-#else
-  #define CASE_BATTGRAPH(x)
-#endif
-
 enum MenuRadioSetupItems {
  CASE_RTCLOCK(ITEM_SETUP_DATE)
  CASE_RTCLOCK(ITEM_SETUP_TIME)
-  CASE_BATTGRAPH(ITEM_SETUP_BATT_RANGE)
  ITEM_SETUP_SOUND_LABEL,
  CASE_AUDIO(ITEM_SETUP_BEEP_MODE)
  CASE_BUZZER(ITEM_SETUP_BUZZER_MODE)
@@ -59,7 +50,7 @@ enum MenuRadioSetupItems {
  ITEM_SETUP_BEEP_VOLUME,
  ITEM_SETUP_BEEP_LENGTH,
  ITEM_SETUP_SPEAKER_PITCH,
-  // ITEM_SETUP_WAV_VOLUME,
+  CASE_DFPLAYER(ITEM_SETUP_WAV_VOLUME)
  // ITEM_SETUP_BACKGROUND_VOLUME,
  CASE_VARIO(ITEM_SETUP_VARIO_LABEL)
  CASE_VARIO(ITEM_SETUP_VARIO_VOLUME)
@@ -70,38 +61,37 @@ enum MenuRadioSetupItems {
  CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
  CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
  CASE_HAPTIC(ITEM_SETUP_HAPTIC_STRENGTH)
-  ITEM_SETUP_CONTRAST,
  ITEM_SETUP_ALARMS_LABEL,
  ITEM_SETUP_BATTERY_WARNING,
  CASE_CAPACITY(ITEM_SETUP_CAPACITY_WARNING)
-  CASE_PCBSKY9X(ITEM_SETUP_TEMPERATURE_WARNING)
  ITEM_SETUP_INACTIVITY_ALARM,
  ITEM_SETUP_MEMORY_WARNING,
  ITEM_SETUP_ALARM_WARNING,
+#if defined(PWR_BUTTON_SOFT)
  ITEM_SETUP_RSSI_POWEROFF_ALARM,
+#endif
  IF_ROTARY_ENCODERS(ITEM_SETUP_RE_NAVIGATION)
  ITEM_SETUP_BACKLIGHT_LABEL,
  ITEM_SETUP_BACKLIGHT_MODE,
  ITEM_SETUP_BACKLIGHT_DELAY,
-  // ITEM_SETUP_BRIGHTNESS,
+  ITEM_SETUP_BRIGHTNESS,
  CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF)
  CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON)
  ITEM_SETUP_FLASH_BEEP,
+  ITEM_SETUP_CONTRAST,
  CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
  #if defined(PXX2)
    ITEM_RADIO_OWNER_ID,
  #endif
-  CASE_GPS(ITEM_SETUP_TIMEZONE)
+  // CASE_GPS(ITEM_SETUP_TIMEZONE)
  // ITEM_SETUP_ADJUST_RTC,
  CASE_GPS(ITEM_SETUP_GPSFORMAT)
  CASE_PXX(ITEM_SETUP_COUNTRYCODE)
  // ITEM_SETUP_LANGUAGE,
  // ITEM_SETUP_IMPERIAL,
+  ITEM_SETUP_PPM,
  IF_FAI_CHOICE(ITEM_SETUP_FAI)
  ITEM_SETUP_SWITCHES_DELAY,
-#if defined(PCBI6X)
-  ITEM_SETUP_USB_ENABLE,
-#endif
  CASE_STM32(ITEM_SETUP_USB_MODE)
  ITEM_SETUP_RX_CHANNEL_ORD,
  ITEM_SETUP_STICK_MODE_LABELS,
@@ -138,10 +128,10 @@ void menuRadioSetup(event_t event)
 #endif

  MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { 
-    HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) 
+    HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) 
    LABEL(SOUND), CASE_AUDIO(0)
    CASE_BUZZER(0)
-    /*0,*/ 0, 0, 0, /*0,*/ CASE_AUDIO(0)
+    /*0,*/ 0, 0, 0, CASE_DFPLAYER(0) CASE_AUDIO(0)
    CASE_VARIO(LABEL(VARIO))
    CASE_VARIO(0)
    CASE_VARIO(0)
@@ -151,23 +141,33 @@ void menuRadioSetup(event_t event)
    CASE_HAPTIC(0)
    CASE_HAPTIC(0)
    CASE_HAPTIC(0)
-    0, LABEL(ALARMS), 0, CASE_CAPACITY(0)
-    CASE_PCBSKY9X(0)
-    0, 0, 0, 0, IF_ROTARY_ENCODERS(0)
-    LABEL(BACKLIGHT), 0, 0, /*0,*/ CASE_PWM_BACKLIGHT(0)
+    LABEL(ALARMS), 0, CASE_CAPACITY(0)
+    0, 0, 0,
+#if defined(PWR_BUTTON_SOFT)
+    0, /* rssi poweroff alarm */
+#endif
+    IF_ROTARY_ENCODERS(0)
+    LABEL(BACKLIGHT), 0, 0,
+    0, /* backlight */
    CASE_PWM_BACKLIGHT(0)
-    0,
+    CASE_PWM_BACKLIGHT(0)
+    0, /* alarm */
+    0, // Contrast
    CASE_SPLASH_PARAM(0)
 #if defined(PXX2)
    0 /* owner registration ID */,
 #endif
+    /*CASE_GPS(0)*/
+    /*0, rtc */
    CASE_GPS(0)
-    0, CASE_GPS(0)
    CASE_PXX(0)
-    0, 0, IF_FAI_CHOICE(0)
+    /*0, 0,*/ /* voice language, imperial */
+    0, /* PPM Unit */
+    IF_FAI_CHOICE(0)
    0,
    CASE_STM32(0) // USB mode
-    0, COL_TX_MODE, 0, 1/*to force edit mode*/});
+    0,
+    COL_TX_MODE, 0, 1/*to force edit mode*/});

  if (event == EVT_ENTRY) {
    reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
@@ -175,7 +175,7 @@ void menuRadioSetup(event_t event)

  uint8_t sub = menuVerticalPosition - HEADER_LINE;

-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint32_t i=0; i<LCD_LINES-1; i++) {
    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
    uint8_t k = i + menuVerticalOffset;
    uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
@@ -185,18 +185,18 @@ void menuRadioSetup(event_t event)
 #if defined(RTCLOCK)
      case ITEM_SETUP_DATE:
        lcdDrawTextAlignedLeft(y, STR_DATE);
-        lcdDrawChar(RADIO_SETUP_DATE_COLUMN, y, '-');
-        lcdDrawChar(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-');
-        for (uint8_t j=0; j<3; j++) {
+        for (uint32_t j=0; j<3; j++) {
          uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0);
          switch (j) {
            case 0:
-              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+TM_YEAR_BASE, rowattr|RIGHT);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
+              lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_year+TM_YEAR_BASE, rowattr|RIGHT);
+              lcdDrawChar(lcdNextPos, y, '-');
+              if (rowattr && s_editMode > 0) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
              break;
            case 1:
-              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0|RIGHT, 2);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
+              lcdDrawNumber(lcdNextPos+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0|RIGHT, 2);
+              lcdDrawChar(lcdNextPos, y, '-');
+              if (rowattr && s_editMode > 0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
              break;
            case 2:
            {
@@ -204,8 +204,8 @@ void menuRadioSetup(event_t event)
              int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0);
              static const uint8_t dmon[]  = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
              dlim += dmon[t.tm_mon];
-              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0|RIGHT, 2);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
+              lcdDrawNumber(lcdNextPos+6*FW-4, y, t.tm_mday, rowattr|LEADING0|RIGHT, 2);
+              if (rowattr && s_editMode > 0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
              break;
            }
          }
@@ -217,21 +217,22 @@ void menuRadioSetup(event_t event)

      case ITEM_SETUP_TIME:
        lcdDrawTextAlignedLeft(y, STR_TIME);
-        lcdDrawChar(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
-        for (uint8_t j=0; j<3; j++) {
+        for (uint32_t j=0; j<3; j++) {
          uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0);
          switch (j) {
            case 0:
-              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0|RIGHT, 2);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
+              lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_hour, rowattr|LEADING0|RIGHT, 2);
+              lcdDrawChar(lcdNextPos + 1, y, ':');
+              if (rowattr && s_editMode > 0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
              break;
            case 1:
-              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0|RIGHT, 2);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
+              lcdDrawNumber(lcdNextPos + 1, y, t.tm_min, rowattr|LEADING0|RIGHT, 2);
+              lcdDrawChar(lcdNextPos + 1, y, ':');
+              if (rowattr && s_editMode > 0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
              break;
            case 2:
-              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0|RIGHT, 2);
-              if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
+              lcdDrawNumber(lcdNextPos + 1, y, t.tm_sec, rowattr|LEADING0|RIGHT, 2);
+              if (rowattr && s_editMode > 0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
              break;
          }
        }
@@ -241,47 +242,32 @@ void menuRadioSetup(event_t event)
        break;
 #endif

-#if defined(BATTGRAPH)
-      case ITEM_SETUP_BATT_RANGE:
-        lcdDrawTextAlignedLeft(y, STR_BATTERY_RANGE);
-        putsVolts(RADIO_SETUP_2ND_COLUMN, y,  90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|LEFT|NO_UNIT);
-        lcdDrawChar(lcdLastRightPos, y, '-');
-        putsVolts(lcdLastRightPos+FW, y, 120+g_eeGeneral.vBatMax, (menuHorizontalPosition>0 ? attr : 0)|LEFT|NO_UNIT);
-        if (attr && s_editMode>0) {
-          if (menuHorizontalPosition==0)
-            CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMin, -50, g_eeGeneral.vBatMax+29); // min=4.0V
-          else
-            CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMax, g_eeGeneral.vBatMin-29, +40); // max=16.0V
-        }
-        break;
-#endif
-
      case ITEM_SETUP_SOUND_LABEL:
        lcdDrawTextAlignedLeft(y, STR_SOUND_LABEL);
        break;

 #if defined(AUDIO)
      case ITEM_SETUP_BEEP_MODE:
-        g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event);
+        g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
        break;

 #if defined(BUZZER) // AUDIO + BUZZER
      case ITEM_SETUP_BUZZER_MODE:
-        g_eeGeneral.buzzerMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr, event);
+        g_eeGeneral.buzzerMode = editChoice(LCD_W-2, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
        break;
 #endif
 #elif defined(BUZZER) // BUZZER only
      case ITEM_SETUP_BUZZER_MODE:
-        g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event);
+        g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
        break;
 #endif

 #if defined(VOICE)
      case ITEM_SETUP_SPEAKER_VOLUME:
      {
-        lcdDrawTextAlignedLeft(y, STR_SPEAKER_VOLUME);
+        lcdDrawTextIndented(y, STR_SPEAKER_VOLUME);
        uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF;
-        drawSlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr);
+        drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, b, VOLUME_LEVEL_MAX, attr);
        if (attr) {
          CHECK_INCDEC_GENVAR(event, b, 0, VOLUME_LEVEL_MAX);
          if (checkIncDec_Ret) {
@@ -293,26 +279,38 @@ void menuRadioSetup(event_t event)
 #endif

      case ITEM_SETUP_BEEP_VOLUME:
-        SLIDER_5POS(y, g_eeGeneral.beepVolume, STR_BEEP_VOLUME, event, attr);
+        g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME);
        break;
-      // case ITEM_SETUP_WAV_VOLUME:
-      //   SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr);
-      //   break;
+
+#if defined(DFPLAYER)
+      case ITEM_SETUP_WAV_VOLUME:
+      {
+        int8_t vol = g_eeGeneral.wavVolume;
+        g_eeGeneral.wavVolume = slider_5pos(y, g_eeGeneral.wavVolume, event, attr, STR_WAV_VOLUME);
+        if (vol != g_eeGeneral.wavVolume) {
+          dfplayerSetVolume(g_eeGeneral.wavVolume);
+        }
+      }
+      break;
+#endif
      // case ITEM_SETUP_BACKGROUND_VOLUME:
-      //   SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr);
+      //   g_eeGeneral.backgroundVolume = slider_5pos(y, g_eeGeneral.backgroundVolume, event, attr, STR_BG_VOLUME);
      //   break;

      case ITEM_SETUP_BEEP_LENGTH:
-        SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr);
+        g_eeGeneral.beepLength = slider_5pos(y, g_eeGeneral.beepLength, event, attr, STR_BEEP_LENGTH);
        break;

      case ITEM_SETUP_SPEAKER_PITCH:
-        lcdDrawTextAlignedLeft( y, STR_SPKRPITCH);
-        lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
-        lcdDrawText(lcdLastRightPos, y, "Hz", attr);
-        if (attr) {
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20);
+        {
+          lcdDrawTextIndented(y, STR_SPKRPITCH);
+          lcdDrawNumber(LCD_W-14, y, g_eeGeneral.speakerPitch*15, attr|RIGHT);
+          coord_t lp = lcdLastLeftPos - FW;
+          lcdDrawText(lcdLastRightPos, y, "Hz", attr);
+          lcdDrawChar(lp, y, '+', attr);
+          if (attr) {
+            CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20);
+          }
        }
        break;

@@ -321,23 +319,23 @@ void menuRadioSetup(event_t event)
        lcdDrawTextAlignedLeft(y, STR_VARIO);
        break;
      case ITEM_SETUP_VARIO_VOLUME:
-        SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr);
+        g_eeGeneral.varioVolume = slider_5pos(y, g_eeGeneral.varioVolume, event, attr, TR_SPEAKER_VOLUME);
        break;
      case ITEM_SETUP_VARIO_PITCH:
-        lcdDrawTextAlignedLeft(y, STR_PITCH_AT_ZERO);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
+        lcdDrawTextIndented(y, STR_PITCH_AT_ZERO);
+        lcdDrawNumber(LCD_W-14, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|RIGHT);
        lcdDrawText(lcdLastRightPos, y, "Hz", attr);
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
        break;
      case ITEM_SETUP_VARIO_RANGE:
-        lcdDrawTextAlignedLeft(y, STR_PITCH_AT_MAX);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
+        lcdDrawTextIndented(y, STR_PITCH_AT_MAX);
+        lcdDrawNumber(LCD_W-14, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|RIGHT);
        lcdDrawText(lcdLastRightPos, y, "Hz", attr);
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
        break;
      case ITEM_SETUP_VARIO_REPEAT:
-        lcdDrawTextAlignedLeft(y, STR_REPEAT_AT_ZERO);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
+        lcdDrawTextIndented(y, STR_REPEAT_AT_ZERO);
+        lcdDrawNumber(LCD_W-14, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|RIGHT);
        lcdDrawText(lcdLastRightPos, y, STR_MS, attr);
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
        break;
@@ -349,21 +347,21 @@ void menuRadioSetup(event_t event)
        break;

      case ITEM_SETUP_HAPTIC_MODE:
-        g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event);
+        g_eeGeneral.hapticMode = editChoice(LCD_W-2s, y, TR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr|RIGHT, event);
        break;

      case ITEM_SETUP_HAPTIC_LENGTH:
-        SLIDER_5POS(y, g_eeGeneral.hapticLength, STR_LENGTH, event, attr);
+        g_eeGeneral.hapticLength = slider_5pos(y, g_eeGeneral.hapticLength, event, attr, STR_LENGTH);
        break;

      case ITEM_SETUP_HAPTIC_STRENGTH:
-        SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr);
+        g_eeGeneral.hapticStrength = slider_5pos(y, g_eeGeneral.hapticStrength, event, attr, STR_HAPTICSTRENGTH);
        break;
 #endif

      case ITEM_SETUP_CONTRAST:
-        lcdDrawTextAlignedLeft(y, STR_CONTRAST);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
+        lcdDrawTextIndented(y, STR_CONTRAST);
+        lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT);
        if (attr) {
          CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
          lcdSetContrast();
@@ -375,51 +373,36 @@ void menuRadioSetup(event_t event)
        break;

      case ITEM_SETUP_BATTERY_WARNING:
-        lcdDrawTextAlignedLeft(y, STR_BATTERYWARNING);
-        putsVolts(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.vBatWarn, attr|LEFT);
-        if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 35, 120); //3.5-12V
+        lcdDrawTextIndented(y, STR_BATTERYWARNING);
+        putsVolts(LCD_W-7, y, g_eeGeneral.vBatWarn, attr|RIGHT);
+        if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 30, 120); //3.5-12V
        break;

      case ITEM_SETUP_MEMORY_WARNING:
      {
        uint8_t b = 1-g_eeGeneral.disableMemoryWarning;
-        g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event);
+        g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, LCD_W-9, y, STR_MEMORYWARNING, attr, event, INDENT_WIDTH);
        break;
      }

      case ITEM_SETUP_ALARM_WARNING:
      {
        uint8_t b = 1 - g_eeGeneral.disableAlarmWarning;
-        g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event);
+        g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, LCD_W-9, y, STR_ALARMWARNING, attr, event, INDENT_WIDTH);
        break;
      }
-
+#if defined(PWR_BUTTON_SOFT)
      case ITEM_SETUP_RSSI_POWEROFF_ALARM:
      {
        uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm;
-        g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_RSSISHUTDOWNALARM, attr, event);
+        g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, LCD_W-9, y, STR_RSSISHUTDOWNALARM, attr, event, INDENT_WIDTH);
        break;
      }
-
-#if defined(TX_CAPACITY_MEASUREMENT)
-      case ITEM_SETUP_CAPACITY_WARNING:
-        lcdDrawTextAlignedLeft(y, STR_CAPAWARNING);
-        drawValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.mAhWarn*50, UNIT_MAH, attr|LEFT) ;
-        if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.mAhWarn, 0, 100);
-        break;
-#endif
-
-#if defined(PCBSKY9X)
-      case ITEM_SETUP_TEMPERATURE_WARNING:
-        lcdDrawTextAlignedLeft(y, STR_TEMPWARNING);
-        drawValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_TEMPERATURE, attr|LEFT) ;
-        if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureWarn, 0, 120); // 0 means no alarm
-        break;
 #endif

      case ITEM_SETUP_INACTIVITY_ALARM:
-        lcdDrawTextAlignedLeft(y, STR_INACTIVITYALARM);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
+        lcdDrawTextIndented(y, STR_INACTIVITYALARM);
+        lcdDrawNumber(LCD_W-7, y, g_eeGeneral.inactivityTimer, attr|RIGHT);
        lcdDrawChar(lcdLastRightPos, y, 'm');
        if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
        break;
@@ -438,30 +421,28 @@ void menuRadioSetup(event_t event)
        break;

      case ITEM_SETUP_BACKLIGHT_MODE:
-        g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event);
+        g_eeGeneral.backlightMode = editChoice(LCD_W-2, y, TR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr|RIGHT, event, INDENT_WIDTH);
        break;

      case ITEM_SETUP_FLASH_BEEP:
-        g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event ) ;
+        g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, LCD_W-9, y, STR_ALARM, attr, event, INDENT_WIDTH);
        break;

      case ITEM_SETUP_BACKLIGHT_DELAY:
-        lcdDrawTextAlignedLeft(y, STR_BLDELAY);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
+        lcdDrawTextIndented(y, STR_BLDELAY);
+        lcdDrawNumber(LCD_W-7, y, g_eeGeneral.lightAutoOff*5, attr|RIGHT);
        lcdDrawChar(lcdLastRightPos, y, 's');
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5);
        break;
-
-      // case ITEM_SETUP_BRIGHTNESS:
-      //   lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS);
-      //   lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
-      //   if (attr) {
-      //     uint8_t b = 100 - g_eeGeneral.backlightBright;
-      //     CHECK_INCDEC_GENVAR(event, b, 0, 100);
-      //     g_eeGeneral.backlightBright = 100 - b;
-      //   }
-      //   break;
-
+      case ITEM_SETUP_BRIGHTNESS:
+        lcdDrawTextIndented(y, STR_BRIGHTNESS);
+        lcdDrawNumber(LCD_W-2, y, 100-g_eeGeneral.backlightBright, attr|RIGHT) ;
+        if (attr) {
+          uint8_t b = 100 - g_eeGeneral.backlightBright;
+          CHECK_INCDEC_GENVAR(event, b, 0, 100);
+          g_eeGeneral.backlightBright = 100 - b;
+        }
+        break;
 #if defined(PWM_BACKLIGHT)
      case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF:
        lcdDrawTextAlignedLeft(y, STR_BLOFFBRIGHTNESS);
@@ -499,6 +480,7 @@ void menuRadioSetup(event_t event)
 #endif

 #if defined(TELEMETRY_FRSKY) && defined(GPS)
+#if defined(RTCLOCK)
      case ITEM_SETUP_TIMEZONE:
        lcdDrawTextAlignedLeft(y, STR_TIMEZONE);
        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
@@ -508,7 +490,7 @@ void menuRadioSetup(event_t event)
      case ITEM_SETUP_ADJUST_RTC:
        g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, STR_ADJUST_RTC, attr, event);
        break;
-
+#endif
      case ITEM_SETUP_GPSFORMAT:
        g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_GPSCOORD, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event);
        break;
@@ -538,6 +520,10 @@ void menuRadioSetup(event_t event)
        break;
 #endif

+      case ITEM_SETUP_PPM:
+        g_eeGeneral.ppmunit = editChoice(LCD_W-2, y, STR_UNITS_PPM, "\004""0.--""0.0\0""us\0 ", g_eeGeneral.ppmunit, PPM_PERCENT_PREC0, PPM_US, attr|RIGHT, event);
+        break;
+
 #if defined(FAI_CHOICE)
      case ITEM_SETUP_FAI:
        editCheckBox(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, "FAI Mode", attr, event);
@@ -553,50 +539,33 @@ void menuRadioSetup(event_t event)

      case ITEM_SETUP_SWITCHES_DELAY:
        lcdDrawTextAlignedLeft(y, STR_SWITCHES_DELAY);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
+        lcdDrawNumber(LCD_W-14, y, 10*SWITCHES_DELAY(), attr|RIGHT);
        lcdDrawText(lcdLastRightPos, y, STR_MS, attr);
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, 100-15);
        break;
-#if defined(PCBI6X)
-      case ITEM_SETUP_USB_ENABLE:
-        globalData.usbDetect = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_USBDETECT, STR_USBDETECTMODES, globalData.usbDetect, USB_DETECT_AUTO, USB_MAX_DETECT, attr, event);
-        break;
-#endif
-#if defined(STM32)
+
      case ITEM_SETUP_USB_MODE:
-        g_eeGeneral.USBMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_USBMODE, STR_USBMODES, g_eeGeneral.USBMode, USB_UNSELECTED_MODE, USB_MAX_MODE, attr, event);
+        g_eeGeneral.USBMode = editChoice(LCD_W-2, y, STR_USBMODE, STR_USBMODES, g_eeGeneral.USBMode, USB_UNSELECTED_MODE, USB_MAX_MODE, attr|RIGHT, event);
        break;
-#endif
+
      case ITEM_SETUP_RX_CHANNEL_ORD:
        lcdDrawTextAlignedLeft(y, STR_RXCHANNELORD); // RAET->AETR
-        for (uint8_t i=1; i<=4; i++) {
-          putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channel_order(i), attr);
+        for (uint32_t i=1; i<=4; i++) {
+          putsChnLetter(LCD_W - 2 - 5*FW + i*FW, y, channelOrder(i), attr);
        }
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23);
        break;

      case ITEM_SETUP_STICK_MODE_LABELS:
        lcdDrawTextAlignedLeft(y, STR_MODE);
-        for (uint8_t i=0; i<4; i++) {
+        for (uint32_t i=0; i<4; i++) {
          lcdDraw1bitBitmap(5*FW+i*(4*FW+2), y, sticks, i, 0);
-#if defined(FRSKY_STICKS) && !defined(PCBTARANIS)
-          if (g_eeGeneral.stickReverse & (1<<i)) {
-            lcdDrawFilledRect(5*FW+i*(4*FW+2), y, 3*FW, FH-1);
-          }
-#endif
        }
-#if defined(FRSKY_STICKS) && !defined(PCBTARANIS)
-        if (attr) {
-          s_editMode = 0;
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickReverse, 0, 15);
-          lcdDrawRect(5*FW-1, y-1, 16*FW+2, 9);
-        }
-#endif
        break;

      case ITEM_SETUP_STICK_MODE:
        lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr);
-        for (uint8_t i=0; i<NUM_STICKS; i++) {
+        for (uint32_t i=0; i<NUM_STICKS; i++) {
          drawSource((5*FW-3)+i*(4*FW+2), y, MIXSRC_Rud + *(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0);
        }
        if (attr && s_editMode>0) {
@@ -607,7 +576,7 @@ void menuRadioSetup(event_t event)
          g_eeGeneral.stickMode = reusableBuffer.generalSettings.stickMode;
          checkThrottleStick();
          resumePulses();
-          clearKeyEvents();
+          waitKeysReleased();
        }
        break;
    }
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
- */
-
-#include "opentx.h"
-
-void menuRadioTrainer(event_t event)
-{
-  uint8_t y;
-  bool slave = SLAVE_MODE();
-
-  MENU(STR_MENUTRAINER, menuTabGeneral, MENU_RADIO_TRAINER, (slave ? HEADER_LINE : HEADER_LINE+6), { HEADER_LINE_COLUMNS 2, 2, 2, 2, 0/*, 0*/ });
-
-  if (slave) {
-    lcdDrawText(7*FW, 4*FH, STR_SLAVE);
-  }
-  else {
-    uint8_t attr;
-    uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
-
-    lcdDrawText(3*FW, MENU_HEADER_HEIGHT+1, STR_MODESRC);
-
-    y = MENU_HEADER_HEIGHT + 1 + FH;
-
-    for (uint8_t i=HEADER_LINE; i<HEADER_LINE+NUM_STICKS; i++) {
-      uint8_t chan = channel_order(i+1-HEADER_LINE);
-      volatile TrainerMix * td = &g_eeGeneral.trainer.mix[chan-1];
-
-      drawSource(0, y, MIXSRC_Rud-1+chan, (menuVerticalPosition==i && CURSOR_ON_LINE()) ? INVERS : 0);
-
-      for (uint8_t j=0; j<3; j++) {
-
-        attr = ((menuVerticalPosition==i && menuHorizontalPosition==j) ? blink : 0);
-
-        switch (j) {
-          case 0:
-            lcdDrawTextAtIndex(4*FW, y, STR_TRNMODE, td->mode, attr);
-            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->mode, 0, 2);
-            break;
-
-          case 1:
-            lcdDrawNumber(11*FW, y, td->studWeight, attr|RIGHT);
-            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->studWeight, -125, 125);
-            break;
-
-          case 2:
-            lcdDrawTextAtIndex(12*FW, y, STR_TRNCHN, td->srcChn, attr);
-            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->srcChn, 0, 3);
-            break;
-        }
-      }
-      y += FH;
-    }
-
-    attr = (menuVerticalPosition==HEADER_LINE+4) ? blink : 0;
-    lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_MULTIPLIER);
-    lcdDrawNumber(LEN_MULTIPLIER*FW+3*FW, MENU_HEADER_HEIGHT+1+5*FH, g_eeGeneral.PPM_Multiplier+10, attr|PREC1|RIGHT);
-    if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
-
-    attr = (menuVerticalPosition==HEADER_LINE+5) ? INVERS : 0;
-    lcdDrawText(0*FW, MENU_HEADER_HEIGHT+1+6*FH, STR_CAL, attr);
-    for (uint8_t i=0; i<4; i++) {
-      uint8_t x = (i*8+16)*FW/2;
-      lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, RIGHT);
-    }
-
-    if (attr) {
-      s_editMode = 0;
-      if (event==EVT_KEY_LONG(KEY_ENTER)){
-        memcpy(g_eeGeneral.trainer.calib, ppmInput, sizeof(g_eeGeneral.trainer.calib));
-        storageDirty(EE_GENERAL);
-        AUDIO_WARNING1();
-      }
-    }
-  }
-}
@@ -50,23 +50,4 @@ void menuRadioVersion(event_t event)
  lcdDrawText(FW, y, vers_stamp, SMLSIZE);
  y += 5 * (FH - 1);

-#if defined(COPROCESSOR)
-  if (Coproc_valid == 1) {
-    lcdDrawTextAlignedLeft(y, "CoPr:");
-    lcdDraw8bitsNumber(10*FW, y, Coproc_read);
-  }
-  else {
-     lcdDrawTextAlignedLeft(y, "CoPr: ---");
-  }
-  y += FH;
-#endif
-
-#if defined(PXX2)
-  lcdDrawText(0, y, BUTTON("Modules / RX version"), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
-  y += FH;
-  if (menuVerticalPosition == ITEM_RADIO_MODULES_VERSION && event == EVT_KEY_BREAK(KEY_ENTER)) {
-    s_editMode = EDIT_SELECT_FIELD;
-    pushMenu(menuRadioModulesVersion);
-  }
-#endif
 }
@@ -36,7 +36,7 @@ void drawSplash()
 {
  lcdClear();
 #if defined(PCBI6X)
-  lcdDraw1bitBitmap(8, 16, splash_lbm, 0, 0);
+  lcdDraw1bitBitmap(10, 16, splash_lbm, 0, 0);
 #else
  lcdDraw1bitBitmap(0, 0, splash_lbm, 0, 0);
 #endif
@@ -20,9 +20,9 @@

 #include "opentx.h"

-constexpr coord_t CHANNEL_NAME_OFFSET = 1;
-constexpr coord_t CHANNEL_VALUE_OFFSET = CHANNEL_NAME_OFFSET + 42;
-constexpr coord_t CHANNEL_GAUGE_OFFSET = CHANNEL_VALUE_OFFSET;
+constexpr coord_t CHANNEL_NAME_OFFSET = 0;
+constexpr coord_t CHANNEL_VALUE_OFFSET = CHANNEL_NAME_OFFSET + 43;
+constexpr coord_t CHANNEL_GAUGE_OFFSET = CHANNEL_VALUE_OFFSET - 1;
 constexpr coord_t CHANNEL_BAR_WIDTH = 70;
 constexpr coord_t CHANNEL_PROPERTIES_OFFSET = CHANNEL_GAUGE_OFFSET + CHANNEL_BAR_WIDTH + 2;

@@ -43,41 +43,35 @@ constexpr coord_t CHANNEL_PROPERTIES_OFFSET = CHANNEL_GAUGE_OFFSET + CHANNEL_BAR
 #define EVT_KEY_PREVIOUS_PAGE          EVT_KEY_BREAK(KEY_LEFT)
 #endif

+static bool mixersView = false;
+
 void menuChannelsViewCommon(event_t event)
 {
-  bool newLongNames = false;
-
  uint8_t ch;

  switch (event) {
-    case EVT_ENTRY:
-      memclear(&reusableBuffer.viewChannels, sizeof(reusableBuffer.viewChannels));
-      break;
-
    case EVT_KEY_FIRST(KEY_ENTER):
-      reusableBuffer.viewChannels.mixersView = !reusableBuffer.viewChannels.mixersView;
+      mixersView = !mixersView;
      break;
  }

  ch = 8 * (g_eeGeneral.view / ALTERNATE_VIEW);

  // Screen title
-  lcdDrawText(LCD_W / 2, 0, reusableBuffer.viewChannels.mixersView ? STR_MIXERS_MONITOR : STR_CHANNELS_MONITOR, CENTERED);
+  lcdDrawText(LCD_W / 2, 0, mixersView ? STR_MIXERS_MONITOR : STR_CHANNELS_MONITOR, CENTERED);
  lcdInvertLine(0);

  int16_t limits = 512 * 2;

 // Channels
-  for (uint8_t line = 0; line < 8; line++) {
+  for (uint32_t line = 0; line < 8; line++) {
    LimitData * ld = limitAddress(ch);
    const uint8_t y = 9 + line * 7;
-    const int32_t val = reusableBuffer.viewChannels.mixersView ? ex_chans[ch] : channelOutputs[ch];
+    const int32_t val = mixersView ? ex_chans[ch] : channelOutputs[ch];
    const uint8_t lenLabel = ZLEN(g_model.limitData[ch].name);

    // Channel name if present, number if not
    if (lenLabel > 0) {
-      if (lenLabel > 4)
-        reusableBuffer.viewChannels.longNames = true;
      lcdDrawSizedText(CHANNEL_NAME_OFFSET, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
    }
    else {
@@ -85,18 +79,12 @@ void menuChannelsViewCommon(event_t event)
    }

    // Value
-#if defined(PPM_UNIT_US)
-      lcdDrawNumber(CHANNEL_VALUE_OFFSET, y + 1, PPM_CH_CENTER(ch) + val / 2, TINSIZE | RIGHT);
-#elif defined(PPM_UNIT_PERCENT_PREC1)
-      lcdDrawNumber(CHANNEL_VALUE_OFFSET, y + 1, calcRESXto1000(val), PREC1 | TINSIZE | RIGHT);
-#else
-      lcdDrawNumber(CHANNEL_VALUE_OFFSET, y + 1, calcRESXto1000(val) / 10, TINSIZE | RIGHT);
-#endif
+    drawChannelValue(CHANNEL_VALUE_OFFSET, y + 1, ch, val, TINSIZE | RIGHT);

-      // Gauge
-      drawGauge(CHANNEL_GAUGE_OFFSET, y, CHANNEL_BAR_WIDTH, 6, val, limits);
+    // Gauge
+    drawGauge(CHANNEL_GAUGE_OFFSET, y, CHANNEL_BAR_WIDTH, 6, val, limits);

-    if (!reusableBuffer.viewChannels.mixersView) {
+    if (!mixersView) {
      // Properties
 #if defined(OVERRIDE_CHANNEL_FUNCTION)
      if (safetyCh[ch] != OVERRIDE_CHANNEL_UNDEFINED)
@@ -110,8 +98,6 @@ void menuChannelsViewCommon(event_t event)

    ++ch;
  }
-
-  reusableBuffer.viewChannels.longNames = newLongNames;
 }

 void menuChannelsView(event_t event)
--- a/Show More
+++ b/Show More