From 765c7915882b984fa21028820cf40f1698529906 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 27 Nov 2020 10:19:45 +0100 Subject: [PATCH 1/5] Review about screen --- radio/src/targets/horus/CMakeLists.txt | 6 ++++++ radio/src/targets/taranis/CMakeLists.txt | 11 +++++++++++ radio/src/translations/cz.h.txt | 10 +++++++++- radio/src/translations/de.h.txt | 16 ++++++++++++---- radio/src/translations/en.h.txt | 10 +++++++++- radio/src/translations/es.h.txt | 10 +++++++++- radio/src/translations/fi.h.txt | 16 ++++++++++++---- radio/src/translations/fr.h.txt | 10 +++++++++- radio/src/translations/it.h.txt | 10 +++++++++- radio/src/translations/nl.h.txt | 16 ++++++++++++---- radio/src/translations/pl.h.txt | 14 +++++++++----- radio/src/translations/pt.h.txt | 16 ++++++++++++---- radio/src/translations/se.h.txt | 10 +++++++++- 13 files changed, 128 insertions(+), 27 deletions(-) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 798c0e230..fbf963b71 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -51,6 +51,7 @@ if (PCB STREQUAL X10) set(BLUETOOTH ON) add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT) add_definitions(-DRADIO_X10E) + add_definitions(-DMANUFACTURER_FRSKY) elseif (PCBREV STREQUAL T16) set(FLAVOUR t16) set(LUA_EXPORT lua_export_t16) @@ -58,6 +59,7 @@ if (PCB STREQUAL X10) add_definitions(-DRADIO_FAMILY_T16) option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" OFF) option(BLUETOOTH "Support for bluetooth module" OFF) + add_definitions(-DMANUFACTURER_JUMPER) elseif (PCBREV STREQUAL TX16S) set(FLAVOUR tx16s) set(LUA_EXPORT lua_export_t16) @@ -71,6 +73,7 @@ if (PCB STREQUAL X10) set(DEFAULT_THEME "DARKBLUE") set(SBUS_TRAINER ON) set(AUX_SERIAL ON) + add_definitions(-DMANUFACTURER_RADIOMASTER) if (NOT BLUETOOTH AND NOT INTERNAL_GPS) set(AUX2_SERIAL ON) endif() @@ -82,11 +85,13 @@ if (PCB STREQUAL X10) add_definitions(-DRADIO_FAMILY_T16) option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" ON) option(BLUETOOTH "Support for bluetooth module" OFF) + add_definitions(-DMANUFACTURER_JUMPER) else() set(FLAVOUR x10) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF) set(BLUETOOTH ON) + add_definitions(-DMANUFACTURER_FRSKY) endif() elseif (PCB STREQUAL X12S) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON) @@ -113,6 +118,7 @@ elseif (PCB STREQUAL X12S) set(FONTS_TARGET x12s_fonts) set(LCD_DRIVER lcd_driver.cpp) set(LUA_EXPORT lua_export_x12s) + add_definitions(-DMANUFACTURER_FRSKY) endif() add_definitions(-DPCBREV=${PCBREV}) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index e7c2be86d..d8e272f98 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -40,6 +40,7 @@ if(PCB STREQUAL X9E) set(STATUS_LEDS NO) set(BLUETOOTH YES) set(ROTARY_ENCODER YES) + add_definitions(-DMANUFACTURER_FRSKY) elseif(PCB STREQUAL X9D+) set(HAPTIC YES) set(LUA_EXPORT lua_export_x9d) @@ -53,6 +54,7 @@ elseif(PCB STREQUAL X9D+) set(GVAR_SCREEN model_gvars.cpp) set(PCBREV 2014 CACHE STRING "PCB Revision") add_definitions(-DPCBREV=${PCBREV}) + add_definitions(-DMANUFACTURER_FRSKY) if (${PCBREV} STREQUAL 2019) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON) @@ -103,6 +105,7 @@ elseif(PCB STREQUAL X9D) set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp) set(GVAR_SCREEN model_gvars.cpp) set(STATUS_LEDS NO) + add_definitions(-DMANUFACTURER_FRSKY) elseif(PCB STREQUAL X7) set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(HAPTIC YES) @@ -124,6 +127,7 @@ elseif(PCB STREQUAL X7) set(LUA_EXPORT lua_export_t12) add_definitions(-DRADIO_T12) add_definitions(-DEEPROM_VARIANT=0x4001) + add_definitions(-DMANUFACTURER_JUMPER) elseif(PCBREV STREQUAL TX12) option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" ON) set(FLAVOUR tx12) @@ -136,6 +140,7 @@ elseif(PCB STREQUAL X7) set(BLUETOOTH NO) add_definitions(-DRADIO_TX12) add_definitions(-DEEPROM_VARIANT=0x4002) + add_definitions(-DMANUFACTURER_RADIOMASTER) elseif(PCBREV STREQUAL ACCESS) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON) @@ -160,6 +165,7 @@ elseif(PCB STREQUAL X7) set(BLUETOOTH YES) set(ROTARY_ENCODER YES) set(INTERNAL_MODULE_SERIAL YES) + add_definitions(-DMANUFACTURER_FRSKY) else() option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF) @@ -174,6 +180,7 @@ elseif(PCB STREQUAL X7) set(BLUETOOTH YES) add_definitions(-DBLUETOOTH_PROBE) set(ROTARY_ENCODER YES) + add_definitions(-DMANUFACTURER_FRSKY) if(DEFINED PCBREV_HARDCODED) # This *can* be used to prevent messing with PA14 (SWCLK), so stlink can be used # without interruptions. @@ -208,6 +215,7 @@ elseif(PCB STREQUAL X9LITE) set(STATUS_LEDS YES) set(ROTARY_ENCODER YES) set(INTERNAL_MODULE_SERIAL YES) + add_definitions(-DMANUFACTURER_FRSKY) elseif(PCB STREQUAL X9LITES) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON) @@ -234,6 +242,7 @@ elseif(PCB STREQUAL X9LITES) set(BLUETOOTH YES) set(ROTARY_ENCODER YES) set(INTERNAL_MODULE_SERIAL YES) + add_definitions(-DMANUFACTURER_FRSKY) elseif(PCB STREQUAL XLITE) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF) @@ -258,6 +267,7 @@ elseif(PCB STREQUAL XLITE) set(STATUS_LEDS YES) set(BLUETOOTH YES) set(INTERNAL_MODULE_SERIAL YES) + add_definitions(-DMANUFACTURER_FRSKY) elseif(PCB STREQUAL XLITES) option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF) option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON) @@ -283,6 +293,7 @@ elseif(PCB STREQUAL XLITES) set(BLUETOOTH YES) set(GYRO YES) set(INTERNAL_MODULE_SERIAL YES) + add_definitions(-DMANUFACTURER_FRSKY) endif() if(GYRO) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 18824b89e..5701824da 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1108,10 +1108,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotař" #define TR_ABOUT_MARTIN_2 "Design, Čeština" -#if defined(PCBTARANIS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" + #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" + #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/výrobce" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index b3be56a75..9e34551c0 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1115,10 +1115,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Grafikdesigner" -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#if defined(MANUFACTURER_FRSKY) + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 3da18fe66..eed0bf5ea 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1113,10 +1113,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" -#if defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 2ede6bba4..950ab8c21 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1112,10 +1112,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Dise\201o gráfico" -#if defined(PCBTARANIS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" + #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" + #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x dise\201ador/productor" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b2cf9f79c..dcb349e2c 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1127,10 +1127,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" -#if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#if defined(MANUFACTURER_FRSKY) + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 5725219be..8993fbc80 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1137,10 +1137,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Design graphique" -#if defined(PCBTARANIS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" #define TR_ABOUT_HARDWARE_3 "du matériel" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "du matériel" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "du matériel" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4b0f83550..2714bd4db 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1129,10 +1129,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphic Designer" -#if defined(PCBTARANIS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" + #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" + #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Designer/Produttore SKY9X" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 5288cc49e..9009f8a69 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1121,10 +1121,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#if defined(MANUFACTURER_FRSKY) + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 342114fcf..cbbbe0938 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1128,15 +1128,19 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Projekty graficzne" -#if defined(PCBTARANIS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" #define TR_ABOUT_HARDWARE_3 "Współautor firmware" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" + #define TR_ABOUT_HARDWARE_3 "Współautor firmware" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" + #define TR_ABOUT_HARDWARE_3 "Współautor firmware" #else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x twórca/producent" - #define TR_ABOUT_HARDWARE_3 "" -#endif #define TR_ABOUT_PARENTS_1 "Projekty macierzyste" #define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index d0f4649ea..93890ecd4 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1129,10 +1129,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" -#if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#if defined(MANUFACTURER_FRSKY) + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 1bf474532..00ac8d2c5 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1128,10 +1128,18 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Grafikdesigner" -#if defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" #define TR_ABOUT_HARDWARE_3 "" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" + #define TR_ABOUT_HARDWARE_3 "" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" + #define TR_ABOUT_HARDWARE_3 "" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x design/producent" From c9a26a2d9a2a448e68bf38d0a617fb461495bd58 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 27 Nov 2020 11:54:27 +0100 Subject: [PATCH 2/5] Immprove display --- radio/src/stamp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index a61d4a29a..d3e35b386 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -37,7 +37,7 @@ #elif defined(JUMPER_RELEASE) #define DISPLAY_VERSION "-jumper" #elif defined(RADIOMASTER_RELEASE) -#define DISPLAY_VERSION "-radiomaster" +#define DISPLAY_VERSION "-RM" #elif defined(TBS_RELEASE) #define DISPLAY_VERSION "-tbs" #elif defined(IMRC_RELEASE) From dbb8d6d6bcf32bce4d2e61d06c7d5b903281fa4b Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 1 Dec 2020 09:05:14 +0100 Subject: [PATCH 3/5] Improve version display for factory firmwares --- radio/src/gui/common/stdlcd/radio_version.cpp | 2 +- radio/src/stamp.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/common/stdlcd/radio_version.cpp b/radio/src/gui/common/stdlcd/radio_version.cpp index d6128ecb7..d3886f8e3 100644 --- a/radio/src/gui/common/stdlcd/radio_version.cpp +++ b/radio/src/gui/common/stdlcd/radio_version.cpp @@ -237,7 +237,7 @@ void menuRadioVersion(event_t event) coord_t y = MENU_HEADER_HEIGHT + 2; lcdDrawText(FW, y, vers_stamp, SMLSIZE); - y += 4 * (FH - 1); + y += 5 * (FH - 1); #if defined(COPROCESSOR) lcdDrawText(FW, y, "COPR\037\033: ", SMLSIZE); diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index d3e35b386..bf8eaa804 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -54,6 +54,10 @@ const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR; #elif defined(BOARD_NAME) const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; +#elif defined(RADIOMASTER_RELEASE) + const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": RM factory firmware" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; +#elif defined(JUMPER_RELEASE) + const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": Factory firmware" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #else const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #endif From a60e84af6f526f50ff78190f578be0d702202617 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 1 Dec 2020 09:11:56 +0100 Subject: [PATCH 4/5] Colorlcd too --- radio/src/stamp.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index bf8eaa804..77385f62c 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -48,7 +48,11 @@ #if defined(COLORLCD) const char fw_stamp[] = "FW" TAB ": opentx-" FLAVOUR; +#if defined(RADIOMASTER_RELEASE) || defined(JUMPER_RELEASE) + const char vers_stamp[] = "VERS" TAB ": Factory firmware (" GIT_STR ")"; +#else const char vers_stamp[] = "VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")"; +#endif const char date_stamp[] = "DATE" TAB ": " DATE; const char time_stamp[] = "TIME" TAB ": " TIME; const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR; From 285c116df5f7c7f48dfdbbb63139374fa375ecf2 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 1 Dec 2020 11:16:07 +0100 Subject: [PATCH 5/5] Add comit number --- radio/src/stamp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index 77385f62c..565df359a 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -59,9 +59,9 @@ #elif defined(BOARD_NAME) const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #elif defined(RADIOMASTER_RELEASE) - const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": RM factory firmware" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; + const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": RM Factory (" GIT_STR ")" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #elif defined(JUMPER_RELEASE) - const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": Factory firmware" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; + const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #else const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #endif