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

re #1294 - clear input name if removing last input line

Browse source
This commit is contained in:
Damjan Adamic 2014-06-17 10:01:14 +02:00
parent 6689919a39
commit 18f327612f
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
companion/src/eeprominterface.cpp
View file

@ -1050,14 +1050,34 @@ bool ModelData::isInputValid(const unsigned int idx) const
void ModelData::removeInput(const int idx) void ModelData::removeInput(const int idx)
{ {
unsigned int chn = expoData[idx].chn;
memmove(&expoData[idx], &expoData[idx+1], (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData)); memmove(&expoData[idx], &expoData[idx+1], (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
expoData[C9X_MAX_EXPOS-1].clear(); expoData[C9X_MAX_EXPOS-1].clear();
//also remove input name if removing last line for this input
bool found = false;
for (int i=0; i<C9X_MAX_EXPOS; i++) {
if (expoData[i].mode==0) continue;
if (expoData[i].chn==chn) {
found = true;
break;
}
}
if (!found) inputNames[chn][0] = 0;
} }
void ModelData::clearInputs() void ModelData::clearInputs()
{ {
for (int i=0; i<C9X_MAX_EXPOS; i++) for (int i=0; i<C9X_MAX_EXPOS; i++)
expoData[i].clear(); expoData[i].clear();
//clear all input names
if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
for (int i=0; i<C9X_MAX_INPUTS; i++) {
inputNames[i][0] = 0;
}
}
} }
void ModelData::clearMixes() void ModelData::clearMixes()