piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some depreciated Rotary Encoder code

Browse Source
This commit is contained in:
elecpower
2021-03-04 08:47:21 +11:00
parent fc03ba58d0
commit 19add4de92
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/customfunctiondata.cpp
+3 -20
View File
@@ -255,23 +255,6 @@ QString CustomFunctionData::resetToString(const int value, const ModelData * mod
if (value < ++step)
return tr("Telemetry");
int reCount = firmware->getCapability(RotaryEncoders);
if (reCount > 0 && value < step + reCount) {
if (reCount == 1 && value < step + 1)
return tr("Rotary Encoder");
else if (reCount == 2) {
if (value < step + 1)
return tr("REa");
else
return tr("REb");
}
else
return QString(CPN_STR_UNKNOWN_ITEM);
}
step += reCount;
if (value < step + firmware->getCapability(Sensors))
return RawSource(SOURCE_TYPE_TELEMETRY, 3 * (value - step)).toString(model);
@@ -283,7 +266,7 @@ int CustomFunctionData::resetParamCount()
{
Firmware * firmware = getCurrentFirmware();
return CPN_MAX_TIMERS + 2 + firmware->getCapability(RotaryEncoders) + firmware->getCapability(Sensors);
return CPN_MAX_TIMERS + 2 + firmware->getCapability(Sensors);
}
// static
@@ -297,10 +280,10 @@ bool CustomFunctionData::isResetParamAvailable(const int index, const ModelData
else
return false;
}
else if (index < CPN_MAX_TIMERS + firmware->getCapability(RotaryEncoders))
else if (index < CPN_MAX_TIMERS + 2)
return true;
else if (model && index < resetParamCount())
return model->sensorData[index - (CPN_MAX_TIMERS + 2 + firmware->getCapability(RotaryEncoders))].isAvailable();
return model->sensorData[index - (CPN_MAX_TIMERS + 2)].isAvailable();
return false;
}