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

Cosmetics

Browse source
This commit is contained in:
3djc 2019-03-08 12:54:41 +01:00
parent af70f8f2f6
commit f47b1065eb
14 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ void drawReceiverName(uint8_t x, uint8_t y, uint8_t receiverSlot)
}
void menuModelFailsafe(event_t event);
void menuModelPinmap(event_t event);
void menuModelReceiverOptions(event_t event);
#if defined(PCBTARANIS)
uint8_t getSwitchWarningsCount()
@ -95,19 +95,15 @@ enum MenuModelSetupItems {
ITEM_MODEL_INTERNAL_MODULE_PXX2_RANGE_REGISTER,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_LABEL,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_PINMAP,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_TELEM,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_BIND_SHARE,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_LABEL,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_PINMAP,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_TELEM,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_BIND_SHARE,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_LABEL,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_PINMAP,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_TELEM,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_BIND_SHARE,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_4_LABEL,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_4_PINMAP,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_4_TELEM,
ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_4_BIND_SHARE,
#endif
ITEM_MODEL_EXTERNAL_MODULE_LABEL,
@ -135,19 +131,15 @@ enum MenuModelSetupItems {
ITEM_MODEL_EXTERNAL_MODULE_PXX2_REGISTER_RANGE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_1_LABEL,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_1_PINMAP,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_1_TELEM,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_1_BIND_SHARE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_2_LABEL,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_2_PINMAP,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_2_TELEM,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_2_BIND_SHARE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_LABEL,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_PINMAP,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_TELEM,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_BIND_SHARE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_LABEL,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_PINMAP,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_TELEM,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_BIND_SHARE,
#if defined(PCBSKY9X) && !defined(REVA)
ITEM_MODEL_EXTRA_MODULE_LABEL,
@ -1292,7 +1284,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_PINMAP:
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_PINMAP:
{
lcdDrawTextAlignedLeft(y, INDENT INDENT "Pinmap");
lcdDrawText(3, y, STR_OPTIONS);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_SET, attr);
if (event == EVT_KEY_BREAK(KEY_ENTER) && attr) {
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
@ -1301,27 +1293,11 @@ void menuModelSetup(event_t event)
memclear(&reusableBuffer.receiverSetup, sizeof(reusableBuffer.receiverSetup));
reusableBuffer.receiverSetup.moduleIdx = moduleIdx;
reusableBuffer.receiverSetup.receiverId = receiverSlot;
pushMenu(menuModelPinmap);
pushMenu(menuModelReceiverOptions);
}
}
break;
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_TELEM:
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_TELEM:
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_TELEM:
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_4_TELEM:
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_1_TELEM:
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_2_TELEM:
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_3_TELEM:
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RECEIVER_4_TELEM:
{
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(k);
uint8_t receiverSlot = g_model.moduleData[moduleIdx].pxx2.getReceiverSlot(receiverIdx) - 1;
g_model.receiverData[receiverSlot].telemetry = editCheckBox(g_model.receiverData[receiverSlot].telemetry, MODEL_SETUP_2ND_COLUMN, y, INDENT INDENT "Telemetry", attr, event);
break;
}
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_BIND_SHARE:
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_2_BIND_SHARE:
case ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_3_BIND_SHARE:
@ -1337,7 +1313,7 @@ void menuModelSetup(event_t event)
drawReceiverName(INDENT_WIDTH * 2, y, receiverSlot);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_BIND, menuHorizontalPosition==0 ? attr : 0);
lcdDrawText(lcdLastRightPos + FW/2, y, BUTTON("Share"), menuHorizontalPosition==1 ? attr : 0);
lcdDrawText(lcdLastRightPos + FW/2, y, STR_BUTTON_SHARE, menuHorizontalPosition==1 ? attr : 0);
if (attr) {
if (menuHorizontalPosition == 0) {
@ -1927,7 +1903,7 @@ void menuModelFailsafe(event_t event)
}
}
void menuModelPinmap(event_t event)
void menuModelReceiverOptions(event_t event)
{
if (menuEvent) {
moduleSettings[reusableBuffer.receiverSetup.moduleIdx].mode = MODULE_MODE_NORMAL;
@ -1938,8 +1914,8 @@ void menuModelPinmap(event_t event)
uint8_t wbar = LCD_W / 2 - 20;
SIMPLE_SUBMENU_NOTITLE(sentModuleChannels(g_moduleIdx));
lcdDrawTextAlignedLeft(0, STR_PINMAPSET);
drawReceiverName(FW * 10, 0, reusableBuffer.receiverSetup.receiverId);
lcdDrawTextAlignedLeft(0, STR_RECEIVER_OPTIONS);
drawReceiverName(FW * 13, 0, reusableBuffer.receiverSetup.receiverId);
lcdInvertLine(0);
if (event == EVT_ENTRY || (reusableBuffer.receiverSetup.state == 0x00 && get_tmr10ms() >= reusableBuffer.receiverSetup.updateTime)) {
@ -1947,7 +1923,7 @@ void menuModelPinmap(event_t event)
reusableBuffer.receiverSetup.timeout = 0;
moduleSettings[reusableBuffer.receiverSetup.moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS;
}
reusableBuffer.receiverSetup.state = 0xFF; //Todo REMOVE ME
if (reusableBuffer.receiverSetup.state != 0) {
for (uint8_t i = 0; i < NUM_BODY_LINES; i++) {
coord_t y = MENU_HEADER_HEIGHT + 1 + i * FH;

1
radio/src/translations.cpp
View file

@ -702,6 +702,7 @@ const char STR_RX_NAME[] = TR_RX_NAME;
const char STR_MENU_OTHER[] = TR_MENU_OTHER;
const char STR_MENU_INVERT[] = TR_MENU_INVERT;
const char STR_JITTER_FILTER[] = TR_JITTER_FILTER;
const char STR_BUTTON_SHARE[] = TR_BUTTON_SHARE;
#if MENUS_LOCK == 1
const char STR_UNLOCKED[] = TR_UNLOCKED;

3
radio/src/translations.h
View file

@ -968,6 +968,7 @@ extern const char STR_MENU_DISPLAY[];
extern const char STR_MENU_OTHER[];
extern const char STR_MENU_INVERT[];
extern const char STR_JITTER_FILTER[];
extern const char STR_BUTTON_SHARE[];
#if MENUS_LOCK == 1
extern const char STR_UNLOCKED[];
@ -975,7 +976,7 @@ extern const char STR_JITTER_FILTER[];
#endif
#if defined(PCBTARANIS) || defined(DSM2)
extern const char STR_MODULE_RANGE[];
extern const char STR_MODULE_RANGE[];
extern const char STR_RECEIVER_OPTIONS[];
extern const char STR_DEL_BUTTON[];
#endif

2
radio/src/translations/cz.h.txt
View file

@ -965,6 +965,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
#define TR_SET BUTTON("Volby")

2
radio/src/translations/de.h.txt
View file

@ -970,6 +970,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
#define TR_SET BUTTON("Set")

2
radio/src/translations/en.h.txt
View file

@ -969,6 +969,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON BUTTON("Add")
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
#define TR_SET BUTTON("Set")

2
radio/src/translations/es.h.txt
View file

@ -976,6 +976,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Limites]"
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Ajuste]"

2
radio/src/translations/fi.h.txt
View file

@ -968,6 +968,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"

2
radio/src/translations/fr.h.txt
View file

@ -980,6 +980,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Prt", "Port."))
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("RAZ")
#define TR_SET BUTTON("Déf")

2
radio/src/translations/it.h.txt
View file

@ -970,6 +970,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"

2
radio/src/translations/nl.h.txt
View file

@ -971,6 +971,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Rng]", "[Range]")
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"

2
radio/src/translations/pl.h.txt
View file

@ -971,6 +971,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Zas]","Zasięg")
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"

2
radio/src/translations/pt.h.txt
View file

@ -975,6 +975,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
#define TR_SET "[Set]"

2
radio/src/translations/se.h.txt
View file

@ -984,6 +984,8 @@
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Tst]", "[Testa]")
#define TR_BUTTON_SHARE BUTTON("Share")
#define TR_RECEIVER_OPTIONS TR("REC. OPTIONS", "RECEIVER OPTIONS")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Nollställ]"
#define TR_SET "[Spara]"