From 7ffd3f5a33ec0fe5bef407ce2adc8c8e162a04a3 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 8 Jun 2021 13:14:48 +0800
Subject: [PATCH 01/45] Added build-flysky script.

---
 tools/build-flysky.py | 71 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 tools/build-flysky.py

diff --git a/tools/build-flysky.py b/tools/build-flysky.py
new file mode 100644
index 000000000..c36e6c25a
--- /dev/null
+++ b/tools/build-flysky.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python3
+
+import argparse
+import datetime
+import os
+from builtins import NotADirectoryError
+import shutil
+import tempfile
+
+
+boards = {
+    "NV14": {
+        "PCB": "NV14",
+        "DEFAULT_MODE": "1",
+    },
+}
+
+translations = [
+    "EN",
+]
+
+
+def timestamp():
+    return datetime.datetime.now().strftime("%y%m%d")
+
+
+def build(board, translation, srcdir):
+    cmake_options = " ".join(["-D%s=%s" % (key, value) for key, value in boards[board].items()])
+    cwd = os.getcwd()
+    if not os.path.exists("output"):
+        os.mkdir("output")
+    path = tempfile.mkdtemp()
+    os.chdir(path)
+    command = "cmake %s -DTRANSLATIONS=%s %s" % (cmake_options, translation, srcdir)
+    print(command)
+    os.system(command)
+    os.system("make firmware -j16")
+    os.chdir(cwd)
+    index = 0
+    while 1:
+        suffix = "" if index == 0 else "_%d" % index
+        filename = "output/firmware_%s_%s_%s%s.bin" % (board.lower(), translation.lower(), timestamp(), suffix)
+        if not os.path.exists(filename):
+            shutil.copy("%s/firmware.bin" % path, filename)
+            break
+        index += 1
+    shutil.rmtree(path)
+
+
+def dir_path(string):
+    if os.path.isdir(string):
+        return string
+    else:
+        raise NotADirectoryError(string)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Build Flysky firmware")
+    parser.add_argument("-b", "--boards", action="append", help="Destination boards", required=True)
+    parser.add_argument("-t", "--translations", action="append", help="Translations", required=True)
+    parser.add_argument("srcdir", type=dir_path)
+
+    args = parser.parse_args()
+
+    for board in (boards.keys() if "ALL" in args.boards else args.boards):
+        for translation in (translations if "ALL" in args.translations else args.translations):
+            build(board, translation, args.srcdir)
+
+
+if __name__ == "__main__":
+    main()

From cc92f2504616d4b44f594a69a889fd4a2cac2bc8 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 9 Jun 2021 16:10:45 +0800
Subject: [PATCH 02/45] Fixed NV14 build, added flysky build script and target
 in build-gh.sh

---
 radio/src/datastructs.h                       |  2 +-
 radio/src/gui/colorlcd/model_curves.cpp       | 10 ++-
 radio/src/lua/CMakeLists.txt                  |  1 +
 radio/src/lua/api_general.cpp                 |  2 +
 radio/src/pulses/afhds3.h                     |  3 +
 .../src/storage/conversions/datastructs_219.h |  6 +-
 radio/src/targets/nv14/CMakeLists.txt         | 66 ++++++++++++++++---
 radio/src/targets/nv14/adc_driver.cpp         |  4 +-
 radio/src/targets/nv14/board.cpp              |  9 ++-
 radio/src/targets/nv14/board.h                | 19 +++++-
 .../src/targets/nv14/bootloader/boot_menu.cpp |  4 +-
 radio/src/targets/nv14/extmodule_driver.cpp   |  2 +-
 radio/src/targets/nv14/hal.h                  | 51 +++++++++++++-
 radio/src/targets/nv14/lcd_driver.cpp         | 62 ++++++++++++++++-
 radio/src/targets/nv14/libopenui_config.h     |  4 +-
 radio/src/targets/nv14/pwr_driver.cpp         | 20 +++---
 radio/src/targets/nv14/touch_driver.cpp       |  3 +-
 tools/build-gh.sh                             |  3 +
 18 files changed, 226 insertions(+), 45 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index eeccb77b6..08afe8281 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -582,7 +582,7 @@ PACK(struct CustomScreenData {
   #define TOPBAR_DATA
 #endif
 
-#if defined(PCBHORUS) || defined(PCBTARANIS)
+#if defined(PCBHORUS) || defined(PCBTARANIS) || defined(PCBNV14)
   #define SCRIPT_DATA \
     NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]);
 #else
diff --git a/radio/src/gui/colorlcd/model_curves.cpp b/radio/src/gui/colorlcd/model_curves.cpp
index fdf2295c0..085bdf3b2 100644
--- a/radio/src/gui/colorlcd/model_curves.cpp
+++ b/radio/src/gui/colorlcd/model_curves.cpp
@@ -168,7 +168,9 @@ class CurveEditWindow : public Page
                        curve.type = newValue;
                      }
                      SET_DIRTY();
-                     curveEdit->update();
+                     curveEdit->updatePreview();
+                     curveDataEdit->clear();
+                     curveDataEdit->update();
                    }
                  });
 
@@ -190,7 +192,9 @@ class CurveEditWindow : public Page
                                      }
                                      curve.points = newValue;
                                      SET_DIRTY();
-                                     curveEdit->update();
+                                     curveEdit->updatePreview();
+                                     curveDataEdit->clear();
+                                     curveDataEdit->update();
                                    }
                                  });
       edit->setSuffix(STR_PTS);
@@ -202,7 +206,7 @@ class CurveEditWindow : public Page
                    [=](int32_t newValue) {
                      g_model.curves[index].smooth = newValue;
                      SET_DIRTY();
-                     curveEdit->update();
+                     curveEdit->updatePreview();
                    });
       grid.nextLine();
     }
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index c1cd80a12..cab6bcd4f 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -33,4 +33,5 @@ if(PYTHONINTERP_FOUND)
   add_lua_export_target(tx12      ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12)
   add_lua_export_target(t8        ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T8)
   add_lua_export_target(t16       ${LUA_INCLUDES} -DPCBHORUS   -DPCBX10 -DRADIO_T16)
+  add_lua_export_target(nv14      ${LUA_INCLUDES} -DPCBFLYSKY  -DPCBNV14)
 endif()
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 9ef7577b2..aa7a5a643 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -64,6 +64,8 @@
   #include "lua/lua_exports_x9d+2019.inc"
 #elif defined(PCBTARANIS)
   #include "lua/lua_exports_x9d.inc"
+#elif defined(PCBNV14)
+  #include "lua/lua_exports_nv14.inc"
 #endif
 
 #if defined(SIMU)
diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h
index 5d687bc0e..c3edc33cd 100644
--- a/radio/src/pulses/afhds3.h
+++ b/radio/src/pulses/afhds3.h
@@ -93,7 +93,10 @@ struct Data
 
   void reset()
   {
+#if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
+#else
     pulsesSize = 0;
+#endif
   }
 
 #if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
diff --git a/radio/src/storage/conversions/datastructs_219.h b/radio/src/storage/conversions/datastructs_219.h
index ef83d2471..3f30c69b3 100644
--- a/radio/src/storage/conversions/datastructs_219.h
+++ b/radio/src/storage/conversions/datastructs_219.h
@@ -27,7 +27,7 @@
   #define NUM_SWITCHES_219                 10
 #elif defined(PCBXLITE) ||defined(PCBXLITES)
   #define NUM_SWITCHES_219                  6
-#elif  defined(RADIO_TLITE) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_T8)
+#elif  defined(RADIO_TLITE) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_T8) || defined(PCBNV14)
   #define NUM_SWITCHES_219                  8
 #elif defined(PCBX7) || defined(PCBX7ACCESS)
   #define NUM_SWITCHES_219                  8
@@ -49,7 +49,7 @@
 #elif defined(PCBX9LITE)
   #define NUM_POTS_219                      1
   #define NUM_SLIDERS_219                   0
-#elif defined(RADIO_T8) || defined(RADIO_TLITE) || defined(PCBXLITE) || defined(PCBX7)
+#elif defined(RADIO_T8) || defined(RADIO_TLITE) || defined(PCBXLITE) || defined(PCBX7) || defined(PCBNV14)
   #define NUM_POTS_219                      2
   #define NUM_SLIDERS_219                   0
 #elif defined(PCBX9E)
@@ -113,7 +113,7 @@
   #define MAX_CURVE_POINTS_219            512
 #endif
 
-#if defined(PCBHORUS)
+#if defined(PCBHORUS) || defined(PCBNV14)
   #define MAX_MODELS_219                   60
   #define MAX_OUTPUT_CHANNELS_219          32 // number of real output channels CH1-CH32
   #define MAX_FLIGHT_MODES_219              9
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 2bf624a70..10c476d1b 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -14,6 +14,8 @@ set(STORAGE_FORMAT BIN)
 set(HAPTIC YES)
 set(GUI_DIR colorlcd)
 set(BITMAPS_DIR 480x272)
+set(HARDWARE_EXTERNAL_MODULE YES)
+set(AUX_SERIAL ON)
 # set(NAVIGATION_TYPE touch)
 set(TARGET_DIR nv14)
 add_definitions(-DHARDWARE_TRAINER_JACK)
@@ -42,17 +44,19 @@ add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
 set(TARGET_SRC
   ${TARGET_SRC}
   audio_spi_driver.cpp
+  ../common/arm/stm32/mixer_scheduler_driver.cpp
   )
 
+#set(FIRMWARE_TARGET_SRC
+#  ${FIRMWARE_TARGET_SRC}
+#  x12s_adc_driver.cpp
+#  )
+
 set(FIRMWARE_TARGET_SRC
   ${FIRMWARE_TARGET_SRC}
-  x12s_adc_driver.cpp
-  )
-
-set(FIRMWARE_TARGET_SRC
-  ${FIRMWARE_TARGET_SRC}
+  adc_driver.cpp
   battery_driver.cpp
-  hallStick_driver.cpp
+  ../horus/flyskyHallStick_driver.cpp
   )
 
 set(BITMAPS_TARGET nv14_bitmaps)
@@ -73,7 +77,9 @@ add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
 add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 add_definitions(-DCROSSFIRE_NATIVE)
 add_definitions(-DFLYSKY_HALL_STICKS_REVERSE)
-add_definitions(-DHALL_STICKS)
+add_definitions(-DFLYSKY_HALL_STICKS)
+add_definitions(-DHARDWARE_EXTERNAL_MODULE)
+add_definitions(-DAUX_SERIAL)
 #add_definitions(-DFLYSKY_AUTO_POWER_DOWN)
 
 if(STICKS_DEAD_ZONE)
@@ -149,12 +155,52 @@ set(STM32LIB_SRC
   STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
   )
 
+MACRO(GET_GCC_INCLUDE_PATH gcc_include_path)
+  if (WIN32)
+    execute_process(COMMAND arm-none-eabi-gcc -v -x c -E NUL ERROR_VARIABLE _gcc_output OUTPUT_QUIET)
+  else()
+    execute_process(COMMAND arm-none-eabi-gcc -v -x c -E - INPUT_FILE /dev/null ERROR_VARIABLE _gcc_output OUTPUT_QUIET)
+  endif()
+
+  # Build an array of string from the GCC output
+  string(REPLACE "\n" ";" _gcc_output "${_gcc_output}")
+
+  set(_capture_include FALSE)
+  set(_include_path "")
+
+  # Go through the lines and capture between '"#include <...> search starts here:"' and 'End of search list.'
+  foreach(_line ${_gcc_output})
+    if(${_line} STREQUAL "End of search list.")
+      set(_capture_include FALSE)
+    endif()
+
+    if(_capture_include)
+      # Remove the leading and trailing empty characters
+      string(REPLACE "\r" "" _line ${_line})
+      string(SUBSTRING "${_line}" 1 -1 _line)
+      set(_include_path "${_include_path}" "-I${_line}")
+    endif()
+
+    if(${_line} STREQUAL "#include <...> search starts here:")
+      set(_capture_include TRUE)
+    endif()
+  endforeach()
+  set(${gcc_include_path} ${_include_path})
+ENDMACRO()
+
 if(PYTHONINTERP_FOUND)
-  add_custom_target(datacopy
+  GET_GCC_INCLUDE_PATH(arm_gcc_include_path)
+
+  add_custom_command(
+    OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
-    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBFLYSKY -DPCBNV14 -DCPUARM -DCOLORLCD -DBACKUP > storage/datacopy.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBFLYSKY -DPCBNV14 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Igui/colorlcd -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/libopenui/src -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/inc -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Include ${arm_gcc_include_path} -Wno-pragma-once-outside-header > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
-  )
+    )
+
+  add_custom_target(datacopy
+    DEPENDS ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
+    )
 endif()
 
 set(LUA_EXPORT lua_export_nv14)
diff --git a/radio/src/targets/nv14/adc_driver.cpp b/radio/src/targets/nv14/adc_driver.cpp
index 60cc4a00b..be68f6559 100644
--- a/radio/src/targets/nv14/adc_driver.cpp
+++ b/radio/src/targets/nv14/adc_driver.cpp
@@ -68,7 +68,7 @@
   #define FIRST_ANALOG_ADC             0
   #define NUM_MAIN_ANALOGS_ADC         10
   #define NUM_MAIN_ANALOGS_ADC_EXT     (NUM_MAIN_ANALOGS - 10)
-#elif defined(PCBNV14) && defined(HALL_STICKS)
+#elif defined(PCBNV14) && defined(FLYSKY_HALL_STICKS)
   #define FIRST_ANALOG_ADC             4
   #define NUM_MAIN_ANALOGS_ADC         9
 #else
@@ -147,7 +147,7 @@ void adcInit()
   ADC_MAIN->SQR2 = (ADC_CHANNEL_SWE<<0) + (ADC_CHANNEL_SWF<<5) + (ADC_CHANNEL_LIBATT<<10) + (ADC_CHANNEL_DRYBATT<<15); // conversions 7 and more
   ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWB<<15) + (ADC_CHANNEL_SWC<<20) + (ADC_CHANNEL_SWD<<25); // conversions 1 to 6
 #elif defined(PCBNV14)
-  #if !defined(HALL_STICKS)
+  #if !defined(FLYSKY_HALL_STICKS)
   ADC_MAIN->SQR1 |= (ADC_CHANNEL_BATT <<0 );
   ADC_MAIN->SQR2 = (ADC_CHANNEL_SWA << 0) + (ADC_CHANNEL_SWC << 5) + (ADC_CHANNEL_SWE << 10) + (ADC_CHANNEL_SWF << 15) + (ADC_CHANNEL_SWG << 20) + (ADC_CHANNEL_SWH << 25); // conversions 7 and more
   ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<20) + (ADC_CHANNEL_POT2<<25); // conversions 1 to 6
diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 65ea598e4..809c8c62b 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -29,6 +29,9 @@ extern "C" {
 }
 #endif
 
+extern void flysky_hall_stick_init( void );
+extern void flysky_hall_stick_loop( void );
+
 HardwareOptions hardwareOptions;
 
 void watchdogInit(unsigned int duration)
@@ -84,7 +87,7 @@ void interrupt1ms()
   if (pre_scale == 10) {
     pre_scale = 0;
 #if !defined(SIMU)
-    if (boardState == BOARD_STARTED) hall_stick_loop();
+    if (boardState == BOARD_STARTED) flysky_hall_stick_loop();
 #endif
     DEBUG_TIMER_START(debugTimerPer10ms);
     DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod);
@@ -144,7 +147,7 @@ void delay_self(int count)
 #define RCC_APB1PeriphOther   (TELEMETRY_RCC_APB1Periph |\
                                TRAINER_RCC_APB1Periph |\
                                INTMODULE_RCC_APB1Periph |\
-                               HALL_RCC_APB1Periph |\
+                               FLYSKY_HALL_RCC_APB1Periph |\
                                EXTMODULE_RCC_APB1Periph |\
                                INTMODULE_RCC_APB1Periph |\
                                AUX_SERIAL_RCC_APB1Periph \
@@ -229,7 +232,7 @@ void boardInit()
   backlightInit();
   lcdInit();
 #if defined(FLYSKY_HALL_STICKS)
-  hall_stick_init(FLYSKY_HALL_BAUDRATE);
+  flysky_hall_stick_init();
 #endif
   usbInit();
   hapticInit();
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index db90d841d..56d04e499 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -34,7 +34,7 @@
 #endif
 
 #include "touch_driver.h"
-#include "hallStick_driver.h"
+//#include "hallStick_driver.h"
 #include "lcd_driver.h"
 #include "battery_driver.h"
 
@@ -128,7 +128,8 @@ void intmoduleSerialStart(uint32_t baudrate, uint8_t rxEnable, uint16_t parity,
 void intmoduleSendBuffer(const uint8_t * data, uint8_t size);
 void intmoduleSendNextFrame();
 
-void extmoduleSerialStart(uint32_t baudrate, uint32_t period_half_us, bool inverted);
+//void extmoduleSerialStart(uint32_t baudrate, uint32_t period_half_us, bool inverted);
+void extmoduleSerialStart();
 void extmoduleSendNextFrame();
 void extmoduleSendInvertedByte(uint8_t byte);
 
@@ -146,6 +147,7 @@ enum EnumKeys
   KEY_PGUP,
   KEY_PGDN,
   KEY_UP,
+  KEY_MODEL = KEY_UP, // TODO: just fixed for compile error, seems this is quite different from horus definition.
   KEY_DOWN,
   KEY_RIGHT,
   KEY_LEFT,
@@ -332,6 +334,8 @@ enum CalibratedAnalogs {
   CALIBRATED_STICK4,
   CALIBRATED_POT1,
   CALIBRATED_POT2,
+  CALIBRATED_SLIDER_REAR_LEFT,
+  CALIBRATED_SLIDER_REAR_RIGHT,  
   CALIBRATED_SWA,
   CALIBRATED_SWB,
   CALIBRATED_SWC,
@@ -374,6 +378,11 @@ void pwrSoftReboot();
 void pwrOff();
 void pwrResetHandler();
 bool pwrPressed();
+#if defined(PWR_EXTRA_SWITCH_GPIO)
+  bool pwrForcePressed();
+#else
+  #define pwrForcePressed() false
+#endif
 uint32_t pwrPressedDuration();;
 #if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
   #define UNEXPECTED_SHUTDOWN()         (false)
@@ -493,9 +502,13 @@ void hapticOff();
 void hapticOn(uint32_t pwmPercent);
 
 // Second serial port driver
-#define AUX_SERIAL
+//#define AUX_SERIAL
 #define DEBUG_BAUDRATE                  115200
+#define LUA_DEFAULT_BAUDRATE            115200
 extern uint8_t auxSerialMode;
+#if defined __cplusplus
+void auxSerialSetup(unsigned int baudrate, bool dma, uint16_t length = USART_WordLength_8b, uint16_t parity = USART_Parity_No, uint16_t stop = USART_StopBits_1);
+#endif
 void auxSerialInit(unsigned int mode, unsigned int protocol);
 void auxSerialPutc(char c);
 #define auxSerialTelemetryInit(protocol) auxSerialInit(UART_MODE_TELEMETRY, protocol)
diff --git a/radio/src/targets/nv14/bootloader/boot_menu.cpp b/radio/src/targets/nv14/bootloader/boot_menu.cpp
index 41d48140a..a689cacab 100644
--- a/radio/src/targets/nv14/bootloader/boot_menu.cpp
+++ b/radio/src/targets/nv14/bootloader/boot_menu.cpp
@@ -79,8 +79,8 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
         lcd->drawText(center, 200, "for mass storage", CENTERED | DEFAULT_COLOR);
 
         bootloaderDrawFooter();
-        lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | DEFAULT_COLOR);
-        lcd->drawText(center, LCD_H - DEFAULT_PADDING, getOtherVersion(nullptr), CENTERED | DEFAULT_COLOR);
+        lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | DEFAULT_COLOR);        
+        lcd->drawText(center, LCD_H - DEFAULT_PADDING, getFirmwareVersion(nullptr), CENTERED | DEFAULT_COLOR);
     }
     else if (st == ST_USB) {
         //lcd->drawBitmap(136, 98, &BMP_USB_PLUGGED);
diff --git a/radio/src/targets/nv14/extmodule_driver.cpp b/radio/src/targets/nv14/extmodule_driver.cpp
index aacaf9cfd..489f105f4 100644
--- a/radio/src/targets/nv14/extmodule_driver.cpp
+++ b/radio/src/targets/nv14/extmodule_driver.cpp
@@ -148,7 +148,7 @@ void extmodulePpmStart()
   NVIC_SetPriority(EXTMODULE_TIMER_IRQn, 7);
 }
 
-void extmoduleSerialStart(uint32_t baudrate, uint32_t period_half_us, bool inverted)
+void extmoduleSerialStart()
 {
 
 }
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index a7a57b872..eba39e872 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -99,7 +99,7 @@
 // ADC
 #define ADC_RCC_AHB1Periph              (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_DMA2)
 #define ADC_RCC_APB2Periph              (RCC_APB2Periph_ADC1 | RCC_APB2Periph_ADC3)
-#if !defined(HALL_STICKS)
+#if !defined(FLYSKY_HALL_STICKS)
 #define ADC_GPIO_PIN_STICK_LH           GPIO_Pin_2      // PA.02
 #define ADC_GPIO_PIN_STICK_LV           GPIO_Pin_3      // PA.03
 #define ADC_GPIO_PIN_STICK_RH           GPIO_Pin_4      // PA.04
@@ -127,7 +127,7 @@
 #define ADC_GPIOC_PINS                  (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_4 | GPIO_Pin_5)
 #define ADC_GPIOF_PINS                  (GPIO_Pin_8 | GPIO_Pin_10)
 
-#if !defined(HALL_STICKS)
+#if !defined(FLYSKY_HALL_STICKS)
 #define ADC_CHANNEL_STICK_LH            ADC_Channel_2   // ADC123_IN2 -> ADC1_IN2
 #define ADC_CHANNEL_STICK_LV            ADC_Channel_3   // ADC123_IN3 -> ADC1_IN3
 #define ADC_CHANNEL_STICK_RH            ADC_Channel_4   // ADC12_IN4  -> ADC1_IN4
@@ -160,7 +160,8 @@
 
 // Power
 #define PWR_RCC_AHB1Periph              RCC_AHB1Periph_GPIOI
-#define PWR_GPIO                        GPIOI
+#define PWR_ON_GPIO                     GPIOI
+#define PWR_SWITCH_GPIO                 GPIOI
 #define PWR_SWITCH_GPIO_REG             PWR_GPIO->IDR
 #define PWR_SWITCH_GPIO_PIN             GPIO_Pin_11 // PI.11
 #define PWR_ON_GPIO_PIN                 GPIO_Pin_14 // PI.14
@@ -205,6 +206,11 @@
 //used in BOOTLOADER
 #define SERIAL_RCC_AHB1Periph 0
 #define SERIAL_RCC_APB1Periph 0
+#define AUX2_SERIAL_RCC_AHB1Periph 0
+#define AUX2_SERIAL_RCC_APB1Periph 0
+#define AUX2_SERIAL_RCC_APB2Periph 0
+#define KEYS_BACKLIGHT_RCC_AHB1Periph 0
+
 // Telemetry
 #define TELEMETRY_RCC_AHB1Periph        (RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOJ | RCC_AHB1Periph_DMA1)
 #define TELEMETRY_RCC_APB1Periph        RCC_APB1Periph_USART2
@@ -357,6 +363,37 @@
 #define HAPTIC_TIMER_MODE               TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1PE
 #define HAPTIC_TIMER_COMPARE_VALUE      HAPTIC_GPIO_TIMER->CCR1
 
+// Flysky Hall Stick
+#if defined(FLYSKY_HALL_STICKS)
+  #if defined (RADIO_TX16S)
+    #define FLYSKY_HALL_STICKS_REVERSE
+  #endif
+
+  #define FLYSKY_HALL_SERIAL_USART                 UART4
+  #define FLYSKY_HALL_SERIAL_GPIO                  GPIOA
+  #define FLYSKY_HALL_DMA_Channel                  DMA_Channel_4
+  #define FLYSKY_HALL_SERIAL_TX_GPIO_PIN           GPIO_Pin_0  // PA.00
+  #define FLYSKY_HALL_SERIAL_RX_GPIO_PIN           GPIO_Pin_1  // PA.01
+  #define FLYSKY_HALL_SERIAL_TX_GPIO_PinSource     GPIO_PinSource0
+  #define FLYSKY_HALL_SERIAL_RX_GPIO_PinSource     GPIO_PinSource1
+  #define FLYSKY_HALL_SERIAL_GPIO_AF               GPIO_AF_UART4
+
+  #define FLYSKY_HALL_RCC_AHB1Periph               RCC_AHB1Periph_DMA1
+  #define FLYSKY_HALL_RCC_APB1Periph               RCC_APB1Periph_UART4
+
+  #define FLYSKY_HALL_SERIAL_USART_IRQHandler      UART4_IRQHandler
+  #define FLYSKY_HALL_SERIAL_USART_IRQn            UART4_IRQn
+  #define FLYSKY_HALL_SERIAL_RX_DMA_Stream_IRQn    DMA1_Stream2_IRQn
+  #define FLYSKY_HALL_SERIAL_TX_DMA_Stream_IRQn    DMA1_Stream4_IRQn
+  #define FLYSKY_HALL_DMA_Stream_RX                DMA1_Stream2
+  #define FLYSKY_HALL_DMA_Stream_TX                DMA1_Stream4
+  #define FLYSKY_HALL_DMA_TX_FLAG_TC               DMA_IT_TCIF4
+
+  #define FLYSKY_HALL_RX_DMA_Stream_IRQHandler     DMA1_Stream2_IRQHandler
+  #define FLYSKY_HALL_TX_DMA_Stream_IRQHandler     DMA1_Stream4_IRQHandler
+
+#endif
+
 // Internal Module
 #define HARDWARE_INTERNAL_MODULE
 #define INTMODULE_RCC_AHB1Periph        (RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_DMA1)
@@ -399,6 +436,7 @@
 #define EXTMODULE_PULSES
 #define EXTMODULE_PWR_GPIO              GPIOD
 #define EXTMODULE_PWR_GPIO_PIN          GPIO_Pin_11
+#define EXTERNAL_MODULE_PWR_OFF()       GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN)
 #define EXTMODULE_PWR_FIX_GPIO          GPIOA
 #define EXTMODULE_PWR_FIX_GPIO_PIN      GPIO_Pin_2      // PA.02
 #define EXTMODULE_RCC_AHB1Periph        (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOI | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_DMA2)
@@ -519,4 +557,11 @@
 #define TIMER_2MHz_RCC_APB1Periph       RCC_APB1Periph_TIM7
 #define TIMER_2MHz_TIMER                TIM7
 
+// Mixer scheduler timer
+#define MIXER_SCHEDULER_TIMER_RCC_APB1Periph RCC_APB1Periph_TIM13
+#define MIXER_SCHEDULER_TIMER                TIM13
+#define MIXER_SCHEDULER_TIMER_FREQ           (PERI1_FREQUENCY * TIMER_MULT_APB1)
+#define MIXER_SCHEDULER_TIMER_IRQn           TIM8_UP_TIM13_IRQn
+#define MIXER_SCHEDULER_TIMER_IRQHandler     TIM8_UP_TIM13_IRQHandler
+
 #endif // _HAL_H_
