Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Add registration button

Browse source
This commit is contained in:
3djc 2019-02-06 12:37:49 +01:00
parent b590a653d7
commit a027aa70a4
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,7 @@ enum MenuModelSetupItems {
ITEM_MODEL_INTERNAL_MODULE_MODE, ITEM_MODEL_INTERNAL_MODULE_MODE,
ITEM_MODEL_INTERNAL_MODULE_MODEL_NUM, ITEM_MODEL_INTERNAL_MODULE_MODEL_NUM,
ITEM_MODEL_INTERNAL_MODULE_FAILSAFE, ITEM_MODEL_INTERNAL_MODULE_FAILSAFE,
ITEM_MODEL_INTERNAL_MODULE_RANGE, ITEM_MODEL_INTERNAL_MODULE_RANGE_REG,
#if defined(PCBXLITE) || defined(PCBXLITES) #if defined(PCBXLITE) || defined(PCBXLITES)
ITEM_MODEL_INTERNAL_MODULE_ANTENNA, ITEM_MODEL_INTERNAL_MODULE_ANTENNA,
#endif #endif
@ -288,7 +288,7 @@ void menuModelSetup(event_t event)
INTERNAL_MODULE_MODE_ROWS, INTERNAL_MODULE_MODE_ROWS,
IF_INTERNAL_MODULE_ON((uint8_t)0), // Model Number IF_INTERNAL_MODULE_ON((uint8_t)0), // Model Number
IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), // Failsafe IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), // Failsafe
IF_INTERNAL_MODULE_ON((uint8_t)0), // Range check IF_INTERNAL_MODULE_ON((uint8_t)1), // Range check and receiver register
ANTENNA_ROW ANTENNA_ROW
IF_INTERNAL_MODULE_RECEIVER_1_ON((uint8_t)0), // Receiver Number IF_INTERNAL_MODULE_RECEIVER_1_ON((uint8_t)0), // Receiver Number
IF_INTERNAL_MODULE_RECEIVER_1_ON((uint8_t)0), // Receiver Range IF_INTERNAL_MODULE_RECEIVER_1_ON((uint8_t)0), // Receiver Range
@ -1014,7 +1014,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_REGISTRATION_ID: case ITEM_MODEL_REGISTRATION_ID:
{ {
lcdDrawTextAlignedLeft(y, "Regis. ID"); lcdDrawTextAlignedLeft(y, "Regis. ID");
for(uint8_t pos=0; pos<LEN_REGISTRATION_ID; pos++) for(uint8_t pos=0; pos<PXX2_LEN_REGISTRATION_ID; pos++)
{ {
lcdDrawHexChar(MODEL_SETUP_2ND_COLUMN + pos*FW*2,y, g_model.modelRegistrationID[pos], menuHorizontalPosition==pos ? attr : 0); lcdDrawHexChar(MODEL_SETUP_2ND_COLUMN + pos*FW*2,y, g_model.modelRegistrationID[pos], menuHorizontalPosition==pos ? attr : 0);
lcdDrawChar(lcdLastRightPos, y, ':'); lcdDrawChar(lcdLastRightPos, y, ':');
@ -1039,12 +1039,16 @@ void menuModelSetup(event_t event)
} }
break; break;
case ITEM_MODEL_INTERNAL_MODULE_RANGE: case ITEM_MODEL_INTERNAL_MODULE_RANGE_REG:
{ {
lcdDrawTextAlignedLeft(y, STR_RANGE); lcdDrawTextAlignedLeft(y, INDENT "Module");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, attr); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition==0 ? attr : 0) );
lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition==1 ? attr : 0) );
if (attr && s_editMode>0) { if (attr && s_editMode>0) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK; if (menuHorizontalPosition == 0 )
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
else
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_REGISTER;
} }
if (attr && s_editMode==0) { if (attr && s_editMode==0) {
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL; moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;