@@ -1104,7 +1104,7 @@ void menuModelSetup(event_t event)
|
||||
for (uint8_t i=0; i<popupMenuItemsCount; i++) {
|
||||
popupMenuItems[i] = reusableBuffer.moduleSetup.bt.devices[i];
|
||||
}
|
||||
popupMenuTitle = STR_BT_SELECT_DEVICE;
|
||||
POPUP_MENU_TITLE(STR_BT_SELECT_DEVICE);
|
||||
POPUP_MENU_START(onBluetoothConnectMenu);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1000,7 +1000,7 @@ void menuModelSetup(event_t event)
|
||||
for (uint8_t i=0; i<popupMenuItemsCount; i++) {
|
||||
popupMenuItems[i] = reusableBuffer.moduleSetup.bt.devices[i];
|
||||
}
|
||||
popupMenuTitle = STR_BT_SELECT_DEVICE;
|
||||
POPUP_MENU_TITLE(STR_BT_SELECT_DEVICE);
|
||||
POPUP_MENU_START(onBluetoothConnectMenu);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -544,6 +544,11 @@ inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
|
||||
popupMenuSelectedItem = (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount - 1) : 0);
|
||||
}
|
||||
|
||||
inline void POPUP_MENU_TITLE(const char * s)
|
||||
{
|
||||
popupMenuTitle = s;
|
||||
}
|
||||
|
||||
inline void POPUP_MENU_START(PopupMenuHandler handler)
|
||||
{
|
||||
if (handler != popupMenuHandler) {
|
||||
|
||||
@@ -1455,7 +1455,7 @@ bool menuModelSetup(event_t event)
|
||||
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
|
||||
popupMenuItems[rx] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[rx];
|
||||
}
|
||||
popupMenuTitle = STR_PXX2_SELECT_RX;
|
||||
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
|
||||
POPUP_MENU_START(onPXX2BindMenu);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,8 +178,7 @@ const char * runPopupMenu(event_t event)
|
||||
|
||||
for (uint8_t i=0; i<display_count; i++) {
|
||||
if (i == popupMenuSelectedItem) {
|
||||
lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, FH+1, TEXT_INVERTED_BGCOLOR);
|
||||
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], TEXT_INVERTED_COLOR);
|
||||
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], INVERS);
|
||||
}
|
||||
else {
|
||||
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
|
||||
|
||||
@@ -568,7 +568,7 @@ bool menuRadioSdManager(event_t _event)
|
||||
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
|
||||
popupMenuItems[rx] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[rx];
|
||||
}
|
||||
popupMenuTitle = STR_PXX2_SELECT_RX;
|
||||
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
|
||||
POPUP_MENU_START(onUpdateReceiverSelection);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,5 +80,6 @@ void startBindMenu(uint8_t moduleIdx)
|
||||
selection += 1;
|
||||
|
||||
POPUP_MENU_SELECT_ITEM(selection);
|
||||
POPUP_MENU_TITLE(STR_SELECT_MODE);
|
||||
POPUP_MENU_START(onBindMenu);
|
||||
}
|
||||
|
||||
@@ -304,7 +304,7 @@ void modelSetupModulePxx2ReceiverLine(uint8_t moduleIdx, uint8_t receiverIdx, co
|
||||
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
|
||||
popupMenuItems[rx] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[rx];
|
||||
}
|
||||
popupMenuTitle = STR_PXX2_SELECT_RX;
|
||||
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
|
||||
POPUP_MENU_START(onPXX2BindMenu);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,6 +167,11 @@ inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
|
||||
popupMenuSelectedItem = (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount) : 0);
|
||||
}
|
||||
|
||||
inline void POPUP_MENU_TITLE(const char * s)
|
||||
{
|
||||
popupMenuTitle = s;
|
||||
}
|
||||
|
||||
inline void POPUP_MENU_START(PopupMenuHandler handler)
|
||||
{
|
||||
if (handler != popupMenuHandler) {
|
||||
|
||||
@@ -580,7 +580,7 @@ void menuRadioSdManager(event_t _event)
|
||||
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
|
||||
popupMenuItems[rx] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[rx];
|
||||
}
|
||||
popupMenuTitle = STR_PXX2_SELECT_RX;
|
||||
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
|
||||
POPUP_MENU_START(onUpdateReceiverSelection);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,7 @@ void handleUsbConnection()
|
||||
#if defined(DEBUG)
|
||||
POPUP_MENU_ADD_ITEM(STR_USB_SERIAL);
|
||||
#endif
|
||||
POPUP_MENU_TITLE(STR_SELECT_MODE);
|
||||
POPUP_MENU_START(onUSBConnectMenu);
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -288,6 +288,7 @@ const char STR_BEEP_VOLUME[] = INDENT TR_BEEP_VOLUME;
|
||||
const char STR_WAV_VOLUME[] = INDENT TR_WAV_VOLUME;
|
||||
const char STR_BG_VOLUME[] = INDENT TR_BG_VOLUME;
|
||||
const char STR_SELECT_MODEL[] = TR_SELECT_MODEL;
|
||||
const char STR_SELECT_MODE[] = TR_SELECT_MODE;
|
||||
const char STR_CREATE_CATEGORY[] = TR_CREATE_CATEGORY;
|
||||
const char STR_RENAME_CATEGORY[] = TR_RENAME_CATEGORY;
|
||||
const char STR_DELETE_CATEGORY[] = TR_DELETE_CATEGORY;
|
||||
|
||||
@@ -465,6 +465,7 @@ extern const char STR_BEEP_VOLUME[];
|
||||
extern const char STR_WAV_VOLUME[];
|
||||
extern const char STR_BG_VOLUME[];
|
||||
extern const char STR_SELECT_MODEL[];
|
||||
extern const char STR_SELECT_MODE[];
|
||||
extern const char STR_CREATE_CATEGORY[];
|
||||
extern const char STR_RENAME_CATEGORY[];
|
||||
extern const char STR_DELETE_CATEGORY[];
|
||||
|
||||
@@ -679,6 +679,7 @@
|
||||
#define TR_VOLTAGE INDENT"Napětí"
|
||||
#define TR_CURRENT INDENT"Proud"
|
||||
#define TR_SELECT_MODEL "Vyber model"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Nová kategorie"
|
||||
#define TR_RENAME_CATEGORY "Přejmenovat kategorii"
|
||||
#define TR_DELETE_CATEGORY "Odstranit kategorii"
|
||||
@@ -901,7 +902,7 @@
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Útlumový člen nutný!"
|
||||
#define TR_PXX2_SELECT_RX "Vyber RX..."
|
||||
#define TR_PXX2_DEFAULT "<výchozí>"
|
||||
#define TR_BT_SELECT_DEVICE "Vyberte zařízení..."
|
||||
#define TR_BT_SELECT_DEVICE "Vyberte zařízení"
|
||||
#define TR_DISCOVER "Hledat"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Čekám..."
|
||||
|
||||
@@ -681,6 +681,7 @@
|
||||
#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spannungsquelle") //9XR-Pro
|
||||
#define TR_CURRENT TR(INDENT "Strom", INDENT "Stromquelle")
|
||||
#define TR_SELECT_MODEL "Modell auswählen"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Modelltyp erstellen"
|
||||
#define TR_RENAME_CATEGORY "Modelltyp umbenennen"
|
||||
#define TR_DELETE_CATEGORY "Modelltyp löschen"
|
||||
@@ -901,9 +902,9 @@
|
||||
#define TR_BYTES "Bytes"
|
||||
#define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -680,6 +680,7 @@
|
||||
#define TR_VOLTAGE TR(INDENT "Voltage", INDENT "Voltage source")
|
||||
#define TR_CURRENT TR(INDENT "Current", INDENT "Current source")
|
||||
#define TR_SELECT_MODEL "Select model"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Create category"
|
||||
#define TR_RENAME_CATEGORY "Rename category"
|
||||
#define TR_DELETE_CATEGORY "Delete category"
|
||||
@@ -900,9 +901,9 @@
|
||||
#define TR_BYTES "bytes"
|
||||
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -682,6 +682,7 @@
|
||||
#define TR_VOLTAGE INDENT"Voltaje"
|
||||
#define TR_CURRENT INDENT"Actual"
|
||||
#define TR_SELECT_MODEL TR("Selec. modelo", "Seleccionar modelo")
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Crear categoría"
|
||||
#define TR_RENAME_CATEGORY "Renombrar categoría"
|
||||
#define TR_DELETE_CATEGORY "Borrar categoría"
|
||||
@@ -904,7 +905,7 @@
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Necesita atenuador"
|
||||
#define TR_PXX2_SELECT_RX "Selecciona RX..."
|
||||
#define TR_PXX2_DEFAULT "<defecto>"
|
||||
#define TR_BT_SELECT_DEVICE "Selecciona dispositivo..."
|
||||
#define TR_BT_SELECT_DEVICE "Selecciona dispositivo"
|
||||
#define TR_DISCOVER "Buscar"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Espera..."
|
||||
|
||||
@@ -698,6 +698,7 @@
|
||||
#define TR_VOLTAGE INDENT"Voltage"
|
||||
#define TR_CURRENT INDENT"Current"
|
||||
#define TR_SELECT_MODEL "Select Model"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Create Category"
|
||||
#define TR_RENAME_CATEGORY "Rename Category"
|
||||
#define TR_DELETE_CATEGORY "Delete Category"
|
||||
@@ -918,9 +919,9 @@
|
||||
#define TR_BYTES "bytes"
|
||||
#define TR_MODULE_BIND "[Bind]"
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -701,6 +701,7 @@
|
||||
#define TR_VOLTAGE TR(INDENT "Tension",INDENT "Source tension")
|
||||
#define TR_CURRENT TR(INDENT "Courant",INDENT "Source courant")
|
||||
#define TR_SELECT_MODEL "Sélect. modèle"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Créer une catégorie"
|
||||
#define TR_RENAME_CATEGORY "Renommer la catégorie"
|
||||
#define TR_DELETE_CATEGORY "Supprimer la catégorie"
|
||||
@@ -922,7 +923,7 @@
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Atténuateur requis"
|
||||
#define TR_PXX2_SELECT_RX "Sélect RX..."
|
||||
#define TR_PXX2_DEFAULT "<défaut>"
|
||||
#define TR_BT_SELECT_DEVICE "Sélect appareil..."
|
||||
#define TR_BT_SELECT_DEVICE "Sélect appareil"
|
||||
#define TR_DISCOVER "Découvrir"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Attente..."
|
||||
|
||||
@@ -700,6 +700,7 @@
|
||||
#define TR_VOLTAGE TR(INDENT "Voltagg.",INDENT "Voltaggio")
|
||||
#define TR_CURRENT TR(INDENT "Corrente",INDENT "Corrente")
|
||||
#define TR_SELECT_MODEL TR("Scegli mod.", "Scegli Modello")
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Crea Categoria"
|
||||
#define TR_RENAME_CATEGORY "Rinomina Categoria"
|
||||
#define TR_DELETE_CATEGORY "Cancella Categoria"
|
||||
|
||||
@@ -686,6 +686,7 @@
|
||||
#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spanningsbron") //9XR-Pro
|
||||
#define TR_CURRENT TR(INDENT "Stroom", INDENT "Stroombron")
|
||||
#define TR_SELECT_MODEL "Kies Model"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Create Category"
|
||||
#define TR_RENAME_CATEGORY "Rename Category"
|
||||
#define TR_DELETE_CATEGORY "Delete Category"
|
||||
@@ -906,9 +907,9 @@
|
||||
#define TR_BYTES "bytes"
|
||||
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -699,6 +699,7 @@
|
||||
#define TR_VOLTAGE TR (INDENT"Napięcie",INDENT"Źródło Napięcia")
|
||||
#define TR_CURRENT TR (INDENT"Prąd",INDENT"Źródło Prądu")
|
||||
#define TR_SELECT_MODEL "Wybór modelu"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Create Category"
|
||||
#define TR_RENAME_CATEGORY "Rename Category"
|
||||
#define TR_DELETE_CATEGORY "Delete Category"
|
||||
@@ -919,9 +920,9 @@
|
||||
#define TR_BYTES "bajty"
|
||||
#define TR_MODULE_BIND TR("[BND]","[Bind]")
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -689,6 +689,7 @@
|
||||
#define TR_VOLTAGE INDENT"Volts"
|
||||
#define TR_CURRENT INDENT"Amperes"
|
||||
#define TR_SELECT_MODEL "Selec. Modelo"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Create Category"
|
||||
#define TR_RENAME_CATEGORY "Rename Category"
|
||||
#define TR_DELETE_CATEGORY "Delete Category"
|
||||
@@ -909,9 +910,9 @@
|
||||
#define TR_BYTES "bytes"
|
||||
#define TR_MODULE_BIND "[Bind]"
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
@@ -698,6 +698,7 @@
|
||||
#define TR_VOLTAGE INDENT"Volt"
|
||||
#define TR_CURRENT INDENT"Ampere"
|
||||
#define TR_SELECT_MODEL "Välj Modell"
|
||||
#define TR_SELECT_MODE "Select mode"
|
||||
#define TR_CREATE_CATEGORY "Skapa Kategori"
|
||||
#define TR_RENAME_CATEGORY "Byt Kat.namn"
|
||||
#define TR_DELETE_CATEGORY "Ta Bort Kategori"
|
||||
@@ -919,9 +920,9 @@
|
||||
#define TR_BYTES "byte"
|
||||
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
|
||||
#define TR_POWERMETER_ATTN_NEEDED "Attenuator needed"
|
||||
#define TR_PXX2_SELECT_RX "Select RX..."
|
||||
#define TR_PXX2_SELECT_RX "Select RX"
|
||||
#define TR_PXX2_DEFAULT "<default>"
|
||||
#define TR_BT_SELECT_DEVICE "Select device..."
|
||||
#define TR_BT_SELECT_DEVICE "Select device"
|
||||
#define TR_DISCOVER "Discover"
|
||||
#define TR_BUTTON_INIT BUTTON("Init")
|
||||
#define TR_WAITING "Waiting..."
|
||||
|
||||
Reference in New Issue
Block a user