Cosmetics

This commit is contained in:
3djc
2020-04-28 13:54:09 +02:00
parent 7ee5b1d024
commit be2c10c6cc
19 changed files with 37 additions and 52 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ set(VERSION_REVISION "8")
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
set(SDCARD_REVISION "0026")
set(SDCARD_REVISION "0027")
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
cmake_minimum_required(VERSION 2.8)
+4 -1
View File
@@ -204,7 +204,10 @@ enum TrainerMode {
enum ModuleIndex {
EXTERNAL_MODULE,
EXTRA_MODULE,
SPORT_MODULE
SPORT_MODULE,
TRAINER_MODE_MASTER_BLUETOOTH,
TRAINER_MODE_SLAVE_BLUETOOTH,
TRAINER_MODE_MULTI
};
#endif
+1 -1
View File
@@ -68,7 +68,7 @@ bool menuRadioDiagAnalogs(event_t event)
#if defined(HARDWARE_TOUCH)
if (HAS_TOUCH_PANEL()) {
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 7 * FH, "Touch panel:");
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 7 * FH, STR_TOUCH_PANEL);
}
if (touchPanelEvent) {
+4 -8
View File
@@ -412,14 +412,10 @@ 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 (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
switch (menuHorizontalPosition) {
case 0:
pushMenu(menuRadioDiagAnalogs);
break;
case 1:
pushMenu(menuRadioDiagKeys);
break;
}
if (menuHorizontalPosition == 0)
pushMenu(menuRadioDiagAnalogs);
else
pushMenu(menuRadioDiagKeys);break;
}
break;
}
+6 -7
View File
@@ -42,7 +42,7 @@ uint8_t GT911_Send_Cfg(uint8_t mode)
uint8_t buf[2];
uint8_t i = 0;
buf[0] = 0;
buf[1] = mode; //
buf[1] = mode;
for (i = 0; i < sizeof(GT911_Cfg); i++)
buf[0] += GT911_Cfg[i];//check sum
@@ -174,11 +174,10 @@ void I2C_Stop(void)
uint8_t I2C_Wait_Ack(void)
{
uint8_t ucErrTime = 0;
SDA_IN(); //
SDA_IN();
I2C_SDA_H();
delay_us(2);
//I2C_SCL_L();delay_us(6);
I2C_SCL_H();//delay_us(6);
I2C_SCL_H();
while (READ_SDA) {
ucErrTime++;
if (ucErrTime > 166) {
@@ -188,7 +187,7 @@ uint8_t I2C_Wait_Ack(void)
delay_us(1);
}
I2C_SDA_L();
I2C_SCL_L();//
I2C_SCL_L();
return 0;
}
@@ -219,7 +218,7 @@ void I2C_Send_Byte(uint8_t txd)
uint8_t t;
SDA_OUT();
I2C_SCL_L();//
I2C_SCL_L();
for (t = 0; t < 8; t++) {
if ((txd & 0x80) >> 7)
I2C_SDA_H();
@@ -346,7 +345,7 @@ bool touchPanelInit(void)
delay_ms(10);
tmp[0] = 0X00;
gt911WriteRegister(GT_CTRL_REG, tmp, 1);//end reset
gt911WriteRegister(GT_CTRL_REG, tmp, 1); //end reset
touchGT911Flag = true;
TOUCH_AF_ExtiConfig();
+8 -8
View File
@@ -248,14 +248,14 @@ const uint8_t GT911_Cfg[] =
#define GT_TP5_REG 0X8170
#define GT911_READ_XY_REG 0x814E
#define GT911_CLEARBUF_REG 0x814E
#define GT911_CONFIG_REG 0x8047
#define GT911_COMMAND_REG 0x8040
#define GT911_PRODUCT_ID_REG 0x8140
#define GT911_VENDOR_ID_REG 0x814A
#define GT911_CONFIG_VERSION_REG 0x8047
#define GT911_CONFIG_CHECKSUM_REG 0x80FF
#define GT911_FIRMWARE_VERSION_REG 0x8144
#define GT911_CLEARBUF_REG 0x814E
#define GT911_CONFIG_REG 0x8047
#define GT911_COMMAND_REG 0x8040
#define GT911_PRODUCT_ID_REG 0x8140
#define GT911_VENDOR_ID_REG 0x814A
#define GT911_CONFIG_VERSION_REG 0x8047
#define GT911_CONFIG_CHECKSUM_REG 0x80FF
#define GT911_FIRMWARE_VERSION_REG 0x8144
PACK(typedef struct
{
+1 -2
View File
@@ -215,7 +215,6 @@ 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;
@@ -320,7 +319,6 @@ const char STR_MONITOR_SCREENS[] = TR_MONITOR_SCREENS;
const char STR_RESET_BTN[] = TR_RESET_BTN;
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;
@@ -592,6 +590,7 @@ const char STR_EXIT[] = TR_EXIT;
const char STR_MODULE_RANGE[] = TR_MODULE_RANGE;
const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
const char STR_SPORT_UPDATE_POWER_MODE[] = TR_SPORT_UPDATE_POWER_MODE;
const char STR_TOUCH_PANEL[] = TR_TOUCH_PANEL;
#if defined(PCBHORUS)
const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;
+1 -2
View File
@@ -169,6 +169,7 @@ extern const char STR_VSENSORTYPES[];
extern const char STR_VFORMULAS[];
extern const char STR_VPREC[];
extern const char STR_VCELLINDEX[];
extern const char STR_TOUCH_PANEL[];
#if defined(BLUETOOTH)
extern const char STR_BLUETOOTH[];
@@ -356,7 +357,6 @@ 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[];
@@ -496,7 +496,6 @@ extern const char STR_MONITOR_SCREENS[];
extern const char STR_RESET_BTN[];
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[];
+1 -2
View File
@@ -590,7 +590,6 @@
#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"
@@ -917,7 +916,6 @@
#define TR_RESET_BTN BUTTON("Reset")
#define TR_DEBUG "Debug"
#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"
@@ -994,6 +992,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Název"
+1 -2
View File
@@ -594,7 +594,6 @@
#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"
@@ -919,7 +918,6 @@
#define TR_RESET_BTN BUTTON("Reset")
#define TR_DEBUG "Testen"
#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"
@@ -1000,6 +998,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name "
+1 -2
View File
@@ -593,7 +593,6 @@
#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"
@@ -918,7 +917,6 @@
#define TR_RESET_BTN BUTTON("Reset")
#define TR_DEBUG "Debug"
#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"
@@ -999,6 +997,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Name"
+1 -2
View File
@@ -587,7 +587,6 @@
#define TR_MENU_RADIO_SWITCHES TR("INTERUPTS", "TEST INTERRUPTORES")
#define TR_MENU_RADIO_ANALOGS TR("ANALÓGICOS", "TEST ANALÓGICOS")
#define TR_MENUCALIBRATION "CALIBRACIÓN"
#define TR_MENU_RADIO_TOUCH "TOUCHSCREEN TEST"
#if defined(COLORLCD)
#define TR_TRIMS2OFFSETS "Trims => Offsets"
#else
@@ -920,7 +919,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -998,6 +996,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS TR("No hay pant. telemetría", "No hay pantallas de telemetría")
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Nombre"
+1 -2
View File
@@ -602,7 +602,6 @@
#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"
@@ -936,7 +935,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -1013,6 +1011,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Name"
+1 -2
View File
@@ -613,7 +613,6 @@
#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"
@@ -938,7 +937,6 @@
#define TR_RESET_BTN BUTTON("RAZ")
#define TR_DEBUG "Debug"
#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"
@@ -1023,6 +1021,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Nom"
+1 -2
View File
@@ -612,7 +612,6 @@
#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"
@@ -938,7 +937,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -1015,6 +1013,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Nome"
+1 -2
View File
@@ -597,7 +597,6 @@
#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)
@@ -924,7 +923,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -1007,6 +1005,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Name"
+1 -2
View File
@@ -611,7 +611,6 @@
#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"
@@ -937,7 +936,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -1014,6 +1012,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Nazwa"
+1 -2
View File
@@ -593,7 +593,6 @@
#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"
@@ -927,7 +926,6 @@
#define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug"
#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"
@@ -1004,6 +1002,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Name"
+1 -2
View File
@@ -610,7 +610,6 @@
#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]"
@@ -937,7 +936,6 @@
#define TR_RESET_BTN "[Nollställ]"
#define TR_DEBUG "Debug"
#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"
@@ -1014,6 +1012,7 @@
#define LEN_SPORT_UPDATE_POWER_MODES "\004"
#define TR_SPORT_UPDATE_POWER_MODES "AUTO""ON\0 "
#define TR_NO_TELEMETRY_SCREENS "No Telemetry Screens"
#define TR_TOUCH_PANEL "Touch panel:"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "Namn"