From 0075f20ae4678213e8662e658a7bcd96ed4aaf59 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Thu, 3 Apr 2014 20:35:57 +0200 Subject: [PATCH] Module/protocol combinations were wrong in companion --- companion/src/firmwares/opentx/opentxinterface.cpp | 2 +- companion/src/modeledit/setup.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 8ba712c89..0e2e49b31 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -716,7 +716,7 @@ int OpenTxInterface::isAvailable(Protocol proto, int port) case PXX_XJT_X16: case PXX_XJT_D8: case PXX_XJT_LR12: - case PXX_DJT: + //case PXX_DJT: // Unavailable for now case LP45: case DSM2: case DSMX: diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index c3d89242a..cccf9b7eb 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -178,7 +178,6 @@ void ModulePanel::update() case PXX_XJT_D8: case PXX_XJT_LR12: case PXX_DJT: - module.channelsCount = 8; mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; if ((protocol==PXX_XJT_X16) || (protocol==PXX_XJT_LR12)) mask |= MASK_FAILSAFES | MASK_RX_NUMBER; break; @@ -189,7 +188,6 @@ void ModulePanel::update() module.channelsCount = 6; break; case PPM: - module.channelsCount = 8; mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT; break; case OFF: @@ -198,7 +196,6 @@ void ModulePanel::update() } } else if (model.trainerMode != 0) { - module.channelsCount = 8; mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; }