From 8b15a28a06636cef09ddd6e8051de26c07db507b Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 28 Apr 2020 10:32:55 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/480x272/radio_diaganas.cpp | 5 +++++ radio/src/targets/horus/tp_gt911.h | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/radio/src/gui/480x272/radio_diaganas.cpp b/radio/src/gui/480x272/radio_diaganas.cpp index b632bf00c..0df7ca1bf 100644 --- a/radio/src/gui/480x272/radio_diaganas.cpp +++ b/radio/src/gui/480x272/radio_diaganas.cpp @@ -21,6 +21,7 @@ #include "opentx.h" #if defined(RADIO_TX16S) #include "tp_gt911.h" +#include #endif constexpr coord_t LEFT_NAME_COLUMN = MENUS_MARGIN_LEFT; @@ -75,6 +76,10 @@ bool menuRadioDiagAnalogs(event_t event) lcdDrawNumber(lcdNextPos + 1, MENU_CONTENT_TOP + 7 * FH, touchState.x); lcdDrawText(lcdNextPos, MENU_CONTENT_TOP + 7 * FH, ", "); lcdDrawNumber(lcdNextPos + 1, MENU_CONTENT_TOP + 7 * FH, touchState.y); + coord_t x = limit(10, (coord_t)touchState.x, 469); // TODO remove, prevent an emergency crash when drawing on y 280 line + coord_t y = limit(7, (coord_t)touchState.y, 264); // TODO remove, prevent an emergency crash when drawing on y 280 line + lcdDrawLine(x - 10, y - 7, x + 10, y + 7, SOLID); + lcdDrawLine(x - 10, y + 7, x + 10, y - 7, SOLID); } #endif diff --git a/radio/src/targets/horus/tp_gt911.h b/radio/src/targets/horus/tp_gt911.h index c09f62dae..d1d250790 100644 --- a/radio/src/targets/horus/tp_gt911.h +++ b/radio/src/targets/horus/tp_gt911.h @@ -229,8 +229,8 @@ const uint8_t GT911_Cfg[] = }; //I2C -#define GT_CMD_WR 0X28 //write -#define GT_CMD_RD 0X29 //read +#define GT_CMD_WR 0X28 +#define GT_CMD_RD 0X29 #define SLAVE_Write_Address 0X28 @@ -238,14 +238,14 @@ const uint8_t GT911_Cfg[] = #define GT_CTRL_REG 0X8040 #define GT_CFGS_REG 0X8047 #define GT_CHECK_REG 0X80FF -#define GT_PID_REG 0X8140 //ID +#define GT_PID_REG 0X8140 -#define GT_GSTID_REG 0X814E // -#define GT_TP1_REG 0X8150 // -#define GT_TP2_REG 0X8158 // -#define GT_TP3_REG 0X8160 // -#define GT_TP4_REG 0X8168 // -#define GT_TP5_REG 0X8170 // +#define GT_GSTID_REG 0X814E +#define GT_TP1_REG 0X8150 +#define GT_TP2_REG 0X8158 +#define GT_TP3_REG 0X8160 +#define GT_TP4_REG 0X8168 +#define GT_TP5_REG 0X8170 #define GT911_READ_XY_REG 0x814E #define GT911_CLEARBUF_REG 0x814E