diff --git a/radio/src/targets/nv14/lcd_driver.cpp b/radio/src/targets/nv14/lcd_driver.cpp
index c1b19906f..007d7e446 100644
--- a/radio/src/targets/nv14/lcd_driver.cpp
+++ b/radio/src/targets/nv14/lcd_driver.cpp
@@ -23,6 +23,7 @@
 uint8_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_BACKUP_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
+uint8_t LCD_SCRATCH_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t currentLayer = LCD_FIRST_LAYER;
 
 lcdSpiInitFucPtr lcdInitFunction;
@@ -1273,7 +1274,8 @@ BitmapBuffer lcdBuffer1(BMP_RGB565, LCD_W, LCD_H,
     (uint16_t *) LCD_FIRST_FRAME_BUFFER);
 BitmapBuffer lcdBuffer2(BMP_RGB565, LCD_W, LCD_H,
     (uint16_t *) LCD_SECOND_FRAME_BUFFER);
-BitmapBuffer * lcd = &lcdBuffer1;
+BitmapBuffer * lcdFront = &lcdBuffer1;
+BitmapBuffer * lcd = &lcdBuffer2;
 
 void LCD_SetLayer(uint32_t layer) {
   if (layer == LCD_FIRST_LAYER) {
@@ -1455,6 +1457,54 @@ void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
 
+// same as DMACopyAlphaBitmap(), but with an 8 bit mask for each pixel (used by fonts)
+void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color)
+{
+  TRACE("++++++");
+  DMA2D_DeInit();
+
+  DMA2D_InitTypeDef DMA2D_InitStruct;
+  DMA2D_InitStruct.DMA2D_Mode = DMA2D_M2M_BLEND;
+  DMA2D_InitStruct.DMA2D_CMode = CM_RGB565;
+  DMA2D_InitStruct.DMA2D_OutputMemoryAdd = CONVERT_PTR_UINT(dest + y*destw + x);
+  DMA2D_InitStruct.DMA2D_OutputBlue = 0;
+  DMA2D_InitStruct.DMA2D_OutputGreen = 0;
+  DMA2D_InitStruct.DMA2D_OutputRed = 0;
+  DMA2D_InitStruct.DMA2D_OutputAlpha = 0;
+  DMA2D_InitStruct.DMA2D_OutputOffset = destw - w;
+  DMA2D_InitStruct.DMA2D_NumberOfLine = h;
+  DMA2D_InitStruct.DMA2D_PixelPerLine = w;
+  DMA2D_Init(&DMA2D_InitStruct);
+
+  DMA2D_FG_InitTypeDef DMA2D_FG_InitStruct;
+  DMA2D_FG_StructInit(&DMA2D_FG_InitStruct);
+  DMA2D_FG_InitStruct.DMA2D_FGMA = CONVERT_PTR_UINT(src + srcy*srcw + srcx);
+  DMA2D_FG_InitStruct.DMA2D_FGO = srcw - w;
+  DMA2D_FG_InitStruct.DMA2D_FGCM = CM_A8; // 8 bit inputs every time
+  DMA2D_FG_InitStruct.DMA2D_FGPFC_ALPHA_MODE = NO_MODIF_ALPHA_VALUE;
+  DMA2D_FG_InitStruct.DMA2D_FGPFC_ALPHA_VALUE = 0;
+  DMA2D_FG_InitStruct.DMA2D_FGC_RED   = GET_RED(bg_color);   // 8 bit red
+  DMA2D_FG_InitStruct.DMA2D_FGC_GREEN = GET_GREEN(bg_color); // 8 bit green
+  DMA2D_FG_InitStruct.DMA2D_FGC_BLUE  = GET_BLUE(bg_color);  // 8 bit blue
+  
+  DMA2D_FGConfig(&DMA2D_FG_InitStruct);
+
+  DMA2D_BG_InitTypeDef DMA2D_BG_InitStruct;
+  DMA2D_BG_StructInit(&DMA2D_BG_InitStruct);
+  DMA2D_BG_InitStruct.DMA2D_BGMA = CONVERT_PTR_UINT(dest + y*destw + x);
+  DMA2D_BG_InitStruct.DMA2D_BGO = destw - w;
+  DMA2D_BG_InitStruct.DMA2D_BGCM = CM_RGB565;
+  DMA2D_BG_InitStruct.DMA2D_BGPFC_ALPHA_MODE = NO_MODIF_ALPHA_VALUE;
+  DMA2D_BG_InitStruct.DMA2D_BGPFC_ALPHA_VALUE = 0;
+  DMA2D_BGConfig(&DMA2D_BG_InitStruct);
+
+  /* Start Transfer */
+  DMA2D_StartTransfer();
+
+  /* Wait for CTC Flag activation */
+  while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
+}
+
 void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format)
 {
   DMA2D_DeInit();
@@ -1532,6 +1582,16 @@ int lcdRestoreBackupBuffer()
   return 1;
 }
 
+uint16_t* lcdGetBackupBuffer()
+{
+  return (uint16_t*)LCD_BACKUP_FRAME_BUFFER;
+}
+
+uint16_t* lcdGetScratchBuffer()
+{
+  return (uint16_t*)LCD_SCRATCH_FRAME_BUFFER;
+}
+
 void lcdRefresh()
 {
   if (currentLayer == LCD_FIRST_LAYER) {
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index 50a1606d5..a24c6fef9 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -86,7 +86,7 @@ constexpr uint32_t ALERT_BUTTON_TOP =              300;
 constexpr uint32_t PAGE_TITLE_TOP =                4;
 constexpr uint32_t PAGE_TITLE_LEFT =               70;
 
-enum LcdColorIndex
+/*enum LcdColorIndex
 {
   DEFAULT_COLOR_INDEX,
   DEFAULT_BGCOLOR_INDEX,
@@ -130,7 +130,7 @@ enum LcdColorIndex
 
   TABLE_HEADER_BGCOLOR_INDEX,
   TABLE_BGCOLOR_INDEX,
-};
+};*/
 
 enum FontIndex
 {
diff --git a/radio/src/targets/nv14/pwr_driver.cpp b/radio/src/targets/nv14/pwr_driver.cpp
index b78cf7f3f..65f653b39 100644
--- a/radio/src/targets/nv14/pwr_driver.cpp
+++ b/radio/src/targets/nv14/pwr_driver.cpp
@@ -32,13 +32,13 @@ void pwrInit()
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
-  GPIO_Init(PWR_GPIO, &GPIO_InitStructure);
+  GPIO_Init(PWR_ON_GPIO, &GPIO_InitStructure);
 
   // TODO move this elsewhere!
   // Init Module PWR
-  //GPIO_ResetBits(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN);
-  //GPIO_InitStructure.GPIO_Pin = INTMODULE_PWR_GPIO_PIN;
-  //GPIO_Init(INTMODULE_PWR_GPIO, &GPIO_InitStructure);
+  //GPIO_ResetBits(INTMODULE_PWR_ON_GPIO, INTMODULE_PWR_ON_GPIO_PIN);
+  //GPIO_InitStructure.GPIO_Pin = INTMODULE_PWR_ON_GPIO_PIN;
+  //GPIO_Init(INTMODULE_PWR_ON_GPIO, &GPIO_InitStructure);
 
   //Bluetooth
   GPIO_SetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN);
@@ -48,7 +48,7 @@ void pwrInit()
   // Init PWR SWITCH PIN
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
   GPIO_InitStructure.GPIO_Pin = PWR_SWITCH_GPIO_PIN;
-  GPIO_Init(PWR_GPIO, &GPIO_InitStructure);
+  GPIO_Init(PWR_ON_GPIO, &GPIO_InitStructure);
   
   // Init SD-DETECT PIN
   GPIO_ResetBits(SD_PRESENT_GPIO, SD_PRESENT_GPIO_PIN);
@@ -56,16 +56,16 @@ void pwrInit()
   GPIO_Init(SD_PRESENT_GPIO, &GPIO_InitStructure);
 
   //turn power off
-  GPIO_ResetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
+  GPIO_ResetBits(PWR_ON_GPIO, PWR_ON_GPIO_PIN);
   //turn Bluetooth off
-  GPIO_ResetBits(PWR_GPIO, BLUETOOTH_ON_GPIO_PIN);
+  GPIO_ResetBits(PWR_ON_GPIO, BLUETOOTH_ON_GPIO_PIN);
 
   boardState = BOARD_POWER_OFF;
 }
 
 void pwrOn()
 {
-  GPIO_SetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
+  GPIO_SetBits(PWR_ON_GPIO, PWR_ON_GPIO_PIN);
   boardState = BOARD_POWER_ON;
 }
 
@@ -78,12 +78,12 @@ void pwrOff()
   // Shutdown the Haptic
   hapticDone();
   boardState = BOARD_POWER_OFF;
-  GPIO_ResetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
+  GPIO_ResetBits(PWR_ON_GPIO, PWR_ON_GPIO_PIN);
 }
 
 bool pwrPressed()
 {
-  return GPIO_ReadInputDataBit(PWR_GPIO, PWR_SWITCH_GPIO_PIN) == Bit_RESET;
+  return GPIO_ReadInputDataBit(PWR_ON_GPIO, PWR_SWITCH_GPIO_PIN) == Bit_RESET;
 }
 
 void pwrResetHandler()
diff --git a/radio/src/targets/nv14/touch_driver.cpp b/radio/src/targets/nv14/touch_driver.cpp
index 72234dd0d..07a81996e 100644
--- a/radio/src/targets/nv14/touch_driver.cpp
+++ b/radio/src/targets/nv14/touch_driver.cpp
@@ -473,7 +473,8 @@ void handleTouch()
       touchState.startY = touchState.y;
       touchState.event = TE_DOWN;
       if (g_eeGeneral.backlightMode & e_backlight_mode_keys)
-        backlightOn(); // TODO is that the best place ?
+        backlightEnable(BACKLIGHT_LEVEL_MAX);          
+ //       backlightOn(); // TODO is that the best place ?
     }
     else if (touchState.event == TE_DOWN) {
       if (dx >= SLIDE_RANGE || dx <= -SLIDE_RANGE || dy >= SLIDE_RANGE || dy <= -SLIDE_RANGE) {
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 2ccc0f914..d97eff033 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -133,6 +133,9 @@ case $FLAVOR in
     TX16S_FS)
         BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=TX16S -DFLYSKY_HALL_STICKS=ON"
         ;;
+    NV14)
+        BUILD_OPTIONS+="-DPCB=NV14"
+        ;;
 esac
 
 cmake ${BUILD_OPTIONS} "${SRCDIR}"

From e36e41579bbbcc866288a83d719945dc1b3174c2 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Fri, 11 Jun 2021 11:14:59 +0800
Subject: [PATCH 03/45] Fixed typo bug in jumper build script.

---
 tools/build-jumper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build-jumper.py b/tools/build-jumper.py
index b6dd3b8b8..436b2b23d 100755
--- a/tools/build-jumper.py
+++ b/tools/build-jumper.py
@@ -43,7 +43,7 @@ boards = {
         "PCBREV": "T18",
         "INTERNAL_MODULE_MULTI": "YES",
         "DEFAULT_MODE": "2",
-    }
+    },
     "T18_FS": {
         "PCB": "X10",
         "PCBREV": "T18",

From a79b317a397bb59e00852f7e6169c746b936566c Mon Sep 17 00:00:00 2001
From: qba667 <jklimasz@gmail.com>
Date: Sun, 20 Jun 2021 09:45:47 +0200
Subject: [PATCH 04/45] Fixed LCD backligh on touch

---
 radio/src/opentx.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 4c421e52e..10552b7a2 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -537,6 +537,11 @@ void checkBacklight()
         resetBacklightTimeout();
       }
     }
