Touch Fixes. Deprecate Console

Touch:
- Move defines that may be altered by the touch config file to the lld
header file.
- Move the definition of the Touch driver structure to the lld config
file.
- Changed CONVERSIONS macro to TOUCHSCREEN_CONVERSIONS
- Replaced references to GDISP_SCREEN_WIDTH with gdispGetWidth
- Renamed TOUCHSCREEN_HAS_IRQ to TOUCHSCREEN_HAS_PRESSED to match new
function name.
- Added prototypes for calibration storage functions to
touchscreen_lld.h so that either the lld driver or the application can
define the function.

Console:
-Deprecated into "old" directory. Functionality replaced by gwin.

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gdisp/Win32/touchscreen_lld_config.h b/drivers/gdisp/Win32/touchscreen_lld_config.h
index de200ef9..ef5d5a27 100644
--- a/drivers/gdisp/Win32/touchscreen_lld_config.h
+++ b/drivers/gdisp/Win32/touchscreen_lld_config.h
@@ -19,7 +19,7 @@
 */

 

 /**

- * @file	drivers/touchscreen/ADS7843/touchscreen_lld_config.h

+ * @file	drivers/gdisp/Win32/touchscreen_lld_config.h

  * @brief   Touchscreen Driver subsystem low level driver.

  *

  * @addtogroup TOUCHSCREEN

@@ -35,14 +35,13 @@
 /* Driver hardware support.                                                  */

 /*===========================================================================*/

 

-#define TOUCHSCREEN_HAS_IRQ				TRUE

+#define TOUCHSCREEN_HAS_PRESSED			TRUE

 #define TOUCHSCREEN_HAS_PRESSURE		FALSE

 #define TOUCHSCREEN_XY_INVERTED			FALSE

 #define TOUCHSCREEN_STORE_CALIBRATION	TRUE

+#define TOUCHSCREEN_CONVERSIONS			1

 

-/* Nasty stuff to fix SPI dependancy in driver structure (which doesn't exist in Win32) */

-typedef struct SPIDriver_t {} SPIDriver;

-typedef struct SPIConfig_t {} SPIConfig;

+struct TouchscreenDriver {};

 

 #endif	/* GFX_USE_TOUCHSCREEN */