feat(cpn): only use vario sensors for vario source (#4963)

This commit is contained in:
Neil Horne
2024-05-05 11:42:48 +10:00
committed by GitHub
parent 402953cfa9
commit 7d61113dda
4 changed files with 42 additions and 3 deletions
+17
View File
@@ -425,6 +425,23 @@ bool SensorData::isSourceAvailable(const ModelData * model, const int index)
return false;
}
// static
bool SensorData::isSourceVario(const ModelData * model, const int index)
{
const int i = abs(index);
if (i > 0) {
if (model->sensorData[i - 1].isAvailable()) {
if (model->sensorData[i - 1].unit == UNIT_FEET_PER_SECOND || model->sensorData[i - 1].unit == UNIT_METERS_PER_SECOND)
return true;
}
}
else
return true;
return false;
}
#define RSSI_ID 0xF101
// static
+12
View File
@@ -143,6 +143,17 @@ class SensorData {
UNIT_DATETIME_SEC
};
enum SensorTypeMasks {
SensorTypeFlagNone = 1 << 1, // AbstractItemModel::IMDG_None
SensorTypeFlagNeg = 1 << 2, // AbstractItemModel::IMDG_Negative
SensorTypeFlagPos = 1 << 3, // AbstractItemModel::IMDG_Positive
SensorTypeFlagVario = 1 << 4,
SensorTypeContextNone = SensorTypeFlagNone,
SensorTypeContextNeg = SensorTypeFlagNeg | SensorTypeFlagNone,
SensorTypeContextPos = SensorTypeFlagPos | SensorTypeFlagNone,
SensorTypeContextVario = SensorTypeFlagVario | SensorTypeFlagNone,
};
SensorData() { clear(); }
unsigned int type; // custom / formula
unsigned int id;
@@ -200,6 +211,7 @@ class SensorData {
static QString sourceToString(const ModelData * model, const int index, const bool positivesign = false);
static bool isSourceAvailable(const ModelData * model, const int index);
static bool isSourceVario(const ModelData * model, const int index);
static QString idToString(const int value);
static QString typeToString(const int value);
static QString formulaToString(const int value);