From e30e34335dfcbfc042f6a30e88f87c4fa269bcce Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sat, 9 Feb 2019 13:21:24 +0100
Subject: [PATCH] pxx2 is 16chans

---
 radio/src/gui/128x64/model_setup.cpp | 4 ++--
 radio/src/pulses/modules.h           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 1e1d010b9..fec14d417 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -74,7 +74,7 @@ enum MenuModelSetupItems {
 #if defined(PCBTARANIS)
   ITEM_MODEL_INTERNAL_MODULE_LABEL,
   ITEM_MODEL_INTERNAL_MODULE_MODE,
-  ITEM_MODEL_INTERNAL_MODULE_NPXX2_CHANNELS,
+  ITEM_MODEL_INTERNAL_MODULE_CHANNELS,
   ITEM_MODEL_INTERNAL_MODULE_NPXX2_BIND,
   ITEM_MODEL_INTERNAL_MODULE_PXX2_MODEL_NUM,
 #if defined(EXTERNAL_ANTENNA)
@@ -985,7 +985,7 @@ void menuModelSetup(event_t event)
 #endif
 
 #if defined(PCBTARANIS)
-      case ITEM_MODEL_INTERNAL_MODULE_NPXX2_CHANNELS:
+      case ITEM_MODEL_INTERNAL_MODULE_CHANNELS:
 #endif
 #if defined(PCBSKY9X)
       case ITEM_MODEL_EXTRA_MODULE_CHANNELS:
diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h
index 928abe24a..4bda954de 100644
--- a/radio/src/pulses/modules.h
+++ b/radio/src/pulses/modules.h
@@ -226,7 +226,7 @@ inline int8_t sentModuleChannels(uint8_t idx)
 {
   if (isModuleCrossfire(idx))
     return CROSSFIRE_CHANNELS_COUNT;
-  else if (isModuleMultimodule(idx) && !isModuleMultimoduleDSM2(idx))
+  else if ((isModuleMultimodule(idx) && !isModuleMultimoduleDSM2(idx)) || isModuleXJT2(idx))
     return 16;
   else
     return 8 + g_model.moduleData[idx].channelsCount;