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

Fix the crazy bind bug. Underlying issue still remains however

Browse Source
This commit is contained in:
3djc
2019-12-16 16:57:47 +01:00
parent f119f1f50e
commit fdca39c2a5
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_setup.cpp
+10 -4
View File
@@ -715,11 +715,17 @@ class ModuleWindow : public FormGroup {
if (moduleState[moduleIdx].mode != MODULE_MODE_BIND) {
bindButton->check(false);
}
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
bindButton->check(false);
#if !defined(INTERNAL_MODULE_MULTI)
if (moduleIdx == EXTERNAL_MODULE) {
#endif
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
bindButton->check(false);
}
#if !defined(INTERNAL_MODULE_MULTI)
}
#endif
});
rangeButton = new TextButton(this, grid.getFieldSlot(2+thirdColumn, 1+thirdColumn), STR_MODULE_RANGE);
radio/src/pulses/pulses.h
+4
View File
@@ -216,6 +216,10 @@ extern ModuleState moduleState[NUM_MODULES];
inline bool isModuleBeeping(uint8_t moduleIndex)
{
#if defined(MULTIMODULE)
#if !defined(INTERNAL_MODULE_MULTI)
if (moduleIndex == INTERNAL_MODULE)
return false;
#endif
if (getMultiModuleStatus(moduleIndex).isBinding())
return true;
#endif