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

Handle multi binding (bug with 1 multi moduel declared still present)

Browse Source
This commit is contained in:
3djc
2019-12-16 15:28:31 +01:00
parent c77732adcb
commit f119f1f50e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_setup.cpp
+6 -4
View File
@@ -702,19 +702,22 @@ class ModuleWindow : public FormGroup {
rangeButton->check(false);
}
if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
bindButton->setText(STR_MODULE_BIND);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
return 0;
}
else {
bindButton->setText(STR_MODULE_BIND);
setMultiBindStatus(moduleIdx, MULTI_BIND_INITIATED);
moduleState[moduleIdx].mode = MODULE_MODE_BIND;
return 1;
}
});
bindButton->setCheckHandler([=]() {
if (moduleState[moduleIdx].mode != MODULE_MODE_BIND) {
bindButton->setText(STR_MODULE_BIND);
bindButton->check(false);
}
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
bindButton->check(false);
}
});
@@ -722,7 +725,6 @@ class ModuleWindow : public FormGroup {
rangeButton = new TextButton(this, grid.getFieldSlot(2+thirdColumn, 1+thirdColumn), STR_MODULE_RANGE);
rangeButton->setPressHandler([=]() -> uint8_t {
if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
bindButton->setText(STR_MODULE_BIND);
bindButton->check(false);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
}