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

Basic touch test screen holders

Browse Source
This commit is contained in:
3djc
2020-04-03 16:06:17 +02:00
parent ca00b50076
commit 3ee435dc3c
19 changed files with 97 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/menus.h
+1
View File
@@ -185,6 +185,7 @@ bool menuModelModuleOptions(event_t event);
bool menuModelReceiverOptions(event_t event);
bool menuRadioDiagKeys(event_t event);
bool menuRadioDiagAnalogs(event_t event);
bool menuRadioDiagTouch(event_t event);
extern const MenuHandlerFunc menuTabModel[MENU_MODEL_PAGES_COUNT];
radio/src/gui/480x272/radio_diagtouch.cpp
+36
View File
@@ -0,0 +1,36 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "ft5x06.h"
bool menuRadioDiagTouch(event_t event)
{
SIMPLE_SUBMENU(STR_MENU_RADIO_TOUCH, ICON_MODEL_SETUP, 1);
if (touchInit()) {
lcdDrawText(LCD_W / 2, LCD_H / 2, STR_TOUCH_EXIT, CENTERED);
}
else {
lcdDrawText(LCD_W / 2, LCD_H / 2, STR_TOUCH_NOTFOUND, CENTERED);
}
return true;
}
radio/src/gui/480x272/radio_hardware.cpp
+12 -5
View File
@@ -418,13 +418,20 @@ bool menuRadioHardware(event_t event)
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0);
lcdDrawText(lcdNextPos + 10, y, STR_KEYS_BTN, menuHorizontalPosition == 1 ? attr : 0);
#if defined(HARDWARE_TOUCH)
lcdDrawText(lcdNextPos + 10, y, STR_KEYS_BTN, menuHorizontalPosition == 2 ? attr : 0);
lcdDrawText(lcdNextPos + 10, y, STR_TOUCH_BTN, menuHorizontalPosition == 2 ? attr : 0);
#endif
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
if (menuHorizontalPosition == 0)
pushMenu(menuRadioDiagAnalogs);
else
pushMenu(menuRadioDiagKeys);
switch (menuHorizontalPosition) {
case 0:
pushMenu(menuRadioDiagAnalogs);
break;
case 1:
pushMenu(menuRadioDiagKeys);
break;
case 2:
pushMenu(menuRadioDiagTouch);
break;
}
}
break;
}
radio/src/targets/horus/CMakeLists.txt
+1
View File
@@ -210,6 +210,7 @@ set(TARGET_SRC
if(HARDWARE_TOUCH)
set(TARGET_SRC ${TARGET_SRC} ft5x06.cpp)
set(GUI_SRC ${GUI_SRC} radio_diagtouch.cpp)
add_definitions(-DHARDWARE_TOUCH)
endif()
radio/src/targets/horus/ft5x06.cpp
+6 -1
View File
@@ -18,4 +18,9 @@
* GNU General Public License for more details.
*/
#include "ft5x06.h"
#include "ft5x06.h"
bool touchInit(void)
{
return true;
}
radio/src/targets/horus/ft5x06.h
+2
View File
@@ -21,4 +21,6 @@
#ifndef _FT5X06_H_
#define _FT5X06_H_
bool touchInit(void);
#endif // _FT5X06_H_
radio/src/translations.cpp
+3
View File
@@ -211,6 +211,7 @@ const char STR_MENUSPECIALFUNCS[] = TR_MENUSPECIALFUNCS;
const char STR_MENUVERSION[] = TR_MENUVERSION;
const char STR_MENU_RADIO_SWITCHES[] = TR_MENU_RADIO_SWITCHES;
const char STR_MENU_RADIO_ANALOGS[] = TR_MENU_RADIO_ANALOGS;
const char STR_MENU_RADIO_TOUCH[] = TR_MENU_RADIO_TOUCH;
const char STR_MENUCALIBRATION[] = TR_MENUCALIBRATION;
const char STR_MENUMODELSEL[] = TR_MENUMODELSEL;
const char STR_MENUSETUP[] = TR_MENUSETUP;
@@ -317,6 +318,8 @@ const char STR_DEBUG[] = TR_DEBUG;
const char STR_KEYS_BTN[] = TR_KEYS_BTN;
const char STR_TOUCH_BTN[] = TR_TOUCH_BTN;
const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN;
const char STR_TOUCH_NOTFOUND[] = TR_TOUCH_NOTFOUND;
const char STR_TOUCH_EXIT[] = TR_TOUCH_EXIT;
const char STR_CALIBRATION[] = TR_CALIBRATION;
const char STR_NO_TOOLS[] = TR_NO_TOOLS;
const char STR_NORMAL[] = TR_NORMAL;
radio/src/translations.h
+3
View File
@@ -355,6 +355,7 @@ extern const char STR_MENUSPECIALFUNCS[];
extern const char STR_MENUVERSION[];
extern const char STR_MENU_RADIO_SWITCHES[];
extern const char STR_MENU_RADIO_ANALOGS[];
extern const char STR_MENU_RADIO_TOUCH[];
extern const char STR_MENUCALIBRATION[];
extern const char STR_MENUMODELSEL[];
extern const char STR_MENUSETUP[];
@@ -495,6 +496,8 @@ extern const char STR_DEBUG[];
extern const char STR_KEYS_BTN[];
extern const char STR_TOUCH_BTN[];
extern const char STR_ANALOGS_BTN[];
extern const char STR_TOUCH_NOTFOUND[];
extern const char STR_TOUCH_EXIT[];
extern const char STR_CALIBRATION[];
extern const char STR_NO_TOOLS[];
extern const char STR_NORMAL[];
radio/src/translations/cz.h.txt
+3
View File
@@ -587,6 +587,7 @@
#define TR_MENUVERSION "VERZE"
#define TR_MENU_RADIO_SWITCHES "DIAG"
#define TR_MENU_RADIO_ANALOGS "ANALOGY"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "KALIBRACE"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trimy => Subtrimy"
@@ -914,6 +915,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Přepínače"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogy"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Kalibrace"
#define TR_SET BUTTON("Nast")
#define TR_TRAINER "Trenér"
radio/src/translations/de.h.txt
+3
View File
@@ -591,6 +591,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("Schalter-Test", "Schalter-Test")
#define TR_MENU_RADIO_ANALOGS "Geber-Test"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION TR("KALIB. ANALOG", "KALIBRIERUNG-Analog")
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -916,6 +917,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Kalibrieren"
#define TR_SET BUTTON("Set")
#define TR_TRAINER "DSC Buchse PPM In/Out"
radio/src/translations/en.h.txt
+3
View File
@@ -590,6 +590,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("SWITCHES", "SWITCHES TEST")
#define TR_MENU_RADIO_ANALOGS TR("ANALOGS", "ANALOGS TEST")
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRATION"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -915,6 +916,8 @@
#define TR_KEYS_BTN BUTTON(TR("Keys", "Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET BUTTON("Set")
#define TR_TRAINER "Trainer"
radio/src/translations/es.h.txt
+3
View File
@@ -601,6 +601,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("INTERUPTS", "TEST INTERUP.")
#define TR_MENU_RADIO_ANALOGS TR("ANAS", "ENTRADAS ANALOG")
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRACION"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Offsets"
@@ -935,6 +936,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibracion"
#define TR_SET "[Ajuste]"
#define TR_TRAINER "Entrena."
radio/src/translations/fi.h.txt
+3
View File
@@ -599,6 +599,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("SWITCHES","SWITCH TEST")
#define TR_MENU_RADIO_ANALOGS TR("ANAS","ANALOG INPUTS")
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRATION"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -933,6 +934,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
radio/src/translations/fr.h.txt
+3
View File
@@ -610,6 +610,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("INTERS", "TEST INTERRUPTEURS")
#define TR_MENU_RADIO_ANALOGS TR("ANAS", "ENTREES ANALOGIQUES")
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRATION"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -935,6 +936,8 @@
#define TR_KEYS_BTN BUTTON(TR("Btns","Inters"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET BUTTON("Déf")
#define TR_TRAINER "Ecolage"
radio/src/translations/it.h.txt
+3
View File
@@ -609,6 +609,7 @@
#define TR_MENUVERSION "VERSIONE"
#define TR_MENU_RADIO_SWITCHES "DIAG"
#define TR_MENU_RADIO_ANALOGS "ANAS"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRAZIONE"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -935,6 +936,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Interruttori"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analogico","Analogici"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION TR("Calibraz.", "Calibrazione")
#define TR_SET "[Set]"
#define TR_TRAINER TR("Trainer", "Maestro/Allievo")
radio/src/translations/nl.h.txt
+3
View File
@@ -594,6 +594,7 @@
#define TR_MENUVERSION "VERSIE"
#define TR_MENU_RADIO_SWITCHES TR("Schak.", "Schakelaar-Test")
#define TR_MENU_RADIO_ANALOGS "Analoog-Test"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION TR("CALIB. ANALOOG", "CALIBRERING Sticks+Pots")
#if defined(COLORLCD)
@@ -921,6 +922,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer Poort"
radio/src/translations/pl.h.txt
+3
View File
@@ -608,6 +608,7 @@
#define TR_MENUVERSION "WERSJA"
#define TR_MENU_RADIO_SWITCHES TR("PRZEŁ","TEST PRZEŁ")
#define TR_MENU_RADIO_ANALOGS TR("WE-ANA","WEJŚCIA ANALOG.")
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "KALIBRACJA"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trymery => Subtrimy"
@@ -934,6 +935,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Port Trenera"
radio/src/translations/pt.h.txt
+3
View File
@@ -590,6 +590,7 @@
#define TR_MENUVERSION "VERSAO"
#define TR_MENU_RADIO_SWITCHES "DIAGNOST"
#define TR_MENU_RADIO_ANALOGS "ANALOGICOS"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "CALIBRAGEM"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Subtrims"
@@ -924,6 +925,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
radio/src/translations/se.h.txt
+3
View File
@@ -607,6 +607,7 @@
#define TR_MENUVERSION "VERSION"
#define TR_MENU_RADIO_SWITCHES TR("BRYTARE","TEST AV BRYTARE")
#define TR_MENU_RADIO_ANALOGS "ANALOGA VÄRDEN"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#define TR_MENUCALIBRATION "KALIBRERING"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "[Spara Trimvärden]"
@@ -934,6 +935,8 @@
#define TR_KEYS_BTN BUTTON(TR("SW","Switches"))
#define TR_TOUCH_BTN BUTTON("Touch")
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Spara]"
#define TR_TRAINER "Trainer"