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

Fixed custom functions "play sound" and trainer.

Browse Source
This commit is contained in:
Raphael Coeffic
2021-12-31 10:53:11 +01:00
parent 7b2d7158ff
commit b4a64189b7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp
+9 -5
View File
@@ -153,7 +153,7 @@ Node convert<CustomFunctionData>::encode(const CustomFunctionData& rhs)
def += LookupValue(trainerLut, p1);
break;
case FuncPlaySound:
def += std::to_string(rhs.param);
def += LookupValue(soundLut, rhs.param);
break;
case FuncPlayPrompt:
case FuncPlayScript:
@@ -252,13 +252,17 @@ bool convert<CustomFunctionData>::decode(const Node& node,
def >> rhs.param;
} break;
case FuncTrainer: {
std::string value_str;
getline(def, value_str, ',');
int value=0;
Node(def.str()) >> trainerLut >> value;
Node(value_str) >> trainerLut >> value;
rhs.func = (AssignFunc)((int)rhs.func + value);
} break;
case FuncPlaySound:
Node(def.str()) >> soundLut >> rhs.param;
break;
case FuncPlaySound: {
std::string snd;
getline(def, snd, ',');
Node(snd) >> soundLut >> rhs.param;
} break;
case FuncPlayPrompt:
case FuncPlayScript:
case FuncBackgroundMusic: {