Revision 13:5959af2ac87a, committed 2020-09-01

Comitter:

nikmaos

Date:

Tue Sep 01 10:52:05 2020 +0000

Parent:

12:f0980f7a75ae

Commit message:

1.09.2020

Changed in this revision

diff -r f0980f7a75ae -r 5959af2ac87a inc/FT_Gpu_Hal.h
--- a/inc/FT_Gpu_Hal.h	Sat Aug 08 18:30:58 2020 +0000
+++ b/inc/FT_Gpu_Hal.h	Tue Sep 01 10:52:05 2020 +0000
@@ -368,6 +368,7 @@
     uint8_t GetTouchTag(void);
     uint16_t GetTouchTagX(void);
     uint16_t GetTouchTagY(void);
+    uint32_t GetTouchTagXY(void);//добавка своя
     uint16_t GetTouchConfig(void);
     void SetTouchConfig(uint16_t TouchConfigVal);
     

diff -r f0980f7a75ae -r 5959af2ac87a inc/FT_LCD_Type.h
--- a/inc/FT_LCD_Type.h	Sat Aug 08 18:30:58 2020 +0000
+++ b/inc/FT_LCD_Type.h	Tue Sep 01 10:52:05 2020 +0000
@@ -172,7 +172,7 @@
 #define my_DispSwizzle (0L)    /* Defines the arrangement of the RGB pins of the FT800 */
 #define my_DispPCLK    (2L)    /* 60MHz / REG_PCLK = PCLK frequency 30 MHz */
 #define my_DispCSPREAD (1L)    /* helps with noise, when set to 1 fewer signals are changed simultaneously, reset-default: 1 */
-#define EVE_TOUCH_RZTHRESH (1800L)  /* touch-sensitivity */
+#define EVE_TOUCH_RZTHRESH (1800L)  /* touch-sensitivity */ //1800
 #define FT81X_ENABLE
 #endif
 

diff -r f0980f7a75ae -r 5959af2ac87a src/FT_GPU_Hal.cpp
--- a/src/FT_GPU_Hal.cpp	Sat Aug 08 18:30:58 2020 +0000
+++ b/src/FT_GPU_Hal.cpp	Tue Sep 01 10:52:05 2020 +0000
@@ -87,7 +87,7 @@
     {
         wait_ms(100);
         sec++;
-        if (sec>5)
+        if (sec>3)
             {
             printf("ERR!: Display is not connected\r\n");
             return 0;

diff -r f0980f7a75ae -r 5959af2ac87a src/FT_Hal_Utils.cpp
--- a/src/FT_Hal_Utils.cpp	Sat Aug 08 18:30:58 2020 +0000
+++ b/src/FT_Hal_Utils.cpp	Tue Sep 01 10:52:05 2020 +0000
@@ -1412,7 +1412,7 @@
     // REG_TOUCH_TAG_XY 
     // Because the tag lookup takes a full frame, and touch coordinates change continuously,
     // the original (x; y) used for the tag lookup is also available in REG_TOUCH_TAG_XY.
-    uint32_t TagRegisterVal = Rd32(REG_TOUCH_TAG_XY);       // check if one of the tracking fields is touched
+    uint32_t TagRegisterVal = Rd32(REG_TOUCH_SCREEN_XY);       // check if one of the tracking fields is touched
     return (TagRegisterVal >> 16) & 0xffff;
 }
 
@@ -1428,6 +1428,17 @@
     return TagRegisterVal & 0xffff;
 }
 
+uint32_t FT813::GetTouchTagXY(void)
+{
+    // REG_TOUCH_TAG
+    // If the screen is being touched, the screen coordinates are looked up in the screen's tag buffer,
+    // delivering a final 8-bit tag value, in REG_TOUCH_TAG.
+    // REG_TOUCH_TAG_XY 
+    // Because the tag lookup takes a full frame, and touch coordinates change continuously,
+    // the original (x; y) used for the tag lookup is also available in REG_TOUCH_TAG_XY.
+    return Rd32(REG_TOUCH_SCREEN_XY);       // check if one of the tracking fields is touched     
+}
+
 uint16_t FT813::GetTouchConfig(void)
 {
     // Read 0x0381