More cosmetics

This commit is contained in:
Bertrand Songis
2019-07-04 17:51:49 +02:00
parent 39c3a151af
commit 9b5673ef73
16 changed files with 77 additions and 38 deletions
+1 -1
View File
@@ -1133,7 +1133,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE:
{
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
lcdDrawTextAlignedLeft(y, STR_MODULE);
lcdDrawTextAlignedLeft(y, INDENT TR_MODULE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0));
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
if (attr) {
+1 -1
View File
@@ -1297,7 +1297,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE:
{
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
lcdDrawTextAlignedLeft(y, STR_MODULE);
lcdDrawTextAlignedLeft(y, INDENT TR_MODULE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0));
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
if (attr) {
@@ -99,15 +99,15 @@ void menuRadioModulesVersion(event_t event)
// Label
if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
if (module == INTERNAL_MODULE)
lcdDrawTextAlignedLeft(y, "Internal module");
lcdDrawTextAlignedLeft(y, STR_INTERNAL_MODULE);
else if (module == EXTERNAL_MODULE)
lcdDrawTextAlignedLeft(y, "External module");
lcdDrawTextAlignedLeft(y, STR_EXTERNAL_MODULE);
}
y += FH;
// Module model
if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
lcdDrawText(INDENT_WIDTH, y, "Module");
lcdDrawText(INDENT_WIDTH, y, STR_MODULE);
uint8_t modelId = reusableBuffer.hardwareAndSettings.modules[module].information.modelID;
lcdDrawText(COLUMN2_X, y, PXX2modulesModels[modelId]);
}
@@ -130,7 +130,7 @@ void menuRadioModulesVersion(event_t event)
if (reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].information.modelID && reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].timestamp < get_tmr10ms() + 2000) {
// Receiver model
if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
lcdDrawText(INDENT_WIDTH, y, "Receiver");
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER);
lcdDrawNumber(lcdLastRightPos + 2, y, receiver + 1);
uint8_t modelId = reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].information.modelID;
lcdDrawText(COLUMN2_X, y, PXX2receiversModels[modelId]);
@@ -153,7 +153,7 @@ void menuRadioModulesVersion(event_t event)
else {
menuVerticalOffset = 0;
if (lines == 0) {
lcdDrawText(LCD_W/2, 4*FH, STR_NO_MODULE_INFORMATION, CENTERED);
}
}