From 0d6d309362b0583e2a8bcfb20e5700320f077cf9 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 1 Nov 2015 12:22:36 +0400 Subject: [PATCH 1/2] Move available protocol list from EEPROMinterface to Firmware class --- companion/src/eeprominterface.h | 4 ++-- companion/src/firmwares/opentx/opentxinterface.cpp | 2 +- companion/src/firmwares/opentx/opentxinterface.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 41e1cf51f..cd7558271 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -1376,8 +1376,6 @@ class EEPROMInterface virtual int getSize(const GeneralSettings &) = 0; - virtual int isAvailable(PulsesProtocol proto, int port=0) = 0; - virtual const int getEEpromSize() = 0; virtual const int getMaxModels() = 0; @@ -1613,6 +1611,8 @@ class Firmware { virtual bool isTelemetrySourceAvailable(int source) = 0; + virtual int isAvailable(PulsesProtocol proto, int port=0) = 0; + public: QList languages; QList ttslanguages; diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 3009b37a6..0e6d74e22 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -818,7 +818,7 @@ bool OpenTxFirmware::isTelemetrySourceAvailable(int source) return true; } -int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port) +int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port) { if (IS_TARANIS(board)) { switch (port) { diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h index e2f249ecb..41c1bf6a2 100644 --- a/companion/src/firmwares/opentx/opentxinterface.h +++ b/companion/src/firmwares/opentx/opentxinterface.h @@ -45,8 +45,6 @@ class OpenTxEepromInterface : public EEPROMInterface virtual int getSize(const GeneralSettings &); - virtual int isAvailable(PulsesProtocol proto, int port=0); - protected: const char * getName(); @@ -123,6 +121,8 @@ class OpenTxFirmware: public Firmware { virtual bool isTelemetrySourceAvailable(int source); + virtual int isAvailable(PulsesProtocol proto, int port=0); + protected: QString getFirmwareBaseUrl(); From 51194481708be253fe81a61683252f5c731c8808 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 1 Nov 2015 12:26:15 +0400 Subject: [PATCH 2/2] Companion support for Taranis internal PPM, remove disabled DJT choice for stock board --- companion/src/firmwares/opentx/opentxinterface.cpp | 4 +++- companion/src/modeledit/setup.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 0e6d74e22..d67acad23 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -829,6 +829,8 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port) case PULSES_PXX_XJT_D8: case PULSES_PXX_XJT_LR12: return 1; + case PULSES_PPM: + return id.contains("internalppm") ? 1 : 0; default: return 0; } @@ -895,7 +897,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port) case PULSES_DSMX: case PULSES_LP45: case PULSES_DSM2: - case PULSES_PXX_DJT: + // case PULSES_PXX_DJT: // Unavailable for now case PULSES_PPM16: case PULSES_PPMSIM: return 1; diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 87ce14850..2c3198896 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -168,7 +168,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module // The protocols available on this board for (int i=0; iisAvailable((PulsesProtocol)i, moduleIdx)) { + if (firmware->isAvailable((PulsesProtocol)i, moduleIdx)) { ui->protocol->addItem(ModelPrinter::printModuleProtocol(i), (QVariant)i); if (i == module.protocol) ui->protocol->setCurrentIndex(ui->protocol->count()-1); }