+    #if defined(HARDWARE_TOUCH)
+    if (touchPanelEventOccured() && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
+      resetBacklightTimeout();
+    }
+    #endif
 
     if (requiredBacklightBright == BACKLIGHT_FORCED_ON) {
       currentBacklightBright = g_eeGeneral.backlightBright;
@@ -550,7 +555,6 @@ void checkBacklight()
       if (flashCounter) {
         backlightOn = !backlightOn;
       }
-
       if (backlightOn) {
         currentBacklightBright = requiredBacklightBright;
         BACKLIGHT_ENABLE();
@@ -2083,7 +2087,7 @@ uint32_t pwrCheck()
           LED_ERROR_BEGIN();
 
           WDG_RESET();
-          lcdRefresh();
+            ();
 
           if (warningResult) {
             pwr_check_state = PWR_CHECK_OFF;

From b621c90640cad1c1290045dcbe768635b554dae2 Mon Sep 17 00:00:00 2001
From: qba667 <jklimasz@gmail.com>
Date: Sun, 20 Jun 2021 09:46:57 +0200
Subject: [PATCH 05/45] Removed not existing debug define

---
 radio/src/targets/horus/flyskyHallStick_driver.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/radio/src/targets/horus/flyskyHallStick_driver.cpp b/radio/src/targets/horus/flyskyHallStick_driver.cpp
index 0aa6f3168..6d4b1d0c4 100644
--- a/radio/src/targets/horus/flyskyHallStick_driver.cpp
+++ b/radio/src/targets/horus/flyskyHallStick_driver.cpp
@@ -534,7 +534,6 @@ void flysky_hall_stick_loop(void)
 
         if (log)
         {
-            TRACE_NOCRLF("Hall(%0d):", FLYSKY_FLYSKY_HALL_BAUDRATE);
             for (int idx = 0; idx < HallProtocol.length + 5; idx++)
             {
                 TRACE_NOCRLF(" %02X", *((uint8_t*)&HallProtocol + idx));

From 0b365adaf94ba69e607503699401dc75a9e72315 Mon Sep 17 00:00:00 2001
From: qba667 <jklimasz@gmail.com>
Date: Sun, 20 Jun 2021 09:48:04 +0200
Subject: [PATCH 06/45] Fixed LCD display for NV14

---
 radio/src/targets/nv14/battery_driver.cpp     |   1 -
 radio/src/targets/nv14/board.h                |   3 +
 .../src/targets/nv14/bootloader/boot_menu.cpp |   6 +-
 radio/src/targets/nv14/lcd_driver.cpp         | 130 ++++++++----------
 radio/src/targets/nv14/lcd_driver.h           |   3 -
 5 files changed, 65 insertions(+), 78 deletions(-)

diff --git a/radio/src/targets/nv14/battery_driver.cpp b/radio/src/targets/nv14/battery_driver.cpp
index 6ef43f042..ca6b11854 100644
--- a/radio/src/targets/nv14/battery_driver.cpp
+++ b/radio/src/targets/nv14/battery_driver.cpp
@@ -182,7 +182,6 @@ void handle_battery_charge(uint32_t last_press_time)
         lcdOn();
       }
       updateTime = get_tmr10ms();     
-      lcdNextLayer();
       lcd->clear();
       drawChargingInfo(chargeState);
       lcdRefresh();
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index 56d04e499..b1901434a 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -390,6 +390,9 @@ uint32_t pwrPressedDuration();;
   #define UNEXPECTED_SHUTDOWN()        (powerupReason == DIRTY_SHUTDOWN)
 #endif
 
+#define AUX_SERIAL_POWER_ON()
+#define AUX_SERIAL_POWER_OFF()
+
 // LCD driver
 #define LCD_W                           320
 #define LCD_H                           480
diff --git a/radio/src/targets/nv14/bootloader/boot_menu.cpp b/radio/src/targets/nv14/bootloader/boot_menu.cpp
index a689cacab..907f8d460 100644
--- a/radio/src/targets/nv14/bootloader/boot_menu.cpp
+++ b/radio/src/targets/nv14/bootloader/boot_menu.cpp
@@ -56,9 +56,6 @@ static void bootloaderDrawFooter()
 
 void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
 {
-#if defined(COLORLCD)
-    lcdNextLayer();
-#endif
     // clear screen
     lcd->drawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, DEFAULT_BGCOLOR);
     int center = LCD_W/2;
@@ -162,6 +159,9 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
             lcd->drawText(DOUBLE_PADDING, LCD_H - DEFAULT_PADDING, "[L TRIM] to exit");
         }        
     }
+#if defined(COLORLCD)
+    lcdRefresh();
+#endif
 }
 
 void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
diff --git a/radio/src/targets/nv14/lcd_driver.cpp b/radio/src/targets/nv14/lcd_driver.cpp
index 007d7e446..6606a7af7 100644
--- a/radio/src/targets/nv14/lcd_driver.cpp
+++ b/radio/src/targets/nv14/lcd_driver.cpp
@@ -19,12 +19,12 @@
  */
 
 #include "opentx.h"
-
+#define LTDC_DOUBLELAYER
 uint8_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_BACKUP_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_SCRATCH_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
-uint8_t currentLayer = LCD_FIRST_LAYER;
+bool secondFrame = false;
 
 lcdSpiInitFucPtr lcdInitFunction;
 lcdSpiInitFucPtr lcdOffFunction;
@@ -1179,24 +1179,37 @@ void LCD_Init_LTDC() {
 
   LTDC_Init(&LTDC_InitStruct);
 
-#if 0
+  //Configure IRQ
+  // LTDC_ITConfig(LTDC_IER_RRIE, ENABLE);
+  // NVIC_InitTypeDef NVIC_InitStructure;
+  // NVIC_InitStructure.NVIC_IRQChannel = LTDC_IRQn;
+  // NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = LTDC_IRQ_PRIO;
+  // NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
+  // NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
+  // NVIC_Init(&NVIC_InitStructure);
+
   LTDC_ITConfig(LTDC_IER_LIE, ENABLE);
   NVIC_InitTypeDef NVIC_InitStructure;
   NVIC_InitStructure.NVIC_IRQChannel = LTDC_IRQn;
   NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = LTDC_IRQ_PRIO;
-  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; /* Not used as 4 bits are used for the pr     e-emption priority. */;
+  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; /* Not used as 4 bits are used for the pre-emption priority. */;
   NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init( &NVIC_InitStructure );
+  NVIC_Init(&NVIC_InitStructure);
+  LTDC_LIPConfig(LCD_H);
 
+#if 0
   DMA2D_ITConfig(DMA2D_CR_TCIE, ENABLE);
   NVIC_InitStructure.NVIC_IRQChannel = DMA2D_IRQn;
   NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = DMA_SCREEN_IRQ_PRIO;
   NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; /* Not used as 4 bits are used for the pr     e-emption priority. */;
   NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
   NVIC_Init( &NVIC_InitStructure );
-
   DMA2D->IFCR = (unsigned long)DMA2D_IFSR_CTCIF;
 #endif
+
+  // Enable LTDC IRQ in NVIC
+  NVIC_EnableIRQ(LTDC_IRQn);
+  NVIC_SetPriority(LTDC_IRQn, 7);
 }
 
 void LCD_LayerInit() {
@@ -1247,25 +1260,29 @@ void LCD_LayerInit() {
   /* Initialize LTDC layer 1 */
   LTDC_LayerInit(LTDC_Layer1, &LTDC_Layer_InitStruct);
 
-  /* Configure Layer 2 */
+#if defined(LTDC_DOUBLELAYER)
+   /* Configure Layer 2 */
   LTDC_Layer_InitStruct.LTDC_BlendingFactor_1 = LTDC_BlendingFactor1_PAxCA;
   LTDC_Layer_InitStruct.LTDC_BlendingFactor_2 = LTDC_BlendingFactor2_PAxCA;
 
   /* Start Address configuration : the LCD Frame buffer is defined on SDRAM w/ Offset */
-  LTDC_Layer_InitStruct.LTDC_CFBStartAdress =
-      (uint32_t) LCD_SECOND_FRAME_BUFFER;
-
+  LTDC_Layer_InitStruct.LTDC_CFBStartAdress = (uint32_t) LCD_SECOND_FRAME_BUFFER;
+      
   /* Initialize LTDC layer 2 */
   LTDC_LayerInit(LTDC_Layer2, &LTDC_Layer_InitStruct);
-
+#endif
   /* LTDC configuration reload */
-  LTDC_ReloadConfig (LTDC_IMReload);
-
-  LTDC_LayerCmd(LTDC_Layer1, ENABLE);
-  LTDC_LayerCmd(LTDC_Layer2, ENABLE);
-
   LTDC_ReloadConfig(LTDC_IMReload);
 
+  LTDC_LayerCmd(LTDC_Layer1, ENABLE);
+  LTDC_LayerAlpha(LTDC_Layer1, 255);
+
+#if defined(LTDC_DOUBLELAYER)
+  LTDC_LayerCmd(LTDC_Layer2, ENABLE);
+  LTDC_LayerAlpha(LTDC_Layer2, 0);
+#endif
+
+  LTDC_ReloadConfig(LTDC_IMReload);
   /* dithering activation */
   LTDC_DitherCmd(ENABLE);
 }
@@ -1277,27 +1294,11 @@ BitmapBuffer lcdBuffer2(BMP_RGB565, LCD_W, LCD_H,
 BitmapBuffer * lcdFront = &lcdBuffer1;
 BitmapBuffer * lcd = &lcdBuffer2;
 
-void LCD_SetLayer(uint32_t layer) {
-  if (layer == LCD_FIRST_LAYER) {
-    lcd = &lcdBuffer1;
-  } else {
-    lcd = &lcdBuffer2;
-  }
-  currentLayer = layer;
-}
-
-void LCD_SetTransparency(uint8_t transparency)
-{
-  if (currentLayer == LCD_FIRST_LAYER) {
-    LTDC_LayerAlpha(LTDC_Layer1, transparency);
-  } else {
-    LTDC_LayerAlpha(LTDC_Layer2, transparency);
-  }
-  LTDC_ReloadConfig (LTDC_IMReload);
-}
-
 extern void loadFonts();
 void lcdInit(void) {
+  // Clear buffers first
+  memset(LCD_FIRST_FRAME_BUFFER, 0, sizeof(LCD_FIRST_FRAME_BUFFER));
+  memset(LCD_SECOND_FRAME_BUFFER, 0, sizeof(LCD_SECOND_FRAME_BUFFER));
 
   loadFonts();
   /* Configure the LCD SPI+RESET pins */
@@ -1308,7 +1309,7 @@ void lcdInit(void) {
 
   /* Configure the LCD Control pins */
   LCD_AF_GPIOConfig();
-
+  
   /* Send LCD initializaiton commands */
   if (LCD_ILI9481_ReadID() == LCD_ILI9481_ID) {
     TRACE("LCD INIT: ILI9481");
@@ -1339,23 +1340,11 @@ void lcdInit(void) {
   }
 
   lcdInitFunction();
-
+  
   LCD_Init_LTDC();
-
   LCD_LayerInit();
-
-  /* Enable LCD display */
   LTDC_Cmd(ENABLE);
-
-  /* Set Background layer */
-  LCD_SetLayer (LCD_FIRST_LAYER);
-  // lcdClear();
-  LCD_SetTransparency(0);
-
-  /* Set Foreground layer */
-  LCD_SetLayer (LCD_SECOND_LAYER);
-  lcd->clear();
-  LCD_SetTransparency(255);
+  LTDC_ReloadConfig(LTDC_IMReload);
 }
 
 void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color)
@@ -1460,7 +1449,6 @@ void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_
 // same as DMACopyAlphaBitmap(), but with an 8 bit mask for each pixel (used by fonts)
 void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color)
 {
-  TRACE("++++++");
   DMA2D_DeInit();
 
   DMA2D_InitTypeDef DMA2D_InitStruct;
@@ -1592,27 +1580,27 @@ uint16_t* lcdGetScratchBuffer()
   return (uint16_t*)LCD_SCRATCH_FRAME_BUFFER;
 }
 
+static volatile uint8_t refreshRequested = 0;
+
+extern "C" void LTDC_IRQHandler(void)
+{
+  LTDC_ClearFlag(LTDC_ICR_CLIF);
+  if (refreshRequested) {
+#if defined(LTDC_DOUBLELAYER)
+    LTDC_LayerAlpha(LTDC_Layer1, (lcd == &lcdBuffer2) ? 255 : 0);
+    LTDC_LayerAlpha(LTDC_Layer2, (lcd == &lcdBuffer1) ? 255 : 0);
+#else
+    LTDC_Layer1->CFBAR = (uint32_t)((lcd == &lcdBuffer2) ? &lcdBuffer1 : &lcdBuffer2)->getData();
+#endif
+    LTDC_ReloadConfig(LTDC_IMReload);
+    refreshRequested = false;
+  }
+}
+
 void lcdRefresh()
 {
-  if (currentLayer == LCD_FIRST_LAYER) {
-    LTDC_LayerAlpha(LTDC_Layer1, 255);
-    LTDC_LayerAlpha(LTDC_Layer2, 0);
-  }
-  else {
-    LTDC_LayerAlpha(LTDC_Layer1, 0);
-    LTDC_LayerAlpha(LTDC_Layer2, 255);
-  }
-  LTDC_ReloadConfig(LTDC_IMReload);
+  while(refreshRequested) {} //block if last frame was not painted yet
+  lcd = (lcd == &lcdBuffer2) ? &lcdBuffer1 : &lcdBuffer2;
+  refreshRequested = true;
 }
 
-void lcdNextLayer()
-{
-  if (currentLayer == LCD_FIRST_LAYER) {
-    LCD_SetLayer(LCD_SECOND_LAYER);
-  }
-  else {
-    LCD_SetLayer(LCD_FIRST_LAYER);
-  }
-}
-
-
diff --git a/radio/src/targets/nv14/lcd_driver.h b/radio/src/targets/nv14/lcd_driver.h
index bc348984e..32b9d7079 100644
--- a/radio/src/targets/nv14/lcd_driver.h
+++ b/radio/src/targets/nv14/lcd_driver.h
@@ -32,9 +32,6 @@
 #define HFP  ( 140 - HBP )
 #define VFP  ( 22 - VBP )
 
-#define LCD_FIRST_LAYER     ( 0 )
-#define LCD_SECOND_LAYER    ( 1 )
-
 
 #define PORT_LCD_CS         ( GPIOE )
 #define LCD_CS_PIN          ( GPIO_Pin_4 )

From 865a8204b6b2a2cfb9200863895db916320ac096 Mon Sep 17 00:00:00 2001
From: qba667 <jklimasz@gmail.com>
Date: Sun, 20 Jun 2021 09:49:26 +0200
Subject: [PATCH 07/45] Fixed transistion form TE_SLIDE_END to TE_DOWN

---
 radio/src/targets/nv14/touch_driver.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/radio/src/targets/nv14/touch_driver.cpp b/radio/src/targets/nv14/touch_driver.cpp
index 07a81996e..b11767c20 100644
--- a/radio/src/targets/nv14/touch_driver.cpp
+++ b/radio/src/targets/nv14/touch_driver.cpp
@@ -468,13 +468,10 @@ void handleTouch()
     touchState.x = touchX;
     touchState.y = touchY;
 
-    if (touchState.event == TE_NONE || touchState.event == TE_UP) {
+    if (touchState.event == TE_NONE || touchState.event == TE_UP || touchState.event == TE_SLIDE_END) {
       touchState.startX = touchState.x;
       touchState.startY = touchState.y;
       touchState.event = TE_DOWN;
-      if (g_eeGeneral.backlightMode & e_backlight_mode_keys)
-        backlightEnable(BACKLIGHT_LEVEL_MAX);          
- //       backlightOn(); // TODO is that the best place ?
     }
     else if (touchState.event == TE_DOWN) {
       if (dx >= SLIDE_RANGE || dx <= -SLIDE_RANGE || dy >= SLIDE_RANGE || dy <= -SLIDE_RANGE) {

From 35776c5f4a69810c4adfd2f953719bf2e3ad02dd Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 22 Jun 2021 17:09:09 +0800
Subject: [PATCH 08/45] Use default theme for nv14, may customize the theme
 later.

---
 radio/src/gui/colorlcd/themes/480_default.cpp | 2 +-
 radio/src/gui/colorlcd/themes/flysky.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp
index 5d5907536..77b5ac252 100644
--- a/radio/src/gui/colorlcd/themes/480_default.cpp
+++ b/radio/src/gui/colorlcd/themes/480_default.cpp
@@ -460,7 +460,7 @@ BitmapBuffer * Theme480::currentMenuBackground = nullptr;
 
 Theme480 Theme480;
 
-#if LCD_W == 480
+#if LCD_W == 480  || LCD_H == 480
 OpenTxTheme * defaultTheme = &Theme480;
 Theme * theme = &Theme480;
 #endif
diff --git a/radio/src/gui/colorlcd/themes/flysky.cpp b/radio/src/gui/colorlcd/themes/flysky.cpp
index a8c519d41..618a988ad 100644
--- a/radio/src/gui/colorlcd/themes/flysky.cpp
+++ b/radio/src/gui/colorlcd/themes/flysky.cpp
@@ -454,9 +454,9 @@ BitmapBuffer * FlyskyTheme::menuIconNormal[MENUS_ICONS_COUNT] = { nullptr };
 BitmapBuffer * FlyskyTheme::menuIconSelected[MENUS_ICONS_COUNT] = { nullptr };
 BitmapBuffer * FlyskyTheme::currentMenuBackground = nullptr;
 
-FlyskyTheme flyskyTheme;
+/*FlyskyTheme flyskyTheme;
 
 #if defined(PCBFLYSKY)
 OpenTxTheme * defaultTheme = &flyskyTheme;
 Theme * theme = &flyskyTheme;
-#endif
+#endif*/

From fac40096213312b9a6e21e2e628728875a68ba13 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 30 Jun 2021 15:07:15 +0800
Subject: [PATCH 09/45] Audio driver fix.

---
 radio/src/audio.cpp                         | 6 ++++++
 radio/src/targets/nv14/audio_spi_driver.cpp | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/radio/src/audio.cpp b/radio/src/audio.cpp
index da1998e4b..bbe59ff34 100644
--- a/radio/src/audio.cpp
+++ b/radio/src/audio.cpp
@@ -531,6 +531,12 @@ void audioTask(void * pdata)
 #if defined(PCBX12S) || defined(RADIO_TX16S)
   // The audio amp needs ~2s to start
   RTOS_WAIT_MS(1000); // 1s
+#elif defined(PCBNV14)
+  while(!isAudioReady())
+  {
+    audioChipReset();
+    RTOS_WAIT_MS(1000);
+  }
 #endif
 
   if (!globalData.unexpectedShutdown) {
diff --git a/radio/src/targets/nv14/audio_spi_driver.cpp b/radio/src/targets/nv14/audio_spi_driver.cpp
index f21b5c46f..60ec589d9 100644
--- a/radio/src/targets/nv14/audio_spi_driver.cpp
+++ b/radio/src/targets/nv14/audio_spi_driver.cpp
@@ -276,7 +276,8 @@ uint8_t audioHardReset(void)
   XDCS_HIGH();
   CS_HIGH();
   RST_HIGH();
-  while (READ_DREQ() == 0 && retry < 200) {
+  while (READ_DREQ() == 0 && retry < 200)
+  {
     retry++;
     delay_us(50);
   }

From fe532f32fe3ed734e1ce6a83f93c4ece2cfd197c Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 30 Jun 2021 15:10:45 +0800
Subject: [PATCH 10/45] Some more fixes.

---
 radio/src/keys.h                          |  2 +-
 radio/src/lua/CMakeLists.txt              |  2 +-
 radio/src/targets/nv14/board.cpp          |  2 +-
 radio/src/targets/nv14/libopenui_config.h | 36 ++++++++++++-----------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/radio/src/keys.h b/radio/src/keys.h
index f8d30f1e5..bbe71e09b 100644
--- a/radio/src/keys.h
+++ b/radio/src/keys.h
@@ -32,7 +32,7 @@ constexpr event_t EVT_ENTRY_UP =       0x1002;
 constexpr event_t EVT_ROTARY_LEFT =    0x1003;
 constexpr event_t EVT_ROTARY_RIGHT =   0x1004;
 
-#if defined(PCBHORUS)
+#if defined(PCBHORUS) || defined (PCBNV14)
 constexpr event_t _MSK_KEY_BREAK =     0x0200;
 constexpr event_t _MSK_KEY_REPT =      0x0400;
 constexpr event_t _MSK_KEY_FIRST =     0x0600;
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index cab6bcd4f..8325bb2aa 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -33,5 +33,5 @@ if(PYTHONINTERP_FOUND)
   add_lua_export_target(tx12      ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12)
   add_lua_export_target(t8        ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T8)
   add_lua_export_target(t16       ${LUA_INCLUDES} -DPCBHORUS   -DPCBX10 -DRADIO_T16)
-  add_lua_export_target(nv14      ${LUA_INCLUDES} -DPCBFLYSKY  -DPCBNV14)
+  add_lua_export_target(nv14      ${LUA_INCLUDES} -I${RADIO_SRC_DIR}/targets/nv14 -DPCBNV14)
 endif()
diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 809c8c62b..8608806ea 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -134,7 +134,7 @@ void delay_self(int count)
                                AUDIO_RCC_AHB1Periph |\
                                HAPTIC_RCC_AHB1Periph |\
                                INTMODULE_RCC_AHB1Periph |\
-                               INTMODULE_RCC_AHB1Periph|\
+                               FLYSKY_HALL_RCC_AHB1Periph |\
                                EXTMODULE_RCC_AHB1Periph\
                               )
 #define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index a24c6fef9..502856879 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -18,19 +18,34 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _LIBOPENUI_CONFIG_H_
-#define _LIBOPENUI_CONFIG_H_
+#pragma once
 
 #include "debug.h"
 #include "libopenui_defines.h"
+
 #include "colors.h"
 #include "board.h"
 #include "keys.h"
 
+enum FontIndex
+{
+  FONT_STD_INDEX,
+#if !defined(BOLD)
+  FONT_BOLD_INDEX,
+  FONT_XXS_INDEX,
+  FONT_XS_INDEX,
+  FONT_L_INDEX,
+  FONT_XL_INDEX,
+  FONT_XXL_INDEX,
+#endif
+  
+  FONTS_COUNT
+};
+
 typedef uint16_t pixel_t;
 
 constexpr bool WRAP_FORM_FIELDS_WITHIN_PAGE = true;
-constexpr uint32_t SLIDE_SPEED_REDUCTION = 5;
+constexpr short SLIDE_SPEED_REDUCTION = 5;
 
 constexpr uint32_t MENU_HEADER_BUTTON_WIDTH =      60;
 constexpr uint32_t MENU_HEADER_BUTTONS_LEFT =      MENU_HEADER_BUTTON_WIDTH;
@@ -132,19 +147,6 @@ constexpr uint32_t PAGE_TITLE_LEFT =               70;
   TABLE_BGCOLOR_INDEX,
 };*/
 
-enum FontIndex
-{
-  FONT_STD_INDEX,
-#if !defined(BOLD)
-  FONT_BOLD_INDEX,
-  FONT_XXS_INDEX,
-  FONT_XS_INDEX,
-  FONT_L_INDEX,
-  FONT_XL_INDEX,
-  FONT_XXL_INDEX,
-#endif
-  FONTS_COUNT
-};
 
 constexpr uint32_t INPUT_EDIT_LABELS_WIDTH = 80;
 constexpr coord_t INPUT_EDIT_CURVE_WIDTH = LCD_W;
@@ -175,4 +177,4 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
 constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
 constexpr coord_t CHAR_SPACING = 0;
 
-#endif // _LIBOPENUI_CONFIG_H_
+#define ROTARY_ENCODER_SPEED() rotencSpeed

From 88cbc5378635d098e30a0b8b0be7f77875f11c53 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 30 Jun 2021 17:18:14 +0800
Subject: [PATCH 11/45] Stick loop should be called per 1ms.

---
 radio/src/targets/nv14/board.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 8608806ea..67c1301b9 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -83,12 +83,11 @@ void interrupt1ms()
     DEBUG_TIMER_STOP(debugTimerHaptic);
   }
 #endif
-
-  if (pre_scale == 10) {
-    pre_scale = 0;
 #if !defined(SIMU)
     if (boardState == BOARD_STARTED) flysky_hall_stick_loop();
 #endif
+  if (pre_scale == 10) {
+    pre_scale = 0;
     DEBUG_TIMER_START(debugTimerPer10ms);
     DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod);
     per10ms();

From 3a9571eeb846a456e574f3200d40ee0d508f5f38 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Mon, 5 Jul 2021 16:55:34 +0800
Subject: [PATCH 12/45] Fixed SWB/SWD problem.

---
 radio/src/targets/nv14/adc_driver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/radio/src/targets/nv14/adc_driver.cpp b/radio/src/targets/nv14/adc_driver.cpp
index be68f6559..8d414cc6c 100644
--- a/radio/src/targets/nv14/adc_driver.cpp
+++ b/radio/src/targets/nv14/adc_driver.cpp
@@ -71,6 +71,7 @@
 #elif defined(PCBNV14) && defined(FLYSKY_HALL_STICKS)
   #define FIRST_ANALOG_ADC             4
   #define NUM_MAIN_ANALOGS_ADC         9
+  #define NUM_SUB_ANALOGS_ADC          2
 #else
   #define FIRST_ANALOG_ADC             0
   #define FIRST_SUB_ANALOG_ADC         0
@@ -173,7 +174,7 @@ void adcInit()
   ADC_MAIN_DMA_Stream->NDTR = NUM_MAIN_ANALOGS_ADC;
   ADC_MAIN_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
 
-#if NUM_SUB_ANALOGS > 0
+#if NUM_SUB_ANALOGS_ADC > 0
   ADC_SUB->SMPR1 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24);
   ADC_SUB->SMPR2 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24) + (ADC_SAMPTIME<<27);
 

From 2a55a286ed9122fbbd507469f25d31afae07a38e Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Mon, 5 Jul 2021 18:51:16 +0800
Subject: [PATCH 13/45] Fixed stick problem, the 1ms timer in nv14 target not
 working properly.

---
 radio/src/targets/nv14/CMakeLists.txt |  3 +-
 radio/src/targets/nv14/board.cpp      | 71 ++-------------------------
 radio/src/targets/nv14/hal.h          |  5 --
 3 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 10c476d1b..50aa59734 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -44,7 +44,9 @@ add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
 set(TARGET_SRC
   ${TARGET_SRC}
   audio_spi_driver.cpp
+  adc_driver.cpp
   ../common/arm/stm32/mixer_scheduler_driver.cpp
+  ../common/arm/stm32/timers_driver.cpp
   )
 
 #set(FIRMWARE_TARGET_SRC
@@ -54,7 +56,6 @@ set(TARGET_SRC
 
 set(FIRMWARE_TARGET_SRC
   ${FIRMWARE_TARGET_SRC}
-  adc_driver.cpp
   battery_driver.cpp
   ../horus/flyskyHallStick_driver.cpp
   )
diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 67c1301b9..15fc3ab5a 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -30,7 +30,6 @@ extern "C" {
 #endif
 
 extern void flysky_hall_stick_init( void );
-extern void flysky_hall_stick_loop( void );
 
 HardwareOptions hardwareOptions;
 
@@ -44,68 +43,6 @@ void watchdogInit(unsigned int duration)
   IWDG->KR = 0xCCCC;      // start
 }
 
-// Start TIMER7 at 2000000Hz
-void init2MhzTimer()
-{
-  TIMER_2MHz_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1; // 0.5 uS, 2 MHz
-  TIMER_2MHz_TIMER->ARR = 65535;
-  TIMER_2MHz_TIMER->CR2 = 0;
-  TIMER_2MHz_TIMER->CR1 = TIM_CR1_CEN;
-}
-
-// Starts TIMER at 1000Hz
-void init1msTimer()
-{
-  INTERRUPT_xMS_TIMER->ARR = 999; // 1mS in uS
-  INTERRUPT_xMS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1;  // 1uS
-  INTERRUPT_xMS_TIMER->CCER = 0;
-  INTERRUPT_xMS_TIMER->CCMR1 = 0;
-  INTERRUPT_xMS_TIMER->EGR = 0;
-  INTERRUPT_xMS_TIMER->CR1 = 5;
-  INTERRUPT_xMS_TIMER->DIER |= 1;
-  NVIC_EnableIRQ(INTERRUPT_xMS_IRQn);
-  NVIC_SetPriority(INTERRUPT_xMS_IRQn, 7);
-}
-void interrupt1ms()
-{
-  static uint8_t pre_scale;       // Used to get 10 Hz counter
-
-  ++pre_scale;
-  
-#if defined(DEBUG) && !defined(SIMU)
-  debugCounter1ms++;
-#endif
-
-#if defined(HAPTIC) && !defined(BOOT)
-  if (pre_scale == 5 || pre_scale == 10) {
-    DEBUG_TIMER_START(debugTimerHaptic);
-    HAPTIC_HEARTBEAT();
-    DEBUG_TIMER_STOP(debugTimerHaptic);
-  }
-#endif
-#if !defined(SIMU)
-    if (boardState == BOARD_STARTED) flysky_hall_stick_loop();
-#endif
-  if (pre_scale == 10) {
-    pre_scale = 0;
-    DEBUG_TIMER_START(debugTimerPer10ms);
-    DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod);
-    per10ms();
-    DEBUG_TIMER_STOP(debugTimerPer10ms);
-  }
-
-  DEBUG_TIMER_START(debugTimerRotEnc);
-  DEBUG_TIMER_STOP(debugTimerRotEnc);
-}
-#if !defined(BOOT)
-extern "C" void INTERRUPT_xMS_IRQHandler()
-{
-  INTERRUPT_xMS_TIMER->SR &= ~TIM_SR_UIF;
-  interrupt1ms();
-  DEBUG_INTERRUPT(INT_1MS);
-}
-#endif
-
 #if defined(SEMIHOSTING)
 extern "C" void initialise_monitor_handles();
 #endif
@@ -187,8 +124,11 @@ void boardInit()
   pwrInit();
   extModuleInit();
   battery_charge_init();
+#if defined(FLYSKY_HALL_STICKS)
+  flysky_hall_stick_init();
+#endif
   init2MhzTimer();
-  init1msTimer();
+  init5msTimer();
   TouchInit();
 
   uint32_t press_start = 0;
@@ -230,9 +170,6 @@ void boardInit()
   adcInit();
   backlightInit();
   lcdInit();
-#if defined(FLYSKY_HALL_STICKS)
-  flysky_hall_stick_init();
-#endif
   usbInit();
   hapticInit();
   boardState = BOARD_STARTED;
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index eba39e872..4e4a73d73 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -365,10 +365,6 @@
 
 // Flysky Hall Stick
 #if defined(FLYSKY_HALL_STICKS)
-  #if defined (RADIO_TX16S)
-    #define FLYSKY_HALL_STICKS_REVERSE
-  #endif
-
   #define FLYSKY_HALL_SERIAL_USART                 UART4
   #define FLYSKY_HALL_SERIAL_GPIO                  GPIOA
   #define FLYSKY_HALL_DMA_Channel                  DMA_Channel_4
@@ -391,7 +387,6 @@
 
   #define FLYSKY_HALL_RX_DMA_Stream_IRQHandler     DMA1_Stream2_IRQHandler
   #define FLYSKY_HALL_TX_DMA_Stream_IRQHandler     DMA1_Stream4_IRQHandler
-
 #endif
 
 // Internal Module

From 1d81db01133255d78483422c028510067d9a5c64 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 7 Jul 2021 10:39:16 +0800
Subject: [PATCH 14/45] Updated timer driver to use 1ms loop to compatible with
 nv14.

---
 .../common/arm/stm32/timers_driver.cpp        | 33 +++++++++++--------
 radio/src/targets/horus/board.cpp             |  2 +-
 radio/src/targets/horus/board.h               |  2 +-
 radio/src/targets/nv14/board.cpp              |  2 +-
 radio/src/targets/nv14/board.h                |  2 +-
 radio/src/targets/taranis/board.cpp           |  2 +-
 radio/src/targets/taranis/board.h             |  2 +-
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/timers_driver.cpp b/radio/src/targets/common/arm/stm32/timers_driver.cpp
index b44d0b051..7ac4881e3 100644
--- a/radio/src/targets/common/arm/stm32/timers_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/timers_driver.cpp
@@ -31,10 +31,10 @@ void init2MhzTimer()
   TIMER_2MHz_TIMER->CR1 = TIM_CR1_CEN;
 }
 
-// Start TIMER at 200Hz
-void init5msTimer()
+// Start TIMER at 1000Hz
+void init1msTimer()
 {
-  INTERRUPT_xMS_TIMER->ARR = 4999; // 5mS in uS
+  INTERRUPT_xMS_TIMER->ARR = 999; // 1mS in uS
   INTERRUPT_xMS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1;  // 1uS
   INTERRUPT_xMS_TIMER->CCER = 0;
   INTERRUPT_xMS_TIMER->CCMR1 = 0;
@@ -45,30 +45,37 @@ void init5msTimer()
   NVIC_SetPriority(INTERRUPT_xMS_IRQn, 7);
 }
 
-void stop5msTimer()
+void stop1msTimer()
 {
   INTERRUPT_xMS_TIMER->CR1 = 0; // stop timer
   NVIC_DisableIRQ(INTERRUPT_xMS_IRQn);
 }
 
 // TODO use the same than board_sky9x.cpp
-void interrupt5ms()
+void interrupt1ms()
 {
   static uint8_t pre_scale; // Used to get 10 Hz counter
 
   ++pre_scale;
 
-#if defined(HAPTIC)
-  DEBUG_TIMER_START(debugTimerHaptic);
-  HAPTIC_HEARTBEAT();
-  DEBUG_TIMER_STOP(debugTimerHaptic);
-#endif
-
+  // 1 ms loop
 #if defined(FLYSKY_HALL_STICKS)
   flysky_hall_stick_loop();  // TODO: need to put in 1ms timer loop for best performance
 #endif
 
-  if (pre_scale == 2) {
+  // 5ms loop
+  if (pre_scale == 5 || pre_scale == 10)
+  {
+#if defined(HAPTIC)
+    DEBUG_TIMER_START(debugTimerHaptic);
+    HAPTIC_HEARTBEAT();
+    DEBUG_TIMER_STOP(debugTimerHaptic);
+#endif
+  }
+  
+  // 10ms loop
+  if (pre_scale == 10)
+	{
     pre_scale = 0;
     DEBUG_TIMER_START(debugTimerPer10ms);
     DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod);
@@ -80,6 +87,6 @@ void interrupt5ms()
 extern "C" void INTERRUPT_xMS_IRQHandler()
 {
   INTERRUPT_xMS_TIMER->SR &= ~TIM_SR_UIF;
-  interrupt5ms();
+  interrupt1ms();
   DEBUG_INTERRUPT(INT_1MS);
 }
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index f5a9d0978..f24f8f1bf 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -206,7 +206,7 @@ void boardInit()
 #endif
 
   init2MhzTimer();
-  init5msTimer();
+  init1msTimer();
   usbInit();
   hapticInit();
 
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index bc1be0d09..504a4d216 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -75,7 +75,7 @@ void boardOff();
 
 // Timers driver
 void init2MhzTimer();
-void init5msTimer();
+void init1msTimer();
 
 // PCBREV driver
 enum {
diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
index 15fc3ab5a..627b175a2 100644
--- a/radio/src/targets/nv14/board.cpp
+++ b/radio/src/targets/nv14/board.cpp
@@ -128,7 +128,7 @@ void boardInit()
   flysky_hall_stick_init();
 #endif
   init2MhzTimer();
-  init5msTimer();
+  init1msTimer();
   TouchInit();
 
   uint32_t press_start = 0;
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index b1901434a..d33bba5a9 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -69,7 +69,7 @@ void boardOff();
 
 // Timers driver
 void init2MhzTimer();
-void init5msTimer();
+void init1msTimer();
 
 // CPU Unique ID
 #define LEN_CPU_UID                     (3*8+2)
diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
index 69e36d5e8..03b6c4c84 100644
--- a/radio/src/targets/taranis/board.cpp
+++ b/radio/src/targets/taranis/board.cpp
@@ -163,7 +163,7 @@ void boardInit()
   lcdInit(); // delaysInit() must be called before
   audioInit();
   init2MhzTimer();
-  init5msTimer();
+  init1msTimer();
   __enable_irq();
   i2cInit();
   usbInit();
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 8e583be73..c01c83046 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -62,7 +62,7 @@ void boardOff();
 
 // Timers driver
 void init2MhzTimer();
-void init5msTimer();
+void init1msTimer();
 
 // PCBREV driver
 enum {

From cf161368ab0076d1156877cd4e4312482cd96a65 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 7 Jul 2021 11:40:44 +0800
Subject: [PATCH 15/45] Clean up something.

---
 radio/src/targets/nv14/board.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index d33bba5a9..38efa567f 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -399,20 +399,19 @@ uint32_t pwrPressedDuration();;
 #define LCD_DEPTH                       16
 #define LCD_CONTRAST_DEFAULT            20
 void lcdInit();
-void lcdNextLayer();
 void lcdRefresh();
 void lcdCopy(void * dest, void * src);
 void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
 void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
 void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
 void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format);
+void lcdStoreBackupBuffer();
+int lcdRestoreBackupBuffer();
 void lcdSetContrast();
 void lcdOff();
 void lcdOn();
 #define lcdSetRefVolt(...)
 #define lcdRefreshWait(...)
-void lcdStoreBackupBuffer();
-int lcdRestoreBackupBuffer();
 
 // Backlight driver
 void backlightInit();

From 6df1f8bdbe0a51383217142b0083669690184252 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 7 Jul 2021 12:14:21 +0800
Subject: [PATCH 16/45] Fixed bootloader.

---
 .../src/targets/nv14/bootloader/boot_menu.cpp | 151 ++++++++++++------
 1 file changed, 100 insertions(+), 51 deletions(-)

diff --git a/radio/src/targets/nv14/bootloader/boot_menu.cpp b/radio/src/targets/nv14/bootloader/boot_menu.cpp
index 907f8d460..ed3b18044 100644
--- a/radio/src/targets/nv14/bootloader/boot_menu.cpp
+++ b/radio/src/targets/nv14/bootloader/boot_menu.cpp
@@ -1,12 +1,26 @@
 #include "opentx.h"
 #include "../../common/arm/stm32/bootloader/boot.h"
 #include "../../common/arm/stm32/bootloader/bin_files.h"
+
 #define SELECTED_COLOR (INVERS | DEFAULT_COLOR)
 #define DEFAULT_PADDING 28
 #define DOUBLE_PADDING  56
 #define MESSAGE_TOP     (LCD_H - (2*DOUBLE_PADDING))
-//#include "bmp_plug_usb.lbm"
-//#include "bmp_usb_plugged.lbm"
+
+const uint8_t __bmp_plug_usb_rle[] {
+#include "bmp_plug_usb.lbm"
+};
+RLEBitmap BMP_PLUG_USB(BMP_ARGB4444, __bmp_plug_usb_rle);
+
+const uint8_t __bmp_usb_plugged_rle[] {
+#include "bmp_usb_plugged.lbm"
+};
+RLEBitmap BMP_USB_PLUGGED(BMP_ARGB4444, __bmp_usb_plugged_rle);
+
+const uint8_t __bmp_background_rle[] {
+#include "bmp_background.lbm"
+};
+RLEBitmap BMP_BACKGROUND(BMP_ARGB4444, __bmp_background_rle);
 
 const uint8_t LBM_FLASH[] = {
 #include "icon_flash.lbm"
@@ -32,105 +46,143 @@ const uint8_t LBM_OK[] = {
 #include "icon_ok.lbm"
 };
 
+#define BL_GREEN      COLOR2FLAGS(RGB(73, 219, 62))
+#define BL_RED        COLOR2FLAGS(RED)
+#define BL_BACKGROUND COLOR2FLAGS(BLACK)
+#define BL_FOREGROUND COLOR2FLAGS(WHITE)
+#define BL_SELECTED   COLOR2FLAGS(RGB(11, 65, 244)) // deep blue
+
 void bootloaderInitScreen()
 {
-  lcdColorTable[DEFAULT_COLOR_INDEX]      = BLACK;
-  lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE;
-  lcdColorTable[LINE_COLOR_INDEX]      = RED;
-  lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
-  lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green
+//  lcdColorTable[DEFAULT_COLOR_INDEX]      = WHITE;
+//  lcdColorTable[DEFAULT_BGCOLOR_INDEX] = BLACK;
+//  lcdColorTable[LINE_COLOR_INDEX]      = RED;
+//  lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
+//  lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green
  
   backlightEnable(BACKLIGHT_LEVEL_MAX);
+	
+  // TODO: load/decompress bitmaps
+  extern void loadFonts();
+  loadFonts();
+	
 }
 
 static void bootloaderDrawTitle(const char* text)
 {
-    lcd->drawText(LCD_W/2, DEFAULT_PADDING, text, CENTERED | DEFAULT_COLOR);
-    lcd->drawSolidFilledRect(DEFAULT_PADDING, DOUBLE_PADDING, LCD_W - DOUBLE_PADDING, 2, DEFAULT_COLOR);
+    lcd->drawText(LCD_W/2, DEFAULT_PADDING, text, CENTERED | BL_FOREGROUND);
+    lcd->drawSolidFilledRect(DEFAULT_PADDING, DOUBLE_PADDING, LCD_W - DOUBLE_PADDING, 2, BL_FOREGROUND);
 }
 
 static void bootloaderDrawFooter()
 {
-    lcd->drawSolidFilledRect(DEFAULT_PADDING, LCD_H - (DOUBLE_PADDING + 4), LCD_W - DOUBLE_PADDING, 2, DEFAULT_COLOR);
+    lcd->drawSolidFilledRect(DEFAULT_PADDING, LCD_H - (DOUBLE_PADDING + 4), LCD_W - DOUBLE_PADDING, 2, BL_FOREGROUND);
+}
+
+static void bootloaderDrawBackground()
+{
+  // we have plenty of memory, let's cache that background
+  static BitmapBuffer* _background = nullptr;
+
+  if (!_background) {
+    _background = new BitmapBuffer(BMP_RGB565, LCD_W, LCD_H);
+    
+    for (int i=0; i<LCD_W; i += BMP_BACKGROUND.width()) {
+      for (int j=0; j<LCD_H; j += BMP_BACKGROUND.height()) {
+        _background->drawBitmap(i, j, &BMP_BACKGROUND);
+      }
+    }
+    _background->drawFilledRect(0, 0, LCD_W, LCD_H, SOLID,
+                                COLOR2FLAGS(BLACK), OPACITY(4));
+  }
+
+  if (_background) {
+    lcd->drawBitmap(0, 0, _background);
+  }
+  else {
+    lcd->clear(BL_BACKGROUND);
+  }
 }
 
 void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
 {
     // clear screen
-    lcd->drawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, DEFAULT_BGCOLOR);
+//    bootloaderDrawBackground();
+
+    lcd->drawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, BL_BACKGROUND);
     int center = LCD_W/2;
     if (st == ST_START) {
 
-        bootloaderDrawTitle("NV14 BOOTLOADER");
+        bootloaderDrawTitle(BOOTLOADER_TITLE);
         
-        lcd->drawBitmapPattern(50, 72, LBM_FLASH, DEFAULT_COLOR);
-        lcd->drawText(84,  75, "Write Firmware");
+        lcd->drawBitmapPattern(50, 72, LBM_FLASH, BL_FOREGROUND);
+        lcd->drawText(84,  75, "Write Firmware", BL_FOREGROUND);
 
-        lcd->drawBitmapPattern(50, 107, LBM_EXIT, DEFAULT_COLOR);
-        lcd->drawText(84, 110, "Exit");
+        lcd->drawBitmapPattern(50, 107, LBM_EXIT, BL_FOREGROUND);
+        lcd->drawText(84, 110, "Exit", BL_FOREGROUND);
 
-        lcd->drawSolidRect(79, (opt == 0) ? 72 : 107, LCD_W - 79 - 28, 26, 2, LINE_COLOR);
+        lcd->drawSolidRect(79, (opt == 0) ? 72 : 107, LCD_W - 79 - 28, 26, 2, BL_SELECTED);
         
-        //lcd->drawBitmap(60, 166, &BMP_PLUG_USB);
-        lcd->drawText(center, 175, "Or plug in a USB cable", CENTERED | DEFAULT_COLOR);
-        lcd->drawText(center, 200, "for mass storage", CENTERED | DEFAULT_COLOR);
+//        lcd->drawBitmap(0, 166, &BMP_PLUG_USB);
+        lcd->drawText(center, 175, "Or plug in a USB cable", CENTERED | BL_FOREGROUND);
+        lcd->drawText(center, 200, "for mass storage", CENTERED | BL_FOREGROUND);
 
         bootloaderDrawFooter();
-        lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | DEFAULT_COLOR);        
-        lcd->drawText(center, LCD_H - DEFAULT_PADDING, getFirmwareVersion(nullptr), CENTERED | DEFAULT_COLOR);
+        lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | BL_FOREGROUND);        
+        lcd->drawText(center, LCD_H - DEFAULT_PADDING, getFirmwareVersion(nullptr), CENTERED | BL_FOREGROUND);
     }
     else if (st == ST_USB) {
-        //lcd->drawBitmap(136, 98, &BMP_USB_PLUGGED);
-        lcd->drawText(center, 128, "USB Connected", CENTERED | DEFAULT_COLOR);
+//        lcd->drawBitmap(0, 98, &BMP_USB_PLUGGED);
+        lcd->drawText(center, 128, "USB Connected", CENTERED | BL_FOREGROUND);
     }
     else if (st == ST_FILE_LIST || st == ST_DIR_CHECK || st == ST_FLASH_CHECK ||
              st == ST_FLASHING || st == ST_FLASH_DONE) {
 
         bootloaderDrawTitle("SD>FIRMWARE");
-        lcd->drawBitmapPattern(DEFAULT_PADDING, 16, LBM_SD, DEFAULT_COLOR);
+        lcd->drawBitmapPattern(DEFAULT_PADDING, 16, LBM_SD, BL_FOREGROUND);
 
         if (st == ST_FLASHING || st == ST_FLASH_DONE) {
 
-            LcdFlags color = BARGRAPH1_COLOR; // red
+            LcdFlags color = BL_RED; // red
 
             if (st == ST_FLASH_DONE) {
-                color = BARGRAPH2_COLOR/* green */;
+                color = BL_GREEN/* green */;
                 opt   = 100; // Completed > 100%
             }
 
-            lcd->drawRect(DEFAULT_PADDING, 120, LCD_W - DOUBLE_PADDING, 31, 2);
+            lcd->drawRect(DEFAULT_PADDING, 120, LCD_W - DOUBLE_PADDING, 31, 2, SOLID, BL_SELECTED);
             lcd->drawSolidFilledRect(DEFAULT_PADDING+4, 124, ((LCD_W - DOUBLE_PADDING - 8) * opt) / 100, 23, color);
         }
         else if (st == ST_DIR_CHECK) {
 
             if (opt == FR_NO_PATH) {
-                lcd->drawText(20, MESSAGE_TOP, "Directory is missing");
+                lcd->drawText(20, MESSAGE_TOP, "Directory is missing", BL_FOREGROUND);
             }
             else {
-                lcd->drawText(20, MESSAGE_TOP, "Directory is empty");
+                lcd->drawText(20, MESSAGE_TOP, "Directory is empty", BL_FOREGROUND);
             }
 
-            lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BARGRAPH1_COLOR);
+            lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BL_RED);
         }
         else if (st == ST_FLASH_CHECK) {
 
             bootloaderDrawFilename(str, 0, true);
 
             if (opt == FC_ERROR) {
-                lcd->drawText(20, MESSAGE_TOP, STR_INVALID_FIRMWARE);
-                lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BARGRAPH1_COLOR);
+                lcd->drawText(20, MESSAGE_TOP, STR_INVALID_FIRMWARE, BL_FOREGROUND);
+                lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BL_RED);
             }
             else if (opt == FC_OK) {
                 VersionTag tag;
                 extractFirmwareVersion(&tag);
 
-                lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP, "Version:", RIGHT);
-                lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP, tag.version);
+                lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP, "Version:", RIGHT | BL_FOREGROUND);
+                lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP, tag.version, BL_FOREGROUND);
                 
