diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
old mode 100644
new mode 100755
index d9f852255..1ad36385b
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -331,6 +331,8 @@ elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPRO)
   set(FLAVOUR tpro)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TX12)
   set(FLAVOUR tx12)
+elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TX12MK2)
+  set(FLAVOUR tx12mk2)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL ZORRO)
   set(FLAVOUR zorro)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T8)
diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
old mode 100644
new mode 100755
diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
old mode 100644
new mode 100755
index 22a2a09fd..37665ac7b
--- a/radio/src/datastructs_private.h
+++ b/radio/src/datastructs_private.h
@@ -810,7 +810,7 @@ PACK(struct TrainerData {
 #if defined(BUZZER)
   #define BUZZER_FIELD int8_t buzzerMode:2    // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
 #else
-  #define BUZZER_FIELD int8_t spare1:2 SKIP
+  #define BUZZER_FIELD int8_t spare4:2 SKIP
 #endif
 
 PACK(struct RadioData {
diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp
old mode 100644
new mode 100755
index 622c73e08..48ef88dec
--- a/radio/src/gui/common/stdlcd/radio_hardware.cpp
+++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp
@@ -214,6 +214,8 @@ enum {
 #elif defined(RADIO_TX12)
   #define SWITCH_TYPE_MAX(sw)            (((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw) || \
                                            (MIXSRC_SI - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SJ - MIXSRC_FIRST_SWITCH == sw)) ? SWITCH_2POS : SWITCH_3POS)
+#elif defined(RADIO_TX12MK2)
+  #define SWITCH_TYPE_MAX(sw)            (((MIXSRC_SA - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD - MIXSRC_FIRST_SWITCH == sw)) ? SWITCH_2POS : SWITCH_3POS)
 #elif defined(RADIO_T12)
   #define SWITCH_TYPE_MAX(sw)            ((MIXSRC_SG - MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH - MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
 #else
diff --git a/radio/src/hal/adc_driver.cpp b/radio/src/hal/adc_driver.cpp
index 4c9152d33..2212b4db7 100644
--- a/radio/src/hal/adc_driver.cpp
+++ b/radio/src/hal/adc_driver.cpp
@@ -57,6 +57,8 @@ const etx_hal_adc_driver_t* etx_hal_adc_driver = nullptr;
   const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1,  1,1,0,   1,1,  1,  1};
 #elif defined(RADIO_TX12)
   const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1,  -1,-1,  1,  1};
+#elif defined(RADIO_TX12MK2)
+  const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1,  1,-1};
 #elif defined(RADIO_ZORRO)
   const int8_t adcDirection[NUM_ANALOGS] = {-1, 1, 1, -1, -1, 1, 1, 1};
 #elif defined(RADIO_TPRO)
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
old mode 100644
new mode 100755
index 3a33faf3b..61dbba2d7
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -32,6 +32,7 @@ if(PYTHONINTERP_FOUND)
   add_lua_export_target(tlite     ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TLITE)
   add_lua_export_target(tpro      ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TPRO)
   add_lua_export_target(tx12      ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12)
+  add_lua_export_target(tx12mk2   ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_TX12MK2)
   add_lua_export_target(zorro     ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_ZORRO)
   add_lua_export_target(t8        ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T8)
   add_lua_export_target(t16       ${LUA_INCLUDES} -DPCBHORUS   -DPCBX10 -DRADIO_T16)
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index a2a049f7e..ffac2cc37 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -55,6 +55,8 @@
   #include "lua/lua_exports_tpro.inc"
 #elif defined(RADIO_TX12)
   #include "lua/lua_exports_tx12.inc"
+#elif defined(RADIO_TX12MK2)
+  #include "lua/lua_exports_tx12mk2.inc"
 #elif defined(RADIO_ZORRO)
   #include "lua/lua_exports_zorro.inc"
 #elif defined(RADIO_T8)
@@ -2706,7 +2708,7 @@ const luaR_value_entry opentxConstants[] = {
   { "EVT_VIRTUAL_ENTER_LONG", EVT_KEY_LONG(KEY_ENTER) },
   { "EVT_VIRTUAL_EXIT", EVT_KEY_BREAK(KEY_EXIT) },
 #elif defined(NAVIGATION_X7) || defined(NAVIGATION_X9D)
-#if defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_T8)
   { "EVT_VIRTUAL_PREV_PAGE", EVT_KEY_BREAK(KEY_PAGEUP) },
   { "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PAGEDN) },
   { "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_MODEL) },
diff --git a/radio/src/options.h b/radio/src/options.h
index a1346ba8c..658ddd6b9 100644
--- a/radio/src/options.h
+++ b/radio/src/options.h
@@ -106,6 +106,7 @@ static const char * const options[] = {
 #endif
 #if defined(ENABLE_SERIAL_PASSTHROUGH)
     "passthrough",
+    "cli",
 #endif
   nullptr //sentinel
 };
diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h
old mode 100644
new mode 100755
index 90f505a32..857826457
--- a/radio/src/sdcard.h
+++ b/radio/src/sdcard.h
@@ -158,6 +158,8 @@ const char * getBasename(const char * path);
   #define ETX_FOURCC 0x4678746F // etx for Jumper TPro
 #elif defined(RADIO_TX12)
   #define ETX_FOURCC 0x4178746F // etx for Radiomaster TX12
+#elif defined(RADIO_TX12MK2)
+  #define ETX_FOURCC 0x4878746F // etx for Radiomaster TX12MK2
 #elif defined(RADIO_ZORRO)
   #define ETX_FOURCC 0x4778746F // otx for Radiomaster Zorro
 #elif defined(RADIO_T8)
diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
old mode 100644
new mode 100755
index e64e38f66..eb3bbf0de
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -360,7 +360,7 @@ void OpenTxSim::updateKeysAndSwitches(bool start)
     KEY_Left,      KEY_LEFT,
     KEY_Up,        KEY_UP,
     KEY_Down,      KEY_DOWN,
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
     KEY_Page_Up,   KEY_PAGEUP,
     KEY_Page_Down, KEY_PAGEDN,
     KEY_Return,    KEY_ENTER,
diff --git a/radio/src/storage/conversions/CMakeLists.txt b/radio/src/storage/conversions/CMakeLists.txt
index 75ec49ad2..43ceb040e 100644
--- a/radio/src/storage/conversions/CMakeLists.txt
+++ b/radio/src/storage/conversions/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(STORAGE_CONVERSIONS 219)
 
 if(PCB STREQUAL X7)
-  if(PCBREV STREQUAL ZORRO OR PCBREV STREQUAL TPRO)
+  if(PCBREV STREQUAL ZORRO OR PCBREV STREQUAL TPRO OR PCBREV STREQUAL TX12MK2)
     set(STORAGE_CONVERSIONS 221)
   endif()
 endif()
diff --git a/radio/src/storage/conversions/yaml/dataconstants_220.h b/radio/src/storage/conversions/yaml/dataconstants_220.h
index 9f39d318e..1ba5ca3c4 100644
--- a/radio/src/storage/conversions/yaml/dataconstants_220.h
+++ b/radio/src/storage/conversions/yaml/dataconstants_220.h
@@ -96,7 +96,7 @@
 #define STORAGE_NUM_SWITCHES 6
 #elif defined(RADIO_TPRO)
 #define STORAGE_NUM_SWITCHES 10
-#elif defined(RADIO_TLITE) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_T8) || defined(PCBX7ACCESS) || defined(PCBX7)
+#elif defined(RADIO_TLITE) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_T8) || defined(PCBX7ACCESS) || defined(PCBX7)
 #define STORAGE_NUM_SWITCHES 8
 #elif defined(PCBX9LITES)
 #define STORAGE_NUM_SWITCHES 7
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs.cpp
old mode 100644
new mode 100755
index b08159c71..0651ad781
--- a/radio/src/storage/conversions/yaml/yaml_datastructs.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs.cpp
@@ -52,6 +52,8 @@ namespace yaml_conv_220 {
   #include "yaml_datastructs_tlite.cpp"
  #elif defined(RADIO_TX12)
   #include "yaml_datastructs_tx12.cpp"
+#elif defined(RADIO_TX12MK2)
+  #include "yaml_datastructs_tx12mk2.cpp"
  #elif defined(RADIO_ZORRO)
   #include "yaml_datastructs_zorro.cpp"
  #elif defined(RADIO_T8)
diff --git a/radio/src/storage/yaml/CMakeLists.txt b/radio/src/storage/yaml/CMakeLists.txt
index f86ad7d7c..1fb0cbbed 100644
--- a/radio/src/storage/yaml/CMakeLists.txt
+++ b/radio/src/storage/yaml/CMakeLists.txt
@@ -25,6 +25,8 @@ elseif(PCB STREQUAL X7)
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tlite.cpp)
   elseif(PCBREV STREQUAL TX12)
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tx12.cpp)
+  elseif(PCBREV STREQUAL TX12MK2)
+    set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tx12mk2.cpp)
   elseif(PCBREV STREQUAL ZORRO)
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_zorro.cpp)
   elseif(PCBREV STREQUAL T8)
diff --git a/radio/src/storage/yaml/yaml_datastructs.cpp b/radio/src/storage/yaml/yaml_datastructs.cpp
old mode 100644
new mode 100755
index 7a0229b7a..f13b32b33
--- a/radio/src/storage/yaml/yaml_datastructs.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs.cpp
@@ -40,6 +40,8 @@
   #include "yaml_datastructs_tlite.cpp"
  #elif defined(RADIO_TX12)
   #include "yaml_datastructs_tx12.cpp"
