Remove module choice from SF set failsafe

This commit is contained in:
elecpower
2020-12-11 08:11:19 +11:00
parent 19b4c687ee
commit ca7ca82f01
6 changed files with 11 additions and 14 deletions
@@ -91,10 +91,8 @@ QString CustomFunctionData::funcToString(const ModelData * model) const
return tr("Background Music Pause"); return tr("Background Music Pause");
else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast) else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
return tr("Adjust %1").arg(RawSource(SOURCE_TYPE_GVAR, func-FuncAdjustGV1).toString(model)); return tr("Adjust %1").arg(RawSource(SOURCE_TYPE_GVAR, func-FuncAdjustGV1).toString(model));
else if (func == FuncSetFailsafeInternalModule) else if (func == FuncSetFailsafe)
return tr("SetFailsafe Int. Module"); return tr("Set Failsafe");
else if (func == FuncSetFailsafeExternalModule)
return tr("SetFailsafe Ext. Module");
else if (func == FuncRangeCheckInternalModule) else if (func == FuncRangeCheckInternalModule)
return tr("RangeCheck Int. Module"); return tr("RangeCheck Int. Module");
else if (func == FuncRangeCheckExternalModule) else if (func == FuncRangeCheckExternalModule)
+1 -2
View File
@@ -62,8 +62,7 @@ enum AssignFunc {
FuncBackgroundMusicPause, FuncBackgroundMusicPause,
FuncAdjustGV1, FuncAdjustGV1,
FuncAdjustGVLast = FuncAdjustGV1+CPN_MAX_GVARS-1, FuncAdjustGVLast = FuncAdjustGV1+CPN_MAX_GVARS-1,
FuncSetFailsafeInternalModule, FuncSetFailsafe,
FuncSetFailsafeExternalModule,
FuncRangeCheckInternalModule, FuncRangeCheckInternalModule,
FuncRangeCheckExternalModule, FuncRangeCheckExternalModule,
FuncBindInternalModule, FuncBindInternalModule,
@@ -1406,8 +1406,7 @@ class CustomFunctionsConversionTable: public ConversionTable {
addConversion(FuncAdjustGV1+i, val); addConversion(FuncAdjustGV1+i, val);
val++; val++;
addConversion(FuncVolume, val++); addConversion(FuncVolume, val++);
addConversion(FuncSetFailsafeInternalModule, val); addConversion(FuncSetFailsafe, val++);
addConversion(FuncSetFailsafeExternalModule, val++);
addConversion(FuncRangeCheckInternalModule, val); addConversion(FuncRangeCheckInternalModule, val);
addConversion(FuncRangeCheckExternalModule, val++); addConversion(FuncRangeCheckExternalModule, val++);
addConversion(FuncBindInternalModule, val); addConversion(FuncBindInternalModule, val);
@@ -1520,9 +1519,6 @@ class ArmCustomFunctionField: public TransformedField {
*((uint16_t *)_param) = fn.param; *((uint16_t *)_param) = fn.param;
*((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1; *((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
} }
else if (fn.func >= FuncSetFailsafeInternalModule && fn.func <= FuncSetFailsafeExternalModule) {
*((uint16_t *)_param) = fn.func - FuncSetFailsafeInternalModule;
}
else if (fn.func >= FuncRangeCheckInternalModule && fn.func <= FuncRangeCheckExternalModule) { else if (fn.func >= FuncRangeCheckInternalModule && fn.func <= FuncRangeCheckExternalModule) {
*((uint16_t *)_param) = fn.func - FuncRangeCheckInternalModule; *((uint16_t *)_param) = fn.func - FuncRangeCheckInternalModule;
} }
+1 -1
View File
@@ -456,7 +456,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
fswtchParamTime[i]->setTime(cfn.param); fswtchParamTime[i]->setTime(cfn.param);
widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM | CUSTOM_FUNCTION_ENABLE; widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM | CUSTOM_FUNCTION_ENABLE;
} }
else if (func >= FuncSetFailsafeInternalModule && func <= FuncBindExternalModule) { else if (func >= FuncSetFailsafe && func <= FuncBindExternalModule) {
widgetsMask |= CUSTOM_FUNCTION_ENABLE; widgetsMask |= CUSTOM_FUNCTION_ENABLE;
} }
else if (func == FuncVolume || func == FuncBacklight) { else if (func == FuncVolume || func == FuncBacklight) {
@@ -276,10 +276,12 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT); lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
} }
#endif // OVERRIDE_CHANNEL_FUNCTION #endif // OVERRIDE_CHANNEL_FUNCTION
else if (func >= FUNC_SET_FAILSAFE && func <= FUNC_BIND) { #if defined(DANGEROUS_MODULE_FUNCTIONS)
else if (func >= FUNC_RANGECHECK && func <= FUNC_BIND) {
val_max = NUM_MODULES-1; val_max = NUM_MODULES-1;
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr); lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr);
} }
#endif
else if (func == FUNC_SET_TIMER) { else if (func == FUNC_SET_TIMER) {
getMixSrcRange(MIXSRC_FIRST_TIMER, val_min, val_max); getMixSrcRange(MIXSRC_FIRST_TIMER, val_min, val_max);
drawTimer(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT, attr); drawTimer(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT, attr);
@@ -268,10 +268,12 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT); lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
} }
#endif #endif
else if (func >= FUNC_SET_FAILSAFE && func <= FUNC_BIND) { #if defined(DANGEROUS_MODULE_FUNCTIONS)
else if (func >= FUNC_RANGECHECK && func <= FUNC_BIND) {
val_max = NUM_MODULES-1; val_max = NUM_MODULES-1;
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr); lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr);
} }
#endif
else if (func == FUNC_SET_TIMER) { else if (func == FUNC_SET_TIMER) {
getMixSrcRange(MIXSRC_FIRST_TIMER, val_min, val_max); getMixSrcRange(MIXSRC_FIRST_TIMER, val_min, val_max);
drawTimer(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT|TIMEHOUR, attr); drawTimer(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT|TIMEHOUR, attr);