fixed rssi alarms
moved FrskyField to Frsky218Field and created VarioField
This commit is contained in:
@@ -185,6 +185,7 @@ class ModelData {
|
|||||||
MavlinkData mavlink;
|
MavlinkData mavlink;
|
||||||
unsigned int telemetryProtocol;
|
unsigned int telemetryProtocol;
|
||||||
FrSkyData frsky;
|
FrSkyData frsky;
|
||||||
|
unsigned int rssiSource;
|
||||||
RSSIAlarmData rssiAlarms;
|
RSSIAlarmData rssiAlarms;
|
||||||
|
|
||||||
char bitmap[10+1];
|
char bitmap[10+1];
|
||||||
|
|||||||
@@ -1728,9 +1728,9 @@ class TelemetryCurrentSourceConversionTable: public ConversionTable
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class FrskyField: public StructField {
|
class Frsky218Field: public StructField {
|
||||||
public:
|
public:
|
||||||
FrskyField(DataField * parent, FrSkyData & frsky, RSSIAlarmData & rssiAlarms, Board::Type board, unsigned int version, unsigned int variant):
|
Frsky218Field(DataField * parent, FrSkyData & frsky, RSSIAlarmData & rssiAlarms, Board::Type board, unsigned int version, unsigned int variant):
|
||||||
StructField(parent, "FrSky"),
|
StructField(parent, "FrSky"),
|
||||||
telemetryVarioSourceConversionTable(board, version),
|
telemetryVarioSourceConversionTable(board, version),
|
||||||
screenTypesConversionTable(board, version),
|
screenTypesConversionTable(board, version),
|
||||||
@@ -1777,6 +1777,20 @@ class FrskyField: public StructField {
|
|||||||
TelemetryCurrentSourceConversionTable telemetryCurrentSourceConversionTable;
|
TelemetryCurrentSourceConversionTable telemetryCurrentSourceConversionTable;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class VarioField: public StructField {
|
||||||
|
public:
|
||||||
|
VarioField(DataField * parent, FrSkyData & frsky, Board::Type board, unsigned int version, unsigned int variant):
|
||||||
|
StructField(parent, "Vario")
|
||||||
|
{
|
||||||
|
Append(new UnsignedField<7>(this, frsky.varioSource, "Vario Source"));
|
||||||
|
Append(new BoolField<1>(this, frsky.varioCenterSilent));
|
||||||
|
Append(new SignedField<8>(this, frsky.varioCenterMax));
|
||||||
|
Append(new SignedField<8>(this, frsky.varioCenterMin));
|
||||||
|
Append(new SignedField<8>(this, frsky.varioMin));
|
||||||
|
Append(new SignedField<8>(this, frsky.varioMax));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TODO
|
* TODO
|
||||||
*/
|
*/
|
||||||
@@ -2029,20 +2043,23 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO rename to VARIO
|
if (version <= 218) {
|
||||||
internalField.Append(new FrskyField(this, modelData.frsky, modelData.rssiAlarms, board, version, variant));
|
internalField.Append(new Frsky218Field(this, modelData.frsky, modelData.rssiAlarms, board, version, variant));
|
||||||
|
}
|
||||||
if (version >= 219) {
|
else {
|
||||||
// TODO RSSI SOURCE
|
internalField.Append(new VarioField(this, modelData.frsky, board, version, variant));
|
||||||
internalField.Append(new SpareBitsField<8>(this));
|
internalField.Append(new UnsignedField<8>(this, modelData.rssiSource));
|
||||||
|
|
||||||
if (IS_TARANIS_X9(board)) {
|
if (IS_TARANIS_X9(board)) {
|
||||||
// TODO TOPBAR
|
// TODO TOPBAR
|
||||||
internalField.Append(new SpareBitsField<16>(this));
|
internalField.Append(new SpareBitsField<16>(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO RSSI ALARMS
|
internalField.Append(new BoolField<1>(this, modelData.rssiAlarms.disabled));
|
||||||
internalField.Append(new SpareBitsField<16>(this));
|
internalField.Append(new SpareBitsField<1>(this));
|
||||||
|
internalField.Append(new ConversionField<SignedField<6> >(this, modelData.rssiAlarms.warning, -45));
|
||||||
|
internalField.Append(new SpareBitsField<2>(this));
|
||||||
|
internalField.Append(new ConversionField<SignedField<6> >(this, modelData.rssiAlarms.critical, -42));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_STM32(board) && version <= 218) {
|
if (IS_STM32(board) && version <= 218) {
|
||||||
|
|||||||
Reference in New Issue
Block a user