Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Merge pull request #2 from kilrah/3djc/reg-2.0

Browse source 
reg 2.0
This commit is contained in:
Bertrand Songis 2019-02-18 12:50:52 +01:00 • committed by GitHub
commit 3f2307c770
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/gui/128x64/model_setup.cpp
View file

@ -287,7 +287,7 @@ void runPopupRegister(event_t event)
}
else if (menuHorizontalPosition == 0) {
// [Enter] pressed
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_REGISTER;
reusableBuffer.modelSetup.pxx2.registerStep = REGISTER_RX_NAME_SELECTED;
}
// no break
@ -1123,23 +1123,25 @@ void menuModelSetup(event_t event)
break;
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RANGE_REGISTER:
TRACE("Phase %d Mode : %d", reusableBuffer.modelSetup.pxx2.registerStep, moduleSettings[INTERNAL_MODULE].mode);
lcdDrawTextAlignedLeft(y, INDENT "Module");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition==0 ? attr : 0) );
lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition==1 ? attr : 0) );
if (attr) {
if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
if (menuHorizontalPosition == 1) {
if (menuHorizontalPosition == 1 && reusableBuffer.modelSetup.pxx2.registerStep < REGISTER_RX_NAME_SELECTED) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_REGISTER;
reusableBuffer.modelSetup.pxx2.registerPopupVerticalPosition = 0;
reusableBuffer.modelSetup.pxx2.registerPopupHorizontalPosition = 0;
reusableBuffer.modelSetup.pxx2.registerPopupEditMode = 0;
s_editMode = 0;
POPUP_INPUT("", runPopupRegister);
}
else {
else if (menuHorizontalPosition == 0) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
}
}
if (s_editMode == 0) {
if (s_editMode == 0 && !warningText) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
}
}