Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 08:15:17 +03:00
Code Issues Wiki Activity

Merge branch 'next' of https://github.com/opentx/opentx into bsongis/spare_values_in_telemetry_and_functions

Browse source
This commit is contained in:
Andre Bernet 2014-02-27 20:09:31 +01:00
commit 572a9ed3ba
284 changed files with 5398 additions and 4396 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/eeprominterface.cpp
View file

@ -438,6 +438,8 @@ QString LogicalSwitchData::funcToString()
case LS_FN_DAPOS:
return QObject::tr("|d|>=x");
case LS_FN_VEQUAL:
return QObject::tr("a=x");
case LS_FN_VALMOSTEQUAL:
return QObject::tr("a~x");
case LS_FN_TIMER:
return QObject::tr("Timer");
@ -549,9 +551,9 @@ QString LogicalSwitchData::toString(const ModelData & model)
if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
if (delay)
result += QObject::tr(" Delay %1 sec").arg(delay/2.0);
result += QObject::tr(" Delay %1 sec").arg(delay/10.0);
if (duration)
result += QObject::tr(" Duration %1 sec").arg(duration/2.0);
result += QObject::tr(" Duration %1 sec").arg(duration/10.0);
}
return result;
@ -950,6 +952,7 @@ void ModelData::setDefault(uint8_t id)
clear();
used = true;
sprintf(name, "MODEL%02d", id+1);
modelId = id+1;
}
int ModelData::getTrimValue(int phaseIdx, int trimIdx)
@ -1058,7 +1061,7 @@ void RegisterFirmwares()
RegisterEepromInterfaces();
}
bool LoadEeprom(RadioData &radioData, uint8_t *eeprom, int size)
bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
{
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
if (eepromInterface->load(radioData, eeprom, size))