-                lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, "Radio:", RIGHT);
-                lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, tag.flavour);
+                lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, "Radio:", RIGHT | BL_FOREGROUND);
+                lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, tag.flavour, BL_FOREGROUND);
                 
-                lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_OK, BARGRAPH2_COLOR);
+                lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_OK, BL_GREEN);
             }
         }
         
@@ -138,38 +190,35 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
 
         if ( st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
 
-            lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DOUBLE_PADDING - 2, LBM_FLASH, DEFAULT_COLOR);
+            lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DOUBLE_PADDING - 2, LBM_FLASH, BL_FOREGROUND);
 
             if (st == ST_FILE_LIST) {
-                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "[R TRIM] to select file");
+                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "[R TRIM] to select file", BL_FOREGROUND);
             }
             else if (st == ST_FLASH_CHECK && opt == FC_OK) {
-                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Hold [R TRIM] long to flash");
+                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Hold [R TRIM] long to flash", BL_FOREGROUND);
             }
             else if (st == ST_FLASHING) {
-                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Firmware ...");
+                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Firmware ...", BL_FOREGROUND);
             }
             else if (st == ST_FLASH_DONE) {
-                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Completed");
+                lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Completed", BL_FOREGROUND);
             }
         }
 
         if (st != ST_FLASHING) {
-            lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DEFAULT_PADDING - 2, LBM_EXIT, DEFAULT_COLOR);
-            lcd->drawText(DOUBLE_PADDING, LCD_H - DEFAULT_PADDING, "[L TRIM] to exit");
+            lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DEFAULT_PADDING - 2, LBM_EXIT, BL_FOREGROUND);
+            lcd->drawText(DOUBLE_PADDING, LCD_H - DEFAULT_PADDING, "[L TRIM] to exit", BL_FOREGROUND);
         }        
     }
-#if defined(COLORLCD)
-    lcdRefresh();
-#endif
 }
 
 void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
 {
-    lcd->drawBitmapPattern(DEFAULT_PADDING, 76 + (line * 25), LBM_FILE, DEFAULT_COLOR);
-    lcd->drawText(DEFAULT_PADDING + 30, 75 + (line * 25), str);
+    lcd->drawBitmapPattern(DEFAULT_PADDING, 76 + (line * 25), LBM_FILE, BL_FOREGROUND);
+    lcd->drawText(DEFAULT_PADDING + 30, 75 + (line * 25), str, BL_FOREGROUND);
 
     if (selected) {
-        lcd->drawSolidRect(DEFAULT_PADDING + 25, 72 + (line * 25), LCD_W - (DEFAULT_PADDING + 25) - 28, 26, 2, LINE_COLOR);
+        lcd->drawSolidRect(DEFAULT_PADDING + 25, 72 + (line * 25), LCD_W - (DEFAULT_PADDING + 25) - 28, 26, 2, BL_SELECTED);
     }
 }

From e9bb2122ad5a545a9cba9ad96dd4849062807872 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 7 Jul 2021 12:47:38 +0800
Subject: [PATCH 17/45] Fixed lcd driver.

---
 radio/src/targets/nv14/lcd_driver.cpp | 95 ++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 23 deletions(-)

diff --git a/radio/src/targets/nv14/lcd_driver.cpp b/radio/src/targets/nv14/lcd_driver.cpp
index 6606a7af7..5f5f89343 100644
--- a/radio/src/targets/nv14/lcd_driver.cpp
+++ b/radio/src/targets/nv14/lcd_driver.cpp
@@ -19,12 +19,21 @@
  */
 
 #include "opentx.h"
-#define LTDC_DOUBLELAYER
+
+#define LCD_FIRST_LAYER                0
+#define LCD_SECOND_LAYER               1
+
 uint8_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_BACKUP_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
 uint8_t LCD_SCRATCH_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(pixel_t)] __SDRAM;
-bool secondFrame = false;
+uint8_t currentLayer = LCD_FIRST_LAYER;
+
+BitmapBuffer lcdBuffer1(BMP_RGB565, LCD_W, LCD_H, (uint16_t *)LCD_FIRST_FRAME_BUFFER);
+BitmapBuffer lcdBuffer2(BMP_RGB565, LCD_W, LCD_H, (uint16_t *)LCD_SECOND_FRAME_BUFFER);
+
+BitmapBuffer * lcdFront = &lcdBuffer1;
+BitmapBuffer * lcd = &lcdBuffer2;
 
 lcdSpiInitFucPtr lcdInitFunction;
 lcdSpiInitFucPtr lcdOffFunction;
@@ -1287,14 +1296,21 @@ void LCD_LayerInit() {
   LTDC_DitherCmd(ENABLE);
 }
 
-BitmapBuffer lcdBuffer1(BMP_RGB565, LCD_W, LCD_H,
-    (uint16_t *) LCD_FIRST_FRAME_BUFFER);
-BitmapBuffer lcdBuffer2(BMP_RGB565, LCD_W, LCD_H,
-    (uint16_t *) LCD_SECOND_FRAME_BUFFER);
-BitmapBuffer * lcdFront = &lcdBuffer1;
-BitmapBuffer * lcd = &lcdBuffer2;
-
 extern void loadFonts();
+
+void LCD_SetLayer(uint32_t layer)
+{
+  if (layer == LCD_FIRST_LAYER) {
+    lcdFront = &lcdBuffer1;
+    lcd = &lcdBuffer2;
+  }
+  else {
+    lcdFront = &lcdBuffer2;
+    lcd = &lcdBuffer1;
+  }
+  currentLayer = layer;
+}
+
 void lcdInit(void) {
   // Clear buffers first
   memset(LCD_FIRST_FRAME_BUFFER, 0, sizeof(LCD_FIRST_FRAME_BUFFER));
@@ -1367,6 +1383,10 @@ void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, ui
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+  
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1400,6 +1420,10 @@ void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x,
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1442,6 +1466,10 @@ void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1489,6 +1517,10 @@ void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+ 
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1522,6 +1554,10 @@ void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1555,6 +1591,10 @@ void lcdCopy(void * dest, void * src)
   /* Start Transfer */
   DMA2D_StartTransfer();
 
+  /* Check configuration error */
+  if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
+    return; // Exit if configuration or transfer error
+  
   /* Wait for CTC Flag activation */
   while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
 }
@@ -1580,27 +1620,36 @@ uint16_t* lcdGetScratchBuffer()
   return (uint16_t*)LCD_SCRATCH_FRAME_BUFFER;
 }
 
-static volatile uint8_t refreshRequested = 0;
+//static volatile uint8_t refreshRequested = 0;
+static volatile uint8_t _frameBufferAddressReloaded = 0;
 
 extern "C" void LTDC_IRQHandler(void)
 {
   LTDC_ClearFlag(LTDC_ICR_CLIF);
-  if (refreshRequested) {
-#if defined(LTDC_DOUBLELAYER)
-    LTDC_LayerAlpha(LTDC_Layer1, (lcd == &lcdBuffer2) ? 255 : 0);
-    LTDC_LayerAlpha(LTDC_Layer2, (lcd == &lcdBuffer1) ? 255 : 0);
-#else
-    LTDC_Layer1->CFBAR = (uint32_t)((lcd == &lcdBuffer2) ? &lcdBuffer1 : &lcdBuffer2)->getData();
-#endif
-    LTDC_ReloadConfig(LTDC_IMReload);
-    refreshRequested = false;
+  _frameBufferAddressReloaded = 1;
+}
+
+static void lcdSwitchLayers()
+{
+  if (currentLayer == LCD_FIRST_LAYER) {
+    LTDC_Layer1->CFBAR = (uint32_t)LCD_SECOND_FRAME_BUFFER;
+    LCD_SetLayer(LCD_SECOND_LAYER);
   }
+  else {
+    LTDC_Layer1->CFBAR = (uint32_t)LCD_FIRST_FRAME_BUFFER;
+    LCD_SetLayer(LCD_FIRST_LAYER);
+  }
+
+  // reload shadow registers on vertical blank
+  _frameBufferAddressReloaded = 0;
+  LTDC->SRCR = LTDC_SRCR_VBR;
+
+  // wait for reload
+  // TODO: replace through some smarter mechanism without busy wait
+  while(_frameBufferAddressReloaded == 0);
 }
 
 void lcdRefresh()
 {
-  while(refreshRequested) {} //block if last frame was not painted yet
-  lcd = (lcd == &lcdBuffer2) ? &lcdBuffer1 : &lcdBuffer2;
-  refreshRequested = true;
+  lcdSwitchLayers();
 }
-

From e2842550eb9cb622b80bbfef3b68612edca819ae Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 7 Jul 2021 13:25:00 +0800
Subject: [PATCH 18/45] Finalized boot loader for NV14.

---
 radio/src/targets/nv14/bootloader/boot_menu.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/radio/src/targets/nv14/bootloader/boot_menu.cpp b/radio/src/targets/nv14/bootloader/boot_menu.cpp
index ed3b18044..d6e521850 100644
--- a/radio/src/targets/nv14/bootloader/boot_menu.cpp
+++ b/radio/src/targets/nv14/bootloader/boot_menu.cpp
@@ -107,9 +107,8 @@ static void bootloaderDrawBackground()
 void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
 {
     // clear screen
-//    bootloaderDrawBackground();
+    bootloaderDrawBackground();
 
-    lcd->drawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, BL_BACKGROUND);
     int center = LCD_W/2;
     if (st == ST_START) {
 
@@ -123,17 +122,17 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
 
         lcd->drawSolidRect(79, (opt == 0) ? 72 : 107, LCD_W - 79 - 28, 26, 2, BL_SELECTED);
         
-//        lcd->drawBitmap(0, 166, &BMP_PLUG_USB);
-        lcd->drawText(center, 175, "Or plug in a USB cable", CENTERED | BL_FOREGROUND);
-        lcd->drawText(center, 200, "for mass storage", CENTERED | BL_FOREGROUND);
+        lcd->drawBitmap(center - 55, 165, &BMP_PLUG_USB);
+        lcd->drawText(center, 250, "Or plug in a USB cable", CENTERED | BL_FOREGROUND);
+        lcd->drawText(center, 275, "for mass storage", CENTERED | BL_FOREGROUND);
 
         bootloaderDrawFooter();
         lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | BL_FOREGROUND);        
         lcd->drawText(center, LCD_H - DEFAULT_PADDING, getFirmwareVersion(nullptr), CENTERED | BL_FOREGROUND);
     }
     else if (st == ST_USB) {
-//        lcd->drawBitmap(0, 98, &BMP_USB_PLUGGED);
-        lcd->drawText(center, 128, "USB Connected", CENTERED | BL_FOREGROUND);
+        lcd->drawBitmap(center - 26, 98, &BMP_USB_PLUGGED);
+        lcd->drawText(center, 168, "USB Connected", CENTERED | BL_FOREGROUND);
     }
     else if (st == ST_FILE_LIST || st == ST_DIR_CHECK || st == ST_FLASH_CHECK ||
              st == ST_FLASHING || st == ST_FLASH_DONE) {
@@ -174,8 +173,12 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
             }
             else if (opt == FC_OK) {
                 VersionTag tag;
+                memset(&tag, 0, sizeof(tag));
                 extractFirmwareVersion(&tag);
 
+                lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP - DEFAULT_PADDING, "Fork:", RIGHT | BL_FOREGROUND);
+                lcd->drawSizedText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP - DEFAULT_PADDING, tag.fork, 6, BL_FOREGROUND);
+
                 lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP, "Version:", RIGHT | BL_FOREGROUND);
                 lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP, tag.version, BL_FOREGROUND);
                 

From e54f2f4c0a6ed6a6b34ad99547ce7127d7fe2290 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Wed, 14 Jul 2021 15:14:29 +0800
Subject: [PATCH 19/45] Fixed build problems after merging from 2.4

---
 radio/src/gui/colorlcd/radio_diaganas.cpp |  2 +-
 radio/src/gui/colorlcd/view_text.cpp      | 11 +++++++++--
 radio/src/targets/nv14/libopenui_config.h |  1 -
 tools/build-gh.sh                         |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio_diaganas.cpp
index 939b113b2..9539bfb36 100644
--- a/radio/src/gui/colorlcd/radio_diaganas.cpp
+++ b/radio/src/gui/colorlcd/radio_diaganas.cpp
@@ -59,7 +59,7 @@ class RadioAnalogsDiagsWindow: public Window {
         dc->drawLine(touchState.x - 10, touchState.y - 8 - parent->top(), touchState.x + 10, touchState.y + 8 - parent->top(), SOLID, 0);
         dc->drawLine(touchState.x - 10, touchState.y + 8 - parent->top(), touchState.x + 10, touchState.y - 8- parent->top(), SOLID, 0);
       }
-#if !defined(SIMU)
+#if !defined(SIMU) && !defined(PCBNV14)
       constexpr coord_t y1 = MENU_CONTENT_TOP + 6 * FH;
       coord_t x1 = MENUS_MARGIN_LEFT;
       x1 = dc->drawText(x1, y1, "Touch GT911 FW ver:") + 8;
diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/view_text.cpp
index c3381508d..af2536453 100644
--- a/radio/src/gui/colorlcd/view_text.cpp
+++ b/radio/src/gui/colorlcd/view_text.cpp
@@ -96,12 +96,15 @@ void ViewTextWindow::checkEvents()
     coord_t deltaY;
     event_t event = getWindowEvent();
 
+#if defined(ROTARY_ENCODER_NAVIGATION)		
     if (event == EVT_ROTARY_LEFT || event == EVT_ROTARY_RIGHT) {
       deltaY = ROTARY_ENCODER_SPEED() * step;
     } else {
       deltaY = step;
     }
