Another lot of refactoring
This commit is contained in:
@@ -247,7 +247,7 @@ void onBindMenu(const char * result)
|
||||
return;
|
||||
}
|
||||
|
||||
moduleFlag[moduleIdx] = MODULE_BIND;
|
||||
moduleSettings[moduleIdx].mode = MODULE_MODE_BIND;
|
||||
}
|
||||
|
||||
|
||||
@@ -331,9 +331,9 @@ void menuModelSetup(event_t event)
|
||||
|
||||
#if (defined(DSM2) || defined(PXX))
|
||||
if (menuEvent) {
|
||||
moduleFlag[0] = 0;
|
||||
moduleSettings[0].mode = 0;
|
||||
#if NUM_MODULES > 1
|
||||
moduleFlag[1] = 0;
|
||||
moduleSettings[1].mode = 0;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
@@ -1027,10 +1027,10 @@ void menuModelSetup(event_t event)
|
||||
lcdDrawTextAlignedLeft(y, STR_RANGE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, attr);
|
||||
if (attr && s_editMode>0) {
|
||||
moduleFlag[INTERNAL_MODULE] = MODULE_RANGECHECK;
|
||||
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
|
||||
}
|
||||
if (attr && s_editMode==0) {
|
||||
moduleFlag[INTERNAL_MODULE] = MODULE_NORMAL_MODE;
|
||||
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -1201,8 +1201,8 @@ void menuModelSetup(event_t event)
|
||||
POPUP_MENU_START(onBindMenu);
|
||||
continue;
|
||||
}
|
||||
if (moduleFlag[moduleIdx] == MODULE_BIND) {
|
||||
newFlag = MODULE_BIND;
|
||||
if (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND) {
|
||||
newFlag = MODULE_MODE_BIND;
|
||||
}
|
||||
else {
|
||||
if (!popupMenuNoItems) {
|
||||
@@ -1211,26 +1211,26 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
else {
|
||||
newFlag = MODULE_BIND;
|
||||
newFlag = MODULE_MODE_BIND;
|
||||
}
|
||||
}
|
||||
else if (l_posHorz == 2) {
|
||||
newFlag = MODULE_RANGECHECK;
|
||||
newFlag = MODULE_MODE_RANGECHECK;
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
if (attr && l_posHorz>0 && s_editMode>0) {
|
||||
if (l_posHorz == 1)
|
||||
newFlag = MODULE_BIND;
|
||||
newFlag = MODULE_MODE_BIND;
|
||||
else if (l_posHorz == 2)
|
||||
newFlag = MODULE_RANGECHECK;
|
||||
newFlag = MODULE_MODE_RANGECHECK;
|
||||
}
|
||||
#endif
|
||||
moduleFlag[moduleIdx] = newFlag;
|
||||
moduleSettings[moduleIdx].mode = newFlag;
|
||||
|
||||
#if defined(MULTIMODULE)
|
||||
if (newFlag == MODULE_BIND) {
|
||||
if (newFlag == MODULE_MODE_BIND) {
|
||||
multiBindStatus = MULTI_BIND_INITIATED;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -573,7 +573,7 @@ void menuMainView(event_t event)
|
||||
#endif
|
||||
|
||||
#if defined(DSM2)
|
||||
if (moduleFlag[0] == MODULE_BIND) {
|
||||
if (moduleSettings[0].mode == MODULE_MODE_BIND) {
|
||||
// Issue 98
|
||||
lcdDrawText(15*FW, 0, "BIND", 0);
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ void onBindMenu(const char * result)
|
||||
return;
|
||||
}
|
||||
|
||||
moduleFlag[moduleIdx] = MODULE_BIND;
|
||||
moduleSettings[moduleIdx].bind = 1;;
|
||||
}
|
||||
|
||||
void copySelection(char * dst, const char * src, uint8_t size)
|
||||
@@ -309,8 +309,8 @@ void menuModelSetup(event_t event)
|
||||
|
||||
#if (defined(DSM2) || defined(PXX))
|
||||
if (menuEvent) {
|
||||
moduleFlag[0] = 0;
|
||||
moduleFlag[1] = 0;
|
||||
moduleSettings[0].mode = 0;
|
||||
moduleSettings[1].mode = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1061,7 +1061,7 @@ void menuModelSetup(event_t event)
|
||||
POPUP_MENU_START(onBindMenu);
|
||||
continue;
|
||||
}
|
||||
if (moduleFlag[moduleIdx] == MODULE_BIND) {
|
||||
if (moduleSettings[moduleIdx].mode == MODULE_BIND) {
|
||||
newFlag = MODULE_BIND;
|
||||
}
|
||||
else {
|
||||
@@ -1079,7 +1079,7 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
}
|
||||
moduleFlag[moduleIdx] = newFlag;
|
||||
moduleSettings[moduleIdx].mode = newFlag;
|
||||
#if defined(MULTIMODULE)
|
||||
if (newFlag == MODULE_BIND)
|
||||
multiBindStatus = MULTI_BIND_INITIATED;
|
||||
|
||||
@@ -138,7 +138,7 @@ void onBindMenu(const char * result)
|
||||
return;
|
||||
}
|
||||
|
||||
moduleFlag[moduleIdx] = MODULE_BIND;
|
||||
moduleSettings[moduleIdx].bind = 1;;
|
||||
}
|
||||
|
||||
void onModelSetupBitmapMenu(const char * result)
|
||||
@@ -298,8 +298,8 @@ bool menuModelSetup(event_t event)
|
||||
}
|
||||
|
||||
if (menuEvent) {
|
||||
moduleFlag[0] = 0;
|
||||
moduleFlag[1] = 0;
|
||||
moduleSettings[0].mode = 0;
|
||||
moduleSettings[1].mode = 0;
|
||||
}
|
||||
|
||||
int sub = menuVerticalPosition;
|
||||
@@ -945,8 +945,8 @@ bool menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
}
|
||||
drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, (moduleFlag[moduleIdx] == MODULE_BIND ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==1 ? attr : 0));
|
||||
drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, (moduleFlag[moduleIdx] == MODULE_RANGECHECK ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==2 ? attr : 0));
|
||||
drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==1 ? attr : 0));
|
||||
drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, (moduleSettings[moduleIdx].mode == MODULE_MODE_RANGECHECK ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==2 ? attr : 0));
|
||||
uint8_t newFlag = 0;
|
||||
#if defined(MULTIMODULE)
|
||||
if (multiBindStatus == MULTI_BIND_FINISHED) {
|
||||
@@ -982,8 +982,8 @@ bool menuModelSetup(event_t event)
|
||||
POPUP_MENU_START(onBindMenu);
|
||||
continue;
|
||||
}
|
||||
if (moduleFlag[moduleIdx] == MODULE_BIND) {
|
||||
newFlag = MODULE_BIND;
|
||||
if (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND) {
|
||||
newFlag = MODULE_MODE_BIND;
|
||||
}
|
||||
else {
|
||||
if (!popupMenuNoItems) {
|
||||
@@ -992,17 +992,17 @@ bool menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
else {
|
||||
newFlag = MODULE_BIND;
|
||||
newFlag = MODULE_MODE_BIND;
|
||||
}
|
||||
}
|
||||
else if (l_posHorz == 2) {
|
||||
newFlag = MODULE_RANGECHECK;
|
||||
newFlag = MODULE_MODE_RANGECHECK;
|
||||
}
|
||||
}
|
||||
}
|
||||
moduleFlag[moduleIdx] = newFlag;
|
||||
moduleSettings[moduleIdx].mode = newFlag;
|
||||
#if defined(MULTIMODULE)
|
||||
if (newFlag == MODULE_BIND)
|
||||
if (newFlag == MODULE_MODE_BIND)
|
||||
multiBindStatus = MULTI_BIND_INITIATED;
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user