From 9357e2d8b8d20c601cc8b2c638d83ff8f4d8aad8 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 1 Apr 2024 12:18:38 +1100 Subject: [PATCH] chore(translation): compiler warning, cleanup (#4825) --- radio/src/CMakeLists.txt | 4 ++-- radio/src/targets/taranis/CMakeLists.txt | 7 ++----- radio/src/translations/cz.h | 2 +- radio/src/translations/pl.h | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 7e98144cf..2ca27d7d2 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -2,8 +2,8 @@ include(CMakeForceCompiler) include(Bitmaps) set(PCB_TYPES X9LITE X9LITES X7 XLITE XLITES X9D X9D+ X9E X10 X12S NV14 PL18) -set(RADIO_LANGUAGES CN CZ DA DE EN ES FI FR HE IT JP PT RU SK SE PL HU NL TW UA) -set(TTS_LANGUAGES CN CZ DA DE EN ES FR HE IT JP PT RU SK SE PL HU NL UA) +set(RADIO_LANGUAGES CN CZ DA DE EN ES FI FR HE HU IT JP NL PL PT RU SE SK TW UA) +set(TTS_LANGUAGES CN CZ DA DE EN ES FR HE HU IT JP NL PL PT RU SE SK UA) set(PCB "X9D+" CACHE STRING "Radio type, one of: ${PCB_TYPES}") set_property(CACHE PCB PROPERTY STRINGS ${PCB_TYPES}) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 741d36157..616c0e912 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -487,7 +487,7 @@ elseif(PCB STREQUAL XLITES) add_definitions(-DMANUFACTURER_FRSKY) endif() -message("CPU_TYPE_FULL = ${CPU_FULL_TYPE}") +message("CPU_TYPE_FULL = ${CPU_TYPE_FULL}") if(CPU_TYPE_FULL STREQUAL STM32F205xE) set(CPU_TYPE STM32F2) add_definitions(-DSTM32F205xx) @@ -504,12 +504,9 @@ elseif (CPU_TYPE_FULL STREQUAL STM32F413xG) add_definitions(-DSTM32F40_41xxx -DSTM32F413xx) set(TARGET_LINKER_DIR stm32f413) else() - message( FATAL_ERROR "Unknown CPU_TYPE_FULL" ) + message(FATAL_ERROR "Unknown CPU_TYPE_FULL" ) endif() -if(TRANSLATIONS STREQUAL UA AND NOT TARGET_FLASH_SIZE STREQUAL 1M) - set(PXX2 OFF) -endif() if(ENABLE_SERIAL_PASSTHROUGH) set(CLI ON "Enable CLI") diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 0db5dac5a..1fac9de90 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -430,7 +430,7 @@ #define TR_SETMIDPOINT CENTER "\006NASTAVIT STŘED POTU" #define TR_MOVESTICKSPOTS CENTER "\002HÝBAT TOČIT/PLYN/POTY/OSY" #else - #define TR_SETMIDPOINT TR(CENTER "\006NASTAVIT STŘED OSY", "\004STŘED OSY/SLIDERU") + #define TR_SETMIDPOINT TR(CENTER "\006NASTAVIT STŘED OSY", CENTER "\004STŘED OSY/SLIDERU") #define TR_MOVESTICKSPOTS CENTER "\007HÝBAT OSY/POTY" #endif #endif diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 1b8c5885f..a26d38895 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -247,7 +247,6 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #endif -#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " > DALEJ" #define TR_FREE "woln" #define TR_YES "Tak" #define TR_NO "Nie"