-
+#else
+      deltaY = step;
+#endif
     switch (event) {
     CASE_EVT_KEY_NEXT_LINE:
       currentPos += deltaY;
@@ -259,12 +262,16 @@ void ViewTextWindow::checkEvents()
     coord_t deltaY;
     event_t event = getWindowEvent();
 
+#if defined(ROTARY_ENCODER_NAVIGATION)		
     if (event == EVT_ROTARY_LEFT || event == EVT_ROTARY_RIGHT) {
       deltaY = ROTARY_ENCODER_SPEED() * step;
     } else {
       deltaY = step;
     }
-
+#else
+      deltaY = step;
+#endif
+			
     int lineStep = deltaY / step;
     if(lineStep > (maxScreenLines >> 1)) lineStep = maxScreenLines >> 1;
 /*
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index 502856879..0a00fe51b 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -177,4 +177,3 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
 constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
 constexpr coord_t CHAR_SPACING = 0;
 
-#define ROTARY_ENCODER_SPEED() rotencSpeed
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 457742b97..78e71f6f2 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -122,7 +122,7 @@ case $FLAVOR in
         BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=ON"
         ;;
     T16_FS)
-        BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T16 -DFLYSKY_HALL_STICKS=ON"
+        BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=ON -DFLYSKY_HALL_STICKS=ON"
         ;;
     T18)
         BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=T18"

From 078f9d1338978bdf4fac0ba3b91cde0caf3bf9ae Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Thu, 22 Jul 2021 12:41:05 +0800
Subject: [PATCH 20/45] Fixed trainer mode selection problem for NV14.

---
 radio/src/dataconstants.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index 86070e89b..3a0c85554 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -183,7 +183,7 @@ enum TrainerMode {
 #endif
   TRAINER_MODE_MASTER_TRAINER_JACK,
   TRAINER_MODE_SLAVE,
-#if defined(PCBTARANIS)
+#if defined(PCBTARANIS) || defined(PCBNV14)
   TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
   TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
 #endif
@@ -210,7 +210,7 @@ enum TrainerMode {
   #define TRAINER_MODE_MAX()             TRAINER_MODE_MULTI
 #elif defined(BLUETOOTH)
   #define TRAINER_MODE_MAX()             TRAINER_MODE_SLAVE_BLUETOOTH
-#elif defined(PCBX7) || defined(PCBXLITE)
+#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBNV14)
   #define TRAINER_MODE_MAX()             TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE
 #elif defined(PCBTARANIS)
   #define TRAINER_MODE_MAX()             (IS_TRAINER_AUX_SERIAL() ? TRAINER_MODE_MASTER_BATTERY_COMPARTMENT : TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)

From 383985f73c87c13100f3f119f8c57d3d640dda3f Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Thu, 22 Jul 2021 12:43:57 +0800
Subject: [PATCH 21/45] Try to fix internal module.

---
 radio/src/targets/nv14/CMakeLists.txt | 18 +++++---
 radio/src/targets/nv14/hal.h          | 59 ++++++++++++++++++---------
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 50aa59734..26c646dfe 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -4,6 +4,8 @@ option(FLYSKY_HALL_STICKS "sticks for FlySky hall sticks" ON)
 option(FLYSKY_HALL_STICKS_REVERSE "Reverse sticks for FlySky hall sticks" OFF)
 option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
 option(AFHDS2 "Support for AFHDS2" ON)
+option(PXX1 "PXX1 protocol support" ON)
+option(PXX2 "PXX2 protocol support" OFF)
 
 set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
 set(CPU_TYPE STM32F4)
@@ -14,8 +16,8 @@ set(STORAGE_FORMAT BIN)
 set(HAPTIC YES)
 set(GUI_DIR colorlcd)
 set(BITMAPS_DIR 480x272)
-set(HARDWARE_EXTERNAL_MODULE YES)
-set(AUX_SERIAL ON)
+#set(HARDWARE_EXTERNAL_MODULE YES)
+#set(AUX_SERIAL ON)
 # set(NAVIGATION_TYPE touch)
 set(TARGET_DIR nv14)
 add_definitions(-DHARDWARE_TRAINER_JACK)
@@ -38,7 +40,8 @@ set(PCB_RF_BAUD 921600 CACHE STRING "INTERNAL_MODULE_BAUDRATE: ${RF_BAUD_RATE}")
 set_property(CACHE PCB_RF_BAUD PROPERTY STRINGS ${RF_BAUD_RATE})
 
 set(FLAVOUR nv14)
-add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_BAUDRATE=${PCB_RF_BAUD})
+#add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_BAUDRATE=${PCB_RF_BAUD})
+add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_SERIAL -DAFHDS2_BAUDRATE=${PCB_RF_BAUD})
 add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
 
 set(TARGET_SRC
@@ -79,8 +82,9 @@ add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 add_definitions(-DCROSSFIRE_NATIVE)
 add_definitions(-DFLYSKY_HALL_STICKS_REVERSE)
 add_definitions(-DFLYSKY_HALL_STICKS)
+add_definitions(-DAFHDS2) 
 add_definitions(-DHARDWARE_EXTERNAL_MODULE)
-add_definitions(-DAUX_SERIAL)
+#add_definitions(-DAUX_SERIAL)
 #add_definitions(-DFLYSKY_AUTO_POWER_DOWN)
 
 if(STICKS_DEAD_ZONE)
@@ -105,7 +109,7 @@ if(DISK_CACHE)
   add_definitions(-DDISK_CACHE)
 endif()
 
-set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
+#set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
 
 set(SRC
   ${SRC}
@@ -116,7 +120,9 @@ set(GVAR_SCREEN model_gvars.cpp)
 
 set(TARGET_SRC
   ${TARGET_SRC}
-  extmodule_driver.cpp
+#  extmodule_driver.cpp
+  extmodule_helper.cpp
+  ../horus/extmodule_driver.cpp
   trainer_driver.cpp
   ../common/arm/stm32/intmodule_serial_driver.cpp
   )
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index 4e4a73d73..e610ad797 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -394,9 +394,10 @@
 #define INTMODULE_RCC_AHB1Periph        (RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_DMA1)
 #define INTMODULE_PWR_GPIO              GPIOH
 #define INTMODULE_PWR_GPIO_PIN          GPIO_Pin_9  // PH.09
-#define INTMODULE_TX_GPIO               GPIOF
+#define INTMODULE_GPIO                  GPIOF
+//#define INTMODULE_TX_GPIO               GPIOF
 #define INTMODULE_TX_GPIO_PIN           GPIO_Pin_7  // PF.07
-#define INTMODULE_RX_GPIO               GPIOF
+//#define INTMODULE_RX_GPIO               GPIOF
 #define INTMODULE_RX_GPIO_PIN           GPIO_Pin_6  // PF.06
 #define INTMODULE_GPIO_PinSource_TX     GPIO_PinSource7
 #define INTMODULE_GPIO_PinSource_RX     GPIO_PinSource6
@@ -404,28 +405,28 @@
 #define INTMODULE_GPIO_AF               GPIO_AF_UART7
 #define INTMODULE_USART_IRQn            UART7_IRQn
 #define INTMODULE_USART_IRQHandler      UART7_IRQHandler
-#define INTMODULE_RX_DMA_STREAM         DMA1_Stream3
+#define INTMODULE_DMA_STREAM            DMA1_Stream1
+#define INTMODULE_DMA_STREAM_IRQ        DMA1_Stream1_IRQn
+#define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler
+#define INTMODULE_DMA_FLAG_TC           DMA_IT_TCIF1
+#define INTMODULE_DMA_CHANNEL           DMA_Channel_5
+
+/*#define INTMODULE_RX_DMA_STREAM         DMA1_Stream3
 #define INTMODULE_RX_DMA_Stream_IRQn    DMA1_Stream3_IRQn
 #define INTMODULE_RX_DMA_Stream_IRQHandler DMA1_Stream3_IRQHandler
 #define INTMODULE_TX_DMA_STREAM         DMA1_Stream1
 #define INTMODULE_TX_DMA_Stream_IRQn    DMA1_Stream1_IRQn
 #define INTMODULE_TX_DMA_Stream_IRQHandler DMA1_Stream1_IRQHandler
-#define INTMODULE_TX_DMA_FLAG_TC        DMA_IT_TCIF1
-//TX new implementation
-#define INTMODULE_DMA_STREAM            DMA1_Stream1
-#define INTMODULE_DMA_CHANNEL           DMA_Channel_5
-#define INTMODULE_GPIO                  INTMODULE_TX_GPIO
-//#define INTMODULE_DMA_STREAM_IRQ        INTMODULE_RX_DMA_Stream_IRQHandler
-#define INTMODULE_DMA_STREAM_IRQ        INTMODULE_TX_DMA_Stream_IRQn
-
-#define INTMODULE_RCC_APB1Periph        (RCC_APB1Periph_UART7 | RCC_APB1Periph_TIM3) 
+#define INTMODULE_TX_DMA_FLAG_TC        DMA_IT_TCIF1*/
 
+#define INTMODULE_RCC_APB1Periph        (RCC_APB1Periph_UART7 | RCC_APB1Periph_TIM3)
 #define INTMODULE_RCC_APB2Periph        0
 #define INTMODULE_TIMER                 TIM3
 #define INTMODULE_TIMER_IRQn            TIM3_IRQn
 #define INTMODULE_TIMER_IRQHandler      TIM3_IRQHandler
 #define INTMODULE_TIMER_FREQ            (PERI1_FREQUENCY * TIMER_MULT_APB1)
 
+
 // External Module
 #define EXTMODULE
 #define EXTMODULE_PULSES
@@ -449,9 +450,14 @@
 #define EXTMODULE_RX_GPIO_AF_USART      GPIO_AF_USART6
 #define EXTMODULE_TIMER                 TIM8
 #define EXTMODULE_TIMER_IRQn            TIM8_CC_IRQn
+#define EXTMODULE_TIMER_CC_IRQn         TIM8_CC_IRQn
 #define EXTMODULE_TIMER_IRQHandler      TIM8_CC_IRQHandler
 #define EXTMODULE_TIMER_FREQ            (PERI2_FREQUENCY * TIMER_MULT_APB2)
+#define EXTMODULE_TIMER_TX_GPIO_AF      GPIO_AF_TIM8
 //USART
+#define EXTMODULE_USART_GPIO               GPIOC
+#define EXTMODULE_USART_GPIO_AF            GPIO_AF_USART6
+
 #define EXTMODULE_USART_TX_DMA_CHANNEL     DMA_Channel_5
 #define EXTMODULE_USART_TX_DMA_STREAM      DMA2_Stream7
 #define EXTMODULE_USART_TX_DMA_IRQn        DMA2_Stream7_IRQn
@@ -460,26 +466,39 @@
 
 #define EXTMODULE_USART_RX_DMA_CHANNEL     DMA_Channel_5
 #define EXTMODULE_USART_RX_DMA_STREAM      DMA2_Stream2
-#define EXTMODULE_USART_RX_DMA_IRQn        DMA2_Stream5_IRQn
-#define EXTMODULE_USART_RX_DMA_IRQHandler  DMA2_Stream5_IRQHandler
-#define EXTMODULE_USART_RX_DMA_FLAG_TC     DMA_IT_TCIF5
+#define EXTMODULE_USART_RX_DMA_IRQn        DMA2_Stream2_IRQn
+#define EXTMODULE_USART_RX_DMA_IRQHandler  DMA2_Stream2_IRQHandler
+#define EXTMODULE_USART_RX_DMA_FLAG_TC     DMA_IT_TCIF2
 
 #define EXTMODULE_USART_IRQHandler         USART6_IRQHandler
 #define EXTMODULE_USART_IRQn               USART6_IRQn
 
+#define EXTMODULE_TIMER_DMA_SIZE           (DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0)
 //TIMER
 #define EXTMODULE_DMA_CHANNEL           DMA_Channel_7
 #define EXTMODULE_DMA_STREAM            DMA2_Stream1
 #define EXTMODULE_DMA_IRQn              DMA2_Stream1_IRQn
 #define EXTMODULE_DMA_IRQHandler        DMA2_Stream1_IRQHandler
 #define EXTMODULE_DMA_FLAG_TC           DMA_IT_TCIF1
-#define EXTMODULE_USART                 USART6
 
-#define EXTMODULE_TX_INVERT_GPIO       GPIOE
-#define EXTMODULE_TX_INVERT_GPIO_PIN   GPIO_Pin_3  // PE.03
-#define EXTMODULE_RX_INVERT_GPIO       GPIOI
-#define EXTMODULE_RX_INVERT_GPIO_PIN   GPIO_Pin_15 // PI.15
+#define EXTMODULE_TIMER_DMA_CHANNEL        DMA_Channel_7
+#define EXTMODULE_TIMER_DMA_STREAM         DMA2_Stream1
+#define EXTMODULE_TIMER_DMA_STREAM_IRQn    DMA2_Stream1_IRQn
+#define EXTMODULE_TIMER_DMA_IRQHandler     DMA2_Stream1_IRQHandler
+#define EXTMODULE_TIMER_DMA_FLAG_TC        DMA_IT_TCIF1
 
+//#define EXTMODULE_USART                    USART6
+
+#define EXTMODULE_TX_INVERT_GPIO           GPIOE
+#define EXTMODULE_TX_INVERT_GPIO_PIN       GPIO_Pin_3  // PE.03
+#define EXTMODULE_RX_INVERT_GPIO           GPIOI
+#define EXTMODULE_RX_INVERT_GPIO_PIN       GPIO_Pin_15 // PI.15
+
+
+#define EXTMODULE_TX_NORMAL()              EXTMODULE_TX_INVERT_GPIO->BSRRH = EXTMODULE_TX_INVERT_GPIO_PIN
+#define EXTMODULE_TX_INVERTED()            EXTMODULE_TX_INVERT_GPIO->BSRRL = EXTMODULE_TX_INVERT_GPIO_PIN
+#define EXTMODULE_RX_NORMAL()              EXTMODULE_TX_INVERT_GPIO->BSRRH = EXTMODULE_RX_INVERT_GPIO_PIN
+#define EXTMODULE_RX_INVERTED()            EXTMODULE_TX_INVERT_GPIO->BSRRL = EXTMODULE_RX_INVERT_GPIO_PIN
 
 // Heartbeat (not used)
 #define HEARTBEAT_RCC_AHB1Periph        RCC_AHB1Periph_GPIOD

From 31b819c83b437041da01d6fb8ac69a5870793831 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Thu, 22 Jul 2021 12:44:26 +0800
Subject: [PATCH 22/45] Try to fix external module.

---
 radio/src/targets/nv14/extmodule_helper.cpp | 63 +++++++++++++++++++++
 radio/src/targets/nv14/telemetry_driver.cpp |  4 +-
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 radio/src/targets/nv14/extmodule_helper.cpp

diff --git a/radio/src/targets/nv14/extmodule_helper.cpp b/radio/src/targets/nv14/extmodule_helper.cpp
new file mode 100644
index 000000000..49c2d7d0d
--- /dev/null
+++ b/radio/src/targets/nv14/extmodule_helper.cpp
@@ -0,0 +1,63 @@
+/*
+ * 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 EXTERNAL_MODULE_ON()
+{
+  GPIO_SetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
+  GPIO_ResetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
+}
+
+void EXTERNAL_MODULE_OFF()
+{
+  GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
+  GPIO_SetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
+}
+
+void extModuleInit()
+{
+  GPIO_InitTypeDef GPIO_InitStructure;
+  GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_GPIO_PIN;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
+  GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
+  GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
+  GPIO_Init(EXTMODULE_PWR_GPIO, &GPIO_InitStructure);
+
+  //for additional transistor to ensuring module is completely disabled
+  GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
+  //pin must be pulled to V+ (voltage of board - VCC is not enough to fully close transistor)
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
+  GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_FIX_GPIO_PIN;
+  GPIO_SetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
+  GPIO_Init(EXTMODULE_PWR_FIX_GPIO, &GPIO_InitStructure);
+
+  GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_INVERT_GPIO_PIN;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
+  GPIO_Init(EXTMODULE_TX_INVERT_GPIO, &GPIO_InitStructure);
+
+  GPIO_InitStructure.GPIO_Pin = EXTMODULE_RX_INVERT_GPIO_PIN;
+  GPIO_Init(EXTMODULE_RX_INVERT_GPIO, &GPIO_InitStructure);
+
+  GPIO_ResetBits(EXTMODULE_TX_INVERT_GPIO, EXTMODULE_TX_INVERT_GPIO_PIN);
+  GPIO_ResetBits(EXTMODULE_RX_INVERT_GPIO, EXTMODULE_RX_INVERT_GPIO_PIN);
+}
diff --git a/radio/src/targets/nv14/telemetry_driver.cpp b/radio/src/targets/nv14/telemetry_driver.cpp
index 2e440380c..b8cce7e8b 100644
--- a/radio/src/targets/nv14/telemetry_driver.cpp
+++ b/radio/src/targets/nv14/telemetry_driver.cpp
@@ -94,10 +94,10 @@ void telemetryPortInvertedInit(uint32_t baudrate)
 #warning "TODO telemetryPortInvertedInit";
 }
 
-void extmoduleSendInvertedByte(uint8_t byte)
+/*void extmoduleSendInvertedByte(uint8_t byte)
 {
 #warning "TODO extmoduleSendInvertedByte";
-}
+}*/
 
 void telemetryPortSetDirectionOutput()
 {

From 3a754126caf061b2a2aeda6e063aadcbedc0845f Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Thu, 22 Jul 2021 12:46:11 +0800
Subject: [PATCH 23/45] Try to fix external module.

---
 radio/src/targets/horus/extmodule_driver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/radio/src/targets/horus/extmodule_driver.cpp b/radio/src/targets/horus/extmodule_driver.cpp
index 878e3ffea..9565e900c 100644
--- a/radio/src/targets/horus/extmodule_driver.cpp
+++ b/radio/src/targets/horus/extmodule_driver.cpp
@@ -167,7 +167,8 @@ void extmoduleSerialStart()
   EXTMODULE_TIMER->EGR = 1; // Restart
   EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_0;
 #else
-  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (inverted ? 0 : TIM_CCER_CC1P);
+//  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (inverted ? 0 : TIM_CCER_CC1P);
+  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P;  // Inverted should be false here?
   EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
   EXTMODULE_TIMER->CCR1 = 0;
   EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high

From 78a7e507f35a16355c44654aa55ce9cbd776a97a Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Thu, 22 Jul 2021 13:14:53 +0800
Subject: [PATCH 24/45] Fixed wrong target directory for NV14 for datacopy

---
 radio/src/targets/nv14/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 26c646dfe..0f96ee6e1 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -201,7 +201,7 @@ if(PYTHONINTERP_FOUND)
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
-    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBFLYSKY -DPCBNV14 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Igui/colorlcd -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/libopenui/src -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/inc -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Include ${arm_gcc_include_path} -Wno-pragma-once-outside-header > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBFLYSKY -DPCBNV14 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Igui/colorlcd -Itargets/nv14 -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/libopenui/src -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/inc -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Include ${arm_gcc_include_path} -Wno-pragma-once-outside-header > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
     )
 

From 62458bdb55a6e394c1c0627ea8c065d213df5054 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Fri, 23 Jul 2021 14:08:38 +0800
Subject: [PATCH 25/45] Migrated NV14 ADC driver to use common driver.

---
 .../targets/common/arm/stm32/adc_driver.cpp   | 74 +++++++++++++++++--
 radio/src/targets/nv14/CMakeLists.txt         |  2 +-
 radio/src/targets/nv14/hal.h                  | 16 +++-
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp
index 6a1214207..4a70161a6 100644
--- a/radio/src/targets/common/arm/stm32/adc_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp
@@ -52,6 +52,17 @@
   const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1,  1,1,  1};
 #elif defined(PCBXLITE)
   const int8_t adcDirection[NUM_ANALOGS] = {1,-1,-1,1,  -1,1,  1,  1};
+#elif defined(PCBNV14)
+  const int8_t adcDirection[NUM_ANALOGS] = { 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/,
+                                              0 /*POT1*/, 0 /*POT2*/, 0 /*SWA*/, 0 /*SWB*/,
+                                              0 /*SWC*/,  -1 /*SWD*/, 0 /*SWE*/, -1 /*SWF*/,
+                                              0 /*SWH*/, 0 /*SWG*/,
+                                              0 /*TX_VOLTAGE*/ };
+  const uint8_t adcMapping[NUM_ANALOGS] = { 0 /*STICK1*/, 1 /*STICK2*/, 2 /*STICK3*/, 3 /*STICK4*/,
+                                              4 /*POT1*/, 5 /*POT2*/, 6 /*SWA*/, 13 /*SWB*/,
+                                              7 /*SWC*/,  14 /*SWD*/, 8 /*SWE*/, 9 /*SWF*/,
+                                              11/*SWH*/,  10/*SWG*/,
+                                              12 /*TX_VOLTAGE*/ };
 #endif
 
 #if NUM_PWMSTICKS > 0
@@ -61,6 +72,10 @@
   #define FIRST_ANALOG_ADC             0
   #define NUM_ANALOGS_ADC              11
   #define NUM_ANALOGS_ADC_EXT          (NUM_ANALOGS - NUM_ANALOGS_ADC)
+#elif defined(PCBNV14) && defined(FLYSKY_HALL_STICKS)
+  #define FIRST_ANALOG_ADC             4
+  #define NUM_ANALOGS_ADC              9
+  #define NUM_ANALOGS_ADC_SUB          2
 #else
   #define FIRST_ANALOG_ADC             0
   #define NUM_ANALOGS_ADC              NUM_ANALOGS
@@ -104,6 +119,12 @@ void adcInit()
   ADC_MAIN->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
   ADC_MAIN->SQR1 = (NUM_ANALOGS_ADC - 1) << 20; // bits 23:20 = number of conversions
 
+#if NUM_ANALOGS_ADC_SUB > 0
+  ADC_SUB->CR1 = ADC_CR1_SCAN;
+  ADC_SUB->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
+  ADC_SUB->SQR1 = (NUM_ANALOGS_ADC_SUB - 1) << 20; // bits 23:20 = number of conversions
+#endif
+	
 #if defined(PCBX10)
   if (STICKS_PWM_ENABLED()) {
     ADC_MAIN->SQR2 = (ADC_CHANNEL_SLIDER2 << 0) + (ADC_CHANNEL_BATT << 5);
@@ -137,6 +158,10 @@ void adcInit()
 #elif defined(PCBX9D) || defined(PCBX9DP)
   ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_Vbat << 20);
   ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25);
+#elif defined(PCBNV14)
+  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWG << 0) + (ADC_CHANNEL_SWH << 5) + (ADC_CHANNEL_BATT << 10); // conversions 7 and more
+	ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWC<<15) + (ADC_CHANNEL_SWE<<20) + (ADC_CHANNEL_SWF<<25); // conversions 1 to 6
+  ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
 #endif
 
   ADC_MAIN->SMPR1 = ADC_MAIN_SMPR1;
@@ -150,6 +175,19 @@ void adcInit()
   ADC_DMA_Stream->NDTR = NUM_ANALOGS_ADC;
   ADC_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
 
+#if NUM_ANALOGS_ADC_SUB > 0
+  ADC_SUB->SMPR1 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24);
+  ADC_SUB->SMPR2 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24) + (ADC_SAMPTIME<<27);
+
+  ADC->CCR = 0;
+
+  ADC_SUB_DMA_Stream->CR = DMA_SxCR_PL | ADC_SUB_DMA_SxCR_CHSEL | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC;
+  ADC_SUB_DMA_Stream->PAR = CONVERT_PTR_UINT(&ADC_SUB->DR);
+  ADC_SUB_DMA_Stream->M0AR = CONVERT_PTR_UINT(&adcValues[SUB_ANALOG_POS]);
+  ADC_SUB_DMA_Stream->NDTR = NUM_ANALOGS_ADC_SUB;
+  ADC_SUB_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
+#endif
+	
 #if defined(PCBX10)
   ADC1->CR1 = ADC_CR1_SCAN;
   ADC1->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
@@ -191,6 +229,14 @@ void adcSingleRead()
   ADC_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA
   ADC_MAIN->CR2 |= (uint32_t)ADC_CR2_SWSTART;
 
+#if NUM_ANALOGS_ADC_SUB > 0
+  ADC_SUB_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
+  ADC_SUB->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR);
+  ADC_SUB_SET_DMA_FLAGS();
+  ADC_SUB_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA
+  ADC_SUB->CR2 |= (uint32_t) ADC_CR2_SWSTART;
+#endif
+	
 #if defined(PCBX10)
   ADC1->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR);
   ADC1->CR2 |= (uint32_t)ADC_CR2_SWSTART;
@@ -214,11 +260,23 @@ void adcSingleRead()
   ADC_EXT_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
 #else
   for (unsigned int i = 0; i < 10000; i++) {
-    if (ADC_TRANSFER_COMPLETE()) {
+#if defined(PCBNV14)
+    if (ADC_TRANSFER_COMPLETE() && ADC_SUB_TRANSFER_COMPLETE())
+    {
       break;
     }
+#else
+    if (ADC_TRANSFER_COMPLETE())
+		{
+      break;
+    }
+#endif
   }
   ADC_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
+#if defined(PCBNV14)
+  ADC_SUB_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
+#endif
+	
 #endif
 
 #if defined(PCBX10)
@@ -256,17 +314,17 @@ void adcRead()
 #endif
 }
 
+uint16_t getRTCBatteryVoltage()
+{
 #if defined(PCBX10)
-uint16_t getRTCBatteryVoltage()
-{
   return (rtcBatteryVoltage * 2 * ADC_VREF_PREC2) / 2048;
-}
+#elif defined(PCBNV14)
+  #warning "TODO RTC voltage"
+  return 330;
 #else
-uint16_t getRTCBatteryVoltage()
-{
   return (getAnalogValue(TX_RTC_VOLTAGE) * ADC_VREF_PREC2) / 2048;
-}
 #endif
+}
 
 #if !defined(SIMU)
 uint16_t getAnalogValue(uint8_t index)
@@ -277,7 +335,7 @@ uint16_t getAnalogValue(uint8_t index)
     // which produces ghost readings on these inputs.
     return 0;
   }
-#if defined(PCBX9E)
+#if defined(PCBX9E) || defined(PCBNV14)
   index = adcMapping[index];
 #endif
   if (adcDirection[index] < 0)
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 0f96ee6e1..be2c2ec84 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -47,7 +47,7 @@ add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
 set(TARGET_SRC
   ${TARGET_SRC}
   audio_spi_driver.cpp
-  adc_driver.cpp
+  ../common/arm/stm32/adc_driver.cpp
   ../common/arm/stm32/mixer_scheduler_driver.cpp
   ../common/arm/stm32/timers_driver.cpp
   )
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index e610ad797..c6c639851 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -149,15 +149,23 @@
 #define ADC_SUB                         ADC3
 #define ADC_SAMPTIME                    2
 #define ADC_DMA                         DMA2
-#define ADC_MAIN_DMA_SxCR_CHSEL         0 // DMA_SxCR_CHSEL_1
+#define ADC_DMA_SxCR_CHSEL              DMA_SxCR_CHSEL_1
+#define ADC_DMA_Stream                  DMA2_Stream4
+#define ADC_SET_DMA_FLAGS()             ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
+#define ADC_TRANSFER_COMPLETE()         (ADC_DMA->HISR & DMA_HISR_TCIF4)
+//#define ADC_MAIN_DMA_SxCR_CHSEL         0 // DMA_SxCR_CHSEL_1
 #define ADC_SUB_DMA_SxCR_CHSEL          DMA_Channel_2
-#define ADC_MAIN_DMA_Stream             DMA2_Stream4
+//#define ADC_MAIN_DMA_Stream             DMA2_Stream4
 #define ADC_SUB_DMA_Stream              DMA2_Stream0
-#define ADC_MAIN_SET_DMA_FLAGS()        ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
+//#define ADC_MAIN_SET_DMA_FLAGS()        ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
 #define ADC_SUB_SET_DMA_FLAGS()         ADC_DMA->LIFCR = (DMA_LIFCR_CTCIF0 | DMA_LIFCR_CHTIF0 | DMA_LIFCR_CTEIF0 | DMA_LIFCR_CDMEIF0 | DMA_LIFCR_CFEIF0)
-#define ADC_MAIN_TRANSFER_COMPLETE()    (ADC_DMA->HISR & DMA_HISR_TCIF4)
+//#define ADC_MAIN_TRANSFER_COMPLETE()    (ADC_DMA->HISR & DMA_HISR_TCIF4)
 #define ADC_SUB_TRANSFER_COMPLETE()     (ADC_DMA->LISR & DMA_LISR_TCIF0)
 
+#define ADC_MAIN_SMPR1                  (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24);
+#define ADC_MAIN_SMPR2                  (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24) + (ADC_SAMPTIME << 27);
+
+
 // Power
 #define PWR_RCC_AHB1Periph              RCC_AHB1Periph_GPIOI
 #define PWR_ON_GPIO                     GPIOI

From 82c3f0b3dff956f3a3cbfbcb64b67778dbd15bf7 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Fri, 23 Jul 2021 17:59:22 +0800
Subject: [PATCH 26/45] NV14 reverted ADC driver change, not working properly
 for common driver.

---
 radio/src/targets/common/arm/stm32/adc_driver.cpp | 15 +++++++++++++--
 radio/src/targets/nv14/CMakeLists.txt             |  3 ++-
 radio/src/targets/nv14/hal.h                      | 14 ++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp
index 4a70161a6..a70dced97 100644
--- a/radio/src/targets/common/arm/stm32/adc_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp
@@ -159,15 +159,26 @@ void adcInit()
   ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_Vbat << 20);
   ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25);
 #elif defined(PCBNV14)
-  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWG << 0) + (ADC_CHANNEL_SWH << 5) + (ADC_CHANNEL_BATT << 10); // conversions 7 and more
-	ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWC<<15) + (ADC_CHANNEL_SWE<<20) + (ADC_CHANNEL_SWF<<25); // conversions 1 to 6
+  #if !defined(FLYSKY_HALL_STICKS)
+  ADC_MAIN->SQR1 |= (ADC_CHANNEL_BATT <<0 );
+  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWA << 0) + (ADC_CHANNEL_SWC << 5) + (ADC_CHANNEL_SWE << 10) + (ADC_CHANNEL_SWF << 15) + (ADC_CHANNEL_SWG << 20) + (ADC_CHANNEL_SWH << 25); // conversions 7 and more
+  ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<20) + (ADC_CHANNEL_POT2<<25); // conversions 1 to 6
   ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
+  #else
+  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWG << 0) + (ADC_CHANNEL_SWH << 5) + (ADC_CHANNEL_BATT << 10); // conversions 7 and more
+  ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWC<<15) + (ADC_CHANNEL_SWE<<20) + (ADC_CHANNEL_SWF<<25); // conversions 1 to 6
+  ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
+  #endif
 #endif
 
   ADC_MAIN->SMPR1 = ADC_MAIN_SMPR1;
   ADC_MAIN->SMPR2 = ADC_MAIN_SMPR2;
 
+#if defined(PCBNV14)
+  ADC->CCR = 0;
+#else
   ADC->CCR = ADC_CCR_VBATE; // Enable vbat sensor
+#endif
 
   ADC_DMA_Stream->CR = DMA_SxCR_PL | ADC_DMA_SxCR_CHSEL | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC;
   ADC_DMA_Stream->PAR = CONVERT_PTR_UINT(&ADC_MAIN->DR);
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index be2c2ec84..708d3957a 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -47,7 +47,8 @@ add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
 set(TARGET_SRC
   ${TARGET_SRC}
   audio_spi_driver.cpp
-  ../common/arm/stm32/adc_driver.cpp
+  adc_driver.cpp
+#  ../common/arm/stm32/adc_driver.cpp
   ../common/arm/stm32/mixer_scheduler_driver.cpp
   ../common/arm/stm32/timers_driver.cpp
   )
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index c6c639851..4d8f6f1b6 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -149,23 +149,25 @@
 #define ADC_SUB                         ADC3
 #define ADC_SAMPTIME                    2
 #define ADC_DMA                         DMA2
-#define ADC_DMA_SxCR_CHSEL              DMA_SxCR_CHSEL_1
+#define ADC_DMA_SxCR_CHSEL              0 //DMA_SxCR_CHSEL_1
 #define ADC_DMA_Stream                  DMA2_Stream4
 #define ADC_SET_DMA_FLAGS()             ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
 #define ADC_TRANSFER_COMPLETE()         (ADC_DMA->HISR & DMA_HISR_TCIF4)
-//#define ADC_MAIN_DMA_SxCR_CHSEL         0 // DMA_SxCR_CHSEL_1
+
+// NV14 customized drivers uses this
+#define ADC_MAIN_DMA_SxCR_CHSEL         0 // DMA_SxCR_CHSEL_1
+#define ADC_MAIN_DMA_Stream             DMA2_Stream4
+#define ADC_MAIN_SET_DMA_FLAGS()        ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
+#define ADC_MAIN_TRANSFER_COMPLETE()    (ADC_DMA->HISR & DMA_HISR_TCIF4)
+
 #define ADC_SUB_DMA_SxCR_CHSEL          DMA_Channel_2
-//#define ADC_MAIN_DMA_Stream             DMA2_Stream4
 #define ADC_SUB_DMA_Stream              DMA2_Stream0
-//#define ADC_MAIN_SET_DMA_FLAGS()        ADC_DMA->HIFCR = (DMA_HIFCR_CTCIF4 | DMA_HIFCR_CHTIF4 | DMA_HIFCR_CTEIF4 | DMA_HIFCR_CDMEIF4 | DMA_HIFCR_CFEIF4)
 #define ADC_SUB_SET_DMA_FLAGS()         ADC_DMA->LIFCR = (DMA_LIFCR_CTCIF0 | DMA_LIFCR_CHTIF0 | DMA_LIFCR_CTEIF0 | DMA_LIFCR_CDMEIF0 | DMA_LIFCR_CFEIF0)
-//#define ADC_MAIN_TRANSFER_COMPLETE()    (ADC_DMA->HISR & DMA_HISR_TCIF4)
 #define ADC_SUB_TRANSFER_COMPLETE()     (ADC_DMA->LISR & DMA_LISR_TCIF0)
 
 #define ADC_MAIN_SMPR1                  (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24);
 #define ADC_MAIN_SMPR2                  (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24) + (ADC_SAMPTIME << 27);
 
