[bw] set multi binding mode only if multimodule
This commit is contained in:
committed by
Raphael Coeffic
parent
b60f7dd37c
commit
bb4eedd073
@@ -1432,7 +1432,8 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
uint8_t newFlag = 0;
|
uint8_t newFlag = 0;
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
|
if (isModuleMultimodule(moduleIdx) &&
|
||||||
|
getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
|
||||||
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
|
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
}
|
}
|
||||||
@@ -1488,11 +1489,11 @@ void menuModelSetup(event_t event)
|
|||||||
moduleState[moduleIdx].mode = newFlag;
|
moduleState[moduleIdx].mode = newFlag;
|
||||||
|
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
if (newFlag == MODULE_MODE_BIND) {
|
if (isModuleMultimodule(moduleIdx) &&
|
||||||
|
(newFlag == MODULE_MODE_BIND)) {
|
||||||
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
|
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -1255,7 +1255,8 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
uint8_t newFlag = 0;
|
uint8_t newFlag = 0;
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
|
if (isModuleMultimodule(moduleIdx) &&
|
||||||
|
getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
|
||||||
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
|
setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
}
|
}
|
||||||
@@ -1294,7 +1295,8 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
moduleState[moduleIdx].mode = newFlag;
|
moduleState[moduleIdx].mode = newFlag;
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
if (newFlag == MODULE_MODE_BIND) {
|
if (isModuleMultimodule(moduleIdx) &&
|
||||||
|
(newFlag == MODULE_MODE_BIND)) {
|
||||||
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
|
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user