Merge branch '2.3.1' into 2.3
# Conflicts: # CREDITS.txt # radio/src/gui/480x272/radio_hardware.cpp
This commit is contained in:
@@ -85,6 +85,7 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
|
||||
Firmware * fw = getCurrentFirmware();
|
||||
|
||||
// Descending switch direction: NOT (!) switches
|
||||
addItems(SWITCH_TYPE_ACT, -1);
|
||||
addItems(SWITCH_TYPE_SENSOR, -CPN_MAX_SENSORS);
|
||||
addItems(SWITCH_TYPE_TELEMETRY, -1);
|
||||
addItems(SWITCH_TYPE_FLIGHT_MODE, -fw->getCapability(FlightModes));
|
||||
@@ -107,6 +108,7 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
|
||||
addItems(SWITCH_TYPE_SENSOR, CPN_MAX_SENSORS);
|
||||
addItems(SWITCH_TYPE_ON, 1);
|
||||
addItems(SWITCH_TYPE_ONE, 1);
|
||||
addItems(SWITCH_TYPE_ACT, 1);
|
||||
}
|
||||
|
||||
void RawSwitchItemModel::setDynamicItemData(QStandardItem * item, const RawSwitch & rsw) const
|
||||
|
||||
@@ -109,6 +109,7 @@ class GeneralSettings {
|
||||
bool adjustRTC;
|
||||
bool optrexDisplay;
|
||||
unsigned int inactivityTimer;
|
||||
unsigned int telemetryBaudrate;
|
||||
bool minuteBeep;
|
||||
bool preBeep;
|
||||
bool flashBeep;
|
||||
@@ -140,6 +141,7 @@ class GeneralSettings {
|
||||
unsigned int rotarySteps;
|
||||
unsigned int countryCode;
|
||||
bool jitterFilter;
|
||||
bool rtcCheckDisable;
|
||||
unsigned int imperial;
|
||||
char ttsLanguage[2+1];
|
||||
int beepVolume;
|
||||
|
||||
@@ -127,12 +127,12 @@ QString ModuleData::protocolToString(unsigned protocol)
|
||||
"FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
|
||||
"TBS Crossfire",
|
||||
"DIY Multiprotocol Module",
|
||||
"FrSky PXX R9M",
|
||||
"FrSky PXX R9M Lite",
|
||||
"FrSky PXX R9M Lite Pro",
|
||||
"FrSky R9M",
|
||||
"FrSky R9M Lite",
|
||||
"FrSky R9M Lite Pro",
|
||||
"SBUS output at VBat",
|
||||
"FrSky ACCESS ISRM", "FrSky ACCST ISRM D16",
|
||||
"FrSky ACCESS R9M",
|
||||
"FrSky ACCESS R9M 2019",
|
||||
"FrSky ACCESS R9M Lite",
|
||||
"FrSky ACCESS R9M Lite Pro",
|
||||
"FrSky XJT lite (D16)", "FrSky XJT lite (D8)", "FrSky XJT lite (LR12)"
|
||||
|
||||
@@ -217,6 +217,10 @@ class SwitchesConversionTable: public ConversionTable {
|
||||
addConversion(RawSwitch(SWITCH_TYPE_SENSOR, i), val++);
|
||||
}
|
||||
}
|
||||
if (version >= 219) {
|
||||
addConversion(RawSwitch(SWITCH_TYPE_ACT, -1), -val+offset);
|
||||
addConversion(RawSwitch(SWITCH_TYPE_ACT, 1), val++);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1914,7 +1918,7 @@ class SensorField: public TransformedField {
|
||||
if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) {
|
||||
_id = sensor.id;
|
||||
_subid = sensor.subid;
|
||||
_instance = (sensor.instance & 0x1F) | (sensor.rxIdx << 5) | (sensor.moduleIdx << 7);
|
||||
_instance = sensor.instance == 0 ? 0 : ((sensor.instance - 1) & 0x1F) | (sensor.rxIdx << 5) | (sensor.moduleIdx << 7);
|
||||
_ratio = sensor.ratio;
|
||||
_offset = sensor.offset;
|
||||
}
|
||||
@@ -1942,12 +1946,12 @@ class SensorField: public TransformedField {
|
||||
sensor.id = _id;
|
||||
sensor.subid = _subid;
|
||||
if (model.moduleData[0].isPxx1Module() || model.moduleData[1].isPxx1Module()) {
|
||||
sensor.instance = (_instance & 0x1F) + (version <= 218 ? -1 : 0); // 5 bits instance
|
||||
sensor.instance = (_instance & 0x1F) + (version <= 218 ? 0 : 1); // 5 bits instance
|
||||
sensor.rxIdx = 0x03; // 2 bits Rx idx
|
||||
sensor.moduleIdx = 0x01; // 1 bit module idx
|
||||
}
|
||||
else {
|
||||
sensor.instance = _instance & 0x1F;
|
||||
sensor.instance = (_instance & 0x1F) + 1;
|
||||
sensor.rxIdx = (_instance >> 5) & 0x03; // 2 bits Rx idx
|
||||
sensor.moduleIdx = (_instance >> 7) & 0x1; // 1 bit module idx
|
||||
}
|
||||
@@ -2361,8 +2365,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
|
||||
internalField.Append(new UnsignedField<8>(this, modelData.rssiSource));
|
||||
|
||||
if (IS_TARANIS_X9(board)) {
|
||||
// TODO TOPBAR
|
||||
internalField.Append(new SpareBitsField<16>(this));
|
||||
internalField.Append(new UnsignedField<8>(this, modelData.frsky.voltsSource));
|
||||
internalField.Append(new UnsignedField<8>(this, modelData.frsky.altitudeSource));
|
||||
}
|
||||
|
||||
internalField.Append(new BoolField<1>(this, modelData.rssiAlarms.disabled));
|
||||
@@ -2571,7 +2575,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
|
||||
internalField.Append(new SignedField<2>(this, generalData.antennaMode));
|
||||
else
|
||||
internalField.Append(new SpareBitsField<2>(this));
|
||||
internalField.Append(new SpareBitsField<3>(this));
|
||||
internalField.Append(new BoolField<1>(this, generalData.rtcCheckDisable));
|
||||
internalField.Append(new SpareBitsField<2>(this));
|
||||
|
||||
for (int i=0; i<4; i++) {
|
||||
internalField.Append(new SignedField<16>(this, generalData.trainer.calib[i]));
|
||||
@@ -2602,7 +2607,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
|
||||
}
|
||||
|
||||
internalField.Append(new UnsignedField<8>(this, generalData.inactivityTimer));
|
||||
internalField.Append(new SpareBitsField<3>(this)); // telemetryBaudrate
|
||||
internalField.Append(new UnsignedField<3>(this, generalData.telemetryBaudrate));
|
||||
if (IS_HORUS(board))
|
||||
internalField.Append(new SpareBitsField<3>(this));
|
||||
else if (IS_TARANIS(board))
|
||||
|
||||
@@ -803,13 +803,15 @@ bool OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
|
||||
case PULSES_MULTIMODULE:
|
||||
case PULSES_CROSSFIRE:
|
||||
return true;
|
||||
case PULSES_ACCESS_R9M:
|
||||
return IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board) || board == BOARD_TARANIS_X9DP_2019 || board == BOARD_X10_EXPRESS || (IS_HORUS(board) && id.contains("internalaccess"));
|
||||
case PULSES_PXX_R9M_LITE:
|
||||
case PULSES_ACCESS_R9M_LITE:
|
||||
case PULSES_ACCESS_R9M_LITE_PRO:
|
||||
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board));
|
||||
case PULSES_XJT_LITE_X16:
|
||||
case PULSES_XJT_LITE_D8:
|
||||
case PULSES_XJT_LITE_LR12:
|
||||
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board));
|
||||
return (IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -115,6 +115,9 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
|
||||
case SWITCH_TYPE_ONE:
|
||||
return tr("One");
|
||||
|
||||
case SWITCH_TYPE_ACT:
|
||||
return tr("Act");
|
||||
|
||||
case SWITCH_TYPE_FLIGHT_MODE:
|
||||
if (modelData)
|
||||
return modelData->flightModeData[index-1].nameToString(index - 1);
|
||||
|
||||
@@ -45,6 +45,7 @@ enum RawSwitchType {
|
||||
SWITCH_TYPE_TIMER_MODE,
|
||||
SWITCH_TYPE_TELEMETRY,
|
||||
SWITCH_TYPE_SENSOR,
|
||||
SWITCH_TYPE_ACT,
|
||||
MAX_SWITCH_TYPE
|
||||
};
|
||||
|
||||
|
||||
@@ -200,6 +200,15 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
|
||||
}
|
||||
else {
|
||||
ui->filterEnable->hide();
|
||||
ui->filterLabel->hide();
|
||||
}
|
||||
|
||||
if (IS_STM32(board)) {
|
||||
ui->rtcCheckDisable->setChecked(!generalSettings.rtcCheckDisable);
|
||||
}
|
||||
else {
|
||||
ui->rtcCheckDisable->hide();
|
||||
ui->rtcCheckLabel->hide();
|
||||
}
|
||||
|
||||
disableMouseScrolling();
|
||||
@@ -217,6 +226,11 @@ void HardwarePanel::on_filterEnable_stateChanged()
|
||||
generalSettings.jitterFilter = !ui->filterEnable->isChecked();
|
||||
}
|
||||
|
||||
void HardwarePanel::on_rtcCheckDisable_stateChanged()
|
||||
{
|
||||
generalSettings.rtcCheckDisable = !ui->rtcCheckDisable->isChecked();
|
||||
}
|
||||
|
||||
void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
|
||||
{
|
||||
int val = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
|
||||
|
||||
@@ -49,6 +49,7 @@ class HardwarePanel : public GeneralPanel
|
||||
void on_txCurrentCalibration_editingFinished();
|
||||
void on_txVoltageCalibration_editingFinished();
|
||||
void on_filterEnable_stateChanged();
|
||||
void on_rtcCheckDisable_stateChanged();
|
||||
|
||||
void on_serialPortMode_currentIndexChanged(int index);
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>470</width>
|
||||
<height>1585</height>
|
||||
<height>1618</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@@ -57,7 +57,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="43" column="1">
|
||||
<item row="44" column="1">
|
||||
<widget class="QSpinBox" name="PPM2">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
@@ -169,7 +169,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="39" column="1">
|
||||
<item row="40" column="1">
|
||||
<widget class="QSpinBox" name="txCurrentCalibration">
|
||||
<property name="minimum">
|
||||
<number>-49</number>
|
||||
@@ -192,27 +192,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0">
|
||||
<widget class="QLabel" name="rs2Label">
|
||||
<property name="text">
|
||||
<string>RS2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="40" column="0" colspan="3">
|
||||
<widget class="Line" name="ppmSeparator">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>10</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="44" column="1">
|
||||
<item row="45" column="1">
|
||||
<widget class="QSpinBox" name="PPM3">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
@@ -231,6 +211,26 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="41" column="0" colspan="3">
|
||||
<widget class="Line" name="ppmSeparator">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>10</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0">
|
||||
<widget class="QLabel" name="rs2Label">
|
||||
<property name="text">
|
||||
<string>RS2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="0" colspan="3">
|
||||
<widget class="Line" name="potsTypeSeparator_1">
|
||||
<property name="minimumSize">
|
||||
@@ -267,7 +267,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="39" column="0">
|
||||
<item row="40" column="0">
|
||||
<widget class="QLabel" name="txCurrentCalibrationLabel">
|
||||
<property name="text">
|
||||
<string>Current Offset</string>
|
||||
@@ -284,7 +284,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="43" column="0">
|
||||
<item row="44" column="0">
|
||||
<widget class="QLabel" name="label_33">
|
||||
<property name="text">
|
||||
<string>PPM 2</string>
|
||||
@@ -312,6 +312,9 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="34" column="1">
|
||||
<widget class="AutoComboBox" name="antennaMode"/>
|
||||
</item>
|
||||
<item row="19" column="1">
|
||||
<widget class="AutoLineEdit" name="sfName">
|
||||
<property name="maxLength">
|
||||
@@ -322,6 +325,19 @@
|
||||
<item row="8" column="2">
|
||||
<widget class="AutoComboBox" name="pot5Type"/>
|
||||
</item>
|
||||
<item row="20" column="2">
|
||||
<widget class="AutoComboBox" name="sgType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="21" column="2">
|
||||
<widget class="AutoComboBox" name="shType">
|
||||
<property name="toolTip">
|
||||
@@ -342,17 +358,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="20" column="2">
|
||||
<widget class="AutoComboBox" name="sgType">
|
||||
<item row="14" column="2">
|
||||
<widget class="AutoComboBox" name="saType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="18" column="2">
|
||||
@@ -375,16 +388,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="2">
|
||||
<widget class="AutoComboBox" name="saType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="0">
|
||||
<widget class="QLabel" name="saLabel">
|
||||
<property name="text">
|
||||
@@ -434,6 +437,16 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="2">
|
||||
<widget class="AutoComboBox" name="pot2Type">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="29" column="2">
|
||||
<widget class="AutoComboBox" name="spType">
|
||||
<property name="toolTip">
|
||||
@@ -447,23 +460,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="1">
|
||||
<widget class="AutoLineEdit" name="rsName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="2">
|
||||
<widget class="AutoComboBox" name="pot2Type">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="35" column="1">
|
||||
<widget class="QCheckBox" name="filterEnable">
|
||||
<property name="text">
|
||||
@@ -471,6 +467,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="1">
|
||||
<widget class="AutoLineEdit" name="rsName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="AutoLineEdit" name="rudName">
|
||||
<property name="maxLength">
|
||||
@@ -512,7 +515,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="46" column="1">
|
||||
<item row="47" column="1">
|
||||
<widget class="QDoubleSpinBox" name="PPM_MultiplierDSB">
|
||||
<property name="decimals">
|
||||
<number>1</number>
|
||||
@@ -545,6 +548,19 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="31" column="2">
|
||||
<widget class="AutoComboBox" name="srType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="38" column="0">
|
||||
<widget class="QLabel" name="txVoltageCalibrationLabel">
|
||||
<property name="text">
|
||||
@@ -562,19 +578,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="31" column="2">
|
||||
<widget class="AutoComboBox" name="srType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="20" column="0">
|
||||
<widget class="QLabel" name="sgLabel">
|
||||
<property name="text">
|
||||
@@ -589,9 +592,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="34" column="1">
|
||||
<widget class="AutoComboBox" name="antennaMode"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="eleLabel">
|
||||
<property name="text">
|
||||
@@ -599,6 +599,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="22" column="0">
|
||||
<widget class="QLabel" name="siLabel">
|
||||
<property name="text">
|
||||
<string>SI</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="AutoLineEdit" name="pot4Name">
|
||||
<property name="maxLength">
|
||||
@@ -613,10 +620,10 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="22" column="0">
|
||||
<widget class="QLabel" name="siLabel">
|
||||
<item row="25" column="0">
|
||||
<widget class="QLabel" name="slLabel">
|
||||
<property name="text">
|
||||
<string>SI</string>
|
||||
<string>SL</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -627,13 +634,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="25" column="0">
|
||||
<widget class="QLabel" name="slLabel">
|
||||
<property name="text">
|
||||
<string>SL</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="27" column="1">
|
||||
<widget class="AutoLineEdit" name="snName">
|
||||
<property name="maxLength">
|
||||
@@ -688,7 +688,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="45" column="1">
|
||||
<item row="46" column="1">
|
||||
<widget class="QSpinBox" name="PPM4">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
@@ -707,7 +707,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="41" column="0">
|
||||
<item row="42" column="0">
|
||||
<widget class="QLabel" name="label_23">
|
||||
<property name="text">
|
||||
<string>PPM 1</string>
|
||||
@@ -727,14 +727,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="45" column="0">
|
||||
<item row="46" column="0">
|
||||
<widget class="QLabel" name="label_35">
|
||||
<property name="text">
|
||||
<string>PPM 4</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="41" column="1">
|
||||
<item row="42" column="1">
|
||||
<widget class="QSpinBox" name="PPM1">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
@@ -766,6 +766,20 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="0">
|
||||
<widget class="QLabel" name="sbLabel">
|
||||
<property name="text">
|
||||
<string>SB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="31" column="1">
|
||||
<widget class="AutoLineEdit" name="srName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="38" column="1">
|
||||
<widget class="QDoubleSpinBox" name="txVoltageCalibration">
|
||||
<property name="statusTip">
|
||||
@@ -788,21 +802,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="0">
|
||||
<widget class="QLabel" name="sbLabel">
|
||||
<property name="text">
|
||||
<string>SB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="31" column="1">
|
||||
<widget class="AutoLineEdit" name="srName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="46" column="0">
|
||||
<item row="47" column="0">
|
||||
<widget class="QLabel" name="label_30">
|
||||
<property name="text">
|
||||
<string>PPM Multiplier</string>
|
||||
@@ -903,16 +903,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="34" column="0">
|
||||
<widget class="QLabel" name="antennaLabel">
|
||||
<property name="text">
|
||||
<string>Antenna</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="27" column="2">
|
||||
<widget class="AutoComboBox" name="snType">
|
||||
<property name="toolTip">
|
||||
@@ -933,7 +923,17 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="44" column="0">
|
||||
<item row="34" column="0">
|
||||
<widget class="QLabel" name="antennaLabel">
|
||||
<property name="text">
|
||||
<string>Antenna</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="45" column="0">
|
||||
<widget class="QLabel" name="label_34">
|
||||
<property name="text">
|
||||
<string>PPM 3</string>
|
||||
@@ -1029,6 +1029,26 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="AutoLineEdit" name="eleName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="2">
|
||||
<widget class="AutoComboBox" name="smType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="36" column="1">
|
||||
<widget class="QComboBox" name="serialPortMode">
|
||||
<item>
|
||||
@@ -1058,26 +1078,6 @@
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="AutoLineEdit" name="eleName">
|
||||
<property name="maxLength">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="2">
|
||||
<widget class="AutoComboBox" name="smType">
|
||||
<property name="toolTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="0">
|
||||
<widget class="QLabel" name="rsLabel">
|
||||
<property name="text">
|
||||
@@ -1113,6 +1113,20 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="39" column="1">
|
||||
<widget class="QCheckBox" name="rtcCheckDisable">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="39" column="0">
|
||||
<widget class="QLabel" name="rtcCheckLabel">
|
||||
<property name="text">
|
||||
<string>RTC Batt Check</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
|
||||
@@ -217,10 +217,7 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
|
||||
// The protocols available on this board
|
||||
for (unsigned int i=0; i<PULSES_PROTOCOL_LAST; i++) {
|
||||
if (firmware->isAvailable((PulsesProtocol) i, moduleIdx)) {
|
||||
if (IS_TARANIS_XLITE(firmware->getBoard()) && i == PULSES_PXX_R9M) //TODO remove when mini are handled as a different module type
|
||||
ui->protocol->addItem("FrSky R9M Mini", (QVariant) i);
|
||||
else
|
||||
ui->protocol->addItem(ModuleData::protocolToString(i), i);
|
||||
ui->protocol->addItem(ModuleData::protocolToString(i), i);
|
||||
if (i == module.protocol)
|
||||
ui->protocol->setCurrentIndex(ui->protocol->count()-1);
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ TEST(Conversions, ConversionX9DPFrom22)
|
||||
EXPECT_STREQ("Thr", model.inputNames[0]);
|
||||
EXPECT_STREQ("Tes", model.sensorData[0].label);
|
||||
EXPECT_EQ(10, model.sensorData[0].id);
|
||||
EXPECT_EQ(9, model.sensorData[0].instance);
|
||||
EXPECT_EQ(10, model.sensorData[0].instance);
|
||||
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model.logicalSw[0].val1);
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ TEST(Conversions, ConversionX9DPFrom23)
|
||||
EXPECT_STREQ("Rud", model1.inputNames[0]);
|
||||
EXPECT_STREQ("Tes", model1.sensorData[0].label);
|
||||
EXPECT_EQ(10, model1.sensorData[0].id);
|
||||
EXPECT_EQ(10, model1.sensorData[0].instance);
|
||||
EXPECT_EQ(11, model1.sensorData[0].instance);
|
||||
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model1.logicalSw[0].val1);
|
||||
|
||||
const ModelData & model2 = radioData.models[1];
|
||||
@@ -96,7 +96,7 @@ TEST(Conversions, ConversionX9DPFrom23)
|
||||
EXPECT_STREQ("Rud", model2.inputNames[0]);
|
||||
EXPECT_STREQ("Tes", model2.sensorData[0].label);
|
||||
EXPECT_EQ(10, model2.sensorData[0].id);
|
||||
EXPECT_EQ(10, model2.sensorData[0].instance);
|
||||
EXPECT_EQ(11, model2.sensorData[0].instance);
|
||||
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model2.logicalSw[0].val1);
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ TEST(Conversions, ConversionX7From22)
|
||||
|
||||
EXPECT_STREQ("Tes", model.sensorData[0].label);
|
||||
EXPECT_EQ(10, model.sensorData[0].id);
|
||||
EXPECT_EQ(9, model.sensorData[0].instance);
|
||||
EXPECT_EQ(10, model.sensorData[0].instance);
|
||||
EXPECT_EQ(900, model.limitData[0].max); // -100
|
||||
|
||||
EXPECT_EQ(10, model.flightModeData[0].gvars[0]);
|
||||
@@ -178,7 +178,7 @@ TEST(Conversions, ConversionXLiteFrom22)
|
||||
|
||||
EXPECT_STREQ("Tes", model.sensorData[0].label);
|
||||
EXPECT_EQ(10, model.sensorData[0].id);
|
||||
EXPECT_EQ(8, model.sensorData[0].instance);
|
||||
EXPECT_EQ(9, model.sensorData[0].instance);
|
||||
EXPECT_EQ(900, model.limitData[0].max); // -100
|
||||
|
||||
EXPECT_EQ(LS_FN_VPOS, model.logicalSw[0].func);
|
||||
@@ -284,7 +284,7 @@ TEST(Conversions, ConversionX10From22)
|
||||
EXPECT_STREQ("Rud", model.inputNames[0]);
|
||||
EXPECT_STREQ("Tes", model.sensorData[0].label);
|
||||
EXPECT_EQ(10, model.sensorData[0].id);
|
||||
EXPECT_EQ(9, model.sensorData[0].instance);
|
||||
EXPECT_EQ(10, model.sensorData[0].instance);
|
||||
EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
|
||||
}
|
||||
|
||||
@@ -360,6 +360,6 @@ TEST(Conversions, ConversionX12SFrom22)
|
||||
EXPECT_STREQ("Rud", model.inputNames[0]);
|
||||
EXPECT_STREQ("Tes", model.sensorData[0].label);
|
||||
EXPECT_EQ(10, model.sensorData[0].id);
|
||||
EXPECT_EQ(9, model.sensorData[0].instance);
|
||||
EXPECT_EQ(10, model.sensorData[0].instance);
|
||||
EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user