Merge pull request #2911 from opentx/bsongis/issue2753_missing_functions_in_companion

Fixes #2753 - Missing functions in Companion
This commit is contained in:
Bertrand Songis
2015-09-22 22:29:42 +02:00
8 changed files with 52 additions and 8 deletions
+12
View File
@@ -810,6 +810,18 @@ QString CustomFunctionData::funcToString() const
return QObject::tr("Background Music Pause"); return QObject::tr("Background Music Pause");
else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast) else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1); return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1);
else if (func == FuncSetFailsafeInternalModule)
return QObject::tr("SetFailsafe Int. Module");
else if (func == FuncSetFailsafeExternalModule)
return QObject::tr("SetFailsafe Ext. Module");
else if (func == FuncRangeCheckInternalModule)
return QObject::tr("RangeCheck Int. Module");
else if (func == FuncRangeCheckExternalModule)
return QObject::tr("RangeCheck Ext. Module");
else if (func == FuncBindInternalModule)
return QObject::tr("Bind Int. Module");
else if (func == FuncBindExternalModule)
return QObject::tr("Bind Ext. Module");
else { else {
return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is) return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is)
} }
+8 -1
View File
@@ -598,6 +598,12 @@ enum AssignFunc {
FuncBackgroundMusicPause, FuncBackgroundMusicPause,
FuncAdjustGV1, FuncAdjustGV1,
FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1, FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
FuncSetFailsafeInternalModule,
FuncSetFailsafeExternalModule,
FuncRangeCheckInternalModule,
FuncRangeCheckExternalModule,
FuncBindInternalModule,
FuncBindExternalModule,
FuncCount, FuncCount,
FuncReserve = -1 FuncReserve = -1
}; };
@@ -1340,7 +1346,8 @@ enum Capability {
HasInputDiff, HasInputDiff,
HasMixerExpo, HasMixerExpo,
MixersMonitor, MixersMonitor,
HasBatMeterRange HasBatMeterRange,
DangerousFunctions,
}; };
class SimulatorInterface; class SimulatorInterface;
@@ -1919,9 +1919,12 @@ class CustomFunctionsConversionTable: public ConversionTable {
val++; val++;
if (IS_ARM(board)) { if (IS_ARM(board)) {
addConversion(FuncVolume, val++); addConversion(FuncVolume, val++);
addConversion(FuncReserve, val++); addConversion(FuncSetFailsafeInternalModule, val);
addConversion(FuncReserve, val++); addConversion(FuncSetFailsafeExternalModule, val++);
addConversion(FuncReserve, val++); addConversion(FuncRangeCheckInternalModule, val);
addConversion(FuncRangeCheckExternalModule, val++);
addConversion(FuncBindInternalModule, val);
addConversion(FuncBindExternalModule, val++);
} }
addConversion(FuncPlaySound, val++); addConversion(FuncPlaySound, val++);
addConversion(FuncPlayPrompt, val++); addConversion(FuncPlayPrompt, val++);
@@ -2080,6 +2083,21 @@ class ArmCustomFunctionField: public TransformedField {
*((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1; *((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
} }
} }
else if (fn.func >= FuncSetFailsafeInternalModule && fn.func <= FuncSetFailsafeExternalModule) {
if (version >= 216) {
*((uint16_t *)_param) = fn.func - FuncSetFailsafeInternalModule;
}
}
else if (fn.func >= FuncRangeCheckInternalModule && fn.func <= FuncRangeCheckExternalModule) {
if (version >= 216) {
*((uint16_t *)_param) = fn.func - FuncRangeCheckInternalModule;
}
}
else if (fn.func >= FuncBindInternalModule && fn.func <= FuncBindExternalModule) {
if (version >= 216) {
*((uint16_t *)_param) = fn.func - FuncBindInternalModule;
}
}
else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) { else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) {
memcpy(_param, fn.paramarm, sizeof(_param)); memcpy(_param, fn.paramarm, sizeof(_param));
} }
@@ -800,6 +800,8 @@ int OpenTxFirmware::getCapability(const Capability capability)
return id.contains("mixersmon") ? 1 : 0; return id.contains("mixersmon") ? 1 : 0;
case HasBatMeterRange: case HasBatMeterRange:
return (IS_TARANIS(board) ? true : false); return (IS_TARANIS(board) ? true : false);
case DangerousFunctions:
return id.contains("danger") ? 1 : 0;
default: default:
return 0; return 0;
} }
+6 -1
View File
@@ -383,13 +383,16 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
populateFuncParamCB(fswtchParamT[i], func, cfn.param); populateFuncParamCB(fswtchParamT[i], func, cfn.param);
widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE; widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
} }
else if (func>=FuncSetTimer1 && func<=FuncSetTimer2) { else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) {
if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds(); if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds();
fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0)); fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59)); fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
fswtchParamTime[i]->setTime(QTimeS(cfn.param)); fswtchParamTime[i]->setTime(QTimeS(cfn.param));
widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE; widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
} }
else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) {
widgetsMask |= CUSTOM_FUNCTION_ENABLE;
}
else if (func==FuncVolume) { else if (func==FuncVolume) {
if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
populateFuncParamCB(fswtchParamT[i], func, cfn.param); populateFuncParamCB(fswtchParamT[i], func, cfn.param);
@@ -604,6 +607,8 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) || ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) || ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) || ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars)) ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars))
) { ) {
// skipped // skipped
+1 -1
View File
@@ -238,7 +238,7 @@ bool isAssignableFunctionAvailable(int function)
#if !defined(HAPTIC) #if !defined(HAPTIC)
case FUNC_HAPTIC: case FUNC_HAPTIC:
#endif #endif
case FUNC_PLAY_DIFF: case FUNC_RESERVE4:
#if !defined(DANGEROUS_MODULE_FUNCTIONS) #if !defined(DANGEROUS_MODULE_FUNCTIONS)
case FUNC_RANGECHECK: case FUNC_RANGECHECK:
case FUNC_BIND: case FUNC_BIND:
+1 -1
View File
@@ -337,7 +337,7 @@ bool isAssignableFunctionAvailable(int function)
#if !defined(HAPTIC) #if !defined(HAPTIC)
case FUNC_HAPTIC: case FUNC_HAPTIC:
#endif #endif
case FUNC_PLAY_DIFF: case FUNC_RESERVE4:
#if !defined(DANGEROUS_MODULE_FUNCTIONS) #if !defined(DANGEROUS_MODULE_FUNCTIONS)
case FUNC_RANGECHECK: case FUNC_RANGECHECK:
case FUNC_BIND: case FUNC_BIND:
+1 -1
View File
@@ -533,7 +533,7 @@ enum Functions {
#endif #endif
FUNC_PLAY_VALUE, FUNC_PLAY_VALUE,
#if defined(CPUARM) #if defined(CPUARM)
FUNC_PLAY_DIFF, FUNC_RESERVE4,
FUNC_PLAY_SCRIPT, FUNC_PLAY_SCRIPT,
FUNC_RESERVE5, FUNC_RESERVE5,
FUNC_BACKGND_MUSIC, FUNC_BACKGND_MUSIC,