Crossfire support added to Companion
This commit is contained in:
committed by
Damjan Adamic
parent
816b22fd9d
commit
cc8bd03d8a
@@ -841,6 +841,7 @@ enum PulsesProtocol {
|
|||||||
PULSES_PXX_XJT_D8,
|
PULSES_PXX_XJT_D8,
|
||||||
PULSES_PXX_XJT_LR12,
|
PULSES_PXX_XJT_LR12,
|
||||||
PULSES_PXX_DJT,
|
PULSES_PXX_DJT,
|
||||||
|
PULSES_CROSSFIRE,
|
||||||
PULSES_PROTOCOL_LAST
|
PULSES_PROTOCOL_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -81,6 +81,9 @@ class ProtocolsConversionTable: public ConversionTable
|
|||||||
addConversion(PULSES_DSM2, val++);
|
addConversion(PULSES_DSM2, val++);
|
||||||
addConversion(PULSES_DSMX, val++);
|
addConversion(PULSES_DSMX, val++);
|
||||||
}
|
}
|
||||||
|
if (IS_TARANIS(board)) {
|
||||||
|
addConversion(PULSES_CROSSFIRE, val++);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -853,6 +853,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
|
|||||||
case PULSES_LP45:
|
case PULSES_LP45:
|
||||||
case PULSES_DSM2:
|
case PULSES_DSM2:
|
||||||
case PULSES_DSMX:
|
case PULSES_DSMX:
|
||||||
|
case PULSES_CROSSFIRE:
|
||||||
return 1;
|
return 1;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "appdata.h"
|
#include "appdata.h"
|
||||||
#include "modelprinter.h"
|
#include "modelprinter.h"
|
||||||
|
|
||||||
TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget *prevFocus):
|
TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget * prevFocus):
|
||||||
ModelPanel(parent, model, generalSettings, firmware),
|
ModelPanel(parent, model, generalSettings, firmware),
|
||||||
timer(timer),
|
timer(timer),
|
||||||
ui(new Ui::Timer)
|
ui(new Ui::Timer)
|
||||||
@@ -247,6 +247,10 @@ void ModulePanel::update()
|
|||||||
module.channelsCount = 6;
|
module.channelsCount = 6;
|
||||||
max_rx_num = 20;
|
max_rx_num = 20;
|
||||||
break;
|
break;
|
||||||
|
case PULSES_CROSSFIRE:
|
||||||
|
mask |= MASK_CHANNELS_RANGE;
|
||||||
|
module.channelsCount = 12;
|
||||||
|
break;
|
||||||
case PULSES_PPM:
|
case PULSES_PPM:
|
||||||
mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
|
mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
|
||||||
if (IS_9XRPRO(firmware->getBoard())) {
|
if (IS_9XRPRO(firmware->getBoard())) {
|
||||||
|
|||||||
@@ -90,13 +90,15 @@ QString ModelPrinter::printThrottleTrimMode()
|
|||||||
|
|
||||||
QString ModelPrinter::printModuleProtocol(unsigned int protocol)
|
QString ModelPrinter::printModuleProtocol(unsigned int protocol)
|
||||||
{
|
{
|
||||||
static const char *strings[] = { "OFF",
|
static const char * strings[] = {
|
||||||
"PPM",
|
"OFF",
|
||||||
"Silverlit A", "Silverlit B", "Silverlit C",
|
"PPM",
|
||||||
"CTP1009",
|
"Silverlit A", "Silverlit B", "Silverlit C",
|
||||||
"LP45", "DSM2", "DSMX",
|
"CTP1009",
|
||||||
"PPM16", "PPMsim",
|
"LP45", "DSM2", "DSMX",
|
||||||
"FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
|
"PPM16", "PPMsim",
|
||||||
|
"FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
|
||||||
|
"Crossfire"
|
||||||
};
|
};
|
||||||
|
|
||||||
return CHECK_IN_ARRAY(strings, protocol);
|
return CHECK_IN_ARRAY(strings, protocol);
|
||||||
|
|||||||
Reference in New Issue
Block a user