From 8515ed53f517eb497ca619ec2c24429a9dcd580e Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sat, 17 Nov 2012 14:05:23 +0100 Subject: more SSD1289 and touchscreen workaround --- src/touchscreen.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/touchscreen.c') diff --git a/src/touchscreen.c b/src/touchscreen.c index 14eba4c5..7b562c32 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -294,7 +294,10 @@ void tsCalibrate(void) { int32_t px, py; uint8_t i, j; + #if GDISP_NEED_CONTROL gdispSetOrientation(GDISP_ROTATE_0); + #endif + gdispClear(Blue); gdispFillStringBox(0, 5, gdispGetWidth(), 30, "Calibration", &fontUI2Double, White, Blue, justifyCenter); -- cgit v1.2.3 From dfb9f92eb1561bcca61dfc9ab516cfba46bc575d Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 21 Nov 2012 11:06:04 +0100 Subject: cleanup of source files --- src/touchscreen.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/touchscreen.c') diff --git a/src/touchscreen.c b/src/touchscreen.c index 7b562c32..0fa5402e 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -32,14 +32,6 @@ #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) -/*===========================================================================*/ -/* Driver local definitions. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Driver exported variables. */ -/*===========================================================================*/ - /*===========================================================================*/ /* Driver local variables. */ /*===========================================================================*/ -- cgit v1.2.3 From 9c74a081313a8681d2a47a15b9a0e228289a5c25 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 25 Nov 2012 23:33:10 +0100 Subject: implemented MCU touchscreen driver --- src/touchscreen.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/touchscreen.c') diff --git a/src/touchscreen.c b/src/touchscreen.c index 0fa5402e..265243a4 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -184,7 +184,7 @@ coord_t tsReadX(void) { y = _tsReadRealY(); #endif - _tsTransform(&x, &y); + //_tsTransform(&x, &y); switch(gdispGetOrientation()) { case GDISP_ROTATE_0: @@ -218,7 +218,7 @@ coord_t tsReadY(void) { y = _tsReadRealY(); #endif - _tsTransform(&x, &y); + //_tsTransform(&x, &y); switch(gdispGetOrientation()) { case GDISP_ROTATE_0: @@ -276,6 +276,9 @@ coord_t tsReadY(void) { * @api */ void tsCalibrate(void) { +#if 0 + + const uint16_t height = gdispGetHeight(); const uint16_t width = gdispGetWidth(); const coord_t cross[][2] = {{(width / 4), (height / 4)}, @@ -362,6 +365,7 @@ calibrate: #if TOUCHSCREEN_STORE_CALIBRATION ts_store_calibration_lld(cal); #endif +#endif } #endif /* GFX_USE_TOUCHSCREEN */ -- cgit v1.2.3 From ac5267af6af5508d4391fddb3d27c8d45879950a Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Nov 2012 00:35:02 +0100 Subject: touchscreen fix --- src/touchscreen.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/touchscreen.c') diff --git a/src/touchscreen.c b/src/touchscreen.c index 265243a4..0fa5402e 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -184,7 +184,7 @@ coord_t tsReadX(void) { y = _tsReadRealY(); #endif - //_tsTransform(&x, &y); + _tsTransform(&x, &y); switch(gdispGetOrientation()) { case GDISP_ROTATE_0: @@ -218,7 +218,7 @@ coord_t tsReadY(void) { y = _tsReadRealY(); #endif - //_tsTransform(&x, &y); + _tsTransform(&x, &y); switch(gdispGetOrientation()) { case GDISP_ROTATE_0: @@ -276,9 +276,6 @@ coord_t tsReadY(void) { * @api */ void tsCalibrate(void) { -#if 0 - - const uint16_t height = gdispGetHeight(); const uint16_t width = gdispGetWidth(); const coord_t cross[][2] = {{(width / 4), (height / 4)}, @@ -365,7 +362,6 @@ calibrate: #if TOUCHSCREEN_STORE_CALIBRATION ts_store_calibration_lld(cal); #endif -#endif } #endif /* GFX_USE_TOUCHSCREEN */ -- cgit v1.2.3