Companion support for FAS offset, Persistent mAh and Altitude in top bar
This commit is contained in:
@@ -51,7 +51,8 @@ enum BoardEnum {
|
|||||||
BOARD_TARANIS_REV4a
|
BOARD_TARANIS_REV4a
|
||||||
};
|
};
|
||||||
|
|
||||||
#define IS_STOCK(board) (board==BOARD_STOCK || board==BOARD_M128)
|
#define IS_9X(board) (board==BOARD_STOCK || board==BOARD_M128)
|
||||||
|
#define IS_STOCK(board) (board==BOARD_STOCK)
|
||||||
#define IS_2560(board) (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
|
#define IS_2560(board) (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
|
||||||
#define IS_ARM(board) (board==BOARD_SKY9X || board==BOARD_TARANIS || board==BOARD_TARANIS_REV4a)
|
#define IS_ARM(board) (board==BOARD_SKY9X || board==BOARD_TARANIS || board==BOARD_TARANIS_REV4a)
|
||||||
#define IS_TARANIS(board) (board==BOARD_TARANIS || board==BOARD_TARANIS_REV4a)
|
#define IS_TARANIS(board) (board==BOARD_TARANIS || board==BOARD_TARANIS_REV4a)
|
||||||
@@ -753,6 +754,9 @@ class FrSkyData {
|
|||||||
int varioCenterMin; // if increment in 0.2m/s = 3.0m/s max
|
int varioCenterMin; // if increment in 0.2m/s = 3.0m/s max
|
||||||
int varioCenterMax;
|
int varioCenterMax;
|
||||||
int varioMax;
|
int varioMax;
|
||||||
|
bool mAhPersistent;
|
||||||
|
unsigned int storedMah;
|
||||||
|
int fasOffset;
|
||||||
|
|
||||||
void clear() { memset(this, 0, sizeof(FrSkyData)); rssiAlarms[0].clear(2, 45); rssiAlarms[1].clear(3, 42); varioSource = 2/*VARIO*/; }
|
void clear() { memset(this, 0, sizeof(FrSkyData)); rssiAlarms[0].clear(2, 45); rssiAlarms[1].clear(3, 42); varioSource = 2/*VARIO*/; }
|
||||||
};
|
};
|
||||||
@@ -1012,7 +1016,9 @@ enum Capability {
|
|||||||
LuaInputs,
|
LuaInputs,
|
||||||
LimitsPer1000,
|
LimitsPer1000,
|
||||||
EnhancedCurves,
|
EnhancedCurves,
|
||||||
TelemetryInternalAlarms
|
TelemetryInternalAlarms,
|
||||||
|
HasFasOffset,
|
||||||
|
HasMahPersistent
|
||||||
};
|
};
|
||||||
|
|
||||||
enum UseContext {
|
enum UseContext {
|
||||||
|
|||||||
@@ -1688,8 +1688,7 @@ class FrskyField: public StructField {
|
|||||||
Append(new UnsignedField<8>(frsky.usrProto));
|
Append(new UnsignedField<8>(frsky.usrProto));
|
||||||
if (version >= 216) {
|
if (version >= 216) {
|
||||||
Append(new UnsignedField<7>(frsky.voltsSource));
|
Append(new UnsignedField<7>(frsky.voltsSource));
|
||||||
// TODO altitude displayed
|
Append(new BoolField<1>(frsky.altitudeDisplayed));
|
||||||
Append(new SpareBitsField<1>());
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Append(new UnsignedField<8>(frsky.voltsSource));
|
Append(new UnsignedField<8>(frsky.voltsSource));
|
||||||
@@ -1718,10 +1717,9 @@ class FrskyField: public StructField {
|
|||||||
Append(new ConversionField< SignedField<6> >(frsky.rssiAlarms[i].value, -45+i*3));
|
Append(new ConversionField< SignedField<6> >(frsky.rssiAlarms[i].value, -45+i*3));
|
||||||
}
|
}
|
||||||
if (version >= 216) {
|
if (version >= 216) {
|
||||||
// TODO uint16_t mAhPersistent:1;
|
Append(new BoolField<1>(frsky.mAhPersistent));
|
||||||
// uint16_t storedMah:15;
|
Append(new UnsignedField<15>(frsky.storedMah));
|
||||||
// int8_t fasOffset;
|
Append(new SignedField<8>(frsky.fasOffset));
|
||||||
Append(new SpareBitsField<24>());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -2043,7 +2041,7 @@ Open9xGeneralDataNew::Open9xGeneralDataNew(GeneralSettings & generalData, BoardE
|
|||||||
internalField.Append(new SpareBitsField<1>());
|
internalField.Append(new SpareBitsField<1>());
|
||||||
|
|
||||||
internalField.Append(new UnsignedField<8>(generalData.inactivityTimer));
|
internalField.Append(new UnsignedField<8>(generalData.inactivityTimer));
|
||||||
if (IS_STOCK(board) && version >= 215) {
|
if (IS_9X(board) && version >= 215) {
|
||||||
internalField.Append(new UnsignedField<3>(generalData.mavbaud));
|
internalField.Append(new UnsignedField<3>(generalData.mavbaud));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
@@ -701,6 +701,10 @@ int Open9xInterface::getCapability(const Capability capability)
|
|||||||
case EnhancedCurves:
|
case EnhancedCurves:
|
||||||
case TelemetryInternalAlarms:
|
case TelemetryInternalAlarms:
|
||||||
return IS_TARANIS(board);
|
return IS_TARANIS(board);
|
||||||
|
case HasFasOffset:
|
||||||
|
return (IS_STOCK(board) ? false : true);
|
||||||
|
case HasMahPersistent:
|
||||||
|
return (IS_ARM(board) ? true : false);
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1078,6 +1082,7 @@ void RegisterOpen9xFirmwares()
|
|||||||
open9x->addOption("novario", QObject::tr("No vario support"));
|
open9x->addOption("novario", QObject::tr("No vario support"));
|
||||||
open9x->addOption("nogps", QObject::tr("No GPS support"));
|
open9x->addOption("nogps", QObject::tr("No GPS support"));
|
||||||
open9x->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
|
open9x->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
|
||||||
|
open9x->addOption("fasoffset", QObject::tr("Allow compensating for offset errors in FrSky FAS current sensors"));
|
||||||
open9x->addOptions(fai_options);
|
open9x->addOptions(fai_options);
|
||||||
firmwares.push_back(open9x);
|
firmwares.push_back(open9x);
|
||||||
|
|
||||||
|
|||||||
@@ -375,8 +375,7 @@ void TelemetryPanel::setup()
|
|||||||
ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
|
ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
|
||||||
}
|
}
|
||||||
int varioCap=GetEepromInterface()->getCapability(HasVario);
|
int varioCap=GetEepromInterface()->getCapability(HasVario);
|
||||||
// if (IS_TARANIS(GetEepromInterface()->getBoard())) {
|
if (IS_TARANIS(GetEepromInterface()->getBoard())) {
|
||||||
if (false) {
|
|
||||||
ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
|
ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
|
||||||
} else {
|
} else {
|
||||||
ui->AltitudeToolbar_ChkB->hide();
|
ui->AltitudeToolbar_ChkB->hide();
|
||||||
@@ -482,6 +481,29 @@ void TelemetryPanel::setup()
|
|||||||
ui->frskyProtoCB->addItem(tr("Winged Shadow How High (not supported)"));
|
ui->frskyProtoCB->addItem(tr("Winged Shadow How High (not supported)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ui->variousGB->hide();
|
||||||
|
if (!(GetEepromInterface()->getCapability(HasFasOffset)) && !(firmware_id.contains("fasoffset"))) {
|
||||||
|
ui->fasOffset_label->hide();
|
||||||
|
ui->fasOffset_DSB->hide();
|
||||||
|
} else {
|
||||||
|
ui->fasOffset_DSB->setValue(model.frsky.fasOffset/10.0);
|
||||||
|
ui->variousGB->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(GetEepromInterface()->getCapability(HasMahPersistent))) {
|
||||||
|
ui->mahCount_label->hide();
|
||||||
|
ui->mahCount_SB->hide();
|
||||||
|
ui->mahCount_ChkB->hide();
|
||||||
|
} else {
|
||||||
|
if (model.frsky.mAhPersistent) {
|
||||||
|
ui->mahCount_ChkB->setChecked(true);
|
||||||
|
ui->mahCount_SB->setValue(model.frsky.storedMah);
|
||||||
|
} else {
|
||||||
|
ui->mahCount_SB->setDisabled(true);
|
||||||
|
}
|
||||||
|
ui->variousGB->show();
|
||||||
|
}
|
||||||
|
|
||||||
ui->frskyProtoCB->setCurrentIndex(model.frsky.usrProto);
|
ui->frskyProtoCB->setCurrentIndex(model.frsky.usrProto);
|
||||||
ui->frskyUnitsCB->setCurrentIndex(model.frsky.imperial);
|
ui->frskyUnitsCB->setCurrentIndex(model.frsky.imperial);
|
||||||
ui->frskyBladesCB->setCurrentIndex(model.frsky.blades);
|
ui->frskyBladesCB->setCurrentIndex(model.frsky.blades);
|
||||||
@@ -715,6 +737,25 @@ void TelemetryPanel::on_varioLimitCenterMax_DSB_editingFinished()
|
|||||||
emit modified();
|
emit modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TelemetryPanel::on_fasOffset_DSB_editingFinished()
|
||||||
|
{
|
||||||
|
model.frsky.fasOffset = ui->fasOffset_DSB->value()*10;
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TelemetryPanel::on_mahCount_SB_editingFinished()
|
||||||
|
{
|
||||||
|
model.frsky.storedMah = ui->mahCount_SB->value();
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TelemetryPanel::on_mahCount_ChkB_toggled(bool checked)
|
||||||
|
{
|
||||||
|
model.frsky.mAhPersistent = checked;
|
||||||
|
ui->mahCount_SB->setDisabled(!checked);
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
|
||||||
void TelemetryPanel::telBarUpdate()
|
void TelemetryPanel::telBarUpdate()
|
||||||
{
|
{
|
||||||
int index;
|
int index;
|
||||||
|
|||||||
@@ -74,6 +74,9 @@ class TelemetryPanel : public ModelPanel
|
|||||||
void on_varioLimitCenterMin_DSB_editingFinished();
|
void on_varioLimitCenterMin_DSB_editingFinished();
|
||||||
void on_varioLimitMinOff_ChkB_toggled(bool checked);
|
void on_varioLimitMinOff_ChkB_toggled(bool checked);
|
||||||
void on_varioLimitCenterMax_DSB_editingFinished();
|
void on_varioLimitCenterMax_DSB_editingFinished();
|
||||||
|
void on_fasOffset_DSB_editingFinished();
|
||||||
|
void on_mahCount_SB_editingFinished();
|
||||||
|
void on_mahCount_ChkB_toggled(bool checked);
|
||||||
void telBarCBcurrentIndexChanged(int index);
|
void telBarCBcurrentIndexChanged(int index);
|
||||||
void ScreenTypeCBcurrentIndexChanged(int index);
|
void ScreenTypeCBcurrentIndexChanged(int index);
|
||||||
void telMaxSBeditingFinished();
|
void telMaxSBeditingFinished();
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>692</width>
|
<width>692</width>
|
||||||
<height>540</height>
|
<height>568</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string>Form</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
|
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,1">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,0,0">
|
<layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,0,0">
|
||||||
<property name="sizeConstraint">
|
<property name="sizeConstraint">
|
||||||
@@ -770,6 +770,106 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="variousGB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string>Various</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_6">
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QSpinBox" name="mahCount_SB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>32767</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1" alignment="Qt::AlignHCenter">
|
||||||
|
<widget class="QLabel" name="mahCount_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>mAh count</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" alignment="Qt::AlignHCenter">
|
||||||
|
<widget class="QLabel" name="fasOffset_label">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>FAS Offset</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QCheckBox" name="mahCount_ChkB">
|
||||||
|
<property name="text">
|
||||||
|
<string>Persistent mAh</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QDoubleSpinBox" name="fasOffset_DSB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<double>-1.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<double>1.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.100000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="2">
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
<item>
|
<item>
|
||||||
|
|||||||
Reference in New Issue
Block a user