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

[bw] set multi binding mode only if multimodule

Browse Source
This commit is contained in:
Raphael Coeffic
2021-09-29 19:08:17 +02:00
committed by Raphael Coeffic
parent b60f7dd37c
commit bb4eedd073
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+4 -3
View File
@@ -1432,7 +1432,8 @@ void menuModelSetup(event_t event)
}
uint8_t newFlag = 0;
#if defined(MULTIMODULE)
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
if (isModuleMultimodule(moduleIdx) &&
getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
s_editMode = 0;
}
@@ -1488,11 +1489,11 @@ void menuModelSetup(event_t event)
moduleState[moduleIdx].mode = newFlag;
#if defined(MULTIMODULE)
if (newFlag == MODULE_MODE_BIND) {
if (isModuleMultimodule(moduleIdx) &&
(newFlag == MODULE_MODE_BIND)) {
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
}
#endif
}
}
break;
radio/src/gui/212x64/model_setup.cpp
+4 -2
View File
@@ -1255,7 +1255,8 @@ void menuModelSetup(event_t event)
}
uint8_t newFlag = 0;
#if defined(MULTIMODULE)
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
if (isModuleMultimodule(moduleIdx) &&
getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
s_editMode = 0;
}
@@ -1294,7 +1295,8 @@ void menuModelSetup(event_t event)
}
moduleState[moduleIdx].mode = newFlag;
#if defined(MULTIMODULE)
if (newFlag == MODULE_MODE_BIND) {
if (isModuleMultimodule(moduleIdx) &&
(newFlag == MODULE_MODE_BIND)) {
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
}
#endif