feat: new SF GV Adjust mode to copy source (instead of %) value (#5406)

This commit is contained in:
philmoz
2024-08-16 08:32:12 +10:00
committed by GitHub
parent 6bf335166f
commit 7e7deb21dc
32 changed files with 96 additions and 38 deletions
@@ -30,7 +30,7 @@ void CustomFunctionData::convert(RadioDataConversionState & cstate)
cstate.setComponent(tr("CFN"), 8);
cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
swtch.convert(cstate);
if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && (adjustMode == FUNC_ADJUST_GVAR_SOURCE || adjustMode == FUNC_ADJUST_GVAR_SOURCERAW))) {
param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
}
}
@@ -190,6 +190,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
case FUNC_ADJUST_GVAR_CONSTANT:
return QString("%1").arg(param);
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
case FUNC_ADJUST_GVAR_GVAR:
return RawSource(param).toString();
case FUNC_ADJUST_GVAR_INCDEC:
@@ -379,7 +380,9 @@ QString CustomFunctionData::gvarAdjustModeToString(const int value)
case FUNC_ADJUST_GVAR_CONSTANT:
return tr("Value");
case FUNC_ADJUST_GVAR_SOURCE:
return tr("Source");
return tr("Source (%)");
case FUNC_ADJUST_GVAR_SOURCERAW:
return tr("Source (value)");
case FUNC_ADJUST_GVAR_GVAR:
return tr("Global Variable");
case FUNC_ADJUST_GVAR_INCDEC:
@@ -81,6 +81,7 @@ enum GVarAdjustModes
{
FUNC_ADJUST_GVAR_CONSTANT,
FUNC_ADJUST_GVAR_SOURCE,
FUNC_ADJUST_GVAR_SOURCERAW,
FUNC_ADJUST_GVAR_GVAR,
FUNC_ADJUST_GVAR_INCDEC,
FUNC_ADJUST_GVAR_COUNT
@@ -105,6 +105,7 @@ static const YamlLookupTable resetLut = {
static const YamlLookupTable gvarModeLut = {
{ FUNC_ADJUST_GVAR_CONSTANT, "Cst" },
{ FUNC_ADJUST_GVAR_SOURCE, "Src" },
{ FUNC_ADJUST_GVAR_SOURCERAW, "SrcRaw" },
{ FUNC_ADJUST_GVAR_GVAR, "GVar" },
{ FUNC_ADJUST_GVAR_INCDEC, "IncDec" },
};
@@ -200,7 +201,8 @@ Node convert<CustomFunctionData>::encode(const CustomFunctionData& rhs)
def += std::to_string(rhs.param);
break;
case FUNC_ADJUST_GVAR_GVAR:
case FUNC_ADJUST_GVAR_SOURCE: {
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW: {
def += YamlRawSourceEncode(RawSource(rhs.param));
} break;
}
@@ -347,7 +349,8 @@ bool convert<CustomFunctionData>::decode(const Node& node,
def >> rhs.param;
break;
case FUNC_ADJUST_GVAR_GVAR:
case FUNC_ADJUST_GVAR_SOURCE: {
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW: {
std::string src_str;
getline(def, src_str, ',');
RawSource src;
+1 -1
View File
@@ -768,7 +768,7 @@ int ModelData::updateReference()
if (!cfd->isEmpty()) {
updateSwitchRef(cfd->swtch);
if (cfd->func == FuncVolume || cfd->func == FuncBacklight || cfd->func == FuncPlayValue ||
(cfd->func >= FuncAdjustGV1 && cfd->func <= FuncAdjustGVLast && (cfd->adjustMode == FUNC_ADJUST_GVAR_GVAR || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCE))) {
(cfd->func >= FuncAdjustGV1 && cfd->func <= FuncAdjustGVLast && (cfd->adjustMode == FUNC_ADJUST_GVAR_GVAR || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCE || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCERAW))) {
updateSourceIntRef(cfd->param);
if (cfd->param == 0)
cfd->clear();
@@ -1787,9 +1787,9 @@ class ArmCustomFunctionField: public TransformedField {
*((uint8_t *)(_param+2)) = fn.adjustMode;
*((uint8_t *)(_param+3)) = fn.func - FuncAdjustGV1;
unsigned int value;
if (fn.adjustMode == 1)
if (fn.adjustMode == FUNC_ADJUST_GVAR_SOURCE || fn.adjustMode == FUNC_ADJUST_GVAR_SOURCERAW)
sourcesConversionTable->exportValue(fn.param, (int &)value);
else if (fn.adjustMode == 2)
else if (fn.adjustMode == FUNC_ADJUST_GVAR_GVAR)
value = RawSource(fn.param).index;
else
value = fn.param;
@@ -1844,9 +1844,9 @@ class ArmCustomFunctionField: public TransformedField {
else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
fn.func = AssignFunc(fn.func + index);
fn.adjustMode = mode;
if (fn.adjustMode == 1)
if (fn.adjustMode == FUNC_ADJUST_GVAR_SOURCE || fn.adjustMode == FUNC_ADJUST_GVAR_SOURCERAW)
sourcesConversionTable->importValue(value, (int &)fn.param);
else if (fn.adjustMode == 2)
else if (fn.adjustMode == FUNC_ADJUST_GVAR_GVAR)
fn.param = RawSource(SOURCE_TYPE_GVAR, value + 1).toValue();
else
fn.param = (int16_t)value;
+3 -2
View File
@@ -697,13 +697,14 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
}
else if (function >= FuncAdjustGV1 && function <= FuncAdjustGVLast) {
switch (adjustmode) {
case 1:
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
b->setModel(tabFilterFactory->getItemModel(rawSourceInputsId));
b->setCurrentIndex(b->findData(value));
if (b->currentIndex() < 0 && value == 0)
b->setCurrentIndex(b->count() / 2); // '----' not in list so set to first positive value
break;
case 2:
case FUNC_ADJUST_GVAR_GVAR:
b->setModel(tabFilterFactory->getItemModel(rawSourceGVarsId));
b->setCurrentIndex(b->findData(value));
if (b->currentIndex() < 0 && value == 0)