diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index a4b333950..03f189211 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -197,7 +197,7 @@ void menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DISCOVER_SENSORS: - lcdDrawText(0, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr); + lcdDrawText(INDENT_WIDTH, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr); if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) { s_editMode = 0; allowNewSensors = !allowNewSensors; @@ -220,7 +220,7 @@ void menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DELETE_ALL_SENSORS: - lcdDrawText(0, y, STR_DELETE_ALL_SENSORS, attr); + lcdDrawText(INDENT_WIDTH, y, STR_DELETE_ALL_SENSORS, attr); if (attr) { s_editMode = 0; if (event == EVT_KEY_BREAK(KEY_ENTER)) { diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index 386d1baec..e989411f9 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -188,7 +188,7 @@ void menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DISCOVER_SENSORS: - lcdDrawText(0, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr); + lcdDrawText(INDENT_WIDTH, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr); if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) { s_editMode = 0; allowNewSensors = !allowNewSensors; @@ -211,7 +211,7 @@ void menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DELETE_ALL_SENSORS: - lcdDrawText(0, y, STR_DELETE_ALL_SENSORS, attr); + lcdDrawText(INDENT_WIDTH, y, STR_DELETE_ALL_SENSORS, attr); if (attr) { s_editMode = 0; if (event == EVT_KEY_BREAK(KEY_ENTER)) { diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 6a99fd560..ab92d0f69 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -533,24 +533,6 @@ inline uint8_t EXTERNAL_MODULE_MODE_ROW() #define REGISTRATION_ID_ROWS #endif -void drawReceiverName(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t receiverIdx, LcdFlags flags) -{ - if (isModulePXX2(moduleIdx)) { - if (g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx][0] != '\0') - lcdDrawSizedText(x, y, g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], effectiveLen(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME), flags); - else - lcdDrawText(x, y, "---", flags); - } -#if defined(HARDWARE_INTERNAL_MODULE) - else if (moduleIdx == INTERNAL_MODULE) { - lcdDrawText(x, y, "Internal", flags); - } -#endif - else { - lcdDrawText(x, y, "External", flags); - } -} - #if defined(EXTERNAL_ANTENNA) #define ANTENNA_ROW IF_NOT_PXX2_MODULE(INTERNAL_MODULE, IF_INTERNAL_MODULE_ON(0)), // Antenna void onAntennaSwitchConfirm(const char * result) diff --git a/radio/src/gui/480x272/model_telemetry.cpp b/radio/src/gui/480x272/model_telemetry.cpp index f89edcc2b..12e6b4cdf 100644 --- a/radio/src/gui/480x272/model_telemetry.cpp +++ b/radio/src/gui/480x272/model_telemetry.cpp @@ -23,70 +23,13 @@ enum MenuModelTelemetryFrskyItems { ITEM_TELEMETRY_PROTOCOL_TYPE, ITEM_TELEMETRY_RSSI_LABEL, + ITEM_TELEMETRY_RSSI_SOURCE, ITEM_TELEMETRY_RSSI_ALARM1, ITEM_TELEMETRY_RSSI_ALARM2, ITEM_TELEMETRY_DISABLE_ALARMS, ITEM_TELEMETRY_SENSORS_LABEL, - ITEM_TELEMETRY_SENSOR1, - ITEM_TELEMETRY_SENSOR2, - ITEM_TELEMETRY_SENSOR3, - ITEM_TELEMETRY_SENSOR4, - ITEM_TELEMETRY_SENSOR5, - ITEM_TELEMETRY_SENSOR6, - ITEM_TELEMETRY_SENSOR7, - ITEM_TELEMETRY_SENSOR8, - ITEM_TELEMETRY_SENSOR9, - ITEM_TELEMETRY_SENSOR10, - ITEM_TELEMETRY_SENSOR11, - ITEM_TELEMETRY_SENSOR12, - ITEM_TELEMETRY_SENSOR13, - ITEM_TELEMETRY_SENSOR14, - ITEM_TELEMETRY_SENSOR15, - ITEM_TELEMETRY_SENSOR16, - ITEM_TELEMETRY_SENSOR17, - ITEM_TELEMETRY_SENSOR18, - ITEM_TELEMETRY_SENSOR19, - ITEM_TELEMETRY_SENSOR20, - ITEM_TELEMETRY_SENSOR21, - ITEM_TELEMETRY_SENSOR22, - ITEM_TELEMETRY_SENSOR23, - ITEM_TELEMETRY_SENSOR24, - ITEM_TELEMETRY_SENSOR25, - ITEM_TELEMETRY_SENSOR26, - ITEM_TELEMETRY_SENSOR27, - ITEM_TELEMETRY_SENSOR28, - ITEM_TELEMETRY_SENSOR29, - ITEM_TELEMETRY_SENSOR30, - ITEM_TELEMETRY_SENSOR31, - ITEM_TELEMETRY_SENSOR32, - ITEM_TELEMETRY_SENSOR33, - ITEM_TELEMETRY_SENSOR34, - ITEM_TELEMETRY_SENSOR35, - ITEM_TELEMETRY_SENSOR36, - ITEM_TELEMETRY_SENSOR37, - ITEM_TELEMETRY_SENSOR38, - ITEM_TELEMETRY_SENSOR39, - ITEM_TELEMETRY_SENSOR40, - ITEM_TELEMETRY_SENSOR41, - ITEM_TELEMETRY_SENSOR42, - ITEM_TELEMETRY_SENSOR43, - ITEM_TELEMETRY_SENSOR44, - ITEM_TELEMETRY_SENSOR45, - ITEM_TELEMETRY_SENSOR46, - ITEM_TELEMETRY_SENSOR47, - ITEM_TELEMETRY_SENSOR48, - ITEM_TELEMETRY_SENSOR49, - ITEM_TELEMETRY_SENSOR50, - ITEM_TELEMETRY_SENSOR51, - ITEM_TELEMETRY_SENSOR52, - ITEM_TELEMETRY_SENSOR53, - ITEM_TELEMETRY_SENSOR54, - ITEM_TELEMETRY_SENSOR55, - ITEM_TELEMETRY_SENSOR56, - ITEM_TELEMETRY_SENSOR57, - ITEM_TELEMETRY_SENSOR58, - ITEM_TELEMETRY_SENSOR59, - ITEM_TELEMETRY_SENSOR60, + ITEM_TELEMETRY_SENSOR_FIRST, + ITEM_TELEMETRY_SENSOR_LAST = ITEM_TELEMETRY_SENSOR_FIRST + MAX_TELEMETRY_SENSORS - 1, ITEM_TELEMETRY_DISCOVER_SENSORS, ITEM_TELEMETRY_NEW_SENSOR, ITEM_TELEMETRY_DELETE_ALL_SENSORS, @@ -105,6 +48,7 @@ enum MenuModelTelemetryFrskyItems { #define TELEM_COL4 350 #define TELEM_COL5 425 +#define RSSI_ROWS LABEL(RSSI), 0, 0, 0, 0, #define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) #define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), \ SENSOR_ROWS(31), SENSOR_ROWS(32), SENSOR_ROWS(33), SENSOR_ROWS(34), SENSOR_ROWS(35), SENSOR_ROWS(36), SENSOR_ROWS(37), SENSOR_ROWS(38), SENSOR_ROWS(39), SENSOR_ROWS(40),SENSOR_ROWS(41), SENSOR_ROWS(42), SENSOR_ROWS(43), SENSOR_ROWS(44), SENSOR_ROWS(45), SENSOR_ROWS(46), SENSOR_ROWS(47), SENSOR_ROWS(48), SENSOR_ROWS(49), SENSOR_ROWS(50),SENSOR_ROWS(51), SENSOR_ROWS(52), SENSOR_ROWS(53), SENSOR_ROWS(54), SENSOR_ROWS(55), SENSOR_ROWS(56), SENSOR_ROWS(57), SENSOR_ROWS(58), SENSOR_ROWS(59), 0, 0, 0, 0, @@ -113,12 +57,11 @@ enum MenuModelTelemetryFrskyItems { #else #define VARIO_ROWS #endif -#define RSSI_ROWS LABEL(RSSI), 0, 0, 0, -#define TELEMETRY_TYPE_ROWS (g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW, +#define TELEMETRY_TYPE_ROWS (!IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW, void onSensorMenu(const char * result) { - uint8_t index = menuVerticalPosition - ITEM_TELEMETRY_SENSOR1; + uint8_t index = menuVerticalPosition - ITEM_TELEMETRY_SENSOR_FIRST; if (index < MAX_TELEMETRY_SENSORS) { if (result == STR_EDIT) { @@ -151,15 +94,17 @@ void onSensorMenu(const char * result) } } -bool menuModelTelemetryFrsky(event_t event) +void onDeleteAllSensorsConfirm(const char * result) { - if (warningResult) { - warningResult = 0; + if (result == STR_OK) { for (int i=0; i0) ? BLINK|INVERS : INVERS); LcdFlags attr = (menuVerticalPosition == k ? blink : 0); - if (k>=ITEM_TELEMETRY_SENSOR1 && k= ITEM_TELEMETRY_SENSOR_FIRST && k <= ITEM_TELEMETRY_SENSOR_LAST) { + int index = k - ITEM_TELEMETRY_SENSOR_FIRST; lcdDrawNumber(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, index+1, LEFT|attr, 0, NULL, ":"); lcdDrawSizedText(60, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR); TelemetryItem & telemetryItem = telemetryItems[index]; @@ -233,7 +178,7 @@ bool menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DISCOVER_SENSORS: - lcdDrawText(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, allowNewSensors ? NO_INDENT(STR_STOP_DISCOVER_SENSORS) : NO_INDENT(STR_DISCOVER_SENSORS), attr); + lcdDrawText(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr); if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) { s_editMode = 0; allowNewSensors = !allowNewSensors; @@ -256,12 +201,12 @@ bool menuModelTelemetryFrsky(event_t event) break; case ITEM_TELEMETRY_DELETE_ALL_SENSORS: - lcdDrawText(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, NO_INDENT(STR_DELETE_ALL_SENSORS), attr); + lcdDrawText(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, STR_DELETE_ALL_SENSORS, attr); if (attr) s_editMode = 0; - if (attr && event==EVT_KEY_LONG(KEY_ENTER)) { + if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) { killEvents(KEY_ENTER); - POPUP_CONFIRMATION(STR_CONFIRMDELETE); + POPUP_CONFIRMATION(STR_CONFIRMDELETE, onDeleteAllSensorsConfirm); } break; @@ -281,6 +226,20 @@ bool menuModelTelemetryFrsky(event_t event) lcdDrawText(MENUS_MARGIN_LEFT, y, "RSSI"); break; + case ITEM_TELEMETRY_RSSI_SOURCE: { + lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_SOURCE); + drawSource(TELEM_COL2, y, g_model.rssiSource ? MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1) : 0, attr); + if (g_model.rssiSource) { + TelemetrySensor * sensor = &g_model.telemetrySensors[g_model.rssiSource - 1]; + lcdDrawText(lcdNextPos, y, " ", attr); + drawReceiverName(lcdNextPos, y, sensor->frskyInstance.rxIndex >> 2, sensor->frskyInstance.rxIndex & 0x03, attr); + } + if (attr) { + g_model.rssiSource = checkIncDec(event, g_model.rssiSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL | NO_INCDEC_MARKS, isRssiSensorAvailable); + } + break; + } + case ITEM_TELEMETRY_RSSI_ALARM1: case ITEM_TELEMETRY_RSSI_ALARM2: { bool warning = (k==ITEM_TELEMETRY_RSSI_ALARM1); diff --git a/radio/src/gui/480x272/widgets.cpp b/radio/src/gui/480x272/widgets.cpp index 301fe575b..0e1dd5416 100644 --- a/radio/src/gui/480x272/widgets.cpp +++ b/radio/src/gui/480x272/widgets.cpp @@ -427,3 +427,21 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char lcdRefresh(); lastDuration = duration; } + +void drawReceiverName(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t receiverIdx, LcdFlags flags) +{ + if (isModulePXX2(moduleIdx)) { + if (g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx][0] != '\0') + lcdDrawSizedText(x, y, g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], effectiveLen(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME), flags); + else + lcdDrawText(x, y, "---", flags); + } +#if defined(HARDWARE_INTERNAL_MODULE) + else if (moduleIdx == INTERNAL_MODULE) { + lcdDrawText(x, y, "Internal", flags); + } +#endif + else { + lcdDrawText(x, y, "External", flags); + } +} diff --git a/radio/src/gui/480x272/widgets.h b/radio/src/gui/480x272/widgets.h index ebd7363b3..411fecdea 100644 --- a/radio/src/gui/480x272/widgets.h +++ b/radio/src/gui/480x272/widgets.h @@ -76,4 +76,6 @@ void drawTopBar(); void drawMainPots(); void drawTrims(uint8_t flightMode); +void drawReceiverName(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t receiverIdx, LcdFlags flags); + #endif // _WIDGETS_H_ diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4a2eac5e7..c080f0902 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1135,9 +1135,9 @@ //TODO: translation #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE TR(INDENT "Chybné ID", INDENT "Ignoruj chyby ID") -#define TR_DISCOVER_SENSORS INDENT "Detekovat nové senzory" -#define TR_STOP_DISCOVER_SENSORS INDENT "Zastavit autodetekci" -#define TR_DELETE_ALL_SENSORS INDENT "Odebrat všechny senzory" +#define TR_DISCOVER_SENSORS "Detekovat nové senzory" +#define TR_STOP_DISCOVER_SENSORS "Zastavit autodetekci" +#define TR_DELETE_ALL_SENSORS "Odebrat všechny senzory" #define TR_CONFIRMDELETE "Opravdu " LCDW_128_480_LINEBREAK "odstranit vše ?" #define TR_SELECT_WIDGET "Zvolit widget" #define TR_REMOVE_WIDGET "Odstranit widget" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 98f50ba64..4984b8316 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1146,9 +1146,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Invert." #define TR_IGNORE_INSTANCE TR(INDENT "Ignr. Inst.", INDENT "Ignor. Instanzen") -#define TR_DISCOVER_SENSORS INDENT "Start Sensorsuche" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop Sensorsuche" -#define TR_DELETE_ALL_SENSORS INDENT "Lösche alle Sensoren" +#define TR_DISCOVER_SENSORS "Start Sensorsuche" +#define TR_STOP_DISCOVER_SENSORS "Stop Sensorsuche" +#define TR_DELETE_ALL_SENSORS "Lösche alle Sensoren" #define TR_CONFIRMDELETE "Wirklich alle " LCDW_128_480_LINEBREAK "löschen ?" #define TR_SELECT_WIDGET "Widget auswählen" // grafisches Element #define TR_REMOVE_WIDGET "Widget löschen" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 61d48a5ae..fcc500307 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1140,9 +1140,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignore instances") -#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" -#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_DISCOVER_SENSORS "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS "Stop discovery" +#define TR_DELETE_ALL_SENSORS "Delete all sensors" #define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index ce16057dd..269a19ab5 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1161,9 +1161,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE INDENT "Ignore instance" -#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" -#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_DISCOVER_SENSORS "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS "Stop discovery" +#define TR_DELETE_ALL_SENSORS "Delete all sensors" #define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d409df8e6..4c2565282 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1154,9 +1154,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE INDENT "Ignore instance" -#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" -#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_DISCOVER_SENSORS "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS "Stop discovery" +#define TR_DELETE_ALL_SENSORS "Delete all sensors" #define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6e36e766f..1c232036f 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1163,9 +1163,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Inversé" #define TR_IGNORE_INSTANCE TR(INDENT "Ign. inst", INDENT "Ignorer instance") -#define TR_DISCOVER_SENSORS INDENT "Découvrir capteurs" -#define TR_STOP_DISCOVER_SENSORS INDENT "Terminer découverte" -#define TR_DELETE_ALL_SENSORS TR(INDENT "Suppr. tous capteurs", INDENT "Supprimer tous capteurs") +#define TR_DISCOVER_SENSORS "Découvrir capteurs" +#define TR_STOP_DISCOVER_SENSORS "Terminer découverte" +#define TR_DELETE_ALL_SENSORS TR("Suppr. tous capteurs", "Supprimer tous capteurs") #define TR_CONFIRMDELETE TR("Tout effacer?", "Vraiment tout " LCDW_128_480_LINEBREAK "effacer ?") #define TR_SELECT_WIDGET "Sélect. widget" #define TR_REMOVE_WIDGET "Supprimer widget" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 74cdaae26..73639d8e2 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1156,9 +1156,9 @@ //TODO: translation #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE TR(INDENT "No inst.","Ignora instanza") -#define TR_DISCOVER_SENSORS INDENT "Cerca nuovi sensori" -#define TR_STOP_DISCOVER_SENSORS INDENT "Ferma ricerca.." -#define TR_DELETE_ALL_SENSORS INDENT "Elimina tutti i sensori" +#define TR_DISCOVER_SENSORS "Cerca nuovi sensori" +#define TR_STOP_DISCOVER_SENSORS "Ferma ricerca.." +#define TR_DELETE_ALL_SENSORS "Elimina tutti i sensori" #define TR_CONFIRMDELETE "Confermi " LCDW_128_480_LINEBREAK "eliminazione ?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 15fe158c1..ed6394015 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1149,9 +1149,9 @@ TR_GYR_VSRCRAW //TODO: translation #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE TR(INDENT "Neg. ID ","Negeer ID's") -#define TR_DISCOVER_SENSORS INDENT "Ontdek nieuwe sensors" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop ontdekking" -#define TR_DELETE_ALL_SENSORS INDENT "Wis alle sensors" +#define TR_DISCOVER_SENSORS "Ontdek nieuwe sensors" +#define TR_STOP_DISCOVER_SENSORS "Stop ontdekking" +#define TR_DELETE_ALL_SENSORS "Wis alle sensors" #define TR_CONFIRMDELETE "Echt alles wissen?" #define TR_SELECT_WIDGET "Widget kiezen" #define TR_REMOVE_WIDGET "Widget wissen" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index dc306ce1f..dcdd5f3ea 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1156,9 +1156,9 @@ //TODO: translation #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE INDENT "Ignoruj przypadek" -#define TR_DISCOVER_SENSORS INDENT "Znajdź nowe czujniki" -#define TR_STOP_DISCOVER_SENSORS INDENT "Szukanie STOP " -#define TR_DELETE_ALL_SENSORS INDENT "Usuń czujniki " +#define TR_DISCOVER_SENSORS "Znajdź nowe czujniki" +#define TR_STOP_DISCOVER_SENSORS "Szukanie STOP " +#define TR_DELETE_ALL_SENSORS "Usuń czujniki " #define TR_CONFIRMDELETE "Usunąć wszystkie?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index a68a9939b..734c11a82 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1145,9 +1145,9 @@ #define TR_SERVOS_KO "Servos KO" #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE INDENT "Ignore instance" -#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" -#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" -#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_DISCOVER_SENSORS "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS "Stop discovery" +#define TR_DELETE_ALL_SENSORS "Delete all sensors" #define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3df3756d3..f2f76dce6 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1156,9 +1156,9 @@ //TODO: translation #define TR_INVERTED_SERIAL INDENT "Invert" #define TR_IGNORE_INSTANCE TR(INDENT "Inst.fel", INDENT "Hantera Instansfel") -#define TR_DISCOVER_SENSORS INDENT "Sök nya sensorer" -#define TR_STOP_DISCOVER_SENSORS INDENT "Avbryt sökning" -#define TR_DELETE_ALL_SENSORS INDENT "Ta bort alla sensorer" +#define TR_DISCOVER_SENSORS "Sök nya sensorer" +#define TR_STOP_DISCOVER_SENSORS "Avbryt sökning" +#define TR_DELETE_ALL_SENSORS "Ta bort alla sensorer" #define TR_CONFIRMDELETE "Ta bort alla?" #define TR_SELECT_WIDGET "Select widget" #define TR_REMOVE_WIDGET "Remove widget"