piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Review about screen

Browse Source
This commit is contained in:
3djc
2020-11-27 10:19:45 +01:00
parent 2a81074ee8
commit 765c791588
13 changed files with 128 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/CMakeLists.txt
+6
View File
@@ -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})
radio/src/targets/taranis/CMakeLists.txt
+11
View File
@@ -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)
radio/src/translations/cz.h.txt
+9 -1
View File
@@ -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"
radio/src/translations/de.h.txt
+12 -4
View File
@@ -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"
radio/src/translations/en.h.txt
+9 -1
View File
@@ -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"
radio/src/translations/es.h.txt
+9 -1
View File
@@ -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"
radio/src/translations/fi.h.txt
+12 -4
View File
@@ -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"
radio/src/translations/fr.h.txt
+9 -1
View File
@@ -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"
radio/src/translations/it.h.txt
+9 -1
View File
@@ -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"
radio/src/translations/nl.h.txt
+12 -4
View File
@@ -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"
radio/src/translations/pl.h.txt
+9 -5
View File
@@ -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)")
radio/src/translations/pt.h.txt
+12 -4
View File
@@ -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"
radio/src/translations/se.h.txt
+9 -1
View File
@@ -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"