-
 // Power
 #define PWR_RCC_AHB1Periph              RCC_AHB1Periph_GPIOI
 #define PWR_ON_GPIO                     GPIOI

From 185b201251baf0c61387381048f8f0079940b1ee Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Fri, 23 Jul 2021 18:07:54 +0800
Subject: [PATCH 27/45] Fixed a problem in B/W screen.

---
 radio/src/opentx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 77332df11..d2a5aa00c 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2077,7 +2077,7 @@ uint32_t pwrCheck()
           LED_ERROR_BEGIN();
 
           WDG_RESET();
-            ();
+          lcdRefresh();
 
           if (warningResult) {
             pwr_check_state = PWR_CHECK_OFF;

From 3997116bb86219f0c536c6d9736d8363aedbdaec Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Sat, 24 Jul 2021 20:24:19 +0800
Subject: [PATCH 28/45] Added NV14 test images.

---
 radio/src/tests/bitmap_320x480.png          | Bin 0 -> 7251 bytes
 radio/src/tests/clipping_320x480.png        | Bin 0 -> 5175 bytes
 radio/src/tests/darkmode_EN_320x480.png     | Bin 0 -> 9735 bytes
 radio/src/tests/lines_320x480.png           | Bin 0 -> 5767 bytes
 radio/src/tests/masks_320x480.png           | Bin 0 -> 11321 bytes
 radio/src/tests/primitives_EN_320x480.png   | Bin 0 -> 10163 bytes
 radio/src/tests/transparency_EN_320x480.png | Bin 0 -> 10170 bytes
 radio/src/tests/vline_320x480.png           | Bin 0 -> 5300 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 radio/src/tests/bitmap_320x480.png
 create mode 100644 radio/src/tests/clipping_320x480.png
 create mode 100644 radio/src/tests/darkmode_EN_320x480.png
 create mode 100644 radio/src/tests/lines_320x480.png
 create mode 100644 radio/src/tests/masks_320x480.png
 create mode 100644 radio/src/tests/primitives_EN_320x480.png
 create mode 100644 radio/src/tests/transparency_EN_320x480.png
 create mode 100644 radio/src/tests/vline_320x480.png

diff --git a/radio/src/tests/bitmap_320x480.png b/radio/src/tests/bitmap_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9396282f9b20525e61ebbef82046876b4cda6b1
GIT binary patch
literal 7251
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
R;Lk!RC?ITZt)FDWKLJ-kF&+Q_

literal 0
HcmV?d00001

diff --git a/radio/src/tests/clipping_320x480.png b/radio/src/tests/clipping_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e74f147890057b5d226f3467fc50e37ddb3a92d
GIT binary patch
literal 5175
zcmeI0Z%7ki9LI0xx#rw-Y0*6YZDpfgm`9y|Ftxeqbcqqtn+$9g+QgDx2(D1_<}#z%
zoCb-7SZBS;=*3<Y#7dBYf{r39k`{y%p-Gw`LG`=4-EPu+VH1M77vq8Fx%=Jk`TaiM
z@AI(p`}b9-mADc?5Vf_ktOh}3M)(C3D9jw1-I9zT$v>=Rr3V~!N89J7W5&1Xc3>o`
zY&kwi;I*`#aF{xq$ek9mjl{ZJ6z;|V^I|uSs^}C4x!&FFw<}aeh5MzSe%wN0mgWFM
z5;#ih{X}hy$KYf%TD7dkWb?%p57j{oc9e6mELWb<O%T&!?i|%<PnbN0L3kL(n-u#J
z#TXXsI6I1y+x5hobs5#4At@K61M%O%>QjF(j!g&Ok!Mu5!8&|gh=V&wHJ4}K29&P;
z$Y8r5KN$Hu2@U`7J%}_$RXm6Nun((?f@xMNxlEiX5i=4ey-6tD5ny~J5FEyTDfmOZ
z|55z_fm5VfmJl01va~1T>WDYnmv@FdrJB~*fSU2X3;HhSMq~crK~3qg%gxw^x3385
zKvmPs8%o*BxQn$s0tppno8p|`4qdtrT^b4%-00$JKFcBki!rbWh0L7`BB0xjvAo1J
z0)r<x20s9UEP{M%-HSpb#0rqOGO7uPz>dL4V!wq+7Rtn;p_j`ua+y0D$i<#SS>W}i
zzNvYd%EQsFEcmG0kdwpwO!IIZ_Qg{SKIpm=JKS78;Vq;ew*kkyh`peL>-51RB&O37
zg*~}LNwA$Lw=2qo#k;buC2zmAp;f<NH>4lucQ^n$1v#{4lX2esf=QF7E~l`+YJ|ZZ
zz8@^LrMFg3qdtu*?$Sk&g4m7_*Tx!!JMUUW@)HmXjDl#APYdl3CNF8UGoZw8Ag+g8
zy9d6&D_|k3)<?vQV%Bqv+)agThGfoq(O)wba{+)bXaAZG8L0#hk#FXVu{A#&Y0+(>
zM0U+Yq$=Zl{L?ZY7oAkr&uiGWf{ll~eH65u=^)2E-F{61SB7>F8Q68uktqe&t*PE{
zpA}DzFt}9jIeX{jC3u0hhj;2JASu-9FxSXB>$d}m4_F)jok(%AGLB+O=IphZYARZ|
zqGUV5Q5W%Gi59N4J2V9o1)zh@x@9Y7`3}PCSizxJ0aut~f*pIu4fQ0-0)%zj6-0?+
zzMlNrqmuP@I#W{(Zuul!K!*7{!bJ2o6V{5g$Be}-c%_koi|Uig648{TvPfkSD-iLf
z6?TM4w1~Bm$|BK%qknJ@ltd(nNUXqrA|eEFO%!d^W!)%(KLinL`M$E-CY$pYGqtwh

literal 0
HcmV?d00001

diff --git a/radio/src/tests/darkmode_EN_320x480.png b/radio/src/tests/darkmode_EN_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..7868be171f05575cf5689d7b1de86018e3d5323e
GIT binary patch
literal 9735
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

literal 0
HcmV?d00001

diff --git a/radio/src/tests/lines_320x480.png b/radio/src/tests/lines_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..49907b7b0386602400377515529c6591d0da53ce
GIT binary patch
literal 5767
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
KPC2N>*8dZDmIZPE

literal 0
HcmV?d00001

diff --git a/radio/src/tests/masks_320x480.png b/radio/src/tests/masks_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..77bdb219193b1f20df0badd4d98f4f5e4b115c05
GIT binary patch
literal 11321
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%0A3T5FHUgNCjL_tIA77
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
T7f9fhU~Jmd@Sx*?^34AOi>0Az

literal 0
HcmV?d00001

diff --git a/radio/src/tests/primitives_EN_320x480.png b/radio/src/tests/primitives_EN_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..46c993e0139b00fccff7c67ab012283543466fd1
GIT binary patch
literal 10163
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

literal 0
HcmV?d00001

diff --git a/radio/src/tests/transparency_EN_320x480.png b/radio/src/tests/transparency_EN_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..899a7364c7703162abad8d9110319ae6847d055e
GIT binary patch
literal 10170
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
MR#foeKzZ)}2EYDaO#lD@

literal 0
HcmV?d00001

