diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 1db9309bf..73d21daff 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -83,6 +83,13 @@ add_custom_command( WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) +add_custom_command( + OUTPUT ${RADIO_SRC_DIRECTORY}/translations/en.h + COMMAND make tra + DEPENDS ${RADIO_SRC_DIRECTORY}/translations/en.h.txt + WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} +) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. @@ -122,6 +129,7 @@ set(companion_SRCS firmwares/ersky9x/ersky9xeeprom.cpp firmwares/ersky9x/ersky9xinterface.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h appdata.cpp helpers.cpp mdichild.cpp @@ -313,6 +321,7 @@ set(simu_SRCS firmwares/ersky9x/ersky9xinterface.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h file.cpp # TODO not needed modeledit/node.cpp modeledit/edge.cpp # TODO not needed diff --git a/radio/src/Makefile b/radio/src/Makefile index 8380a747e..e373abd7c 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1086,7 +1086,7 @@ else build: stamp_header tra lbm allsrc.cpp elf remallsrc bin endif -tra: translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h +tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps/sticks.lbm elf: $(TARGET).elf @@ -1140,6 +1140,11 @@ taranis-stamp: @echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-taranis.txt @cat stamp-opentx-taranis.txt +translations/en.h: translations/en.h.txt + @echo + @echo "Create English language specific header files" + $(TRANSLATE) translations/en.h.txt translations/en.h en + translations/cz.h: translations/cz.h.txt @echo @echo "Create Czech language specific header files" diff --git a/radio/src/fonts/sqt5/font_05x07_avr.png b/radio/src/fonts/sqt5/font_05x07_avr.png new file mode 100644 index 000000000..4843d8f6c Binary files /dev/null and b/radio/src/fonts/sqt5/font_05x07_avr.png differ diff --git a/radio/src/fonts/std/font_05x07_avr.png b/radio/src/fonts/std/font_05x07_avr.png new file mode 100644 index 000000000..c95126af5 Binary files /dev/null and b/radio/src/fonts/std/font_05x07_avr.png differ diff --git a/radio/src/fonts/std/font_05x07_extra.png b/radio/src/fonts/std/font_05x07_extra.png index 4d939852c..79d190243 100644 Binary files a/radio/src/fonts/std/font_05x07_extra.png and b/radio/src/fonts/std/font_05x07_extra.png differ diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ef7c278b0..b1de8a33d 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -449,7 +449,7 @@ const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS; const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE; const pm_char STR_TYPE[] PROGMEM = TR_TYPE; const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS; -const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; +const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; const pm_char STR_GLOBAL_VAR[] PROGMEM = TR_GLOBAL_VAR; const pm_char STR_OWN[] PROGMEM = TR_OWN; const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER; @@ -579,7 +579,11 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; #endif const pm_uchar font_5x7[] PROGMEM = { +#if defined (CPUARM) #include "font_05x07.lbm" +#else +#include "font_05x07_avr.lbm" +#endif #if defined(TRANSLATIONS_DE) #include "font_de_05x07.lbm" #elif defined(TRANSLATIONS_CZ) diff --git a/radio/src/translations/.gitignore b/radio/src/translations/.gitignore index c87e4f22e..f1029c186 100644 --- a/radio/src/translations/.gitignore +++ b/radio/src/translations/.gitignore @@ -1,3 +1,4 @@ +/en.h /cz.h /de.h /es.h diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d1b9d986e..32beb0af9 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -174,7 +174,11 @@ #endif #define LEN_VCSWFUNC "\005" -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a