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

Damjan and Kilrah remarks taken into account

Browse Source
This commit is contained in:
bsongis
2015-05-06 18:37:55 +02:00
parent 9ed37ab21b
commit bda87be10e
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+10 -10
View File
@@ -379,13 +379,12 @@ void checkModelIdUnique(uint8_t index, uint8_t module)
uint8_t modelId = g_model.header.modelId[module];
if (modelId != 0) {
for (uint8_t i=0; i<MAX_MODELS; i++) {
for (uint8_t j=0; j<NUM_MODULES; j++) {
if (i == index && module == j) {
continue;
}
else if (modelId == modelHeaders[i].modelId[j]) {
POPUP_WARNING(STR_MODELIDUSED);
return;
if (i != index) {
for (uint8_t j=0; j<NUM_MODULES; j++) {
if (modelId == modelHeaders[i].modelId[j]) {
POPUP_WARNING(STR_MODELIDUSED);
return;
}
}
}
}
@@ -421,9 +420,10 @@ void modelDefault(uint8_t id)
g_model.externalModule = MODULE_TYPE_PPM;
#endif
#if defined(PXX) && defined(CPUARM)
modelHeaders[id].modelId[1] = g_model.header.modelId[1] = 0;
modelHeaders[id].modelId[0] = g_model.header.modelId[0] = id+1;
#if defined(CPUARM)
for (int i=0; i<NUM_MODULES; i++) {
modelHeaders[id].modelId[i] = g_model.header.modelId[i] = id+1;
}
checkModelIdUnique(id, 0);
#endif