diff --git a/radio/src/tests/vline_320x480.png b/radio/src/tests/vline_320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ff6dcf16d53049e71f2056363ac512cf0da00da
GIT binary patch
literal 5300
zcmeHLZA@EL7{0w+;g<D|%SW)Z(5)~#=10<u%U4!sZLtLfQW^0FGfNkj+66QUM!K)q
zLg^rum2H@iIwP!v_y>ZaCYztPgKW+WM`a<ygjhCy;EYHOF4-jNdvDL_h~bB^CTh|j
z<idH+dCv1b=Xu|IE<KidGn1}JCkTS6sjg}u2#FqkA~Xpj`&Wvx2_olMP1Vzljsq_(
zjn`cG@E|!^EN5I{R^FlJsn;h=`jCCC*TdUs*+tfBcr$7*Q`Ln6YHiTql+IoZ%saSD
zpNF?dC7Ktv7EE6b^f)*w^(|Vv*nUfxIt5b)jLshUm0sKJaFtF$c9u{B-R*NYc+=qQ
zX-ta;cTxjiwta<zatLOby=Y~MlC16D|CGPioE-%|jkNapX7w7HtN)#K&hY}DDA2XY
zB>fs30<Oe!+Z>$Ir?~}*J*sxLvCa6eb+z7_a}@t|O|8GdeS^2JFgo2wBH<RDzuRoI
zj&~7Pw^W)YqV_@+;|gVyhsLH9IAbGi3HG;Qn49e2rKV-Pa1gR+%Jrcv)-oiTJ57}+
ziy2VEesCTq@jh!k|6VCll^6x#=5lfR!7UQaeQE_yeH*5}JbntH-e4e@wv2<LtX1*B
zU_N43oFN%;F;j?-^9%%Kp>o8a?_sjGb7utQC224^505_-Cv=?FGGFsJ&2Fh=B$Qu^
z`TYh!>k<wDMbafBLs=XS+F<3VJ`Yjo1K8r!D~KNfI73PnPo1@7bi~ND!lI1pf>bTK
z-LRzM$T85=cKdWLSvz@sQdpq$or7)14hUwOckFNzv#WQP0C)QG<Q{6kWT5sv1}i*p
z&@F17YdwER0Qh1NvMhR{!3?KYrmBa)?m(M}yqF1r%EDOS4g?fk!Y+(#ft645GZ&QN
zHpNf@sivNf1eU!gU!c7<>*LW<NPHq{k-EY%Z^?)tV3}%Nt@XR4Q(=)%XC)=y_US#X
z!U$EMAdMVlYL0}5_rR|el&NIZ{&NA8noQ?UH5si?HicsRjdBGUC|$KHVs$v`GS5Q!
zc|AmpTKlbARi_0o;h7?W2I`i>9Dr{aY%o}Z89M(Qc$Pj1yj69dL)4FPc)gpqGdlkY
zY#M|h!in#=eHUeVcP1dU0bO_=24=!c>63_NeDGP?dlx|OLoF@}Vg;_Y!&FEMG4E#O
z0{I0X50!~=;ydo>;_cZ-xscbxvs*<Ojss&Z#Wy0fAI9aPU15cTTM)Vr(2Z#%2pCIO
z-#~lIhRoU503Mz(jYLES5H}3=v+^GS^cMiVB+791Cy3fGj+Rwxn;`xP#N%3T*s(g@
z6^2&Qk;k~y`D7r^!QDG0xB&~7k}00n$4WR#po=z-C+r+%<*yigngM`^C(2DgL@MFI
zU2v*ts=6QGsNA9qn(tr<sEUN!4yOv6wnJQ?8`J2)j(s_#U<In=e`7AsYvL&^K{*Jj
z#)OkqiDvo!)mW_{XU7wkoB<WUiPp^>`M{>b;BjdAqwsD@&|HanTk!aw90~S8gVoSH
z_O9BSwk2+^1iih9Bf-$frl+&Wz==pWxHoZgCFt!<+8x*j^}wP>DATV{Fef-FQFA35
zC+$r(&j03HIZ<zK@+wa@&cA&rz&&!)_j|H&!d1(Yym2OPocOvMzheIjpEJqE>EV+%
xPVsa0uYXP9%jJd-?BtEp{||hs>)iygukT#>XQc)2z<(o&nrG^(#thbuKLCkgxz+#x

literal 0
HcmV?d00001


From f99389c4a2fb5468c444dba2a858a548460545ad Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Sun, 25 Jul 2021 14:28:49 +0800
Subject: [PATCH 29/45] Fixed problematic test images.

---
 radio/src/tests/bitmap_480x272.png          | Bin 6441 -> 6427 bytes
 radio/src/tests/clipping_480x272.png        | Bin 1197 -> 4374 bytes
 radio/src/tests/lines_480x272.png           | Bin 4962 -> 4980 bytes
 radio/src/tests/masks_480x272.png           | Bin 13120 -> 14063 bytes
 radio/src/tests/primitives_EN_480x272.png   | Bin 8855 -> 9364 bytes
 radio/src/tests/transparency_EN_480x272.png | Bin 9025 -> 9421 bytes
 radio/src/tests/vline_480x272.png           | Bin 1294 -> 4451 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/radio/src/tests/bitmap_480x272.png b/radio/src/tests/bitmap_480x272.png
index a9148109cfc13c066a3ac61a69c3f7f00872260c..f546ecd6ce9c4881e63698277a40aa2191858be7 100644
GIT binary patch
delta 3251
zcmYjUdpwi-AK$Yvt8I)jGmMo}<kIjYsWir>q>Hn}P(v8Gh0Z~oJu{7JST5CBIjN^a
zmvbs~p*mA>{3_)kT^u=bI$D==@;a&LTz<dr^YlBf-*12JweR=y`MhtR@0z_2dh47S
zV=IFLrTLo@izdb?=LBXH$~u;1jXz}>Wwf`frGWC7qNE-<yyDMz&U$$sL*I=t-QAeR
zx}#3LDNx$}yA~XAr-G){7?4tf0t&w^FRQIHkY$MHUV1a5Daq#SAS2j@!x106hwdCu
z&=~7zT6Q07o-f}vBRJ0m<@ctTo-8zr5LPAM#aJAs3L_UjYJ_?&3C`GI27lzG=$@HU
z{Pq{3givEp(Dj>+Sj0vj5&Co>^F*u-=?Ei}RQ8QTa##{}0%OTJ9t~y1bC9YPeN7JG
zPsV)&{^GFbSV<~uLJg#8FEqU1%#fx(o716h@2>PcETK1osxV(56Arj7P&_Qx+!02c
z%P^0<?B##SOBPyzS5y|>JPw^)xTo=BzkknYx3Rw+8w2-=>BhZv)TV3CD%r0@_<W}L
ze0mngVXR??loU2dN{gCl>vLqxH>Bs}bF8!CpHr54s?*#q>DLb^+>j^z1$jS>Dmq~<
zS?z8jj_IRdCDfsnPe+2LYUge^WMR9F7pIghmMz0OftKs39H)xStKOdx4vk7<FGKG2
z3$@*M2yjMcsxbDXq08)XM_AKHk><N%Uhg+3UjQz41-&XF64bl*+;fR$GhH7yKPuua
zpPkw&<uX-)wq(>4cExg#p_Hs@ti18#_2*cZ9h!ts^MD2LRIc1*+ry1dYeQAxa&Ias
z`M|8)HxFE$5G0?x<rZ<28wFG54>*~+wN=x$oL2V?{vciPMIx9hbiwO@qN$0|PRjW=
z&d0{;TO19D_N<L=J!k#k08mRp9>osRk@X8i29^k^NJ!XsY5leLl-}=9`e8}b=abiW
z(&=n>rBeq&9Z8{G$=&z6fWp3OW^PaN*D%nTX<V`Nm{&mlTUGpQmJNC4oKf;1a?+;d
z`a`FMPS0ra0Vw~BU)wm9e^te7ZO78!IBfpLzyaqtcOQX(#6DdcW18Nz_J9D2+MtWS
z9~!n1P3${1->RoNenDk0rCyl*n%rO1n4o;YXq_||i`8gG4N%K{TrD-c<+=;=tuJmD
z?v5LU9P)2%mbcWmUsPA|cEd6lkkw!Tq^v*fa`fXcw<yHyfw#W>4=Vr12r&SUy%vBc
z6I%QT3-?^bqAZLJzYRNG$>S|=%WTaDl>FBNR^?{*?Yg@Lm4K6Tb~?TuyR(E#{&e&?
zIQsKXeaUpyao=^NyK~hOg-LL3B@hYjuN%vlLUz!)Z6Rhu2-RcF89Rqzj>iG9NM2rQ
zFgo*-EJNO1<>}`6Z0XdH@;eu8w+YzHi32M01C8rusIdCd*%IsRAJ{>MP?D$KQI+0f
zfHzbR7)QGmmw{469=M=(Co;YgnzcP}tx2Wxl(IX_%HLi(dK>{&LU-a(P+=^Ak2VKP
z&l6rf1`ieShz4l5jKhzIs$a+0mWE5G?$%;|ej4h2kh~RXOmo}L`t5Mz`d44Ur>gL2
z`U3D;FL!#KbusbW!;_xU@_V0C&?UG5K_%k4K?SP(cwVt8*35C3Q*USQQ7;xD@vR6i
z+{C~_UYpoDCyg1uK8mL1z$Tg;JO!E^cBqe8G93$f839%M)&Weni16}(_nFn=Ni`Pt
z1pN%x|F5|IQ&~#NNVx_+EU9|J!S9xrml=$aSwq229_B`;k>k2|&Pr5mhjxJ@0&u%z
z7W9DC&{gMl(_~T6WC6Sh93k=ogAK?jr19U>tvw(_cHTpG;T?t0w3UGa-rN_l!YWUI
zQyutuJ^|tFsnR>_{@g77&2B8#pWuF|gcnXJ6(N~(G2QrEJd1(>em9gZczCo{t?q#w
z@}fS6V*S1SKQ8-UY=qKP6nMnPyFDin4goUBW`MMS;}WdBe;0O$;lIo}Bzx3&07FA%
zI79oT)YPZ_O^AlGwA~}A^$JMlcpDHDli9l>RM_w*%7zKb!nEWpL}@zGe@1B6frR+5
zAm&C+?_q!`=xYJaUVHEf3WX9Lb4hq3bt9xro+gqW0)a)=zlSVb{Y{Mtdpi|taOtx+
z0Yn=6dGa%2{A=&(ROS@!;z7yVzwwkKIS@1@$p@6rpoE_l>`zD7d?oM`fRLZ7&WqXX
zHB|opD7H+Qu=h`Hj)q)O2XV^_A}zCNc=6<OG<$QN&b0%xc0faL!uJz|&#K9bxvaW9
zZ4gfy&l|CvG{90mvAD_&knOPWz1c8CMs4#54bpJHl;P?gyNPk1n`_aSjp9A{RvE+R
z_<Sjuf94^S)gF{gmwZqXS~Cc65=|yp9OvGY@*QB0V6`})rjrV;9I+`kS0^uYEQ+2q
z{{03s0j!IBOvGh=O*UD&cNyxmO__PGZV?Lu^)LcKk!%YaGh>u>vXlvtFI*|^C+1s6
z$N8;G(6;wJw-{Z@XpRtyWRs|yzxX!ZTM6Ib&D|=cL7^{JpQ+&M`lq2sape0POtT+z
zR1|&rt0I9wwjqshi{&9*mzC7MSQAU$p*s1i5r-@32LM+a4wq}CmuxB6!h4eCbZ$vg
z-La-0?>P3pBm~e3VvujX`v&LHP@J%(e8^xp8xK2z=K|=mkHyIdteW>%wT-x@i^{4|
zvL7iIRvZs<_D56*LTa<Rxsz_gc6Tb8<<TcDAIyJk%596kp|NlbVC5YwDG3S;gd&qH
zc+32<M@fB6*s>M4L4^14mYP{ZR4NsMAOpEl=5-Nb(Dt3wk^T96NC`1vGX>Af6!t_B
zQ@BqD!nQS?%Y^)ar=68g1#5E*X_Tk}?f5A|rAIh8F@m)h4Urchj&}SW@hzY5!o=EE
zgE&tlqF9&pNZw8p0xiZp!LxK_Mu{m0F*IpXan2i1=mvaX+#4aJNRCPX-}w7M6G_v4
zJJwK8w730lmH5?X2>o|N8TLy6(y8!tAe>-DIANI{*?NE8>H{Qq&aQOBR|xd7o#A&2
zaz|B_ws9VdWxgP^*MZO`>v<ju`M`F8GffT^Lk#iT=YSz8P5b_7=*(#_rb*I<{JDiX
zDF;3NtZybHe>`(|^rNagu6gRO5H#>g{MU!XO3>tnRiuYGLa^rPKVU4UMJCA4iH3K2
z>5Rp<!lo^)iUAsDD-@^E5#75l@bO-(-UOU+I&aMq^!95_Mr79_N1CmXLo5RD=u+YW
zO65rmU3Sj(XmDNh>;}GWRwXh*G2iO6!wMj>vY`ZX{}gTql!UztUb~D2bk92V#LR$P
zzvg^45?S3vTG>kGDqQ<k8q}|v7JcKVzahaxRWTcXz4X?w&z`=ioa53+N47p~@_zJz
z#1K>knflLgp&i=mm=RpH&mG9|fC#)`3;j;44V}xq6iywe(E)#tzxn4~hQR`*oKJE^
z&t0fhZCxUetPrEX`5=uaz}uEyICVlSf1!ORww_9Vs?gXI6dfWK`M+ytqz6;ziaTOB
zyC|{Ma=A<ZNRgZ4n>@SAyuz0(%q;GL?aycJJhlNrrwi~~kxagzeYcty82${((Y0-B
zjf#ep?t0Z$U%{JeV0Ef|t#WrwDJ~F&8ghyFvB(}hpFHZll)I>6*O$w;ICFC!GPXGD
zW%NJ9J`;rgtig=sYTmz64Phw_^HrIoNb3U`1@gVj^ysRQKbOl+1MfM3@CS1EEKEL^
z8zoGv_prY@y@Pmpqy_@Hi|psRL<ey(oyUTn5e<A)f(r>8ljE5(*|Q4329N9LTP|e7
zO5(-AIEi~s5?NB3?tZg9D+x~d^z{Xn9Q>)cp}=brHvm0e|77~x)i#MHTJvq%n(x_e
sHL29}7A3oyTvJXB2Qd)K(P>DedO?QU_nrY4N#L_GWKHn5LGqIS0I+gMf&c&j

delta 3264
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
TqgG-Z_={b#Eb9A6*}ne)>q|A|

diff --git a/radio/src/tests/clipping_480x272.png b/radio/src/tests/clipping_480x272.png
index 5a90991cb50cde470ce699ffe72b0a0c0359708d..c7284536501b8d90867f7cb4e62c3c749a3f6651 100644
GIT binary patch
literal 4374
zcmeAS@N?(olHy`uVBq!ia0y~yV0-|?0vt?0k>@G~w;31&?s~d7hE&8Q*L--!d{{$4
zkHv(ED=%k;fmGCDMFS}&W>F?(U4ElpwXGKgBzPOa#6d}>#jIa4PRT&{jBOX0s!RlX
z+74uJfQbnLOpA42Tzq0A#RN73#4!Py1>q<jFu2tu=gR`+8GLb0DCtNx5$%WSR{)v{
zG%vFcW*(#MEH*di1QQl8;lbH>QS3`bl_b<LAdVEwWkBcUI`%JvI1|WWQ#7zTVmPbE
z9jbi-&`h9lCNTb%20345m_wwPmb4tm;I1;+3-=0;!wctd^lV$;ei`OTo@N0F*+&w-
z$6(q$oD)FC&4Tfx9FQEs%NXR8u!YrjRvgSHAP$nZ+@dcm&V>1~&5@&rudqk$F)YlN
zC>j8bQ#%Xe>moU%r;R~V5gerYFsnh~i{veo@IS1;;?{2AHu)novUn~DNC1tS{0z$P
z5kqo_n{&eyNRUp4S&b6Dz&Jn-{zPEJJIgFSSpkhJwoDF?ah}Ccz8g16LU8bc1nFs*
z)yUxs3U=h+H{fWzsMvQg#Ri&=nt^5ljay;~OIN@YiIff$R9Qel`Z5(}HFEd@;{YZ2
zC0Y)=5ICM;BnM4Xj#5lLGG?5MCpupico49GVb=f02RWr~I%R)$pL{%nBfy-+Em-H{
z!;?QAoNd4O#XW^1gGJ=d4THuj4~#S-7_Ss1I<fQ~ntAP6zgquAfdzRS0h5wWo^EzF
zXLARJeDQs%g#3_6P{0J1AlWPV$eE!+nB~cuj~5-JLBYJhfW>XIkRhW5FtMJ^KuWp4
zG8rn?D@caN^)CAhN_31*1QtB`W!~E$tgL0=4vfaibgCpTigS%^cXLaJ<eBuso_RS2
zQOAG@_5(LKKdgeKBVgvZ;LqIrS%=T#_RLA2dEJViXK?UL6_Bv)PBvK!FW@+Mx*%mq
z2P_yy%aX=nRF;4$%S+J85?r?-)hQE%z;)#p9CanQT!$CsJWk-MQgXDa9IYx*S^xuD
zRgNa_(Uu^n0ZvLw5ZE#_D7vB2<8}_#_G>$!z{7ZqJ>Ra!jc20b0>OZS<ijl&A4q|l
zWGe(DGAj!}-GueMROu#A+B_Uh^P_2=)HFYYdOyP=c~59#VAv<<rtu(fAvbWmgTd3)
K&t;ucLK6VcMCv90

literal 1197
zcmeAS@N?(olHy`uVBq!ia0y~yV0-|?0vt?0k>@G~w}BLAfk$L90|S2|2s5s*U!KXp
zz!LB2;uumf=k49SzDEog8ZOFsO+2_Rfyc{j*Cay?37w;&A^|~n_$Thyc+V>k8TRL7
zm&oreao0O<>wHeym9Sv(+Jn<CGBZ5LXW|u5y}%GS*eRK7KaJ+<Ti4nB(a(Q#_Sx56
zeR7BMbUuGNP@=nD{<2A~`T1yj`G41q^WP+A7woTj#Lyv>(V)@DMjExE@(V-R)0&@_
z*)kQAmX>f^XEdz1yzpIrWzgqcbMJGv*xhIAXWn)_rup{9X8cBfQhz8rM~<PncCWlv
zWEn7k%Py2>%wv9_!`HWXC)@U9_Ms8%gFanQ+kp%W-!0Z&Fa07>mONAZGApxeF7K}+
hj6))eP&X*<zo-k4Y34m=1T23TJYD@<);T3K0RWOvH?jZ#

diff --git a/radio/src/tests/lines_480x272.png b/radio/src/tests/lines_480x272.png
index 86c6ceb11dbe0e82b0f6949e6ad8dbe58e8316f8..398345c8136cfd7b9dc3f12fe10b7522a342d446 100644
GIT binary patch
literal 4980
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

literal 4962
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
OSjh_(CN(E!ZT%Mm8iQK^

diff --git a/radio/src/tests/masks_480x272.png b/radio/src/tests/masks_480x272.png
index e6a8c0873b25dd49e61d591bef11a883a3efbe69..e602c58a728a0084e2fc8f54f133b6f4004d2c16 100644
GIT binary patch
literal 14063
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

literal 13120
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%0Dq{64b3en`!5>+b
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

diff --git a/radio/src/tests/primitives_EN_480x272.png b/radio/src/tests/primitives_EN_480x272.png
index e67c6199cb78bda6fe4bc50a78ee08b2a533f614..8a27da53ae8bec1fd39a4e4031d993e66071fede 100644
GIT binary patch
delta 5936
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
I=@?A=f0)5ORR910

delta 5457
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

diff --git a/radio/src/tests/transparency_EN_480x272.png b/radio/src/tests/transparency_EN_480x272.png
index 301584068b0c709c06228a5dc6c14ba7d5fd8ddf..25b69c9d3783b1fdccf61699e6066c499576a11a 100644
GIT binary patch
delta 6335
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

delta 5946
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
CMlhiO

diff --git a/radio/src/tests/vline_480x272.png b/radio/src/tests/vline_480x272.png
index 7947a4f9bc526e8b127e6c6048bc2d33f48733ba..9357cc152327d77fc1a52dde4009d0aaf136c357 100644
GIT binary patch
literal 4451
zcmeHLZA@EL7{0x`;AOPz&c<2_D_pY?)HN2ogh9mg16pd@1*b7t7s+KXSBx&3`v}2A
zTc`!Hj;}2l>5r!FVkIOlTO^AyS<(jPSPV%!a4MPz47GD{!GvGL7~j+01LykRfBn&$
zoYUvN@AE$Id!C+jsO_**v)iznq9~24wfP7|saD{_u{7-bzTf;4MeTjT)ogvUr@eFi
zhU=@F9rSFqUK2=jxkneDV9ty<EJ@!|IF#_Q*@t?X6Kxk3d^JsxMyFjA7>8Zl2vXYk
z8;*;Q(oCa)mUy#)?&q0_(+$UGCXAj~b^{(a_(brRt@QC;Auue*vwT8nYjh*JMXBgq
zHk80*DrooIu?DYuq$(vdiJfH4WAFZma$4k^{#W@#bF@ynv+1Mv<tVGX1C;iFE=&gV
zJxjZ<lr<@WwXo*bA6E{OJgD<_YPrv7iaWIraGkd}OX->(ZDsIQluOhWDuU_Ny#MU@
z>Hm~z5udqBk`-e%|I~>K3bI=RRMF#@lhkZets1YNR`Abg>8>aH%SjfgMy7iC4+V?Z
z+ictFL1jfIn}5g~8Yab<Dx=*?b*D(OmM=K*T1%S(R=r16wOp`97T_NT*!hi1WVHEW
zRn->rvjVmRu#=+-*dRpPdg_4!Ho=L8DbYYywX#PQ4`^bFrd$V@+WIotyo6d6Pim_b
zO0EO!y<`mu^9QNL74@JZ+M-y}M{J<C{*G1vhc9#eorln$uKkH17jxq|0}!tfO$CM&
z0VMMs0SN-+>nQ4v4B03F$dlVU5cT%}F&fJVNU<uuy8amf`5Yi0rP0X0lg^I(>R#GC
zTlXBAj)S=qwPg2q_c&LPj4jzC5IV)0F9qkNw_qoQ4@Hzu2p{x)2pwMVW>1~{MP|a`
z4Wf=5%^k2QkY+wSO=SNEvfmpMcCshSX}6R{y2o=~kSwL80zqg;CtT+9gH4?AJBG%H
zI8jb-irt*Mv%|5_&W3fVL!BLn(6ua~U1ca#V1p1IJm6t}eTBpRvFrfgC>;1haj$R`
z`$Q!iak^LN#%rIdDN+bH`Hj}1Kw7uy>n+9R1q%b=Wba#XDIjklZ*H8ciG;CxjY2L6
zC*bvr-{{$eJ<C8(2D4OdZ(AVn(rho-@U570aoZgGIsLvhz2_VJdaE5|GI}C-?X?g@
zG^!(@VnI`+9an-DL|KkwDXAOR7_zeAk~86|huEGcc{7BoTEJ@)K_ncap6AVAX`YvG
zYP2BAl1!Pj07jktdbW~r3><P?{tG+Zebh_m<=^Brba97>!|uPr>5-&YacYIW&;wHb
z4vv=W<<h+#xmShVXecDtS={Ynf{4UhUdu`PEly49i)1I|H?x5>Kb-D*1^?<mOb9pG
zAg`qY#T--~V34GbPT<s}zR&}O{Q6)b!`=1O8s(X?LQDvEzZ}mP%p)-eqfgUF(#=|&
zn$#CWR>-fmiRT78h0+oEXD~nBOn$s`1D_vnrG0?KDBLCQ-spOrcW<!pynE*_C+Oyt
kznlc}mlIa~|K7bRs=h9Ab(sB?fj>_uSIgn%>o&3PU%y8l{r~^~

literal 1294
zcmeAS@N?(olHy`uVBq!ia0y~yV0-|?0vt?0k>@G~w}BLAfk$L90|S2|2s5s*U!KXp
zz;eLT#WAE}&f7cIL3aW~92^(OZ1{gw$fBTt^FSI8^Di0CyPaNLB6F+0*7fuA^Xu=A
zmt*LtoOS&3`scO(nH%=o?5&-c+0eJV-u|SC!$I~&IV0W;>t}<h>HbW%DN+g5@myaf
zWH#vD6?~z1nc?;h>kH1y7_WUh>%c#gE#iDXSPiegckB_M?CC05$I~VbXLoDz&18G=
zBY`h!86#Jop3o_i1N-c59tEnX{&~sFdM4YAd$PY5q)H`tm&=C$?a!_Gtg_IDdCgmQ
z_q{+-Tkbm`wb>C0AiJh*jabm`!>p6~5M<?#ouMErAE<}%fSmO{(iWuV-PS;mnwq=I
zKu-T4YRyu0!sNjJw_+eSZ+{~LqW*h<1)~>&jFH$0B0JcC$_i3ng4pX`GJy2PoJ|Co
zzoW026(q;n4zlLK9X^l|2O?$dfVMS$w)6zqmR__9r19Lt7LZ1nyP3>DjTY-BvsdX%
z1qN8G5=d?G&H#{F_d>9Rzx1Sl<~ZD33R0RO^dj7d_X@`sYa`wgjxX#fQW^p;W~WHq
znC?*Tw5)Nj4VQq!WI+>$DGtmooTJoe5Dddq@R#w^i&@_-PtSP;EZ`VCUHx3vIVCg!
E0Pz`yT>t<8


From 74f2445558d9b9fdb8eb5d2acfd9ab557fde841e Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 24 Jul 2021 16:42:56 +0200
Subject: [PATCH 30/45] WiP: Simu and modules fixes

---
 radio/src/gui/colorlcd/curveedit.cpp             |  4 ++--
 radio/src/gui/colorlcd/model_setup.cpp           | 10 ++++++++++
 radio/src/gui/gui_common.cpp                     |  7 +++++++
 radio/src/pulses/afhds3.h                        |  2 ++
 radio/src/pulses/modules_constants.h             |  6 ++++++
 radio/src/pulses/modules_helpers.h               | 15 ++++++++++++++-
 radio/src/pulses/pulses.cpp                      | 16 ++++++++++++++--
 radio/src/pulses/pulses.h                        |  2 ++
 .../targets/common/arm/stm32/timers_driver.cpp   |  2 +-
 radio/src/targets/nv14/CMakeLists.txt            |  1 +
 radio/src/targets/nv14/adc_driver.cpp            |  2 +-
 radio/src/targets/nv14/board.h                   |  2 +-
 radio/src/targets/nv14/libopenui_config.h        |  2 +-
 radio/src/targets/simu/simpgmspace.cpp           |  2 +-
 radio/src/translations.h                         |  1 +
 radio/src/translations/untranslated.h            |  6 +++---
 16 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/radio/src/gui/colorlcd/curveedit.cpp b/radio/src/gui/colorlcd/curveedit.cpp
index 9de50061f..4d6412f2b 100644
--- a/radio/src/gui/colorlcd/curveedit.cpp
+++ b/radio/src/gui/colorlcd/curveedit.cpp
@@ -48,7 +48,7 @@ void CurveDataEdit::update()
   uint8_t curvePointsCount = 5 + curve.points;
 
   // Point number
-  for (uint8_t i = 0; i < curvePointsCount; i++) {
+  for (int i = 0; i < curvePointsCount; i++) {
     auto txt = new StaticText(
         this,
         {i * boxWidth + PAGE_PADDING, 10, boxWidth - PAGE_PADDING, boxHeight},
@@ -60,7 +60,7 @@ void CurveDataEdit::update()
   // x value
   if (curve.type == CURVE_TYPE_CUSTOM) {
     // Adjustable points for custom curves
-    for (uint8_t i = 0; i < curvePointsCount; i++) {
+    for (int i = 0; i < curvePointsCount; i++) {
       int8_t* points = curveAddress(index);
       auto pointEdit = new NumberEdit(
           this,
diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index f045fabfc..2239080d0 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -622,6 +622,16 @@ class ModuleWindow : public FormGroup {
                                   rfChoice->setFocus(SET_FOCUS_DEFAULT);
                               });
       }
+      else if (isModuleFlySky(moduleIdx)) {
+        rfChoice = new Choice(this, grid.getFieldSlot(2, 1), STR_FLYSKY_PROTOCOLS, 0, MODULE_SUBTYPE_ISRM_PXX2_ACCST_LR12,
+                              GET_DEFAULT(g_model.moduleData[moduleIdx].subType),
+                              [=](int32_t newValue) {
+                                  g_model.moduleData[moduleIdx].subType = newValue;
+                                  SET_DIRTY();
+                                  update();
+                                  rfChoice->setFocus(SET_FOCUS_DEFAULT);
+                              });
+      }
 #if defined(MULTIMODULE)
       else if (isModuleMultimodule(moduleIdx)) {
         Choice * mmSubProtocol = nullptr;
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 058c20765..2afe2e6b9 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -628,6 +628,13 @@ bool isInternalModuleAvailable(int moduleType)
     return true;
 #endif
   }
+
+#if (defined(AFHDS3) || defined(AFHDS2A)) && (defined(INTERNAL_MODULE_AFHDS2A) || defined(INTERNAL_MODULE_AFHDS3))
+  if (moduleType == MODULE_TYPE_AFHDS3) {
+    return true;
+  }
+#endif
+
   return false;
 }
 #else
diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h
index c3edc33cd..1cf262eee 100644
--- a/radio/src/pulses/afhds3.h
+++ b/radio/src/pulses/afhds3.h
@@ -102,7 +102,9 @@ struct Data
 #if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
   void sendByte(uint8_t b)
   {
+#if !defined(SIMU)
     *ptr++ = b;
+#endif
   }
 
   const uint8_t* getData()
diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h
index b6b7a6abc..4774c3dae 100644
--- a/radio/src/pulses/modules_constants.h
+++ b/radio/src/pulses/modules_constants.h
@@ -38,6 +38,7 @@ enum ModuleType {
   MODULE_TYPE_SBUS,
   MODULE_TYPE_XJT_LITE_PXX2,
   MODULE_TYPE_AFHDS3, //no more protocols possible because of 4 bits value
+  //MODULE_TYPE_AFHDS2A,
   MODULE_TYPE_COUNT,
   MODULE_TYPE_MAX = MODULE_TYPE_COUNT - 1
 };
@@ -222,6 +223,11 @@ enum ModuleSubtypeDSM2 {
   DSM2_PROTO_DSMX,
 };
 
+enum ModuleSubtypeFlysky {
+  FLYSKY_SUBTYPE_AFHDS3=0,
+  FLYSKY_SUBTYPE_AFHDS2A
+};
+
 enum FailsafeModes {
   FAILSAFE_NOT_SET,
   FAILSAFE_HOLD,
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index 37a8c45c2..23eca3f9f 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -319,9 +319,22 @@ inline bool isModuleSBUS(uint8_t moduleIdx)
   return g_model.moduleData[moduleIdx].type == MODULE_TYPE_SBUS;
 }
 
+inline bool isModuleFlySky(uint8_t idx)
+{
+  return
+    (g_model.moduleData[idx].type == MODULE_TYPE_AFHDS3);
+}
+
+inline bool isModuleAFHDS2A(uint8_t idx)
+{
+  return isModuleFlySky(idx)
+    && (g_model.moduleData[idx].subType == FLYSKY_SUBTYPE_AFHDS2A);
+}
+
 inline bool isModuleAFHDS3(uint8_t idx)
 {
-  return g_model.moduleData[idx].type == MODULE_TYPE_AFHDS3;
+  return isModuleFlySky(idx)
+    && (g_model.moduleData[idx].subType == FLYSKY_SUBTYPE_AFHDS3);
 }
 
 // order is the same as in enum Protocols in myeeprom.h (none, ppm, pxx, pxx2, dsm, crossfire, multi, r9m, r9m2, sbus)
diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index d1f067d53..ee93e7a21 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -187,9 +187,13 @@ uint8_t getRequiredProtocol(uint8_t module)
       break;
 #endif
 
-#if defined(AFHDS3)
+#if defined(AFHDS3) || defined(AFHDS2)
     case MODULE_TYPE_AFHDS3:
-      protocol = PROTOCOL_CHANNELS_AFHDS3;
+      if (isModuleAFHDS3(module)) {
+        protocol = PROTOCOL_CHANNELS_AFHDS3;
+      } else if (isModuleAFHDS2A(module)) {
+        protocol = PROTOCOL_CHANNELS_AFHDS2A;
+      }
       break;
 #endif
 
@@ -505,6 +509,14 @@ static void enablePulsesInternalModule(uint8_t protocol)
       break;
 #endif
 
+#if defined(AFHDS2)
+    case PROTOCOL_CHANNELS_AFHDS2A:
+      extmodulePulsesData.afhds2.init(INTERNAL_MODULE);
+      extmoduleSerialStart();
+      mixerSchedulerSetPeriod(INTERNAL_MODULE, 2 * 1000 /* us */);
+      break;
+#endif
+
     default:
       // internal module stopped, set internal period to 0 and start the scheduler
       mixerSchedulerSetPeriod(INTERNAL_MODULE, 0);
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index 679bfe419..76d489737 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -273,6 +273,7 @@ union InternalModulePulsesData {
 #if defined(INTERNAL_MODULE_PPM)
   PpmPulsesData<pulse_duration_t> ppm;
 #endif
+
 } __ALIGNED(4);
 
 union ExternalModulePulsesData {
@@ -389,6 +390,7 @@ enum ChannelsProtocols {
   PROTOCOL_CHANNELS_SBUS,
   PROTOCOL_CHANNELS_PXX2_LOWSPEED,
   PROTOCOL_CHANNELS_PXX2_HIGHSPEED,
+  PROTOCOL_CHANNELS_AFHDS2A,
   PROTOCOL_CHANNELS_AFHDS3,
   PROTOCOL_CHANNELS_GHOST
 };
diff --git a/radio/src/targets/common/arm/stm32/timers_driver.cpp b/radio/src/targets/common/arm/stm32/timers_driver.cpp
index 7ac4881e3..bae659483 100644
--- a/radio/src/targets/common/arm/stm32/timers_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/timers_driver.cpp
@@ -59,7 +59,7 @@ void interrupt1ms()
   ++pre_scale;
 
   // 1 ms loop
-#if defined(FLYSKY_HALL_STICKS)
+#if defined(FLYSKY_HALL_STICKS) && !defined(SIMU)
   flysky_hall_stick_loop();  // TODO: need to put in 1ms timer loop for best performance
 #endif
 
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 708d3957a..be14ca93d 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -43,6 +43,7 @@ set(FLAVOUR nv14)
 #add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_BAUDRATE=${PCB_RF_BAUD})
 add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_SERIAL -DAFHDS2_BAUDRATE=${PCB_RF_BAUD})
 add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
+add_definitions(-DINTERNAL_MODULE_AFHDS2A)
 
 set(TARGET_SRC
   ${TARGET_SRC}
diff --git a/radio/src/targets/nv14/adc_driver.cpp b/radio/src/targets/nv14/adc_driver.cpp
index 8d414cc6c..203ee1f34 100644
--- a/radio/src/targets/nv14/adc_driver.cpp
+++ b/radio/src/targets/nv14/adc_driver.cpp
@@ -297,13 +297,13 @@ void adcRead()
 #endif
 }
 
+#if !defined(SIMU)
 uint16_t getRTCBatteryVoltage()
 {
   #warning "TODO RTC voltage"
   return 330;
 }
 
-#if !defined(SIMU)
 uint16_t getAnalogValue(uint8_t index)
 {
   if (IS_POT(index) && !IS_POT_SLIDER_AVAILABLE(index)) {
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index 38efa567f..dc1228e1c 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -483,7 +483,7 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode);
 void telemetryPortSetDirectionOutput();
 void telemetryPortSetDirectionInput();
 void sportSendBuffer(uint8_t * buffer, uint32_t count);
-uint8_t telemetryGetByte(uint8_t * byte);
+bool telemetryGetByte(uint8_t * byte);
 void telemetryClearFifo();
 void sportSendByte(uint8_t byte);
 extern uint32_t telemetryErrors;
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index 0a00fe51b..f23ad216b 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -60,7 +60,7 @@ constexpr uint32_t MENU_FOOTER_TOP =               LCD_H - MENU_FOOTER_HEIGHT;
 constexpr uint32_t MENU_BODY_HEIGHT =              MENU_FOOTER_TOP - MENU_BODY_TOP;
 constexpr uint32_t MENUS_MARGIN_LEFT =             6;
 
-constexpr uint32_t PAGE_PADDING =                  8;
+constexpr coord_t  PAGE_PADDING =                  8;
 constexpr uint32_t PAGE_LINE_HEIGHT =              26;
 constexpr uint32_t PAGE_LINE_SPACING =             6;
 constexpr uint32_t PAGE_INDENT_WIDTH =             10;
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index a32bed11d..cb0757e78 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -471,7 +471,7 @@ void sportSendByte(uint8_t byte)
 {
 }
 
-void sportSendBuffer(const uint8_t * buffer, uint32_t count)
+void sportSendBuffer(uint8_t * buffer, uint32_t count)
 {
 }
 
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 84fa3f02d..74f3d3399 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -166,6 +166,7 @@ extern const char STR_XJT_ACCST_RF_PROTOCOLS[];
 extern const char STR_ISRM_RF_PROTOCOLS[];
 extern const char STR_R9M_PXX2_RF_PROTOCOLS[];
 extern const char STR_DSM_PROTOCOLS[];
+extern const char STR_FLYSKY_PROTOCOLS[];
 extern const char STR_CRSF_BAUDRATE[];
 extern const char STR_PPM_POL[];
 extern const char STR_SBUS_INVERSION_VALUES[];
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index a734e63c6..cb85b7825 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -111,10 +111,10 @@
 #endif
 
 #define LEN_EXTERNAL_MODULE_PROTOCOLS  "\014"
-#define TR_EXTERNAL_MODULE_PROTOCOLS   "OFF\0        ""PPM\0        ""XJT\0        ""ISRM\0       ""DSM2\0       ""CRSF\0       ""MULTI\0      ""R9M\0        ""R9M ACCESS\0 " TR_MODULE_R9M_LITE "R9ML ACCESS\0""GHST\0       ""R9MLP ACCESS""SBUS\0       ""XJT Lite\0   ""AFHDS3\0  "
+#define TR_EXTERNAL_MODULE_PROTOCOLS   "OFF\0        ""PPM\0        ""XJT\0        ""ISRM\0       ""DSM2\0       ""CRSF\0       ""MULTI\0      ""R9M\0        ""R9M ACCESS\0 " TR_MODULE_R9M_LITE "R9ML ACCESS\0""GHST\0       ""R9MLP ACCESS""SBUS\0       ""XJT Lite\0   ""FLYSKY\0  "
 
-#define LEN_FLYSKY_PROTOCOLS           "\006"
-#define TR_FLYSKY_PROTOCOLS
+#define LEN_FLYSKY_PROTOCOLS           "\007"
+#define TR_FLYSKY_PROTOCOLS            "AFHDS3\0""AFHDS2A"
 
 #define LEN_INTERNAL_MODULE_PROTOCOLS  LEN_EXTERNAL_MODULE_PROTOCOLS
 #define TR_INTERNAL_MODULE_PROTOCOLS   TR_EXTERNAL_MODULE_PROTOCOLS

From 30fe8013444e038b93dce4b4c246a1b1893dda34 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Sun, 25 Jul 2021 16:55:20 +0800
Subject: [PATCH 31/45] Fixed nv14 build.

---
 radio/src/pulses/pulses.cpp    | 2 +-
 radio/src/targets/nv14/board.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index ee93e7a21..db2480f9a 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -511,7 +511,7 @@ static void enablePulsesInternalModule(uint8_t protocol)
 
 #if defined(AFHDS2)
     case PROTOCOL_CHANNELS_AFHDS2A:
-      extmodulePulsesData.afhds2.init(INTERNAL_MODULE);
+/*      extmodulePulsesData.afhds2.init(INTERNAL_MODULE);*/
       extmoduleSerialStart();
       mixerSchedulerSetPeriod(INTERNAL_MODULE, 2 * 1000 /* us */);
       break;
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index dc1228e1c..38efa567f 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -483,7 +483,7 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode);
 void telemetryPortSetDirectionOutput();
 void telemetryPortSetDirectionInput();
 void sportSendBuffer(uint8_t * buffer, uint32_t count);
-bool telemetryGetByte(uint8_t * byte);
+uint8_t telemetryGetByte(uint8_t * byte);
 void telemetryClearFifo();
 void sportSendByte(uint8_t byte);
 extern uint32_t telemetryErrors;

From 9e044b6f97d6f6e3bb3a43b4e4c5bc050e310444 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Sun, 25 Jul 2021 21:15:20 +0800
Subject: [PATCH 32/45] Fixed NV14 build error.

---
 radio/src/pulses/pulses.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index db2480f9a..5d4df0b06 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -511,8 +511,8 @@ static void enablePulsesInternalModule(uint8_t protocol)
 
 #if defined(AFHDS2)
     case PROTOCOL_CHANNELS_AFHDS2A:
-/*      extmodulePulsesData.afhds2.init(INTERNAL_MODULE);*/
-      extmoduleSerialStart();
+/*      extmodulePulsesData.afhds2.init(INTERNAL_MODULE);
+      extmoduleSerialStart();*/
       mixerSchedulerSetPeriod(INTERNAL_MODULE, 2 * 1000 /* us */);
       break;
 #endif

From 0dc0d07b2792ca36078708eade0027c88c2c7eee Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Mon, 26 Jul 2021 22:28:57 +0800
Subject: [PATCH 33/45] Fixed simu build problem.

---
 radio/src/targets/simu/simpgmspace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index cb0757e78..a32bed11d 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -471,7 +471,7 @@ void sportSendByte(uint8_t byte)
 {
 }
 
-void sportSendBuffer(uint8_t * buffer, uint32_t count)
+void sportSendBuffer(const uint8_t * buffer, uint32_t count)
 {
 }
 

From 353996fab8457d1a364130b4d0bda1e3c4e3db35 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Mon, 26 Jul 2021 23:31:53 +0800
Subject: [PATCH 34/45] Updated failed images.

---
 radio/src/tests/primitives_CN_480x272.png   | Bin 9147 -> 9554 bytes
 radio/src/tests/transparency_CN_480x272.png | Bin 9228 -> 9582 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/radio/src/tests/primitives_CN_480x272.png b/radio/src/tests/primitives_CN_480x272.png
index b99ee6ff7ea7691da5924527958ff665ab5bfe65..94e283babd63e1e1d605c0c3061b5f44441e2414 100644
GIT binary patch
delta 6213
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

delta 5940
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
Ue|**5TEO@%iCh+OJRB|jKc2YotpET3

diff --git a/radio/src/tests/transparency_CN_480x272.png b/radio/src/tests/transparency_CN_480x272.png
index a6ee82449dfaf6e0943823681abd701adf67dcd9..f35e221306354dab630b78d740097b6caa9aac87 100644
GIT binary patch
delta 6685
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

delta 6364
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


From 6cd3ee557a5f5d2eb007ab34a3754c31e595baef Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 01:44:39 +0800
Subject: [PATCH 35/45] Fixed simu build failure for NV14.

---
 radio/src/targets/nv14/board.h              | 2 +-
 radio/src/targets/nv14/telemetry_driver.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index 38efa567f..dc1228e1c 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -483,7 +483,7 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode);
 void telemetryPortSetDirectionOutput();
 void telemetryPortSetDirectionInput();
 void sportSendBuffer(uint8_t * buffer, uint32_t count);
-uint8_t telemetryGetByte(uint8_t * byte);
+bool telemetryGetByte(uint8_t * byte);
 void telemetryClearFifo();
 void sportSendByte(uint8_t byte);
 extern uint32_t telemetryErrors;
diff --git a/radio/src/targets/nv14/telemetry_driver.cpp b/radio/src/targets/nv14/telemetry_driver.cpp
index b8cce7e8b..3ad7bca4f 100644
--- a/radio/src/targets/nv14/telemetry_driver.cpp
+++ b/radio/src/targets/nv14/telemetry_driver.cpp
@@ -197,7 +197,7 @@ extern "C" void TELEMETRY_USART_IRQHandler(void)
 }
 
 // TODO we should have telemetry in an higher layer, functions above should move to a sport_driver.cpp
-uint8_t telemetryGetByte(uint8_t * byte)
+bool telemetryGetByte(uint8_t * byte)
 {
 #if defined(PCBX12S)
   if (telemetryFifoMode & TELEMETRY_SERIAL_WITHOUT_DMA)

From 86d787756e30f6f11fcd759b99ab6514b62cd3fe Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 02:03:47 +0800
Subject: [PATCH 36/45] Fixed NV14 firmware and simu build error.

---
 radio/src/targets/nv14/board.h              | 2 +-
 radio/src/targets/nv14/keys_driver.cpp      | 8 ++++----
 radio/src/targets/nv14/telemetry_driver.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index dc1228e1c..f27b02a9a 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -482,7 +482,7 @@ int32_t getVolume();
 void telemetryPortInit(uint32_t baudrate, uint8_t mode);
 void telemetryPortSetDirectionOutput();
 void telemetryPortSetDirectionInput();
-void sportSendBuffer(uint8_t * buffer, uint32_t count);
+void sportSendBuffer(const uint8_t * buffer, uint32_t count);
 bool telemetryGetByte(uint8_t * byte);
 void telemetryClearFifo();
 void sportSendByte(uint8_t byte);
diff --git a/radio/src/targets/nv14/keys_driver.cpp b/radio/src/targets/nv14/keys_driver.cpp
index 98512df67..3e4f530b3 100644
--- a/radio/src/targets/nv14/keys_driver.cpp
+++ b/radio/src/targets/nv14/keys_driver.cpp
@@ -24,9 +24,9 @@ uint32_t readKeys()
 {
   uint32_t result = 0;
   bool getKeys = true;
-#if defined(LUA)
+/*#if defined(LUA)
   getKeys = (luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT);
-#endif
+#endif*/  //TODO: not sure why has LUA condition here, this construct is not in horus target
   if (getKeys) {
     if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
        result |= 1 << KEY_PGDN;
@@ -57,11 +57,11 @@ uint32_t readTrims()
 {
   uint32_t result = 0;
   bool getTrim = true;
-#if defined(LUA)
+/*#if defined(LUA)
   if(luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT) {
     getTrim = false;
   }
-#endif
+#endif*/  //TODO: not sure why has LUA condition here, this construct is not in horus target
   if(!getTrim) return result;
   if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
     result |= 1 << (TRM_LH_DWN - TRM_BASE);
diff --git a/radio/src/targets/nv14/telemetry_driver.cpp b/radio/src/targets/nv14/telemetry_driver.cpp
index 3ad7bca4f..adf82c752 100644
--- a/radio/src/targets/nv14/telemetry_driver.cpp
+++ b/radio/src/targets/nv14/telemetry_driver.cpp
@@ -117,7 +117,7 @@ void sportSendByte(uint8_t byte)
   USART_SendData(TELEMETRY_USART, byte);
 }
 
-void sportSendBuffer(uint8_t * buffer, uint32_t count)
+void sportSendBuffer(const uint8_t * buffer, uint32_t count)
 {
   telemetryPortSetDirectionOutput();
 

From fc3fe63a2c60ff082124a74033d0e1f37af43c26 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 02:16:44 +0800
Subject: [PATCH 37/45] Added NV14 in workflow action.

---
 .github/workflows/actions.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index a951d29b3..9c017603d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -26,6 +26,7 @@ jobs:
     strategy:
       matrix:
         target:
+          - NV14
           - T12
           - T16
           - T18

From 15e19a52c4faf52c6fe6d354404b214d8bcd0cb1 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 08:29:25 +0800
Subject: [PATCH 38/45] Updated new definitions about RAM BACKUP.

---
 radio/src/targets/nv14/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index be14ca93d..d7b12236b 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
   set(LINKER_SCRIPT targets/nv14/stm32f4_flash.ld)
 endif()
 
-set(RAMBACKUP YES)
+set(RTC_BACKUP_RAM YES)
 set(PPM_LIMITS_SYMETRICAL YES)
 # for size report script
 set(CPU_TYPE_FULL STM32F429xI)

From 7700df705c3009b3d88fc7d387e9534d5e19a1ac Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 27 Jul 2021 08:09:04 +0200
Subject: [PATCH 39/45] Removed useless "powerupReason"

---
 radio/src/targets/nv14/board.h        | 62 +++++++++++++++++----------
 radio/src/targets/nv14/pwr_driver.cpp |  5 ---
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index f27b02a9a..186856ab0 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -238,13 +238,6 @@ enum EnumSwitchesPositions
 };
 
 #define STORAGE_NUM_SWITCHES_POSITIONS  (STORAGE_NUM_SWITCHES * 3)
-enum EnumPowerupState
-{
-  BOARD_POWER_OFF = 0xCAFEDEAD,
-  BOARD_POWER_ON = 0xDEADBEEF,
-  BOARD_STARTED = 0xBAADF00D,
-  BOARD_REBOOT = 0xC00010FF,
-};
 
 void monitorInit();
 void keysInit();
@@ -261,15 +254,6 @@ uint32_t readTrims();
 #define DBLKEYS_PRESSED_RGT_UP(in)      (false)
 #define DBLKEYS_PRESSED_LFT_DWN(in)     (false)
 
-// WDT driver
-extern uint32_t powerupReason;
-extern uint32_t boardState;
-
-#define SHUTDOWN_REQUEST                0xDEADBEEF
-#define NO_SHUTDOWN_REQUEST             ~SHUTDOWN_REQUEST
-#define DIRTY_SHUTDOWN                  0xCAFEDEAD
-#define NORMAL_POWER_OFF                ~DIRTY_SHUTDOWN
-
 #define WDG_DURATION                              500 /*ms*/
 void watchdogInit(unsigned int duration);
 #if defined(SIMU)
@@ -361,6 +345,45 @@ uint16_t getBatteryVoltage();   // returns current battery voltage in 10mV steps
 #define BATTERY_MIN                   35 // 3.5V
 #define BATTERY_MAX                   42 // 4.2V
 
+enum EnumPowerupState
+{
+  BOARD_POWER_OFF = 0xCAFEDEAD,
+  BOARD_POWER_ON = 0xDEADBEEF,
+  BOARD_STARTED = 0xBAADF00D,
+  BOARD_REBOOT = 0xC00010FF,
+};
+
+extern uint32_t boardState;
+
+#if defined(__cplusplus)
+enum PowerReason {
+  SHUTDOWN_REQUEST = 0xDEADBEEF,
+  SOFTRESET_REQUEST = 0xCAFEDEAD,
+};
+
+constexpr uint32_t POWER_REASON_SIGNATURE = 0x0178746F;
+
+inline bool UNEXPECTED_SHUTDOWN()
+{
+#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
+  return false;
+#else
+  if (WAS_RESET_BY_WATCHDOG())
+    return true;
+  else if (WAS_RESET_BY_SOFTWARE())
+    return RTC->BKP0R != SOFTRESET_REQUEST;
+  else
+    return RTC->BKP1R == POWER_REASON_SIGNATURE && RTC->BKP0R != SHUTDOWN_REQUEST;
+#endif
+}
+
+inline void SET_POWER_REASON(uint32_t value)
+{
+  RTC->BKP0R = value;
+  RTC->BKP1R = POWER_REASON_SIGNATURE;
+}
+#endif
+
 #if defined(__cplusplus) && !defined(SIMU)
 extern "C" {
 #endif
@@ -384,12 +407,7 @@ bool pwrPressed();
   #define pwrForcePressed() false
 #endif
 uint32_t pwrPressedDuration();;
-#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
-  #define UNEXPECTED_SHUTDOWN()         (false)
-#else
-  #define UNEXPECTED_SHUTDOWN()        (powerupReason == DIRTY_SHUTDOWN)
-#endif
-
+  
 #define AUX_SERIAL_POWER_ON()
 #define AUX_SERIAL_POWER_OFF()
 
diff --git a/radio/src/targets/nv14/pwr_driver.cpp b/radio/src/targets/nv14/pwr_driver.cpp
index 65f653b39..16c447ff3 100644
--- a/radio/src/targets/nv14/pwr_driver.cpp
+++ b/radio/src/targets/nv14/pwr_driver.cpp
@@ -21,7 +21,6 @@
 #include "pwr.h"
 #include "board.h"
 
-uint32_t powerupReason __NOINIT;   // Stores power up reason beyond initialization for emergency mode activation
 uint32_t boardState __NOINIT;
 
 void pwrInit()
@@ -89,10 +88,6 @@ bool pwrPressed()
 void pwrResetHandler()
 {
   if (boardState != BOARD_POWER_OFF) {
-    powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? DIRTY_SHUTDOWN : ~DIRTY_SHUTDOWN;
     RCC->CSR |= RCC_CSR_RMVF; //clear all flags
   }
-  else {
-    powerupReason = ~DIRTY_SHUTDOWN;
-  }
 }

From 67bf2a4e2b4a2a83d468f1fa130257e470d6fb27 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 14:16:06 +0800
Subject: [PATCH 40/45] NV14 fixed firmware and simu build.

---
 radio/src/targets/nv14/CMakeLists.txt |  5 ++--
 radio/src/targets/nv14/board.h        | 43 ++++++++++++++++++++++-----
 radio/src/targets/nv14/pwr_driver.cpp |  4 +--
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index d7b12236b..461c9e63f 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -68,7 +68,7 @@ set(FIRMWARE_TARGET_SRC
 set(BITMAPS_TARGET nv14_bitmaps)
 set(FONTS_TARGET x12_fonts)
 set(LCD_DRIVER lcd_driver.cpp)
-set(LUA_EXPORT lua_export_x10)
+set(LUA_EXPORT lua_export_nv14)
 set(TOUCH_DRIVER touch_driver.cpp)
 set(HARDWARE_TOUCH YES)
 
@@ -77,6 +77,8 @@ set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${BITMAPS_TARGET} truetype_fonts)
 set(HARDWARE_TOUCH ON)
 set(SOFTWARE_KEYBOARD ON)
 
+set(FIRMWARE_DEPENDENCIES datacopy)
+
 add_definitions(-DSTM32F429_439xx -DSDRAM -DCOLORLCD -DLIBOPENUI -DHARDWARE_TOUCH -DSOFTWARE_KEYBOARD)
 add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
 add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
@@ -212,4 +214,3 @@ if(PYTHONINTERP_FOUND)
     )
 endif()
 
-set(LUA_EXPORT lua_export_nv14)
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index f27b02a9a..fc02cfcee 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -21,10 +21,10 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
-#include "../definitions.h"
-#include "../opentx_constants.h"
-#include "hal.h"
+#include "definitions.h"
+#include "opentx_constants.h"
 #include "board_common.h"
+#include "hal.h"
 
 #if !defined(LUA_EXPORT_GENERATION)
 #include "stm32f4xx_sdio.h"
@@ -265,10 +265,10 @@ uint32_t readTrims();
 extern uint32_t powerupReason;
 extern uint32_t boardState;
 
-#define SHUTDOWN_REQUEST                0xDEADBEEF
+/*#define SHUTDOWN_REQUEST                0xDEADBEEF
 #define NO_SHUTDOWN_REQUEST             ~SHUTDOWN_REQUEST
 #define DIRTY_SHUTDOWN                  0xCAFEDEAD
-#define NORMAL_POWER_OFF                ~DIRTY_SHUTDOWN
+#define NORMAL_POWER_OFF                ~DIRTY_SHUTDOWN*/
 
 #define WDG_DURATION                              500 /*ms*/
 void watchdogInit(unsigned int duration);
@@ -361,6 +361,35 @@ uint16_t getBatteryVoltage();   // returns current battery voltage in 10mV steps
 #define BATTERY_MIN                   35 // 3.5V
 #define BATTERY_MAX                   42 // 4.2V
 
+#if defined(__cplusplus)
+enum PowerReason {
+  SHUTDOWN_REQUEST = 0xDEADBEEF,
+  SOFTRESET_REQUEST = 0xCAFEDEAD,
+};
+
+constexpr uint32_t POWER_REASON_SIGNATURE = 0x0178746F;
+
+inline bool UNEXPECTED_SHUTDOWN()
+{
+#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
+  return false;
+#else
+  if (WAS_RESET_BY_WATCHDOG())
+    return true;
+  else if (WAS_RESET_BY_SOFTWARE())
+    return RTC->BKP0R != SOFTRESET_REQUEST;
+  else
+    return RTC->BKP1R == POWER_REASON_SIGNATURE && RTC->BKP0R != SHUTDOWN_REQUEST;
+#endif
+}
+
+inline void SET_POWER_REASON(uint32_t value)
+{
+  RTC->BKP0R = value;
+  RTC->BKP1R = POWER_REASON_SIGNATURE;
+}
+#endif
+
 #if defined(__cplusplus) && !defined(SIMU)
 extern "C" {
 #endif
@@ -384,11 +413,11 @@ bool pwrPressed();
   #define pwrForcePressed() false
 #endif
 uint32_t pwrPressedDuration();;
-#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
+/*#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
   #define UNEXPECTED_SHUTDOWN()         (false)
 #else
   #define UNEXPECTED_SHUTDOWN()        (powerupReason == DIRTY_SHUTDOWN)
-#endif
+#endif*/
 
 #define AUX_SERIAL_POWER_ON()
 #define AUX_SERIAL_POWER_OFF()
diff --git a/radio/src/targets/nv14/pwr_driver.cpp b/radio/src/targets/nv14/pwr_driver.cpp
index 65f653b39..f042fb120 100644
--- a/radio/src/targets/nv14/pwr_driver.cpp
+++ b/radio/src/targets/nv14/pwr_driver.cpp
@@ -89,10 +89,10 @@ bool pwrPressed()
 void pwrResetHandler()
 {
   if (boardState != BOARD_POWER_OFF) {
-    powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? DIRTY_SHUTDOWN : ~DIRTY_SHUTDOWN;
+    powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? SOFTRESET_REQUEST : SHUTDOWN_REQUEST;
     RCC->CSR |= RCC_CSR_RMVF; //clear all flags
   }
   else {
-    powerupReason = ~DIRTY_SHUTDOWN;
+    powerupReason = SHUTDOWN_REQUEST;
   }
 }

From 4e112f690329b1c5acda09f598212fe0c66699f3 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 27 Jul 2021 08:37:40 +0200
Subject: [PATCH 41/45] Fixed datacopy dependency

---
 radio/src/targets/nv14/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index d7b12236b..fc0548b79 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -73,6 +73,7 @@ set(TOUCH_DRIVER touch_driver.cpp)
 set(HARDWARE_TOUCH YES)
 
 set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${BITMAPS_TARGET} truetype_fonts)
+set(FIRMWARE_DEPENDENCIES datacopy)
 
 set(HARDWARE_TOUCH ON)
 set(SOFTWARE_KEYBOARD ON)

From aede763f4cbb0ffbc1045f3c7a8cb25fb5865bd2 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 14:38:54 +0800
Subject: [PATCH 42/45] Merged remove useless powerup reason.

---
 radio/src/targets/nv14/board.h        | 33 +++++++++------------------
 radio/src/targets/nv14/pwr_driver.cpp |  5 ----
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index fc02cfcee..d4bc4e37c 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -238,13 +238,6 @@ enum EnumSwitchesPositions
 };
 
 #define STORAGE_NUM_SWITCHES_POSITIONS  (STORAGE_NUM_SWITCHES * 3)
-enum EnumPowerupState
-{
-  BOARD_POWER_OFF = 0xCAFEDEAD,
-  BOARD_POWER_ON = 0xDEADBEEF,
-  BOARD_STARTED = 0xBAADF00D,
-  BOARD_REBOOT = 0xC00010FF,
-};
 
 void monitorInit();
 void keysInit();
@@ -261,15 +254,6 @@ uint32_t readTrims();
 #define DBLKEYS_PRESSED_RGT_UP(in)      (false)
 #define DBLKEYS_PRESSED_LFT_DWN(in)     (false)
 
-// WDT driver
-extern uint32_t powerupReason;
-extern uint32_t boardState;
-
-/*#define SHUTDOWN_REQUEST                0xDEADBEEF
-#define NO_SHUTDOWN_REQUEST             ~SHUTDOWN_REQUEST
-#define DIRTY_SHUTDOWN                  0xCAFEDEAD
-#define NORMAL_POWER_OFF                ~DIRTY_SHUTDOWN*/
-
 #define WDG_DURATION                              500 /*ms*/
 void watchdogInit(unsigned int duration);
 #if defined(SIMU)
@@ -361,6 +345,16 @@ uint16_t getBatteryVoltage();   // returns current battery voltage in 10mV steps
 #define BATTERY_MIN                   35 // 3.5V
 #define BATTERY_MAX                   42 // 4.2V
 
+enum EnumPowerupState
+{
+  BOARD_POWER_OFF = 0xCAFEDEAD,
+  BOARD_POWER_ON = 0xDEADBEEF,
+  BOARD_STARTED = 0xBAADF00D,
+  BOARD_REBOOT = 0xC00010FF,
+};
+
+extern uint32_t boardState;
+
 #if defined(__cplusplus)
 enum PowerReason {
   SHUTDOWN_REQUEST = 0xDEADBEEF,
@@ -413,12 +407,7 @@ bool pwrPressed();
   #define pwrForcePressed() false
 #endif
 uint32_t pwrPressedDuration();;
-/*#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
-  #define UNEXPECTED_SHUTDOWN()         (false)
-#else
-  #define UNEXPECTED_SHUTDOWN()        (powerupReason == DIRTY_SHUTDOWN)
-#endif*/
-
+  
 #define AUX_SERIAL_POWER_ON()
 #define AUX_SERIAL_POWER_OFF()
 
diff --git a/radio/src/targets/nv14/pwr_driver.cpp b/radio/src/targets/nv14/pwr_driver.cpp
index f042fb120..16c447ff3 100644
--- a/radio/src/targets/nv14/pwr_driver.cpp
+++ b/radio/src/targets/nv14/pwr_driver.cpp
@@ -21,7 +21,6 @@
 #include "pwr.h"
 #include "board.h"
 
-uint32_t powerupReason __NOINIT;   // Stores power up reason beyond initialization for emergency mode activation
 uint32_t boardState __NOINIT;
 
 void pwrInit()
@@ -89,10 +88,6 @@ bool pwrPressed()
 void pwrResetHandler()
 {
   if (boardState != BOARD_POWER_OFF) {
-    powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? SOFTRESET_REQUEST : SHUTDOWN_REQUEST;
     RCC->CSR |= RCC_CSR_RMVF; //clear all flags
   }
-  else {
-    powerupReason = SHUTDOWN_REQUEST;
-  }
 }

From a752651cda085d18a486cef995985092db065457 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 15:15:46 +0800
Subject: [PATCH 43/45] Revert common adc driver changes for NV14.

---
 .../targets/common/arm/stm32/adc_driver.cpp   | 87 ++-----------------
 1 file changed, 9 insertions(+), 78 deletions(-)

diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp
index a70dced97..6a1214207 100644
--- a/radio/src/targets/common/arm/stm32/adc_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp
@@ -52,17 +52,6 @@
   const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1,  1,1,  1};
 #elif defined(PCBXLITE)
   const int8_t adcDirection[NUM_ANALOGS] = {1,-1,-1,1,  -1,1,  1,  1};
-#elif defined(PCBNV14)
-  const int8_t adcDirection[NUM_ANALOGS] = { 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/,
-                                              0 /*POT1*/, 0 /*POT2*/, 0 /*SWA*/, 0 /*SWB*/,
-                                              0 /*SWC*/,  -1 /*SWD*/, 0 /*SWE*/, -1 /*SWF*/,
-                                              0 /*SWH*/, 0 /*SWG*/,
-                                              0 /*TX_VOLTAGE*/ };
-  const uint8_t adcMapping[NUM_ANALOGS] = { 0 /*STICK1*/, 1 /*STICK2*/, 2 /*STICK3*/, 3 /*STICK4*/,
-                                              4 /*POT1*/, 5 /*POT2*/, 6 /*SWA*/, 13 /*SWB*/,
-                                              7 /*SWC*/,  14 /*SWD*/, 8 /*SWE*/, 9 /*SWF*/,
-                                              11/*SWH*/,  10/*SWG*/,
-                                              12 /*TX_VOLTAGE*/ };
 #endif
 
 #if NUM_PWMSTICKS > 0
@@ -72,10 +61,6 @@
   #define FIRST_ANALOG_ADC             0
   #define NUM_ANALOGS_ADC              11
   #define NUM_ANALOGS_ADC_EXT          (NUM_ANALOGS - NUM_ANALOGS_ADC)
-#elif defined(PCBNV14) && defined(FLYSKY_HALL_STICKS)
-  #define FIRST_ANALOG_ADC             4
-  #define NUM_ANALOGS_ADC              9
-  #define NUM_ANALOGS_ADC_SUB          2
 #else
   #define FIRST_ANALOG_ADC             0
   #define NUM_ANALOGS_ADC              NUM_ANALOGS
@@ -119,12 +104,6 @@ void adcInit()
   ADC_MAIN->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
   ADC_MAIN->SQR1 = (NUM_ANALOGS_ADC - 1) << 20; // bits 23:20 = number of conversions
 
-#if NUM_ANALOGS_ADC_SUB > 0
-  ADC_SUB->CR1 = ADC_CR1_SCAN;
-  ADC_SUB->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
-  ADC_SUB->SQR1 = (NUM_ANALOGS_ADC_SUB - 1) << 20; // bits 23:20 = number of conversions
-#endif
-	
 #if defined(PCBX10)
   if (STICKS_PWM_ENABLED()) {
     ADC_MAIN->SQR2 = (ADC_CHANNEL_SLIDER2 << 0) + (ADC_CHANNEL_BATT << 5);
@@ -158,27 +137,12 @@ void adcInit()
 #elif defined(PCBX9D) || defined(PCBX9DP)
   ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_Vbat << 20);
   ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25);
-#elif defined(PCBNV14)
-  #if !defined(FLYSKY_HALL_STICKS)
-  ADC_MAIN->SQR1 |= (ADC_CHANNEL_BATT <<0 );
-  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWA << 0) + (ADC_CHANNEL_SWC << 5) + (ADC_CHANNEL_SWE << 10) + (ADC_CHANNEL_SWF << 15) + (ADC_CHANNEL_SWG << 20) + (ADC_CHANNEL_SWH << 25); // conversions 7 and more
-  ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<20) + (ADC_CHANNEL_POT2<<25); // conversions 1 to 6
-  ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
-  #else
-  ADC_MAIN->SQR2 = (ADC_CHANNEL_SWG << 0) + (ADC_CHANNEL_SWH << 5) + (ADC_CHANNEL_BATT << 10); // conversions 7 and more
-  ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWC<<15) + (ADC_CHANNEL_SWE<<20) + (ADC_CHANNEL_SWF<<25); // conversions 1 to 6
-  ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
-  #endif
 #endif
 
   ADC_MAIN->SMPR1 = ADC_MAIN_SMPR1;
   ADC_MAIN->SMPR2 = ADC_MAIN_SMPR2;
 
-#if defined(PCBNV14)
-  ADC->CCR = 0;
-#else
   ADC->CCR = ADC_CCR_VBATE; // Enable vbat sensor
-#endif
 
   ADC_DMA_Stream->CR = DMA_SxCR_PL | ADC_DMA_SxCR_CHSEL | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC;
   ADC_DMA_Stream->PAR = CONVERT_PTR_UINT(&ADC_MAIN->DR);
@@ -186,19 +150,6 @@ void adcInit()
   ADC_DMA_Stream->NDTR = NUM_ANALOGS_ADC;
   ADC_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
 
-#if NUM_ANALOGS_ADC_SUB > 0
-  ADC_SUB->SMPR1 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24);
-  ADC_SUB->SMPR2 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24) + (ADC_SAMPTIME<<27);
-
-  ADC->CCR = 0;
-
-  ADC_SUB_DMA_Stream->CR = DMA_SxCR_PL | ADC_SUB_DMA_SxCR_CHSEL | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC;
-  ADC_SUB_DMA_Stream->PAR = CONVERT_PTR_UINT(&ADC_SUB->DR);
-  ADC_SUB_DMA_Stream->M0AR = CONVERT_PTR_UINT(&adcValues[SUB_ANALOG_POS]);
-  ADC_SUB_DMA_Stream->NDTR = NUM_ANALOGS_ADC_SUB;
-  ADC_SUB_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
-#endif
-	
 #if defined(PCBX10)
   ADC1->CR1 = ADC_CR1_SCAN;
   ADC1->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
@@ -240,14 +191,6 @@ void adcSingleRead()
   ADC_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA
   ADC_MAIN->CR2 |= (uint32_t)ADC_CR2_SWSTART;
 
-#if NUM_ANALOGS_ADC_SUB > 0
-  ADC_SUB_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
-  ADC_SUB->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR);
-  ADC_SUB_SET_DMA_FLAGS();
-  ADC_SUB_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA
-  ADC_SUB->CR2 |= (uint32_t) ADC_CR2_SWSTART;
-#endif
-	
 #if defined(PCBX10)
   ADC1->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR);
   ADC1->CR2 |= (uint32_t)ADC_CR2_SWSTART;
@@ -271,23 +214,11 @@ void adcSingleRead()
   ADC_EXT_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
 #else
   for (unsigned int i = 0; i < 10000; i++) {
-#if defined(PCBNV14)
-    if (ADC_TRANSFER_COMPLETE() && ADC_SUB_TRANSFER_COMPLETE())
-    {
+    if (ADC_TRANSFER_COMPLETE()) {
       break;
     }
-#else
-    if (ADC_TRANSFER_COMPLETE())
-		{
-      break;
-    }
-#endif
   }
   ADC_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
-#if defined(PCBNV14)
-  ADC_SUB_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
-#endif
-	
 #endif
 
 #if defined(PCBX10)
@@ -325,17 +256,17 @@ void adcRead()
 #endif
 }
 
+#if defined(PCBX10)
 uint16_t getRTCBatteryVoltage()
 {
-#if defined(PCBX10)
   return (rtcBatteryVoltage * 2 * ADC_VREF_PREC2) / 2048;
-#elif defined(PCBNV14)
-  #warning "TODO RTC voltage"
-  return 330;
-#else
-  return (getAnalogValue(TX_RTC_VOLTAGE) * ADC_VREF_PREC2) / 2048;
-#endif
 }
+#else
+uint16_t getRTCBatteryVoltage()
+{
+  return (getAnalogValue(TX_RTC_VOLTAGE) * ADC_VREF_PREC2) / 2048;
+}
+#endif
 
 #if !defined(SIMU)
 uint16_t getAnalogValue(uint8_t index)
@@ -346,7 +277,7 @@ uint16_t getAnalogValue(uint8_t index)
     // which produces ghost readings on these inputs.
     return 0;
   }
-#if defined(PCBX9E) || defined(PCBNV14)
+#if defined(PCBX9E)
   index = adcMapping[index];
 #endif
   if (adcDirection[index] < 0)

From c4b9c26fcc2232d369f56d25282bb7234da03ab1 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 15:16:27 +0800
Subject: [PATCH 44/45] Added NV14 specific definitions.

---
 radio/src/opentx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 42827f98e..0bb88ac0f 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -538,11 +538,11 @@ void checkBacklight()
         resetBacklightTimeout();
       }
     }
-    #if defined(HARDWARE_TOUCH)
+#if defined(HARDWARE_TOUCH) && defined(PCBNV14)
     if (touchPanelEventOccured() && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
       resetBacklightTimeout();
     }
-    #endif
+#endif
 
     if (requiredBacklightBright == BACKLIGHT_FORCED_ON) {
       currentBacklightBright = g_eeGeneral.backlightBright;

From afe6245ae81dbc8cc0957cf250dba512073997d9 Mon Sep 17 00:00:00 2001
From: Richard Li <richard.li@ces.hk>
Date: Tue, 27 Jul 2021 15:25:53 +0800
Subject: [PATCH 45/45] Updated extmodule change to only specific to NV14 and
 will not affect other radios.

---
 radio/src/targets/horus/extmodule_driver.cpp | 7 +++++--
 tools/build-flysky.py                        | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/radio/src/targets/horus/extmodule_driver.cpp b/radio/src/targets/horus/extmodule_driver.cpp
index 3f963a4bc..ce7c0e98e 100644
--- a/radio/src/targets/horus/extmodule_driver.cpp
+++ b/radio/src/targets/horus/extmodule_driver.cpp
@@ -167,8 +167,11 @@ void extmoduleSerialStart()
   EXTMODULE_TIMER->EGR = 1; // Restart
   EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_0;
 #else
-//  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (inverted ? 0 : TIM_CCER_CC1P);
-  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P;  // Inverted should be false here?
+#if defined(PCBNV14)
+  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P;  // inverted breaks NV14 build, inverted should be false here?
+#else
+  EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (inverted ? 0 : TIM_CCER_CC1P);
+#endif
   EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
   EXTMODULE_TIMER->CCR1 = 0;
   EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high
diff --git a/tools/build-flysky.py b/tools/build-flysky.py
index c36e6c25a..0ac9936b2 100644
--- a/tools/build-flysky.py
+++ b/tools/build-flysky.py
@@ -35,6 +35,8 @@ def build(board, translation, srcdir):
     print(command)
     os.system(command)
     os.system("make firmware -j16")
+    os.system("make simu -j16")
+    os.system("make tests-radio -j16")
     os.chdir(cwd)
     index = 0
     while 1: