From 068c1a0f11be5fb74d34fb70009c0f56b650a054 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 12 Jul 2021 08:58:54 +0200 Subject: [PATCH] Renamed "hiccups" to "TSI2CEvents" And use uint32_t for counting them. --- radio/src/gui/colorlcd/radio_diaganas.cpp | 10 +++++----- radio/src/targets/horus/tp_gt911.cpp | 2 +- radio/src/targets/horus/tp_gt911.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio_diaganas.cpp index 4de2b94d1..939b113b2 100644 --- a/radio/src/gui/colorlcd/radio_diaganas.cpp +++ b/radio/src/gui/colorlcd/radio_diaganas.cpp @@ -61,11 +61,11 @@ class RadioAnalogsDiagsWindow: public Window { } #if !defined(SIMU) constexpr coord_t y1 = MENU_CONTENT_TOP + 6 * FH; - constexpr coord_t x1 = MENUS_MARGIN_LEFT; - dc->drawText(x1, y1, "Touch GT911 FW ver:"); - dc->drawNumber(x1 + 150, y1, touchGT911fwver, LEFT, 4); - dc->drawText(x1 + 200, y1, "Hiccups:"); - dc->drawNumber(x1 + 260, y1, touchGT911hiccups, LEFT, 5); + coord_t x1 = MENUS_MARGIN_LEFT; + x1 = dc->drawText(x1, y1, "Touch GT911 FW ver:") + 8; + x1 = dc->drawNumber(x1, y1, touchGT911fwver, LEFT, 4) + 16; + x1 = dc->drawText(x1, y1, "TSI2CEvents:") + 4; + dc->drawNumber(x1, y1, touchGT911hiccups, LEFT, 5); #endif #endif }; diff --git a/radio/src/targets/horus/tp_gt911.cpp b/radio/src/targets/horus/tp_gt911.cpp index 0802ba3f4..8dd01b49b 100644 --- a/radio/src/targets/horus/tp_gt911.cpp +++ b/radio/src/targets/horus/tp_gt911.cpp @@ -407,7 +407,7 @@ bool touchGT911Flag = false; volatile static bool touchEventOccured = false; struct TouchData touchData; uint16_t touchGT911fwver = 0; -uint16_t touchGT911hiccups = 0; +uint32_t touchGT911hiccups = 0; static void TOUCH_AF_ExtiStop(void) { diff --git a/radio/src/targets/horus/tp_gt911.h b/radio/src/targets/horus/tp_gt911.h index 2a051e847..0651dc1b6 100644 --- a/radio/src/targets/horus/tp_gt911.h +++ b/radio/src/targets/horus/tp_gt911.h @@ -24,7 +24,7 @@ extern bool touchGT911Flag; extern uint16_t touchGT911fwver; -extern uint16_t touchGT911hiccups; +extern uint32_t touchGT911hiccups; extern bool touchPanelInit(); void touchPanelRead();