+ #elif defined(RADIO_TX12MK2)
+  #include "yaml_datastructs_tx12mk2.cpp"
  #elif defined(RADIO_ZORRO)
   #include "yaml_datastructs_zorro.cpp"
  #elif defined(RADIO_T8)
diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
new file mode 100755
index 000000000..878f839da
--- /dev/null
+++ b/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
@@ -0,0 +1,877 @@
+// generated by generate_yaml.py
+
+//
+// Enums first
+//
+
+const struct YamlIdStr enum_BacklightMode[] = {
+  {  e_backlight_mode_off, "backlight_mode_off"  },
+  {  e_backlight_mode_keys, "backlight_mode_keys"  },
+  {  e_backlight_mode_sticks, "backlight_mode_sticks"  },
+  {  e_backlight_mode_all, "backlight_mode_all"  },
+  {  e_backlight_mode_on, "backlight_mode_on"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_AntennaModes[] = {
+  {  ANTENNA_MODE_INTERNAL, "MODE_INTERNAL"  },
+  {  ANTENNA_MODE_ASK, "MODE_ASK"  },
+  {  ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL"  },
+  {  ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_ModuleType[] = {
+  {  MODULE_TYPE_NONE, "TYPE_NONE"  },
+  {  MODULE_TYPE_PPM, "TYPE_PPM"  },
+  {  MODULE_TYPE_XJT_PXX1, "TYPE_XJT_PXX1"  },
+  {  MODULE_TYPE_ISRM_PXX2, "TYPE_ISRM_PXX2"  },
+  {  MODULE_TYPE_DSM2, "TYPE_DSM2"  },
+  {  MODULE_TYPE_CROSSFIRE, "TYPE_CROSSFIRE"  },
+  {  MODULE_TYPE_MULTIMODULE, "TYPE_MULTIMODULE"  },
+  {  MODULE_TYPE_R9M_PXX1, "TYPE_R9M_PXX1"  },
+  {  MODULE_TYPE_R9M_PXX2, "TYPE_R9M_PXX2"  },
+  {  MODULE_TYPE_R9M_LITE_PXX1, "TYPE_R9M_LITE_PXX1"  },
+  {  MODULE_TYPE_R9M_LITE_PXX2, "TYPE_R9M_LITE_PXX2"  },
+  {  MODULE_TYPE_GHOST, "TYPE_GHOST"  },
+  {  MODULE_TYPE_R9M_LITE_PRO_PXX2, "TYPE_R9M_LITE_PRO_PXX2"  },
+  {  MODULE_TYPE_SBUS, "TYPE_SBUS"  },
+  {  MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2"  },
+  {  MODULE_TYPE_FLYSKY, "TYPE_FLYSKY"  },
+  {  MODULE_TYPE_LEMON_DSMP, "TYPE_LEMON_DSMP"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_TrainerMultiplex[] = {
+  {  TRAINER_OFF, "OFF"  },
+  {  TRAINER_ADD, "ADD"  },
+  {  TRAINER_REPL, "REPL"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_BeeperMode[] = {
+  {  e_mode_quiet, "mode_quiet"  },
+  {  e_mode_alarms, "mode_alarms"  },
+  {  e_mode_nokeys, "mode_nokeys"  },
+  {  e_mode_all, "mode_all"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_BluetoothModes[] = {
+  {  BLUETOOTH_OFF, "OFF"  },
+  {  BLUETOOTH_TELEMETRY, "TELEMETRY"  },
+  {  BLUETOOTH_TRAINER, "TRAINER"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_Functions[] = {
+  {  FUNC_OVERRIDE_CHANNEL, "OVERRIDE_CHANNEL"  },
+  {  FUNC_TRAINER, "TRAINER"  },
+  {  FUNC_INSTANT_TRIM, "INSTANT_TRIM"  },
+  {  FUNC_RESET, "RESET"  },
+  {  FUNC_SET_TIMER, "SET_TIMER"  },
+  {  FUNC_ADJUST_GVAR, "ADJUST_GVAR"  },
+  {  FUNC_VOLUME, "VOLUME"  },
+  {  FUNC_SET_FAILSAFE, "SET_FAILSAFE"  },
+  {  FUNC_RANGECHECK, "RANGECHECK"  },
+  {  FUNC_BIND, "BIND"  },
+  {  FUNC_PLAY_SOUND, "PLAY_SOUND"  },
+  {  FUNC_PLAY_TRACK, "PLAY_TRACK"  },
+  {  FUNC_PLAY_VALUE, "PLAY_VALUE"  },
+  {  FUNC_RESERVE4, "RESERVE4"  },
+  {  FUNC_PLAY_SCRIPT, "PLAY_SCRIPT"  },
+  {  FUNC_RESERVE5, "RESERVE5"  },
+  {  FUNC_BACKGND_MUSIC, "BACKGND_MUSIC"  },
+  {  FUNC_BACKGND_MUSIC_PAUSE, "BACKGND_MUSIC_PAUSE"  },
+  {  FUNC_VARIO, "VARIO"  },
+  {  FUNC_HAPTIC, "HAPTIC"  },
+  {  FUNC_LOGS, "LOGS"  },
+  {  FUNC_BACKLIGHT, "BACKLIGHT"  },
+  {  FUNC_SCREENSHOT, "SCREENSHOT"  },
+  {  FUNC_RACING_MODE, "RACING_MODE"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_TimerModes[] = {
+  {  TMRMODE_OFF, "OFF"  },
+  {  TMRMODE_ON, "ON"  },
+  {  TMRMODE_START, "START"  },
+  {  TMRMODE_THR, "THR"  },
+  {  TMRMODE_THR_REL, "THR_REL"  },
+  {  TMRMODE_THR_START, "THR_START"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_MixerMultiplex[] = {
+  {  MLTPX_ADD, "ADD"  },
+  {  MLTPX_MUL, "MUL"  },
+  {  MLTPX_REPL, "REPL"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_MixSources[] = {
+  {  MIXSRC_NONE, "NONE"  },
+  {  MIXSRC_Rud, "Rud"  },
+  {  MIXSRC_Ele, "Ele"  },
+  {  MIXSRC_Thr, "Thr"  },
+  {  MIXSRC_Ail, "Ail"  },
+  {  MIXSRC_POT1, "POT1"  },
+  {  MIXSRC_POT2, "POT2"  },
+  {  MIXSRC_MAX, "MAX"  },
+  {  MIXSRC_CYC1, "CYC1"  },
+  {  MIXSRC_CYC2, "CYC2"  },
+  {  MIXSRC_CYC3, "CYC3"  },
+  {  MIXSRC_TrimRud, "TrimRud"  },
+  {  MIXSRC_TrimEle, "TrimEle"  },
+  {  MIXSRC_TrimThr, "TrimThr"  },
+  {  MIXSRC_TrimAil, "TrimAil"  },
+  {  MIXSRC_SA, "SA"  },
+  {  MIXSRC_SB, "SB"  },
+  {  MIXSRC_SC, "SC"  },
+  {  MIXSRC_SD, "SD"  },
+  {  MIXSRC_SE, "SE"  },
+  {  MIXSRC_SF, "SF"  },
+  {  MIXSRC_SW1, "SW1"  },
+  {  MIXSRC_CH1, "CH1"  },
+  {  MIXSRC_CH2, "CH2"  },
+  {  MIXSRC_CH3, "CH3"  },
+  {  MIXSRC_CH4, "CH4"  },
+  {  MIXSRC_CH5, "CH5"  },
+  {  MIXSRC_CH6, "CH6"  },
+  {  MIXSRC_CH7, "CH7"  },
+  {  MIXSRC_CH8, "CH8"  },
+  {  MIXSRC_CH9, "CH9"  },
+  {  MIXSRC_CH10, "CH10"  },
+  {  MIXSRC_CH11, "CH11"  },
+  {  MIXSRC_CH12, "CH12"  },
+  {  MIXSRC_CH13, "CH13"  },
+  {  MIXSRC_CH14, "CH14"  },
+  {  MIXSRC_CH15, "CH15"  },
+  {  MIXSRC_CH16, "CH16"  },
+  {  MIXSRC_GVAR1, "GVAR1"  },
+  {  MIXSRC_TX_VOLTAGE, "TX_VOLTAGE"  },
+  {  MIXSRC_TX_TIME, "TX_TIME"  },
+  {  MIXSRC_TX_GPS, "TX_GPS"  },
+  {  MIXSRC_TIMER1, "TIMER1"  },
+  {  MIXSRC_TIMER2, "TIMER2"  },
+  {  MIXSRC_TIMER3, "TIMER3"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_LogicalSwitchesFunctions[] = {
+  {  LS_FUNC_NONE, "FUNC_NONE"  },
+  {  LS_FUNC_VEQUAL, "FUNC_VEQUAL"  },
+  {  LS_FUNC_VALMOSTEQUAL, "FUNC_VALMOSTEQUAL"  },
+  {  LS_FUNC_VPOS, "FUNC_VPOS"  },
+  {  LS_FUNC_VNEG, "FUNC_VNEG"  },
+  {  LS_FUNC_RANGE, "FUNC_RANGE"  },
+  {  LS_FUNC_APOS, "FUNC_APOS"  },
+  {  LS_FUNC_ANEG, "FUNC_ANEG"  },
+  {  LS_FUNC_AND, "FUNC_AND"  },
+  {  LS_FUNC_OR, "FUNC_OR"  },
+  {  LS_FUNC_XOR, "FUNC_XOR"  },
+  {  LS_FUNC_EDGE, "FUNC_EDGE"  },
+  {  LS_FUNC_EQUAL, "FUNC_EQUAL"  },
+  {  LS_FUNC_GREATER, "FUNC_GREATER"  },
+  {  LS_FUNC_LESS, "FUNC_LESS"  },
+  {  LS_FUNC_DIFFEGREATER, "FUNC_DIFFEGREATER"  },
+  {  LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER"  },
+  {  LS_FUNC_TIMER, "FUNC_TIMER"  },
+  {  LS_FUNC_STICKY, "FUNC_STICKY"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_SwashType[] = {
+  {  SWASH_TYPE_NONE, "TYPE_NONE"  },
+  {  SWASH_TYPE_120, "TYPE_120"  },
+  {  SWASH_TYPE_120X, "TYPE_120X"  },
+  {  SWASH_TYPE_140, "TYPE_140"  },
+  {  SWASH_TYPE_90, "TYPE_90"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_SwitchSources[] = {
+  {  SWSRC_NONE, "NONE"  },
+  {  SWSRC_SA0, "SA0"  },
+  {  SWSRC_SA1, "SA1"  },
+  {  SWSRC_SA2, "SA2"  },
+  {  SWSRC_SB0, "SB0"  },
+  {  SWSRC_SB1, "SB1"  },
+  {  SWSRC_SB2, "SB2"  },
+  {  SWSRC_SC0, "SC0"  },
+  {  SWSRC_SC1, "SC1"  },
+  {  SWSRC_SC2, "SC2"  },
+  {  SWSRC_SD0, "SD0"  },
+  {  SWSRC_SD1, "SD1"  },
+  {  SWSRC_SD2, "SD2"  },
+  {  SWSRC_SE0, "SE0"  },
+  {  SWSRC_SE1, "SE1"  },
+  {  SWSRC_SE2, "SE2"  },
+  {  SWSRC_SF0, "SF0"  },
+  {  SWSRC_SF1, "SF1"  },
+  {  SWSRC_SF2, "SF2"  },
+  {  SWSRC_TrimRudLeft, "TrimRudLeft"  },
+  {  SWSRC_TrimRudRight, "TrimRudRight"  },
+  {  SWSRC_TrimEleDown, "TrimEleDown"  },
+  {  SWSRC_TrimEleUp, "TrimEleUp"  },
+  {  SWSRC_TrimThrDown, "TrimThrDown"  },
+  {  SWSRC_TrimThrUp, "TrimThrUp"  },
+  {  SWSRC_TrimAilLeft, "TrimAilLeft"  },
+  {  SWSRC_TrimAilRight, "TrimAilRight"  },
+  {  SWSRC_SW1, "SW1"  },
+  {  SWSRC_SW2, "SW2"  },
+  {  SWSRC_ON, "ON"  },
+  {  SWSRC_ONE, "ONE"  },
+  {  SWSRC_TELEMETRY_STREAMING, "TELEMETRY_STREAMING"  },
+  {  SWSRC_RADIO_ACTIVITY, "RADIO_ACTIVITY"  },
+  {  SWSRC_OFF, "OFF"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_PotsWarnMode[] = {
+  {  POTS_WARN_OFF, "WARN_OFF"  },
+  {  POTS_WARN_MANUAL, "WARN_MANUAL"  },
+  {  POTS_WARN_AUTO, "WARN_AUTO"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_ModelOverridableEnable[] = {
+  {  OVERRIDE_GLOBAL, "GLOBAL"  },
+  {  OVERRIDE_OFF, "OFF"  },
+  {  OVERRIDE_ON, "ON"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_FailsafeModes[] = {
+  {  FAILSAFE_NOT_SET, "NOT_SET"  },
+  {  FAILSAFE_HOLD, "HOLD"  },
+  {  FAILSAFE_CUSTOM, "CUSTOM"  },
+  {  FAILSAFE_NOPULSES, "NOPULSES"  },
+  {  FAILSAFE_RECEIVER, "RECEIVER"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_TelemetrySensorFormula[] = {
+  {  TELEM_FORMULA_ADD, "FORMULA_ADD"  },
+  {  TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE"  },
+  {  TELEM_FORMULA_MIN, "FORMULA_MIN"  },
+  {  TELEM_FORMULA_MAX, "FORMULA_MAX"  },
+  {  TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY"  },
+  {  TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE"  },
+  {  TELEM_FORMULA_CELL, "FORMULA_CELL"  },
+  {  TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION"  },
+  {  TELEM_FORMULA_DIST, "FORMULA_DIST"  },
+  {  0, NULL  }
+};
+const struct YamlIdStr enum_TelemetrySensorType[] = {
+  {  TELEM_TYPE_CUSTOM, "TYPE_CUSTOM"  },
+  {  TELEM_TYPE_CALCULATED, "TYPE_CALCULATED"  },
+  {  0, NULL  }
+};
+
+//
+// Structs last
+//
+
+static const struct YamlNode struct_CalibData[] = {
+  YAML_IDX_CUST("calib",r_calib,w_calib),
+  YAML_SIGNED( "mid", 16 ),
+  YAML_SIGNED( "spanNeg", 16 ),
+  YAML_SIGNED( "spanPos", 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_signed_16[] = {
+  YAML_IDX,
+  YAML_SIGNED( "val", 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_TrainerMix[] = {
+  YAML_IDX,
+  YAML_UNSIGNED( "srcChn", 6 ),
+  YAML_ENUM("mode", 2, enum_TrainerMultiplex),
+  YAML_SIGNED( "studWeight", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_TrainerData[] = {
+  YAML_ARRAY("calib", 16, 4, struct_signed_16, NULL),
+  YAML_ARRAY("mix", 16, 4, struct_TrainerMix, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_1[] = {
+  YAML_STRING("name", 6),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_2[] = {
+  YAML_SIGNED( "val", 16 ),
+  YAML_UNSIGNED( "mode", 8 ),
+  YAML_UNSIGNED( "param", 8 ),
+  YAML_SIGNED( "spare", 32 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_3[] = {
+  YAML_SIGNED( "val1", 32 ),
+  YAML_SIGNED( "val2", 32 ),
+  YAML_END
+};
+static const struct YamlNode union_anonymous_0_elmts[] = {
+  YAML_STRUCT("play", 48, struct_anonymous_1, NULL),
+  YAML_STRUCT("all", 64, struct_anonymous_2, NULL),
+  YAML_STRUCT("clear", 64, struct_anonymous_3, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_CustomFunctionData[] = {
+  YAML_IDX,
+  YAML_SIGNED_CUST( "swtch", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_ENUM("func", 7, enum_Functions),
+  YAML_CUSTOM("def",r_customFn,w_customFn),
+  YAML_PADDING( 64 ),
+  YAML_PADDING( 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_string_24[] = {
+  YAML_IDX,
+  YAML_STRING("val", 3),
+  YAML_END
+};
+static const struct YamlNode struct_RadioData[] = {
+  YAML_CUSTOM("semver",nullptr,w_semver),
+  YAML_CUSTOM("board",nullptr,w_board),
+  YAML_ARRAY("calib", 48, 6, struct_CalibData, NULL),
+  YAML_PADDING( 16 ),
+  YAML_SIGNED( "currModel", 8 ),
+  YAML_UNSIGNED( "contrast", 8 ),
+  YAML_UNSIGNED( "vBatWarn", 8 ),
+  YAML_SIGNED( "txVoltageCalibration", 8 ),
+  YAML_ENUM("backlightMode", 3, enum_BacklightMode),
+  YAML_ENUM("antennaMode", 2, enum_AntennaModes),
+  YAML_UNSIGNED( "disableRtcWarning", 1 ),
+  YAML_UNSIGNED( "keysBacklight", 1 ),
+  YAML_SIGNED( "rotEncDirection", 1 ),
+  YAML_ENUM("internalModule", 8, enum_ModuleType),
+  YAML_STRUCT("trainer", 128, struct_TrainerData, NULL),
+  YAML_UNSIGNED( "view", 8 ),
+  YAML_PADDING( 2 ),
+  YAML_UNSIGNED( "fai", 1 ),
+  YAML_SIGNED_CUST( "beepMode", 2, r_beeperMode, w_beeperMode ),
+  YAML_UNSIGNED( "alarmsFlash", 1 ),
+  YAML_UNSIGNED( "disableMemoryWarning", 1 ),
+  YAML_UNSIGNED( "disableAlarmWarning", 1 ),
+  YAML_UNSIGNED( "stickMode", 2 ),
+  YAML_SIGNED( "timezone", 5 ),
+  YAML_UNSIGNED( "adjustRTC", 1 ),
+  YAML_UNSIGNED( "inactivityTimer", 8 ),
+  YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
+  YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
+  YAML_SIGNED( "splashMode", 3 ),
+  YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
+  YAML_SIGNED( "switchesDelay", 8 ),
+  YAML_UNSIGNED( "lightAutoOff", 8 ),
+  YAML_UNSIGNED( "templateSetup", 8 ),
+  YAML_SIGNED( "PPM_Multiplier", 8 ),
+  YAML_SIGNED_CUST( "hapticLength", 8, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ),
+  YAML_UNSIGNED( "gpsFormat", 1 ),
+  YAML_PADDING( 1 ),
+  YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ),
+  YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ),
+  YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ),
+  YAML_SIGNED_CUST( "vBatMax", 8, r_vbat_max, w_vbat_max ),
+  YAML_UNSIGNED( "backlightBright", 8 ),
+  YAML_UNSIGNED( "globalTimer", 32 ),
+  YAML_UNSIGNED( "bluetoothBaudrate", 4 ),
+  YAML_ENUM("bluetoothMode", 4, enum_BluetoothModes),
+  YAML_UNSIGNED( "countryCode", 2 ),
+  YAML_SIGNED( "pwrOnSpeed", 3 ),
+  YAML_SIGNED( "pwrOffSpeed", 3 ),
+  YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr),
+  YAML_UNSIGNED( "noJitterFilter", 1 ),
+  YAML_UNSIGNED( "imperial", 1 ),
+  YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
+  YAML_UNSIGNED( "USBMode", 2 ),
+  YAML_UNSIGNED( "jackMode", 2 ),
+  YAML_PADDING( 1 ),
+  YAML_STRING("ttsLanguage", 2),
+  YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "backgroundVolume", 4, r_5pos, w_5pos ),
+  YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ),
+  YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ),
+  YAML_SIGNED( "varioRepeat", 8 ),
+  YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active),
+  YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr),
+  YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr),
+  YAML_ARRAY("serialPort", 4, 4, struct_serialConfig, nullptr),
+  YAML_ARRAY("slidersConfig", 1, 4, struct_sliderConfig, nullptr),
+  YAML_PADDING( 4 ),
+  YAML_ARRAY("potsConfig", 2, 4, struct_potConfig, nullptr),
+  YAML_UNSIGNED( "backlightColor", 8 ),
+  YAML_ARRAY("sticksConfig", 0, 4, struct_sticksConfig, stick_name_valid),
+  YAML_ARRAY("switchConfig", 2, 8, struct_switchConfig, nullptr),
+  YAML_PADDING( 192 ),
+  YAML_PADDING( 144 ),
+  YAML_PADDING( 8 ),
+  YAML_STRING("bluetoothName", 10),
+  YAML_STRING("ownerRegistrationID", 8),
+  YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
+  YAML_END
+};
+static const struct YamlNode struct_unsigned_8[] = {
+  YAML_IDX,
+  YAML_UNSIGNED( "val", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_ModelHeader[] = {
+  YAML_STRING("name", 10),
+  YAML_ARRAY("modelId", 8, 2, struct_unsigned_8, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_TimerData[] = {
+  YAML_IDX,
+  YAML_UNSIGNED( "start", 22 ),
+  YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
+  YAML_SIGNED( "value", 22 ),
+  YAML_ENUM("mode", 3, enum_TimerModes),
+  YAML_UNSIGNED( "countdownBeep", 2 ),
+  YAML_UNSIGNED( "minuteBeep", 1 ),
+  YAML_UNSIGNED( "persistent", 2 ),
+  YAML_SIGNED( "countdownStart", 2 ),
+  YAML_STRING("name", 3),
+  YAML_END
+};
+static const struct YamlNode struct_CurveRef[] = {
+  YAML_UNSIGNED( "type", 8 ),
+  YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
+  YAML_END
+};
+static const struct YamlNode struct_MixData[] = {
+  YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
+  YAML_UNSIGNED( "destCh", 5 ),
+  YAML_UNSIGNED_CUST( "srcRaw", 10, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_UNSIGNED( "carryTrim", 1 ),
+  YAML_UNSIGNED( "mixWarn", 2 ),
+  YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
+  YAML_PADDING( 1 ),
+  YAML_SIGNED_CUST( "offset", 14, in_read_weight, in_write_weight ),
+  YAML_SIGNED_CUST( "swtch", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
+  YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
+  YAML_UNSIGNED( "delayUp", 8 ),
+  YAML_UNSIGNED( "delayDown", 8 ),
+  YAML_UNSIGNED( "speedUp", 8 ),
+  YAML_UNSIGNED( "speedDown", 8 ),
+  YAML_STRING("name", 6),
+  YAML_END
+};
+static const struct YamlNode struct_LimitData[] = {
+  YAML_IDX,
+  YAML_SIGNED_CUST( "min", 11, in_read_weight, in_write_weight ),
+  YAML_SIGNED_CUST( "max", 11, in_read_weight, in_write_weight ),
+  YAML_SIGNED( "ppmCenter", 10 ),
+  YAML_SIGNED_CUST( "offset", 11, in_read_weight, in_write_weight ),
+  YAML_UNSIGNED( "symetrical", 1 ),
+  YAML_UNSIGNED( "revert", 1 ),
+  YAML_PADDING( 3 ),
+  YAML_SIGNED( "curve", 8 ),
+  YAML_STRING("name", 4),
+  YAML_END
+};
+static const struct YamlNode struct_ExpoData[] = {
+  YAML_UNSIGNED( "mode", 2 ),
+  YAML_UNSIGNED( "scale", 14 ),
+  YAML_UNSIGNED_CUST( "srcRaw", 10, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_SIGNED( "carryTrim", 6 ),
+  YAML_UNSIGNED( "chn", 5 ),
+  YAML_SIGNED_CUST( "swtch", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
+  YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
+  YAML_PADDING( 1 ),
+  YAML_STRING("name", 6),
+  YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
+  YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_CurveHeader[] = {
+  YAML_IDX,
+  YAML_UNSIGNED( "type", 1 ),
+  YAML_UNSIGNED( "smooth", 1 ),
+  YAML_SIGNED( "points", 6 ),
+  YAML_STRING("name", 3),
+  YAML_END
+};
+static const struct YamlNode struct_signed_8[] = {
+  YAML_IDX,
+  YAML_SIGNED( "val", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_LogicalSwitchData[] = {
+  YAML_IDX,
+  YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
+  YAML_CUSTOM("def",r_logicSw,w_logicSw),
+  YAML_PADDING( 10 ),
+  YAML_PADDING( 10 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 2 ),
+  YAML_PADDING( 16 ),
+  YAML_UNSIGNED( "delay", 8 ),
+  YAML_UNSIGNED( "duration", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_SwashRingData[] = {
+  YAML_ENUM("type", 8, enum_SwashType),
+  YAML_UNSIGNED( "value", 8 ),
+  YAML_UNSIGNED_CUST( "collectiveSource", 8, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_UNSIGNED_CUST( "aileronSource", 8, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_UNSIGNED_CUST( "elevatorSource", 8, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_SIGNED( "collectiveWeight", 8 ),
+  YAML_SIGNED( "aileronWeight", 8 ),
+  YAML_SIGNED( "elevatorWeight", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_trim_t[] = {
+  YAML_IDX,
+  YAML_SIGNED( "value", 11 ),
+  YAML_UNSIGNED( "mode", 5 ),
+  YAML_END
+};
+static const struct YamlNode struct_FlightModeData[] = {
+  YAML_IDX,
+  YAML_ARRAY("trim", 16, 4, struct_trim_t, NULL),
+  YAML_STRING("name", 6),
+  YAML_SIGNED_CUST( "swtch", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 7 ),
+  YAML_UNSIGNED( "fadeIn", 8 ),
+  YAML_UNSIGNED( "fadeOut", 8 ),
+  YAML_ARRAY("gvars", 16, 9, struct_signed_16, gvar_is_active),
+  YAML_END
+};
+static const struct YamlNode struct_GVarData[] = {
+  YAML_IDX,
+  YAML_STRING("name", 3),
+  YAML_UNSIGNED( "min", 12 ),
+  YAML_UNSIGNED( "max", 12 ),
+  YAML_UNSIGNED( "popup", 1 ),
+  YAML_UNSIGNED( "prec", 1 ),
+  YAML_UNSIGNED( "unit", 2 ),
+  YAML_PADDING( 4 ),
+  YAML_END
+};
+static const struct YamlNode struct_VarioData[] = {
+  YAML_UNSIGNED_CUST( "source", 7, r_tele_sensor, w_tele_sensor ),
+  YAML_UNSIGNED( "centerSilent", 1 ),
+  YAML_SIGNED( "centerMax", 8 ),
+  YAML_SIGNED( "centerMin", 8 ),
+  YAML_SIGNED( "min", 8 ),
+  YAML_SIGNED( "max", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_RssiAlarmData[] = {
+  YAML_SIGNED( "disabled", 1 ),
+  YAML_PADDING( 1 ),
+  YAML_SIGNED( "warning", 6 ),
+  YAML_PADDING( 2 ),
+  YAML_SIGNED( "critical", 6 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_5[] = {
+  YAML_SIGNED( "delay", 6 ),
+  YAML_UNSIGNED( "pulsePol", 1 ),
+  YAML_UNSIGNED( "outputType", 1 ),
+  YAML_SIGNED( "frameLength", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_6[] = {
+  YAML_PADDING( 8 ),
+  YAML_UNSIGNED( "disableTelemetry", 1 ),
+  YAML_UNSIGNED( "disableMapping", 1 ),
+  YAML_UNSIGNED( "autoBindMode", 1 ),
+  YAML_UNSIGNED( "lowPowerMode", 1 ),
+  YAML_UNSIGNED( "receiverTelemetryOff", 1 ),
+  YAML_UNSIGNED( "receiverHigherChannels", 1 ),
+  YAML_PADDING( 2 ),
+  YAML_SIGNED( "optionValue", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_7[] = {
+  YAML_UNSIGNED( "power", 2 ),
+  YAML_PADDING( 2 ),
+  YAML_UNSIGNED( "receiverTelemetryOff", 1 ),
+  YAML_UNSIGNED( "receiverHigherChannels", 1 ),
+  YAML_SIGNED( "antennaMode", 2 ),
+  YAML_PADDING( 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_8[] = {
+  YAML_PADDING( 6 ),
+  YAML_UNSIGNED( "noninverted", 1 ),
+  YAML_PADDING( 1 ),
+  YAML_SIGNED( "refreshRate", 8 ),
+  YAML_END
+};
+static const struct YamlNode struct_string_64[] = {
+  YAML_IDX,
+  YAML_STRING("val", 8),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_9[] = {
+  YAML_UNSIGNED( "receivers", 7 ),
+  YAML_UNSIGNED( "racingMode", 1 ),
+  YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_10[] = {
+  YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL),
+  YAML_UNSIGNED( "mode", 3 ),
+  YAML_UNSIGNED( "rfPower", 1 ),
+  YAML_UNSIGNED( "reserved", 4 ),
+  YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_11[] = {
+  YAML_UNSIGNED( "bindPower", 3 ),
+  YAML_UNSIGNED( "runPower", 3 ),
+  YAML_UNSIGNED( "emi", 1 ),
+  YAML_UNSIGNED( "telemetry", 1 ),
+  YAML_UNSIGNED( "failsafeTimeout", 16 ),
+  YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL),
+  YAML_UNSIGNED( "mode", 2 ),
+  YAML_UNSIGNED( "reserved", 6 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_12[] = {
+  YAML_UNSIGNED( "raw12bits", 1 ),
+  YAML_UNSIGNED( "telemetryBaudrate", 3 ),
+  YAML_PADDING( 4 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_13[] = {
+  YAML_UNSIGNED( "telemetryBaudrate", 3 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_14[] = {
+  YAML_UNSIGNED( "flags", 8 ),
+  YAML_END
+};
+static const struct YamlNode union_anonymous_4_elmts[] = {
+  YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL),
+  YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL),
+  YAML_STRUCT("multi", 24, struct_anonymous_6, NULL),
+  YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL),
+  YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL),
+  YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL),
+  YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL),
+  YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL),
+  YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL),
+  YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL),
+  YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_ModuleData[] = {
+  YAML_IDX,
+  YAML_ENUM("type", 8, enum_ModuleType),
+  YAML_CUSTOM("subType",r_modSubtype,w_modSubtype),
+  YAML_UNSIGNED( "channelsStart", 8 ),
+  YAML_SIGNED_CUST( "channelsCount", 8, r_channelsCount, w_channelsCount ),
+  YAML_ENUM("failsafeMode", 4, enum_FailsafeModes),
+  YAML_PADDING( 4 ),
+  YAML_UNION("mod", 200, union_anonymous_4_elmts, select_mod_type),
+  YAML_END
+};
+static const struct YamlNode struct_TrainerModuleData[] = {
+  YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
+  YAML_UNSIGNED( "channelsStart", 8 ),
+  YAML_SIGNED( "channelsCount", 8 ),
+  YAML_SIGNED( "frameLength", 8 ),
+  YAML_SIGNED( "delay", 6 ),
+  YAML_UNSIGNED( "pulsePol", 1 ),
+  YAML_PADDING( 1 ),
+  YAML_END
+};
+static const struct YamlNode union_ScriptDataInput_elmts[] = {
+  YAML_SIGNED( "value", 16 ),
+  YAML_UNSIGNED_CUST( "source", 16, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_END
+};
+static const struct YamlNode union_ScriptDataInput[] = {
+  YAML_IDX,
+  YAML_UNION("u", 16, union_ScriptDataInput_elmts, select_script_input),
+  YAML_END
+};
+static const struct YamlNode struct_ScriptData[] = {
+  YAML_IDX,
+  YAML_STRING("file", 6),
+  YAML_STRING("name", 6),
+  YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
+  YAML_END
+};
+static const struct YamlNode union_anonymous_15_elmts[] = {
+  YAML_UNSIGNED( "id", 16 ),
+  YAML_UNSIGNED( "persistentValue", 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_17[] = {
+  YAML_UNSIGNED( "physID", 5 ),
+  YAML_UNSIGNED( "rxIndex", 3 ),
+  YAML_END
+};
+static const struct YamlNode union_anonymous_16_elmts[] = {
+  YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL),
+  YAML_UNSIGNED( "instance", 8 ),
+  YAML_ENUM("formula", 8, enum_TelemetrySensorFormula),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_19[] = {
+  YAML_UNSIGNED( "ratio", 16 ),
+  YAML_SIGNED( "offset", 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_20[] = {
+  YAML_UNSIGNED( "source", 8 ),
+  YAML_UNSIGNED( "index", 8 ),
+  YAML_PADDING( 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_21[] = {
+  YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_22[] = {
+  YAML_UNSIGNED( "source", 8 ),
+  YAML_PADDING( 24 ),
+  YAML_END
+};
+static const struct YamlNode struct_anonymous_23[] = {
+  YAML_UNSIGNED( "gps", 8 ),
+  YAML_UNSIGNED( "alt", 8 ),
+  YAML_PADDING( 16 ),
+  YAML_END
+};
+static const struct YamlNode union_anonymous_18_elmts[] = {
+  YAML_STRUCT("custom", 32, struct_anonymous_19, NULL),
+  YAML_STRUCT("cell", 32, struct_anonymous_20, NULL),
+  YAML_STRUCT("calc", 32, struct_anonymous_21, NULL),
+  YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL),
+  YAML_STRUCT("dist", 32, struct_anonymous_23, NULL),
+  YAML_UNSIGNED( "param", 32 ),
+  YAML_END
+};
+static const struct YamlNode struct_TelemetrySensor[] = {
+  YAML_IDX,
+  YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1),
+  YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2),
+  YAML_STRING("label", 4),
+  YAML_UNSIGNED( "subId", 8 ),
+  YAML_ENUM("type", 1, enum_TelemetrySensorType),
+  YAML_PADDING( 1 ),
+  YAML_UNSIGNED( "unit", 6 ),
+  YAML_UNSIGNED( "prec", 2 ),
+  YAML_UNSIGNED( "autoOffset", 1 ),
+  YAML_UNSIGNED( "filter", 1 ),
+  YAML_UNSIGNED( "logs", 1 ),
+  YAML_UNSIGNED( "persistent", 1 ),
+  YAML_UNSIGNED( "onlyPositive", 1 ),
+  YAML_PADDING( 1 ),
+  YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg),
+  YAML_END
+};
+static const struct YamlNode struct_FrSkyBarData[] = {
+  YAML_IDX,
+  YAML_UNSIGNED_CUST( "source", 16, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_SIGNED( "barMin", 16 ),
+  YAML_SIGNED( "barMax", 16 ),
+  YAML_END
+};
+static const struct YamlNode struct_LineDataSource[] = {
+  YAML_IDX,
+  YAML_UNSIGNED_CUST( "val", 16, r_mixSrcRaw, w_mixSrcRaw ),
+  YAML_END
+};
+static const struct YamlNode struct_FrSkyLineData[] = {
+  YAML_IDX,
+  YAML_ARRAY("sources", 16, 2, struct_LineDataSource, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_TelemetryScriptData[] = {
+  YAML_STRING("file", 6),
+  YAML_ARRAY("inputs", 16, 8, struct_signed_16, NULL),
+  YAML_END
+};
+static const struct YamlNode union_TelemetryScreenData_u_elmts[] = {
+  YAML_ARRAY("bars", 48, 4, struct_FrSkyBarData, NULL),
+  YAML_ARRAY("lines", 32, 4, struct_FrSkyLineData, NULL),
+  YAML_STRUCT("script", 176, struct_TelemetryScriptData, NULL),
+  YAML_END
+};
+static const struct YamlNode struct_TelemetryScreenData[] = {
+  YAML_IDX,
+  YAML_CUSTOM("type",r_tele_screen_type,w_tele_screen_type),
+  YAML_UNION("u", 192, union_TelemetryScreenData_u_elmts, select_tele_screen_data),
+  YAML_END
+};
+static const struct YamlNode struct_ModelData[] = {
+  YAML_CUSTOM("semver",nullptr,w_semver),
+  YAML_STRUCT("header", 96, struct_ModelHeader, NULL),
+  YAML_ARRAY("timers", 88, 3, struct_TimerData, NULL),
+  YAML_UNSIGNED( "telemetryProtocol", 3 ),
+  YAML_UNSIGNED( "thrTrim", 1 ),
+  YAML_UNSIGNED( "noGlobalFunctions", 1 ),
+  YAML_UNSIGNED( "displayTrims", 2 ),
+  YAML_UNSIGNED( "ignoreSensorIds", 1 ),
+  YAML_SIGNED( "trimInc", 3 ),
+  YAML_UNSIGNED( "disableThrottleWarning", 1 ),
+  YAML_UNSIGNED( "displayChecklist", 1 ),
+  YAML_UNSIGNED( "extendedLimits", 1 ),
+  YAML_UNSIGNED( "extendedTrims", 1 ),
+  YAML_UNSIGNED( "throttleReversed", 1 ),
+  YAML_UNSIGNED( "enableCustomThrottleWarning", 1 ),
+  YAML_PADDING( 7 ),
+  YAML_SIGNED( "customThrottleWarningPosition", 8 ),
+  YAML_UNSIGNED( "beepANACenter", 16 ),
+  YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
+  YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
+  YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
+  YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
+  YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
+  YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
+  YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active),
+  YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
+  YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),
+  YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ),
+  YAML_CUSTOM("switchWarningState",r_swtchWarn,w_swtchWarn),
+  YAML_PADDING( 32 ),
+  YAML_ARRAY("gvars", 56, 9, struct_GVarData, NULL),
+  YAML_STRUCT("varioData", 40, struct_VarioData, NULL),
+  YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ),
+  YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL),
+  YAML_UNSIGNED( "thrTrimSw", 3 ),
+  YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
+  YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
+  YAML_PADDING( 1 ),
+  YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
+  YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
+  YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
+  YAML_ARRAY("scriptsData", 192, 7, struct_ScriptData, NULL),
+  YAML_ARRAY("inputNames", 24, 32, struct_string_24, NULL),
+  YAML_UNSIGNED( "potsWarnEnabled", 16 ),
+  YAML_ARRAY("potsWarnPosition", 8, 2, struct_signed_8, NULL),
+  YAML_ARRAY("telemetrySensors", 112, 40, struct_TelemetrySensor, NULL),
+  YAML_PADDING( 8 ),
+  YAML_ARRAY("screens", 192, 4, struct_TelemetryScreenData, NULL),
+  YAML_UNSIGNED( "view", 8 ),
+  YAML_STRING("modelRegistrationID", 8),
+  YAML_END
+};
+static const struct YamlNode struct_PartialModel[] = {
+  YAML_STRUCT("header", 96, struct_ModelHeader, NULL),
+  YAML_ARRAY("timers", 88, 3, struct_TimerData, NULL),
+  YAML_END
+};
+
+#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 29
+
+static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
+
+const YamlNode* get_radiodata_nodes()
+{
+   return &__RadioData_root_node;
+}
+static const struct YamlNode __ModelData_root_node = YAML_ROOT( struct_ModelData );
+
+const YamlNode* get_modeldata_nodes()
+{
+   return &__ModelData_root_node;
+}
+static const struct YamlNode __PartialModel_root_node = YAML_ROOT( struct_PartialModel );
+
+const YamlNode* get_partialmodel_nodes()
+{
+   return &__PartialModel_root_node;
+}
+
diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp
index d55dd2819..b0862e2b0 100644
--- a/radio/src/strhelpers.cpp
+++ b/radio/src/strhelpers.cpp
@@ -415,7 +415,7 @@ int getRawSwitchIdx(char sw)
   if (sw < 'A' || sw > 'Z')
     return -1;
 
-#if defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_ZORRO)
+#if defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_ZORRO) && !defined(RADIO_TX12MK2)
   if (sw >= 'H')
     return sw - 'H' + 5;
 #if defined(RADIO_T12)
@@ -433,7 +433,7 @@ int getRawSwitchIdx(char sw)
 
 char getRawSwitchFromIdx(int idx)
 {
-#if defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_ZORRO) && !defined(RADIO_TPRO)
+#if defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_TX12MK2) && !defined(RADIO_ZORRO) && !defined(RADIO_TPRO)
     if (idx >= 5)
       return 'H' + idx - 5;
     else if (idx == 4)
@@ -444,7 +444,7 @@ char getRawSwitchFromIdx(int idx)
   #endif
     else
       return 'A' + idx;
-#elif defined(RADIO_TX12) || defined(RADIO_T8)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_T8)
     if (idx < 6)
         return 'A' + idx;
     else
diff --git a/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp b/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp
index 25ee92dfc..95076d991 100644
--- a/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp
@@ -120,7 +120,7 @@ void rotaryEncoderCheck()
 #else
   uint8_t newPosition = ROTARY_ENCODER_POSITION();
   if (newPosition != rotencPosition && !(readKeys() & (1 << KEY_ENTER))) {
-#if defined(RADIO_ZORRO) // zorro def. rotation dir is inverse of other radios
+#if defined(RADIO_ZORRO) || defined(RADIO_TX12MK2) // def. rotation dir is inverse of other radios
     if (!(rotencPosition & 0x01) ^ ((newPosition & 0x02) >> 1)) {
 #else
     if ((rotencPosition & 0x01) ^ ((newPosition & 0x02) >> 1)) {
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
old mode 100644
new mode 100755
index fe7257680..ade7f4be7
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -190,6 +190,32 @@ elseif(PCB STREQUAL X7)
     add_definitions(-DRADIO_TX12)
     add_definitions(-DEEPROM_VARIANT=0x4002)
     add_definitions(-DMANUFACTURER_RADIOMASTER)
+  elseif(PCBREV STREQUAL TX12MK2)
+    set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
+    set(INTERNAL_MODULE_SERIAL YES)
+    set(FLAVOUR tx12mk2)
+    set(NAVIGATION_TYPE x7)
+    set(CPU_TYPE STM32F4)
+    set(CPU_TYPE_FULL STM32F407xE)  # for size report
+    add_definitions(-DSTM32F407xx)
+    set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld)
+    set(FIRMWARE_TARGET_SRC
+            ${FIRMWARE_TARGET_SRC}
+            startup_stm32f40_41xxx.s
+            ../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
+            )
+    add_definitions(-DSTM32F40_41xxx -DSTM32F407xx)
+    set(ROTARY_ENCODER YES)
+    set(LUA_EXPORT lua_export_tx12mk2)
+    set(BLUETOOTH NO)
+    set(USB_CHARGER YES)
+    set(AUX_SERIAL ON)
+    add_definitions(-DRADIO_TX12MK2)
+    add_definitions(-DEEPROM_VARIANT=0x4008)
+    add_definitions(-DMANUFACTURER_RADIOMASTER)
+    set(PXX2 ON)
+    set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
+    set(CLI ON CACHE BOOL "Enable CLI")
   elseif(PCBREV STREQUAL ZORRO)
     set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
     set(INTERNAL_MODULE_SERIAL YES)
diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
index 0b1395f84..75dee2843 100644
--- a/radio/src/targets/taranis/board.cpp
+++ b/radio/src/targets/taranis/board.cpp
@@ -151,7 +151,7 @@ void boardInit()
   bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE, true);
 #endif
 
-#if defined (RADIO_ZORRO)
+#if defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
     
   if (FLASH_OB_GetBOR() != OB_BOR_LEVEL3)
   {
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
old mode 100644
new mode 100755
index ab1bcb4f9..229337349
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -31,7 +31,7 @@
 #include "opentx_constants.h"
 #include "board_common.h"
 
-#if defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
   #define  NAVIGATION_X7_TX12
 #endif
 
@@ -294,7 +294,7 @@ enum EnumSwitches
   SW_SQ,
   SW_SR,
 };
-#if defined(RADIO_TX12)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2)
   #define IS_3POS(x)                      ((x) != SW_SA && (x) != SW_SD)
 #elif defined(RADIO_ZORRO)
   #define IS_3POS(x)                      ((x) == SW_SB || (x) == SW_SC)
@@ -422,6 +422,11 @@ enum EnumSwitchesPositions
   #define STORAGE_NUM_SWITCHES          NUM_SWITCHES
   #define DEFAULT_SWITCH_CONFIG         (SWITCH_3POS << 10) + (SWITCH_3POS << 8) + (SWITCH_TOGGLE << 6) + (SWITCH_3POS << 4) + (SWITCH_3POS << 2) + (SWITCH_TOGGLE << 0)
   #define DEFAULT_POTS_CONFIG           (POT_WITH_DETENT << 0) + (POT_WITH_DETENT << 2);
+#elif defined(RADIO_TX12MK2)
+  #define NUM_SWITCHES                  6
+  #define STORAGE_NUM_SWITCHES          8
+  #define DEFAULT_SWITCH_CONFIG         (SWITCH_3POS << 10) + (SWITCH_3POS << 8) + (SWITCH_TOGGLE << 6) + (SWITCH_3POS << 4) + (SWITCH_3POS << 2) + (SWITCH_TOGGLE << 0)
+  #define DEFAULT_POTS_CONFIG           (POT_WITH_DETENT << 0) + (POT_WITH_DETENT << 2);
 #elif defined(RADIO_ZORRO)
   #define NUM_SWITCHES                  8
   #define STORAGE_NUM_SWITCHES          NUM_SWITCHES
@@ -708,7 +713,7 @@ uint8_t isBacklightEnabled();
 #if !defined(SIMU)
   void usbJoystickUpdate();
 #endif
-#if defined(RADIO_TX12)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2)
   #define USB_NAME                     "Radiomaster TX12"
   #define USB_MANUFACTURER             'R', 'M', '_', 'T', 'X', ' ', ' ', ' '  /* 8 bytes */
   #define USB_PRODUCT                  'R', 'M', ' ', 'T', 'X', '1', '2', ' '  /* 8 Bytes */
@@ -896,7 +901,7 @@ void fsLedOn(uint8_t);
 #define IS_LCD_RESET_NEEDED()           true
 #define LCD_CONTRAST_MIN                10
 #define LCD_CONTRAST_MAX                30
-#if defined(RADIO_TX12)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2)
   #define LCD_CONTRAST_DEFAULT          20
 #elif defined(RADIO_TPRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TPRO)
   #define LCD_CONTRAST_DEFAULT          25
@@ -972,7 +977,7 @@ extern Fifo<uint8_t, TELEMETRY_FIFO_SIZE> telemetryFifo;
   #define BATTERY_DIVIDER 26214
 #endif 
 
-#if defined(RADIO_ZORRO)
+#if defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define VOLTAGE_DROP 45
 #else
   #define VOLTAGE_DROP 20
diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
old mode 100644
new mode 100755
index e45911ae8..0f29ac1bd
--- a/radio/src/targets/taranis/hal.h
+++ b/radio/src/targets/taranis/hal.h
@@ -73,7 +73,7 @@
   #define KEYS_GPIO_PIN_LEFT            GPIO_Pin_7 // PD.07
   #define KEYS_GPIO_REG_RIGHT           GPIOD->IDR
   #define KEYS_GPIO_PIN_RIGHT           GPIO_Pin_3 // PD.03
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
   #define KEYS_GPIO_REG_PAGEUP          GPIOD->IDR
   #define KEYS_GPIO_PIN_PAGEUP          GPIO_Pin_3  // PD.03
   #define KEYS_GPIO_REG_PAGEDN          GPIOD->IDR
@@ -85,8 +85,14 @@
   #define KEYS_GPIO_REG_EXIT            GPIOC->IDR
   #define KEYS_GPIO_PIN_EXIT            GPIO_Pin_5  // PC.05
 #endif
+#if defined(RADIO_TX12MK2)
+  #define KEYS_GPIO_REG_ENTER           GPIOA->IDR
+  #define KEYS_GPIO_PIN_ENTER           GPIO_Pin_10 // PA.10
+#else
   #define KEYS_GPIO_REG_ENTER           GPIOA->IDR
   #define KEYS_GPIO_PIN_ENTER           GPIO_Pin_13 // PA.13
+
+#endif
   #define KEYS_GPIO_REG_SYS             GPIOB->IDR
   #define KEYS_GPIO_PIN_SYS             GPIO_Pin_4  // PB.04
   #define KEYS_GPIO_REG_MDL             GPIOE->IDR
@@ -209,7 +215,7 @@
   #define ROTARY_ENCODER_EXTI_PortSource  EXTI_PortSourceGPIOE
   #define ROTARY_ENCODER_EXTI_PinSource1  EXTI_PinSource10
   #define ROTARY_ENCODER_EXTI_PinSource2  EXTI_PinSource12
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
   #define ROTARY_ENCODER_NAVIGATION
   #define ROTARY_ENCODER_GPIO              GPIOE
   #define ROTARY_ENCODER_GPIO_PIN_A        GPIO_Pin_9 // PE.9
@@ -365,7 +371,7 @@
   #define SWITCHES_GPIO_PIN_A_H         GPIO_Pin_1  // PE.01
   #define SWITCHES_GPIO_REG_A_L         GPIOE->IDR
   #define SWITCHES_GPIO_PIN_A_L         GPIO_Pin_0  // PE.00
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
   #define STORAGE_SWITCH_A
   #define HARDWARE_SWITCH_A
   #define SWITCHES_GPIO_REG_A           GPIOC->IDR
@@ -463,6 +469,13 @@
   #define SWITCHES_GPIO_PIN_C_L         GPIO_Pin_2  // PE.02
   #define SWITCHES_GPIO_REG_C_H         GPIOE->IDR
   #define SWITCHES_GPIO_PIN_C_H         GPIO_Pin_3  // PE.03
+#elif  defined(RADIO_TX12MK2)
+  #define STORAGE_SWITCH_C
+  #define HARDWARE_SWITCH_C
+  #define SWITCHES_GPIO_REG_C_L         GPIOE->IDR
+  #define SWITCHES_GPIO_PIN_C_L         GPIO_Pin_0   // PE.00
+  #define SWITCHES_GPIO_REG_C_H         GPIOD->IDR
+  #define SWITCHES_GPIO_PIN_C_H         GPIO_Pin_11  // PD.11
 #elif defined(RADIO_TX12)
   #define STORAGE_SWITCH_C
   #define HARDWARE_SWITCH_C
@@ -536,7 +549,7 @@
   #define HARDWARE_SWITCH_D
   #define SWITCHES_GPIO_REG_D           GPIOD->IDR
   #define SWITCHES_GPIO_PIN_D           GPIO_Pin_14  // PD.14
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO)
   #define STORAGE_SWITCH_D
   #define HARDWARE_SWITCH_D
   #define SWITCHES_GPIO_REG_D           GPIOE->IDR
@@ -599,6 +612,13 @@
   #define SWITCHES_GPIO_PIN_E_H         GPIO_Pin_13 // PE.13
   #define SWITCHES_GPIO_REG_E_L         GPIOE->IDR
   #define SWITCHES_GPIO_PIN_E_L         GPIO_Pin_7  // PE.07
+#elif defined(RADIO_TX12MK2)
+  #define STORAGE_SWITCH_E
+  #define HARDWARE_SWITCH_E
+  #define SWITCHES_GPIO_REG_E_H         GPIOE->IDR
+  #define SWITCHES_GPIO_PIN_E_H         GPIO_Pin_14 // PE.14
+  #define SWITCHES_GPIO_REG_E_L         GPIOE->IDR
+  #define SWITCHES_GPIO_PIN_E_L         GPIO_Pin_7  // PE.07
 #elif defined(RADIO_TPRO)
   // SW1
   #define STORAGE_SWITCH_E
@@ -648,6 +668,13 @@
   #define SWITCHES_GPIO_PIN_F_L         GPIO_Pin_1  // PE.01
   #define SWITCHES_GPIO_REG_F_H         GPIOE->IDR
   #define SWITCHES_GPIO_PIN_F_H         GPIO_Pin_2 // PE.02
+#elif defined(RADIO_TX12MK2)
+  #define STORAGE_SWITCH_F
+  #define HARDWARE_SWITCH_F
+  #define SWITCHES_GPIO_REG_F_L         GPIOD->IDR
+  #define SWITCHES_GPIO_PIN_F_L         GPIO_Pin_14 // PD.14
+  #define SWITCHES_GPIO_REG_F_H         GPIOE->IDR
+  #define SWITCHES_GPIO_PIN_F_H         GPIO_Pin_1  // PE.01
 #elif defined(RADIO_TPRO)
   // SW2
   #define STORAGE_SWITCH_F
@@ -688,6 +715,8 @@
   #define HARDWARE_SWITCH_G
   #define SWITCHES_GPIO_REG_G           GPIOE->IDR
   #define SWITCHES_GPIO_PIN_G           GPIO_Pin_14 // PE.14
+#elif defined(RADIO_TX12MK2)
+  #define STORAGE_SWITCH_G
 #elif defined(RADIO_TPRO)
   // SW3
   #define STORAGE_SWITCH_G
@@ -721,6 +750,8 @@
   #define STORAGE_SWITCH_H
   // no SWH
 #elif defined(RADIO_TX12)
+#elif defined(RADIO_TX12MK2)
+  #define STORAGE_SWITCH_H
 #elif defined(RADIO_TPRO)
   // SW4
   #define STORAGE_SWITCH_H
@@ -771,6 +802,8 @@
   #define HARDWARE_SWITCH_J
   #define SWITCHES_GPIO_REG_J           GPIOD->IDR
   #define SWITCHES_GPIO_PIN_J           GPIO_Pin_14  // PD.14
+#elif defined(RADIO_TX12MK2)
+  // no headers
 #elif defined(RADIO_TLITE)
   // no SWI
   #define STORAGE_SWITCH_I
@@ -927,6 +960,13 @@
   #define KEYS_GPIOC_PINS               (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3|GPIO_Pin_13)
   #define KEYS_GPIOD_PINS               (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15)
   #define KEYS_GPIOE_PINS               (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 |GPIO_Pin_8| GPIO_Pin_9  | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15)
+#elif defined(RADIO_TX12MK2)
+  #define KEYS_RCC_AHB1Periph           (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE)
+  #define KEYS_GPIOA_PINS               (GPIO_Pin_10 | GPIO_Pin_5)
+  #define KEYS_GPIOB_PINS               (GPIO_Pin_4)
+  #define KEYS_GPIOC_PINS               (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_5 | GPIO_Pin_13)
+  #define KEYS_GPIOD_PINS               (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15)
+  #define KEYS_GPIOE_PINS               (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9  | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15)
 #elif defined(RADIO_T8)
   #define KEYS_RCC_AHB1Periph           (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE)
   #define KEYS_GPIOA_PINS               (KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_BIND)
@@ -1286,7 +1326,7 @@
   #define LED_BLUE_GPIO_PIN             GPIO_Pin_5  // PC.05
   #define LED_GREEN_GPIO                GPIOB
   #define LED_GREEN_GPIO_PIN            GPIO_Pin_1  // PB.01
-#elif defined(RADIO_ZORRO)
+#elif defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define STATUS_LEDS
   #define GPIO_LED_GPIO_ON              GPIO_SetBits
   #define GPIO_LED_GPIO_OFF             GPIO_ResetBits
@@ -1417,7 +1457,7 @@
   #define INTMODULE_DMA_STREAM_IRQHandler  DMA2_Stream7_IRQHandler
   #define INTMODULE_DMA_FLAG_TC         DMA_IT_TCIF7
   #define INTMODULE_DMA_CHANNEL         DMA_Channel_4
-#elif defined(RADIO_ZORRO)
+#elif defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define INTMODULE_RCC_APB1Periph      0
   #define INTMODULE_RCC_APB2Periph      RCC_APB2Periph_USART1
   #define INTMODULE_RCC_AHB1Periph      (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA2)
@@ -1506,9 +1546,9 @@
 #endif
 
 // External Module
-#if defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) || defined(PCBX7ACCESS) || defined(RADIO_ZORRO)
+#if defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) || defined(PCBX7ACCESS) || defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define EXTMODULE_RCC_APB2Periph      (RCC_APB2Periph_TIM8 | RCC_APB2Periph_USART6)
-  #if defined(RADIO_X9DP2019) || defined(RADIO_X7ACCESS) || defined(RADIO_ZORRO)
+  #if defined(RADIO_X9DP2019) || defined(RADIO_X7ACCESS) || defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
     #define EXTMODULE_RCC_AHB1Periph    (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA2)
     #define EXTMODULE_PWR_GPIO          GPIOD
     #define EXTMODULE_PWR_GPIO_PIN      GPIO_Pin_8  // PD.08
@@ -1663,7 +1703,7 @@
 #endif
 
 // Serial Port
-#if (defined(PCBX7) && !defined(RADIO_ZORRO)) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019)
+#if (defined(PCBX7) && !defined(RADIO_ZORRO) && !defined(RADIO_TX12MK2)) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019)
   #define AUX_SERIAL_RCC_AHB1Periph         0
   #define AUX_SERIAL_RCC_APB1Periph         0
   #define AUX_SERIAL_RCC_APB2Periph         0
@@ -1726,7 +1766,7 @@
 #define TELEMETRY_EXTI_IRQn             EXTI9_5_IRQn
 #define TELEMETRY_EXTI_TRIGGER          EXTI_Trigger_Rising
 
-#if defined(RADIO_X7) || defined(RADIO_X7ACCESS) || defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO)
+#if defined(RADIO_X7) || defined(RADIO_X7ACCESS) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO)
   #define TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER
 #elif defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019)
   #define TELEMETRY_EXTI_IRQHandler       EXTI9_5_IRQHandler
@@ -1836,7 +1876,7 @@
   #define INTMODULE_HEARTBEAT_EXTI_LINE           EXTI_Line1
   #define INTMODULE_HEARTBEAT_EXTI_IRQn           EXTI1_IRQn
   #define INTMODULE_HEARTBEAT_EXTI_IRQHandler     EXTI1_IRQHandler
-#elif defined(RADIO_ZORRO)
+#elif defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define INTMODULE_HEARTBEAT_RCC_AHB1Periph      0
 #else
   #define INTMODULE_HEARTBEAT
@@ -1866,7 +1906,7 @@
 #endif
 
 // Trainer / Trainee from the module bay
-#if defined(PCBX9LITE) ||  defined(PCBXLITE) || defined(RADIO_X9DP2019) || defined(PCBX7ACCESS) || defined(RADIO_ZORRO)
+#if defined(PCBX9LITE) ||  defined(PCBXLITE) || defined(RADIO_X9DP2019) || defined(PCBX7ACCESS) || defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define TRAINER_MODULE_CPPM
   #define TRAINER_MODULE_SBUS
   #define TRAINER_MODULE_RCC_AHB1Periph      0
@@ -2022,7 +2062,7 @@
 #define KEYS_BACKLIGHT_RCC_AHB1Periph        0
 
 // LCD driver
-#if defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_T8) || defined(RADIO_TPRO)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_T8) || defined(RADIO_TPRO)
   #define LCD_VERTICAL_INVERT
 #endif
 #if defined(PCBX9E)
@@ -2124,7 +2164,7 @@
 #elif defined(PCBX7ACCESS)
   #define EEPROM_WP_GPIO                GPIOB
   #define EEPROM_WP_GPIO_PIN            LL_GPIO_PIN_5  // PB.05
-#elif defined(RADIO_ZORRO)
+#elif defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define EEPROM_WP_GPIO                GPIOD
   #define EEPROM_WP_GPIO_PIN            LL_GPIO_PIN_10  // PD.10
 #elif defined(RADIO_X9DP2019)
@@ -2215,7 +2255,7 @@
   #define AUDIO_SPEAKER_ENABLE_GPIO_PIN GPIO_Pin_14 // PD.14
   #define HEADPHONE_TRAINER_SWITCH_GPIO      GPIOD
   #define HEADPHONE_TRAINER_SWITCH_GPIO_PIN  GPIO_Pin_9 // PD.09
-#elif defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TLITE) || defined(RADIO_TPRO)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TLITE) || defined(RADIO_TPRO)
   #define AUDIO_RCC_AHB1Periph          (RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_DMA1)
   #define AUDIO_MUTE_GPIO               GPIOE
   #define AUDIO_MUTE_GPIO_PIN           GPIO_Pin_12  // PE.12
@@ -2230,7 +2270,7 @@
 #endif
 
 // Haptic
-#if defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_ZORRO)
+#if defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_ZORRO) || defined(RADIO_TX12MK2)
   #define HAPTIC_PWM
   #define HAPTIC_RCC_AHB1Periph         RCC_AHB1Periph_GPIOB
   #define HAPTIC_RCC_APB1Periph         RCC_APB1Periph_TIM2
@@ -2345,7 +2385,7 @@
   #define BT_USART_IRQn                 USART3_IRQn
   // #define BT_DMA_Stream_RX              DMA1_Stream1
   // #define BT_DMA_Channel_RX             DMA_Channel_4
-#elif defined(PCBX9D) || defined(PCBX9DP) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_T8) || defined(RADIO_ZORRO)
+#elif defined(PCBX9D) || defined(PCBX9DP) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_T8) || defined(RADIO_ZORRO)
   #define STORAGE_BLUETOOTH
   #define BT_RCC_AHB1Periph             0
   #define BT_RCC_APB1Periph             0
diff --git a/radio/src/targets/taranis/keys_driver.cpp b/radio/src/targets/taranis/keys_driver.cpp
old mode 100644
new mode 100755
index c3490bfe1..32aaa76f3
--- a/radio/src/targets/taranis/keys_driver.cpp
+++ b/radio/src/targets/taranis/keys_driver.cpp
@@ -184,7 +184,7 @@ uint32_t switchState(uint8_t index)
 
   switch (index) {
 
-#if defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8)
+#if defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_T8)
     ADD_2POS_CASE(A);
     ADD_3POS_CASE(B, 1);
     ADD_3POS_CASE(C, 2);
@@ -226,6 +226,10 @@ uint32_t switchState(uint8_t index)
     ADD_2POS_CASE(F);
     ADD_2POS_CASE(G);
     ADD_2POS_CASE(H);
+#elif defined(RADIO_TX12MK2)
+    ADD_2POS_CASE(D);
+    ADD_3POS_CASE(E, 4);
+    ADD_3POS_CASE(F, 5);
 #elif defined(RADIO_TX12) || defined(RADIO_ZORRO)
     ADD_2POS_CASE(D);
     ADD_3POS_CASE(E, 4);
diff --git a/radio/src/targets/taranis/lcd_driver_spi.cpp b/radio/src/targets/taranis/lcd_driver_spi.cpp
old mode 100644
new mode 100755
index d97218581..155339a65
--- a/radio/src/targets/taranis/lcd_driver_spi.cpp
+++ b/radio/src/targets/taranis/lcd_driver_spi.cpp
@@ -27,7 +27,7 @@
   #include "opentx.h"
 #endif
 
-#if defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO)
+#if defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO)
   #define LCD_CONTRAST_OFFSET            -10
 #else
   #define LCD_CONTRAST_OFFSET            160
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index bd12bcdea..6c184f3ff 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -53,7 +53,7 @@
     STR_CHAR_SWITCH "SA", STR_CHAR_SWITCH "SB", STR_CHAR_SWITCH "SC",     \
         STR_CHAR_SWITCH "SD", STR_CHAR_SWITCH "SG", STR_CHAR_SWITCH "SH", \
         STR_CHAR_SWITCH "SI", STR_CHAR_SWITCH "SJ"
-#elif defined(RADIO_TX12)
+#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2)
   #define TR_POTS_VSRCRAW STR_CHAR_POT "S1", STR_CHAR_POT "S2"
   #define TR_SW_VSRCRAW                     \
     STR_CHAR_SWITCH "SA", STR_CHAR_SWITCH "SB", STR_CHAR_SWITCH  \
diff --git a/tools/generate-yaml.sh b/tools/generate-yaml.sh
index 45b8f5ad3..79d5f39b1 100755
--- a/tools/generate-yaml.sh
+++ b/tools/generate-yaml.sh
@@ -9,7 +9,7 @@ if [[ -n ${GCC_ARM} ]] ; then
   export PATH=${GCC_ARM}:$PATH
 fi
 
-: ${FLAVOR:="t12;t8;tlite;tpro;tx12;zorro;tx16s;x12s;nv14;x7;x9d;x9dp;x9e;x9lite;x9lites;xlite;xlites"}
+: ${FLAVOR:="t12;t8;tlite;tpro;tx12;tx12mk2;zorro;tx16s;x12s;nv14;x7;x9d;x9dp;x9e;x9lite;x9lites;xlite;xlites"}
 : ${SRCDIR:=$(dirname "$(pwd)/$0")/..}
 
 : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev -DYAML_STORAGE=YES "}