From e91a464352517885af505a49f713a6cad0068dcd Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 2 Sep 2019 12:09:56 +0200 Subject: [PATCH] Default modules to OFF for new models (#6687) Default modules to OFF for new models --- companion/src/firmwares/modeldata.cpp | 22 +++------------------- radio/src/opentx.cpp | 7 +------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp index b3d4f82fa..a2fdb4981 100644 --- a/companion/src/firmwares/modeldata.cpp +++ b/companion/src/firmwares/modeldata.cpp @@ -157,30 +157,14 @@ void ModelData::clear() { memset(reinterpret_cast(this), 0, sizeof(ModelData)); modelIndex = -1; // an invalid index, this is managed by the TreeView data model + moduleData[0].protocol = PULSES_OFF; + moduleData[1].protocol = PULSES_OFF; moduleData[0].channelsCount = 8; moduleData[1].channelsStart = 0; moduleData[1].channelsCount = 8; moduleData[0].ppm.delay = 300; moduleData[1].ppm.delay = 300; - moduleData[2].ppm.delay = 300; - Firmware * firmware = Firmware::getCurrentVariant(); - int board = firmware->getBoard(); - if (firmware->isAvailable(PULSES_ACCESS_ISRM, 0)) { - moduleData[0].protocol = PULSES_ACCESS_ISRM; - moduleData[1].protocol = PULSES_OFF; - } - else if (IS_HORUS_OR_TARANIS(board)) { - moduleData[0].protocol = PULSES_PXX_XJT_X16; - moduleData[1].protocol = PULSES_OFF; - } - else if (IS_SKY9X(board)) { - moduleData[0].protocol = PULSES_PPM; - moduleData[1].protocol = PULSES_PPM; - } - else { - moduleData[0].protocol = PULSES_PPM; - moduleData[1].protocol = PULSES_OFF; - } + moduleData[2].ppm.delay = 300; //Trainer PPM for (int i=0; i