diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 7665f7ca4..dc30519ac 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -67,48 +67,6 @@ void menuRadioDiagAnalogs(event_t event) } #endif - -#if defined(PCBTARANIS) - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, STR_BATT_CALIB); - putsVolts(LEN_CALIB_FIELDS*FW+FW, MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, getBatteryVoltage(), (menuVerticalPosition==HEADER_LINE ? INVERS | (s_editMode > 0 ? BLINK : 0) : 0) | PREC2 | LEFT); -#elif defined(PCBSKY9X) - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1+4*FH, STR_BATT_CALIB); - static int32_t adcBatt; - // TODO board.cpp - adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8; - uint32_t batCalV = (adcBatt + adcBatt*(g_eeGeneral.txVoltageCalibration)/128) * 4191; - batCalV /= 55296; - putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT+1+4*FH, batCalV, (menuVerticalPosition==HEADER_LINE ? INVERS : 0)); -#else - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH, STR_BATT_CALIB); - putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH, g_vbat100mV, (menuVerticalPosition==HEADER_LINE ? INVERS : 0)); -#endif - - if (menuVerticalPosition == HEADER_LINE) { - CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127); - } - -#if defined(TX_CAPACITY_MEASUREMENT) - lcdDrawTextAlignedLeft(6*FH+1, STR_CURRENT_CALIB); - drawValueWithUnit(LEN_CALIB_FIELDS*FW+4*FW, 6*FH+1, getCurrent(), UNIT_MILLIAMPS, (menuVerticalPosition==2 ? INVERS : 0)) ; - if (menuVerticalPosition==2) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49); -#endif - -#if defined(PCBSKY9X) - #if defined(TX_CAPACITY_MEASUREMENT) - #define TEMP_CALIB_POS 7*FH+1 - #define TEMP_CALIB_MENU_POS 3 - #else - #define TEMP_CALIB_POS 6*FH+1 - #define TEMP_CALIB_MENU_POS 2 - #endif - - lcdDrawTextAlignedLeft(TEMP_CALIB_POS, STR_TEMP_CALIB); - drawValueWithUnit(LEN_CALIB_FIELDS*FW+4*FW, TEMP_CALIB_POS, getTemperature(), UNIT_TEMPERATURE, (menuVerticalPosition==TEMP_CALIB_MENU_POS ? INVERS : 0)) ; - if (menuVerticalPosition==TEMP_CALIB_MENU_POS) - CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100); -#endif - #if (NUM_PWMSTICKS > 0) && !defined(SIMU) lcdDrawTextAlignedLeft(7*FH, STICKS_PWM_ENABLED() ? "Sticks: PWM" : "Sticks: ANA"); #endif diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 9b53134dd..01a412394 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -111,11 +111,18 @@ enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_SB, ITEM_RADIO_HARDWARE_SC, ITEM_RADIO_HARDWARE_SD, -#if NUM_SWITCHES > 4 +#if NUM_SWITCHES >= 5 ITEM_RADIO_HARDWARE_SF, #endif -#if NUM_SWITCHES > 5 +#if NUM_SWITCHES >= 6 ITEM_RADIO_HARDWARE_SH, +#endif + ITEM_RADIO_HARDWARE_BATTERY_CALIB, +#if defined(TX_CAPACITY_MEASUREMENT) + ITEM_RADIO_HARDWARE_CAPACITY_CALIB, +#endif +#if defined(PCBSKY9X) + ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB, #endif #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE, @@ -128,7 +135,6 @@ enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_BLUETOOTH_NAME, #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, - ITEM_RADIO_OWNER_ID, ITEM_RADIO_HARDWARE_DEBUG, ITEM_RADIO_HARDWARE_MAX }; @@ -147,7 +153,9 @@ enum MenuRadioHardwareItems { #define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1 #endif -#if defined(PCBTARANIS) +#if defined(PCBX3) + #define BLUETOOTH_ROWS +#elif defined(PCBTARANIS) #define BLUETOOTH_ROWS uint8_t(IS_BLUETOOTH_CHIP_PRESENT() ? 0 : HIDDEN_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_TELEMETRY ? -1 : HIDDEN_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : 0), #elif defined(BLUETOOTH) #define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : READONLY_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : READONLY_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : 0), @@ -170,34 +178,41 @@ enum MenuRadioHardwareItems { void menuRadioHardware(event_t event) { - MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { + MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE + ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS - 0, - 0, - 0, - 0, - 0, + 0 /* calibration button */, + 0 /* stick 1 */, + 0 /* stick 2 */, + 0 /* stick 3 */, + 0 /* stick 4 */, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, + 0 /* battery calib */, +#if defined(TX_CAPACITY_MEASUREMENT) + 0, +#endif +#if defined(PCBSKY9X) + 0, +#endif #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 0 /* max bauds */, #endif BLUETOOTH_ROWS 0 /* jitter filter */, - 0 /* owner id */, - 1 /* debugs */ + 1 /* debugs */, }); uint8_t sub = menuVerticalPosition - HEADER_LINE; - for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); uint8_t attr = (sub == k ? blink : 0); @@ -249,10 +264,10 @@ void menuRadioHardware(event_t event) case ITEM_RADIO_HARDWARE_SB: case ITEM_RADIO_HARDWARE_SC: case ITEM_RADIO_HARDWARE_SD: -#if NUM_SWITCHES > 4 +#if NUM_SWITCHES >= 5 case ITEM_RADIO_HARDWARE_SF: #endif -#if NUM_SWITCHES > 5 +#if NUM_SWITCHES >= 6 case ITEM_RADIO_HARDWARE_SH: #endif { @@ -271,6 +286,47 @@ void menuRadioHardware(event_t event) break; } + case ITEM_RADIO_HARDWARE_BATTERY_CALIB: +#if defined(PCBTARANIS) + lcdDrawTextAlignedLeft(y, STR_BATT_CALIB); + putsVolts(HW_SETTINGS_COLUMN2, y, getBatteryVoltage(), attr|PREC2|LEFT); +#elif defined(PCBSKY9X) + lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1+4*FH, STR_BATT_CALIB); + static int32_t adcBatt; + // TODO board.cpp + adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8; + uint32_t batCalV = (adcBatt + adcBatt*(g_eeGeneral.txVoltageCalibration)/128) * 4191; + batCalV /= 55296; + putsVolts(HW_SETTINGS_COLUMN2, y, batCalV, (menuVerticalPosition==HEADER_LINE ? INVERS : 0)); +#else + lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH, STR_BATT_CALIB); + putsVolts(HW_SETTINGS_COLUMN2, y, g_vbat100mV, attr|LEFT); +#endif + if (attr) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127); + } + break; + +#if defined(TX_CAPACITY_MEASUREMENT) + case ITEM_RADIO_HARDWARE_BATTERY_CALIB: + lcdDrawTextAlignedLeft(y, STR_CURRENT_CALIB); + drawValueWithUnit(HW_SETTINGS_COLUMN2, y, getCurrent(), UNIT_MILLIAMPS, attr) ; + if (attr) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49); + } + break; +#endif + +#if defined(PCBSKY9X) + case ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB: + lcdDrawTextAlignedLeft(y, STR_TEMP_CALIB); + drawValueWithUnit(HW_SETTINGS_COLUMN2, y, getTemperature(), UNIT_TEMPERATURE, attr) ; + if (attr) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100); + } + break; +#endif + #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE: lcdDrawTextAlignedLeft(y, STR_MAXBAUDRATE); @@ -328,14 +384,10 @@ void menuRadioHardware(event_t event) g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event); break; - case ITEM_RADIO_OWNER_ID: - editSingleName(HW_SETTINGS_COLUMN2, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr); - break; - case ITEM_RADIO_HARDWARE_DEBUG: lcdDrawTextAlignedLeft(y, STR_DEBUG); lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0); - lcdDrawText(lcdLastRightPos + 2, y, STR_SWITCHES_BTN, menuHorizontalPosition == 1 ? attr : 0); + lcdDrawText(lcdLastRightPos + 2, y, STR_KEYS_BTN, menuHorizontalPosition == 1 ? attr : 0); if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { if (menuHorizontalPosition == 0) pushMenu(menuRadioDiagAnalogs); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 118ba8efd..25d407045 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -26,9 +26,9 @@ const unsigned char sticks[] = { #include "sticks.lbm" }; -#define RADIO_SETUP_2ND_COLUMN (LCD_W-6*FW-3) +#define RADIO_SETUP_2ND_COLUMN (LCD_W-7*FW-3) #define RADIO_SETUP_DATE_COLUMN (FW*15+7) -#define RADIO_SETUP_TIME_COLUMN (FW*15+9) +#define RADIO_SETUP_TIME_COLUMN (RADIO_SETUP_2ND_COLUMN + 2 * FWNUM) #define SLIDER_5POS(y, value, label, event, attr) { \ int8_t tmp = value; \ @@ -88,6 +88,9 @@ enum MenuRadioSetupItems { CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON) ITEM_SETUP_FLASH_BEEP, CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH) +#if defined(PXX2) + ITEM_RADIO_OWNER_ID, +#endif CASE_GPS(ITEM_SETUP_TIMEZONE) ITEM_SETUP_ADJUST_RTC, CASE_GPS(ITEM_SETUP_GPSFORMAT) @@ -132,11 +135,38 @@ void menuRadioSetup(event_t event) } #endif - MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) - LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) 0, 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0, - CASE_STM32(0) // USB mode - CASE_JACK_DETECT(0) // Jack mode - 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); + MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { + HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) + LABEL(SOUND), CASE_AUDIO(0) + CASE_BUZZER(0) + 0, 0, 0, 0, 0, CASE_AUDIO(0) + CASE_VARIO(LABEL(VARIO)) + CASE_VARIO(0) + CASE_VARIO(0) + CASE_VARIO(0) + CASE_VARIO(0) + CASE_HAPTIC(LABEL(HAPTIC)) + CASE_HAPTIC(0) + CASE_HAPTIC(0) + CASE_HAPTIC(0) + 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) + CASE_PCBSKY9X(0) + 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) + LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) + CASE_PWM_BACKLIGHT(0) + 0, + CASE_SPLASH_PARAM(0) +#if defined(PXX2) + 0 /* owner registration ID */, +#endif + CASE_GPS(0) + 0, CASE_GPS(0) + CASE_PXX(0) + 0, 0, IF_FAI_CHOICE(0) + 0, + CASE_STM32(0) // USB mode + CASE_JACK_DETECT(0) // Jack mode + 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); if (event == EVT_ENTRY) { reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode; @@ -472,6 +502,12 @@ void menuRadioSetup(event_t event) } #endif +#if defined(PXX2) + case ITEM_RADIO_OWNER_ID: + editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr); + break; +#endif + #if defined(TELEMETRY_FRSKY) && defined(GPS) case ITEM_SETUP_TIMEZONE: lcdDrawTextAlignedLeft(y, STR_TIMEZONE); diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp index c67501d18..d3e86a989 100644 --- a/radio/src/gui/212x64/radio_hardware.cpp +++ b/radio/src/gui/212x64/radio_hardware.cpp @@ -243,7 +243,7 @@ void menuRadioHardware(event_t event) lcdDrawTextAlignedLeft(y, STR_DEBUG); lcdDrawText(HW_SETTINGS_COLUMN , y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0); - lcdDrawText(lcdLastRightPos + 2, y, STR_SWITCHES_BTN, menuHorizontalPosition == 1 ? attr : 0); + lcdDrawText(lcdLastRightPos + 2, y, STR_KEYS_BTN, menuHorizontalPosition == 1 ? attr : 0); if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { if (menuHorizontalPosition == 0) pushMenu(menuRadioDiagAnalogs); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 075301146..010436cb8 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -464,7 +464,7 @@ const char STR_SUBTYPE[] = TR_SUBTYPE; const char STR_RESET_BTN[] = TR_RESET_BTN; const char STR_DEBUG[] = TR_DEBUG; -const char STR_SWITCHES_BTN[] = TR_SWITCHES_BTN; +const char STR_KEYS_BTN[] = TR_KEYS_BTN; const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN; const char STR_CALIB_BTN[] = TR_CALIB_BTN; diff --git a/radio/src/translations.h b/radio/src/translations.h index 34a09a9f4..a35f847aa 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -663,7 +663,7 @@ extern const char STR_PERSISTENT_MAH[]; extern const char STR_RESET_BTN[]; extern const char STR_DEBUG[]; -extern const char STR_SWITCHES_BTN[]; +extern const char STR_KEYS_BTN[]; extern const char STR_ANALOGS_BTN[]; extern const char STR_CALIB_BTN[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index c43db8254..790b541de 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -973,7 +973,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Volby") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 75d645c1b..4fc2b912e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -978,7 +978,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index dd9124e54..212732ee0 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -806,7 +806,7 @@ #define TR_POWEROFF "\027Power OFF..." #define TR_SHUTDOWN "SHUTTING DOWN" #define TR_SAVEMODEL "Saving model settings" -#define TR_BATT_CALIB TR("Battery calib", "Battery calibration") +#define TR_BATT_CALIB TR("Batt. calib", "Battery calibration") #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR(INDENT "Voltage", INDENT "Voltage source") #define TR_CURRENT TR(INDENT "Current", INDENT "Current source") @@ -972,13 +972,13 @@ #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_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_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) +#define TR_KEYS_BTN BUTTON(TR("Keys", "Switches")) +#define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 161fb22b0..c02976c82 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -984,7 +984,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Ajuste]" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 9ab2741b6..bd63d19ec 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -976,7 +976,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index fb05b49dd..ec1eba44e 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -988,8 +988,8 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN BUTTON("RAZ") #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) +#define TR_KEYS_BTN BUTTON(TR("Swtchs", "Switches")) +#define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Déf") #define TR_TRAINER "Ecolage" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ec1bb3954..9958a3a34 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -978,7 +978,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 61914d8f6..3df6734d7 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -979,7 +979,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 102e8ed35..5439f35d8 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -979,7 +979,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index eced2ed04..2ed660a3e 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -983,7 +983,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3ce1f38b6..7b6d2a81f 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -992,7 +992,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN "[Nollställ]" #define TR_DEBUG "Debug" -#define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) +#define TR_KEYS_BTN BUTTON(TR("SW","Switches")) #define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Spara]"