More spares to allow A3/A4/RSSI_Tx/Rx_Batt in Telemetry (ARM boards)
This commit is contained in:
@@ -211,21 +211,31 @@ QString RotaryEncoderString(int index)
|
||||
|
||||
QString RawSource::toString()
|
||||
{
|
||||
static const QString trims[] = { QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA")};
|
||||
static const QString trims[] = {
|
||||
QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA")
|
||||
};
|
||||
|
||||
static const QString telemetry[] = { QObject::tr("Batt"), QObject::tr("Timer1"), QObject::tr("Timer2"),
|
||||
(IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("SWR") : QObject::tr("Tx")), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("RSSI") : QObject::tr("Rx")), QObject::tr("A1"), QObject::tr("A2"), QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"),
|
||||
QObject::tr("T2"), QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"), QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"),
|
||||
QObject::tr("Cnsp"), QObject::tr("Powr"), QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"), QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("ASpd"), QObject::tr("dTE"),
|
||||
QObject::tr("A1-"), QObject::tr("A2-"), QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"), QObject::tr("Cel-"), QObject::tr("Vfs-"), QObject::tr("Cur+"), QObject::tr("Pwr+"),
|
||||
QObject::tr("ACC "), QObject::tr("Time"),
|
||||
};
|
||||
static const QString telemetry[] = {
|
||||
QObject::tr("Batt"), QObject::tr("Timer1"), QObject::tr("Timer2"),
|
||||
QObject::tr("SWR"), QObject::tr("RSSI Tx"), QObject::tr("RSSI Rx"), QObject::tr("Rx Batt"),
|
||||
QObject::tr("A1"), QObject::tr("A2"), QObject::tr("A3"), QObject::tr("A4"),
|
||||
QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"), QObject::tr("T2"),
|
||||
QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"),
|
||||
QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"), QObject::tr("Cnsp"), QObject::tr("Powr"),
|
||||
QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"),
|
||||
QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("ASpd"), QObject::tr("dTE"),
|
||||
QObject::tr("A1-"), QObject::tr("A2-"), QObject::tr("A3-"), QObject::tr("A4-"),
|
||||
QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"),
|
||||
QObject::tr("Cel-"), QObject::tr("Vfs-"), QObject::tr("Cur+"), QObject::tr("Pwr+"),
|
||||
QObject::tr("ACC"), QObject::tr("Time"),
|
||||
};
|
||||
|
||||
static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
|
||||
QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
|
||||
QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
|
||||
QObject::tr("LSV"), QObject::tr("LSW")
|
||||
};
|
||||
static const QString virtualSwitches[] = {
|
||||
QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
|
||||
QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
|
||||
QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
|
||||
QObject::tr("LSV"), QObject::tr("LSW")
|
||||
};
|
||||
|
||||
if (index<0) {
|
||||
return QObject::tr("----");
|
||||
|
||||
@@ -175,10 +175,14 @@ enum TelemetrySource {
|
||||
TELEMETRY_SOURCE_TX_BATT,
|
||||
TELEMETRY_SOURCE_TIMER1,
|
||||
TELEMETRY_SOURCE_TIMER2,
|
||||
TELEMETRY_SOURCE_SWR,
|
||||
TELEMETRY_SOURCE_RSSI_TX,
|
||||
TELEMETRY_SOURCE_RSSI_RX,
|
||||
TELEMETRY_SOURCE_RX_BATT,
|
||||
TELEMETRY_SOURCE_A1,
|
||||
TELEMETRY_SOURCE_A2,
|
||||
TELEMETRY_SOURCE_A3,
|
||||
TELEMETRY_SOURCE_A4,
|
||||
TELEMETRY_SOURCE_ALT,
|
||||
TELEMETRY_SOURCE_RPM,
|
||||
TELEMETRY_SOURCE_FUEL,
|
||||
@@ -202,6 +206,8 @@ enum TelemetrySource {
|
||||
TELEMETRY_SOURCE_DTE,
|
||||
TELEMETRY_SOURCE_A1_MIN,
|
||||
TELEMETRY_SOURCE_A2_MIN,
|
||||
TELEMETRY_SOURCE_A3_MIN,
|
||||
TELEMETRY_SOURCE_A4_MIN,
|
||||
TELEMETRY_SOURCE_ALT_MIN,
|
||||
TELEMETRY_SOURCE_ALT_MAX,
|
||||
TELEMETRY_SOURCE_RPM_MAX,
|
||||
@@ -217,6 +223,7 @@ enum TelemetrySource {
|
||||
TELEMETRY_SOURCES_STATUS_COUNT = TELEMETRY_SOURCE_GPS_TIME+1,
|
||||
TELEMETRY_SOURCES_DISPLAY_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
|
||||
TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_DTE+1,
|
||||
TELEMETRY_SOURCE_RESERVE = -1
|
||||
};
|
||||
|
||||
#define TM_HASTELEMETRY 0x01
|
||||
|
||||
@@ -321,55 +321,101 @@ class SwitchField: public ConversionField< SignedField<N> > {
|
||||
int _switch;
|
||||
};
|
||||
|
||||
class TelemetrySourcesConversionTable: public ConversionTable {
|
||||
|
||||
public:
|
||||
TelemetrySourcesConversionTable(BoardEnum board, unsigned int version)
|
||||
{
|
||||
int val = 0;
|
||||
|
||||
if (IS_AFTER_RELEASE_21_MARCH_2013(board, version)) {
|
||||
addConversion(0, val++);
|
||||
}
|
||||
|
||||
addConversion(TELEMETRY_SOURCE_TX_BATT, val++);
|
||||
addConversion(TELEMETRY_SOURCE_TIMER1, val++);
|
||||
addConversion(TELEMETRY_SOURCE_TIMER2, val++);
|
||||
if (IS_ARM(board) && version >= 216)
|
||||
addConversion(TELEMETRY_SOURCE_SWR, val++);
|
||||
addConversion(TELEMETRY_SOURCE_RSSI_TX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_RSSI_RX, val++);
|
||||
if (IS_ARM(board) && version >= 216)
|
||||
addConversion(TELEMETRY_SOURCE_RX_BATT, val++);
|
||||
addConversion(TELEMETRY_SOURCE_A1, val++);
|
||||
addConversion(TELEMETRY_SOURCE_A2, val++);
|
||||
if (IS_ARM(board) && version >= 216)
|
||||
addConversion(TELEMETRY_SOURCE_A3, val++);
|
||||
if (IS_ARM(board) && version >= 216)
|
||||
addConversion(TELEMETRY_SOURCE_A4, val++);
|
||||
addConversion(TELEMETRY_SOURCE_ALT, val++);
|
||||
addConversion(TELEMETRY_SOURCE_RPM, val++);
|
||||
addConversion(TELEMETRY_SOURCE_FUEL, val++);
|
||||
addConversion(TELEMETRY_SOURCE_T1, val++);
|
||||
addConversion(TELEMETRY_SOURCE_T2, val++);
|
||||
addConversion(TELEMETRY_SOURCE_SPEED, val++);
|
||||
addConversion(TELEMETRY_SOURCE_DIST, val++);
|
||||
addConversion(TELEMETRY_SOURCE_GPS_ALT, val++);
|
||||
addConversion(TELEMETRY_SOURCE_CELL, val++);
|
||||
addConversion(TELEMETRY_SOURCE_CELLS_SUM, val++);
|
||||
addConversion(TELEMETRY_SOURCE_VFAS, val++);
|
||||
addConversion(TELEMETRY_SOURCE_CURRENT, val++);
|
||||
addConversion(TELEMETRY_SOURCE_CONSUMPTION, val++);
|
||||
addConversion(TELEMETRY_SOURCE_POWER, val++);
|
||||
addConversion(TELEMETRY_SOURCE_ACCX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_ACCY, val++);
|
||||
addConversion(TELEMETRY_SOURCE_ACCZ, val++);
|
||||
addConversion(TELEMETRY_SOURCE_HDG, val++);
|
||||
addConversion(TELEMETRY_SOURCE_VERTICAL_SPEED, val++);
|
||||
if (version >= 216) {
|
||||
addConversion(TELEMETRY_SOURCE_ASPD, val++);
|
||||
addConversion(TELEMETRY_SOURCE_DTE, val++);
|
||||
}
|
||||
if (IS_ARM(board) && version >= 216) {
|
||||
for (int i=0; i<5; i++)
|
||||
addConversion(TELEMETRY_SOURCE_RESERVE, val++);
|
||||
}
|
||||
addConversion(TELEMETRY_SOURCE_A1_MIN, val++);
|
||||
addConversion(TELEMETRY_SOURCE_A2_MIN, val++);
|
||||
if (IS_ARM(board) && version >= 216) {
|
||||
addConversion(TELEMETRY_SOURCE_A3_MIN, val++);
|
||||
addConversion(TELEMETRY_SOURCE_A4_MIN, val++);
|
||||
}
|
||||
addConversion(TELEMETRY_SOURCE_ALT_MIN, val++);
|
||||
addConversion(TELEMETRY_SOURCE_ALT_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_RPM_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_T1_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_T2_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_SPEED_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_DIST_MAX, val++);
|
||||
addConversion(TELEMETRY_SOURCE_CELL_MIN, val++);
|
||||
addConversion(TELEMETRY_SOURCE_VFAS_MIN, val++);
|
||||
addConversion(TELEMETRY_SOURCE_POWER_MAX, val++);
|
||||
if (IS_ARM(board) && version >= 216) {
|
||||
for (int i=0; i<5; i++)
|
||||
addConversion(TELEMETRY_SOURCE_RESERVE, val++);
|
||||
}
|
||||
addConversion(TELEMETRY_SOURCE_ACC, val++);
|
||||
addConversion(TELEMETRY_SOURCE_GPS_TIME, val++);
|
||||
}
|
||||
};
|
||||
|
||||
template <int N>
|
||||
class TelemetrySourceField: public TransformedField {
|
||||
class TelemetrySourceField: public ConversionField< UnsignedField<N> > {
|
||||
public:
|
||||
TelemetrySourceField(unsigned int & source, BoardEnum board, unsigned int version):
|
||||
TransformedField(internalField),
|
||||
internalField(_source),
|
||||
ConversionField< UnsignedField<N> >(source, &conversionTable, "Telemetry source"),
|
||||
conversionTable(board, version),
|
||||
source(source),
|
||||
board(board),
|
||||
version(version),
|
||||
_source(0)
|
||||
version(version)
|
||||
{
|
||||
}
|
||||
|
||||
virtual void beforeExport()
|
||||
{
|
||||
_source = source;
|
||||
|
||||
if (source > 0 && !IS_AFTER_RELEASE_21_MARCH_2013(board, version))
|
||||
_source--;
|
||||
|
||||
if (IS_ARM(board) && version >= 216) {
|
||||
if (source > 1+TELEMETRY_SOURCE_DTE)
|
||||
_source += 5;
|
||||
if (source > 1+TELEMETRY_SOURCE_POWER_MAX)
|
||||
_source += 5;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void afterImport()
|
||||
{
|
||||
source = _source;
|
||||
|
||||
if (source > 0 && !IS_AFTER_RELEASE_21_MARCH_2013(board, version))
|
||||
source++;
|
||||
|
||||
if (IS_ARM(board) && version >= 216) {
|
||||
if (source > 1+TELEMETRY_SOURCE_DTE)
|
||||
source -= 5;
|
||||
if (source > 1+TELEMETRY_SOURCE_POWER_MAX)
|
||||
source -= 5;
|
||||
}
|
||||
}
|
||||
|
||||
protected:
|
||||
UnsignedField<N> internalField;
|
||||
TelemetrySourcesConversionTable conversionTable;
|
||||
unsigned int & source;
|
||||
BoardEnum board;
|
||||
unsigned int version;
|
||||
unsigned int _source;
|
||||
};
|
||||
|
||||
template <int N>
|
||||
|
||||
Reference in New Issue
Block a user