Timer3 added in sources
This commit is contained in:
@@ -123,6 +123,7 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
|
||||
break;
|
||||
case TELEMETRY_SOURCE_TIMER1:
|
||||
case TELEMETRY_SOURCE_TIMER2:
|
||||
case TELEMETRY_SOURCE_TIMER3:
|
||||
result.step = singleprec ? 5 : 1;
|
||||
result.max = singleprec ? 255*5 : 60*60;
|
||||
result.unit = QObject::tr("s");
|
||||
@@ -338,7 +339,7 @@ QString RawSource::toString(const ModelData & model)
|
||||
};
|
||||
|
||||
static const QString telemetry[] = {
|
||||
QObject::tr("Batt"), QObject::tr("Time"), QObject::tr("Timer1"), QObject::tr("Timer2"),
|
||||
QObject::tr("Batt"), QObject::tr("Time"), QObject::tr("Timer1"), QObject::tr("Timer2"), QObject::tr("Timer3"),
|
||||
QObject::tr("SWR"), QObject::tr("RSSI Tx"), QObject::tr("RSSI Rx"),
|
||||
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"),
|
||||
@@ -743,7 +744,7 @@ QString FuncSwData::funcToString()
|
||||
return QObject::tr("Play Haptic");
|
||||
else if (func == FuncReset)
|
||||
return QObject::tr("Reset");
|
||||
else if (func >= FuncSetTimer1 && func <= FuncSetTimer2)
|
||||
else if (func >= FuncSetTimer1 && func <= FuncSetTimer3)
|
||||
return QObject::tr("Set Timer %1").arg(func-FuncSetTimer1+1);
|
||||
else if (func == FuncVario)
|
||||
return QObject::tr("Vario");
|
||||
@@ -794,6 +795,7 @@ QString FuncSwData::paramToString()
|
||||
else if (func==FuncReset) {
|
||||
qs.append( QObject::tr("Timer1"));
|
||||
qs.append( QObject::tr("Timer2"));
|
||||
qs.append( QObject::tr("Timer3"));
|
||||
qs.append( QObject::tr("All"));
|
||||
qs.append( QObject::tr("Telemetry"));
|
||||
if (param>=0 && param<(int)qs.count())
|
||||
|
||||
@@ -226,6 +226,7 @@ enum TelemetrySource {
|
||||
TELEMETRY_SOURCE_TX_TIME,
|
||||
TELEMETRY_SOURCE_TIMER1,
|
||||
TELEMETRY_SOURCE_TIMER2,
|
||||
TELEMETRY_SOURCE_TIMER3,
|
||||
TELEMETRY_SOURCE_SWR,
|
||||
TELEMETRY_SOURCE_RSSI_TX,
|
||||
TELEMETRY_SOURCE_RSSI_RX,
|
||||
@@ -372,9 +373,8 @@ class RawSource {
|
||||
return (this->type != other.type) || (this->index != other.index);
|
||||
}
|
||||
|
||||
bool isTimeBased() const
|
||||
{
|
||||
return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2));
|
||||
bool isTimeBased() const {
|
||||
return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2 || index==TELEMETRY_SOURCE_TIMER3));
|
||||
}
|
||||
|
||||
RawSourceType type;
|
||||
@@ -738,6 +738,7 @@ enum AssignFunc {
|
||||
FuncReset,
|
||||
FuncSetTimer1,
|
||||
FuncSetTimer2,
|
||||
FuncSetTimer3,
|
||||
FuncVario,
|
||||
FuncPlayPrompt,
|
||||
FuncPlayBoth,
|
||||
|
||||
@@ -429,6 +429,8 @@ class TelemetrySourcesConversionTable: public ConversionTable {
|
||||
}
|
||||
addConversion(1+TELEMETRY_SOURCE_TIMER1, val++);
|
||||
addConversion(1+TELEMETRY_SOURCE_TIMER2, val++);
|
||||
if (IS_ARM(board) && version >= 217)
|
||||
addConversion(1+TELEMETRY_SOURCE_TIMER3, val++);
|
||||
if (IS_ARM(board) && version >= 216)
|
||||
addConversion(1+TELEMETRY_SOURCE_SWR, val++);
|
||||
addConversion(1+TELEMETRY_SOURCE_RSSI_TX, val++);
|
||||
@@ -1588,6 +1590,7 @@ class LogicalSwitchField: public TransformedField {
|
||||
switch (val1.index) {
|
||||
case TELEMETRY_SOURCE_TIMER1:
|
||||
case TELEMETRY_SOURCE_TIMER2:
|
||||
case TELEMETRY_SOURCE_TIMER3:
|
||||
csw.val2 = (csw.val2 + 128) * 3;
|
||||
break;
|
||||
case TELEMETRY_SOURCE_ALT:
|
||||
@@ -1694,6 +1697,7 @@ class CustomFunctionsConversionTable: public ConversionTable {
|
||||
if (IS_ARM(board)) {
|
||||
addConversion(FuncSetTimer1, val);
|
||||
addConversion(FuncSetTimer2, val);
|
||||
addConversion(FuncSetTimer3, val);
|
||||
val++;
|
||||
}
|
||||
for (int i=0; i<MAX_GVARS(board, version); i++)
|
||||
@@ -1847,7 +1851,7 @@ class ArmCustomFunctionField: public TransformedField {
|
||||
if (version >= 216)
|
||||
*((uint8_t *)(_param+3)) = fn.func - FuncTrainer;
|
||||
}
|
||||
else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer2) {
|
||||
else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer3) {
|
||||
if (version >= 216) {
|
||||
*((uint16_t *)_param) = fn.param;
|
||||
*((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
|
||||
@@ -1894,6 +1898,12 @@ class ArmCustomFunctionField: public TransformedField {
|
||||
else
|
||||
*((uint32_t *)_param) = value;
|
||||
}
|
||||
else if (fn.func == FuncReset) {
|
||||
if (version >= 217)
|
||||
*((uint32_t *)_param) = fn.param;
|
||||
else
|
||||
*((uint32_t *)_param) = (fn.param < 2 ? fn.param : fn.param-1);
|
||||
}
|
||||
else {
|
||||
*((uint32_t *)_param) = fn.param;
|
||||
}
|
||||
@@ -1920,7 +1930,7 @@ class ArmCustomFunctionField: public TransformedField {
|
||||
fn.func = AssignFunc(fn.func + index);
|
||||
fn.param = (int8_t)value;
|
||||
}
|
||||
else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer2) {
|
||||
else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer3) {
|
||||
fn.func = AssignFunc(fn.func + index);
|
||||
fn.param = (int)value;
|
||||
}
|
||||
@@ -1964,6 +1974,12 @@ class ArmCustomFunctionField: public TransformedField {
|
||||
else
|
||||
SourcesConversionTable::getInstance(board, version, variant, FLAG_NONONE|FLAG_NOSWITCHES)->importValue(value, (int &)fn.param);
|
||||
}
|
||||
else if (fn.func == FuncReset) {
|
||||
if (version >= 217)
|
||||
fn.param = value;
|
||||
else
|
||||
fn.param = (value < 2 ? value : value+1);
|
||||
}
|
||||
else {
|
||||
fn.param = value;
|
||||
}
|
||||
|
||||
@@ -537,6 +537,7 @@ void populateGVCB(QComboBox *b, int value)
|
||||
|
||||
void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData & model, unsigned int flags)
|
||||
{
|
||||
BoardEnum board = GetCurrentFirmware()->getBoard();
|
||||
RawSource item;
|
||||
|
||||
b->clear();
|
||||
@@ -557,7 +558,6 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (flags & POPULATE_VIRTUAL_INPUTS) {
|
||||
int virtualInputs = GetCurrentFirmware()->getCapability(VirtualInputs);
|
||||
for (int i=0; i<virtualInputs; i++) {
|
||||
@@ -632,7 +632,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
|
||||
|
||||
if (flags & POPULATE_TELEMETRYEXT) {
|
||||
for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
|
||||
if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(GetCurrentFirmware()->getBoard()))
|
||||
if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(board))
|
||||
continue;
|
||||
item = RawSource(SOURCE_TYPE_TELEMETRY, i);
|
||||
b->addItem(item.toString(model), item.toValue());
|
||||
@@ -641,7 +641,9 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
|
||||
}
|
||||
else if (flags & POPULATE_TELEMETRY) {
|
||||
for (int i=0; i<TELEMETRY_SOURCES_COUNT; i++) {
|
||||
if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(GetCurrentFirmware()->getBoard()))
|
||||
if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(board))
|
||||
continue;
|
||||
if (i==TELEMETRY_SOURCE_TIMER3 && !IS_ARM(board))
|
||||
continue;
|
||||
item = RawSource(SOURCE_TYPE_TELEMETRY, i);
|
||||
b->addItem(item.toString(model), item.toValue());
|
||||
|
||||
Reference in New Issue
Block a user