Merge pull request #16 from inmarket/master

Touch fixes. Deprecate Console

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) */
+struct TouchscreenDriver {};
-typedef struct SPIDriver_t {} SPIDriver;
-typedef struct SPIConfig_t {} SPIConfig;
 
 #endif	/* GFX_USE_TOUCHSCREEN */
 

drivers/touchscreen/ADS7843/touchscreen_lld.c

@@ -211,7 +211,7 @@ uint16_t ts_lld_read_y(void) {
 }
 
 /* ---- Optional Routines ---- */
-#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__)
+#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__)
 	/*
 	 * @brief	for checking if touchscreen is pressed or not.
 	 *

drivers/touchscreen/ADS7843/touchscreen_lld_config.h

@@ -35,9 +35,48 @@
 /* Driver hardware support.                                                  */
 /*===========================================================================*/
 
-#define TOUCHSCREEN_HAS_IRQ				TRUE
+#define TOUCHSCREEN_HAS_PRESSED				TRUE
 #define TOUCHSCREEN_HAS_PRESSURE			FALSE
 
+struct TouchscreenDriver {
+    /*
+     * @brief   Pointer to SPI driver.
+     * @note    SPI driver must be enabled in mcuconf.h and halconf.h
+     */
+    SPIDriver       *spip;
+
+    /*
+     * @brief   Pointer to the SPI configuration structure.
+     * @note    The lowest possible speed ~ 1-2MHz is to be used, otherwise
+     *          will result in a lot of noise
+     */
+    const SPIConfig  *spicfg;
+
+    /*
+     * @brief   Touchscreen controller TPIRQ pin GPIO port
+     */
+    ioportid_t      tsIRQPort;
+
+    /*
+     * @brief   Touchscreen controller TPIRQ GPIO pin
+     * @note    The interface is polled as of now, interrupt support is
+     *          to be implemented in the future.
+     */
+    ioportmask_t    tsIRQPin;
+
+    /*
+     * @brief   Initialize the SPI with the configuration struct given or not
+     *          If TRUE, spiStart is called by the init, otherwise not
+     * @note    This is provided in such a case when SPI port is being shared
+     *          across multiple peripherals, so not to disturb the SPI bus.
+     *          You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE()
+     *          macros to change the SPI configuration or speed before and
+     *          after using the touchpad. An example case would be sharing the
+     *          bus with a fast flash memory chip.
+     */
+    bool_t          direct_init;
+};
+
 #endif	/* GFX_USE_TOUCHSCREEN */
 
 #endif	/* TOUCHSCREEN_LLD_CONFIG_H */

drivers/touchscreen/XPT2046/touchscreen_lld.c

@@ -211,7 +211,7 @@ uint16_t ts_lld_read_y(void) {
 }
 
 /* ---- Optional Routines ---- */
-#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__)
+#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__)
 	/*
 	 * @brief	for checking if touchscreen is pressed or not.
 	 *

drivers/touchscreen/XPT2046/touchscreen_lld_config.h

@@ -35,9 +35,48 @@
 /* Driver hardware support.                                                  */
 /*===========================================================================*/
 
-#define TOUCHSCREEN_HAS_IRQ				TRUE
+#define TOUCHSCREEN_HAS_PRESSED				TRUE
 #define TOUCHSCREEN_HAS_PRESSURE			TRUE
 
+struct TouchscreenDriver {
+    /*
+     * @brief   Pointer to SPI driver.
+     * @note    SPI driver must be enabled in mcuconf.h and halconf.h
+     */
+    SPIDriver       *spip;
+
+    /*
+     * @brief   Pointer to the SPI configuration structure.
+     * @note    The lowest possible speed ~ 1-2MHz is to be used, otherwise
+     *          will result in a lot of noise
+     */
+    const SPIConfig  *spicfg;
+
+    /*
+     * @brief   Touchscreen controller TPIRQ pin GPIO port
+     */
+    ioportid_t      tsIRQPort;
+
+    /*
+     * @brief   Touchscreen controller TPIRQ GPIO pin
+     * @note    The interface is polled as of now, interrupt support is
+     *          to be implemented in the future.
+     */
+    ioportmask_t    tsIRQPin;
+
+    /*
+     * @brief   Initialize the SPI with the configuration struct given or not
+     *          If TRUE, spiStart is called by the init, otherwise not
+     * @note    This is provided in such a case when SPI port is being shared
+     *          across multiple peripherals, so not to disturb the SPI bus.
+     *          You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE()
+     *          macros to change the SPI configuration or speed before and
+     *          after using the touchpad. An example case would be sharing the
+     *          bus with a fast flash memory chip.
+     */
+    bool_t          direct_init;
+};
+
 #endif	/* GFX_USE_TOUCHSCREEN */
 
 #endif	/* TOUCHSCREEN_LLD_CONFIG_H */

gfx.mk

@@ -7,7 +7,6 @@ GFXSRC +=   $(GFXLIB)/src/gdisp.c \
             $(GFXLIB)/src/gdisp_fonts.c \
             $(GFXLIB)/src/gwin.c \
             $(GFXLIB)/src/touchscreen.c \
-			$(GFXLIB)/src/console.c \
 			$(GFXLIB)/src/graph.c \
 
 GFXINC +=   $(GFXLIB)/include

include/touchscreen.h

@@ -31,21 +31,6 @@
 
 #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__)
 
-#ifndef TOUCHSCREEN_STORE_CALIBRATION
-	#define TOUCHSCREEN_STORE_CALIBRATION FALSE
-#endif
-
-#ifndef TOUCHSCREEN_VERIFY_CALIBRATION
-	#define TOUCHSCREEN_VERIFY_CALIBRATION FALSE
-#endif
-
-/**
- * @brief	specifies how many conversions are made for a readout.
- *
- * @note	higher is more accurate, but takes more time
- */
-#define	CONVERSIONS 3
-
 /*===========================================================================*/
 /* Driver constants.                                                         */
 /*===========================================================================*/
@@ -89,7 +74,7 @@ coord_t tsReadX(void);
 coord_t tsReadY(void);
 void tsCalibrate(void);
 
-#if TOUCHSCREEN_HAS_IRQ
+#if TOUCHSCREEN_HAS_PRESSED
 	bool_t tsPressed(void);
 #endif
 

include/touchscreen_lld.h

@@ -49,8 +49,8 @@
 	#define TOUCHSCREEN_XY_INVERTED	FALSE
 #endif
 
-#ifndef TOUCHSCREEN_HAS_IRQ
+#ifndef TOUCHSCREEN_HAS_PRESSED
-	#define TOUCHSCREEN_HAS_IRQ	FALSE
+	#define TOUCHSCREEN_HAS_PRESSED	FALSE
 #endif
 
 #ifndef TOUCHSCREEN_HAS_PRESSURE
@@ -65,52 +65,29 @@
     #define TOUCHSCREEN_SPI_EPILOGUE()
 #endif
 
+#ifndef TOUCHSCREEN_STORE_CALIBRATION
+	#define TOUCHSCREEN_STORE_CALIBRATION FALSE
+#endif
+
+#ifndef TOUCHSCREEN_VERIFY_CALIBRATION
+	#define TOUCHSCREEN_VERIFY_CALIBRATION FALSE
+#endif
+
+#ifndef TOUCHSCREEN_CONVERSIONS
+	#define	TOUCHSCREEN_CONVERSIONS 3
+#endif
+
 /*===========================================================================*/
 /* Driver types.                                                             */
 /*===========================================================================*/
 
 /**
- * @brief	Structure representing a touchscreen driver.
+ * @brief	Structure representing a touchscreen driver. Hardware dependant.
  */
-typedef struct TouchscreenDriver {
+typedef struct TouchscreenDriver TouchscreenDriver;
-    /*
-     * @brief   Pointer to SPI driver.
-     * @note    SPI driver must be enabled in mcuconf.h and halconf.h
-     */
-    SPIDriver       *spip;
-
-    /*
-     * @brief   Pointer to the SPI configuration structure.
-     * @note    The lowest possible speed ~ 1-2MHz is to be used, otherwise
-     *          will result in a lot of noise
-     */
-    const SPIConfig  *spicfg;
-
-    /*
-     * @brief   Touchscreen controller TPIRQ pin GPIO port
-     */
-    ioportid_t      tsIRQPort;
-
-    /*
-     * @brief   Touchscreen controller TPIRQ GPIO pin
-     * @note    The interface is polled as of now, interrupt support is
-     *          to be implemented in the future.
-     */
-    ioportmask_t    tsIRQPin;
-
-    /*
-     * @brief   Initialize the SPI with the configuration struct given or not
-     *          If TRUE, spiStart is called by the init, otherwise not
-     * @note    This is provided in such a case when SPI port is being shared
-     *          across multiple peripherals, so not to disturb the SPI bus.
-     *          You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE()
-     *          macros to change the SPI configuration or speed before and
-     *          after using the touchpad. An example case would be sharing the
-     *          bus with a fast flash memory chip.
-     */
-    bool_t          direct_init;
-} TouchscreenDriver;
 
+// Forward declaration
+struct cal_t;
 
 /*===========================================================================*/
 /* External declarations.                                                    */
@@ -128,7 +105,7 @@ extern "C" {
 	uint16_t ts_lld_read_x(void);
 	uint16_t ts_lld_read_y(void);
 
-	#if TOUCHSCREEN_HAS_IRQ
+	#if TOUCHSCREEN_HAS_PRESSED
 	uint8_t ts_lld_pressed(void);
 	#endif
 
@@ -136,6 +113,12 @@ extern "C" {
 	uint16_t ts_lld_read_z(void);
 	#endif
 
+	#if TOUCHSCREEN_STORE_CALIBRATION
+	// These may be defined by the low level driver or by the application
+	void ts_store_calibration_lld(struct cal_t *cal);
+	struct cal_t *ts_restore_calibration_lld(void);
+	#endif
+
 #ifdef __cplusplus
 }
 #endif

releases.txt

@@ -9,6 +9,9 @@ current stable: 1.4
 FEATURE:	Added three point calibration
 FIX:		Touchpad renamed into Touchscreen
 FIX:		tsIRQ() renamed into tsPressed()
+FEATURE:	Touchscreen support added to gdisp Win32 driver
+FIX:		gdisp Win32 driver fixes
+DEPRECATE:	console deprecated - replaced with gwin functionality
 
 
 *** changes after 1.3 ***

src/touchscreen.c

@@ -32,11 +32,6 @@
 
 #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__)
 
-#if TOUCHSCREEN_STORE_CALIBRATION
-extern void ts_store_calibration_lld(struct cal_t *cal);
-extern struct cal_t *ts_restore_calibration_lld(void);
-#endif
-
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
@@ -59,12 +54,12 @@ static coord_t _tsReadRealX(void) {
     int16_t i;
     coord_t x;
 
-    for(i = 0; i < CONVERSIONS; i++) {
+    for(i = 0; i < TOUCHSCREEN_CONVERSIONS; i++) {
         results += ts_lld_read_x();
     }
 
     /* Take the average of the readings */
-    x = results / CONVERSIONS;
+    x = results / TOUCHSCREEN_CONVERSIONS;
 
     return x;
 }
@@ -74,12 +69,12 @@ static coord_t _tsReadRealY(void) {
     int16_t i;
     coord_t y;
 
-    for(i = 0; i < CONVERSIONS; i++) {
+    for(i = 0; i < TOUCHSCREEN_CONVERSIONS; i++) {
         results += ts_lld_read_y();
     }
 
     /* Take the average of the readings */
-    y = results / CONVERSIONS;
+    y = results / TOUCHSCREEN_CONVERSIONS;
 
     return y;
 }
@@ -237,9 +232,9 @@ coord_t tsReadY(void) {
         case GDISP_ROTATE_0:
             return y;
         case GDISP_ROTATE_90:
-            return GDISP_SCREEN_WIDTH - x - 1;
+            return gdispGetWidth() - x - 1;
         case GDISP_ROTATE_180:
-            return GDISP_SCREEN_HEIGHT - y - 1;
+            return gdispGetHeight() - y - 1;
         case GDISP_ROTATE_270:
             return x;
     }
@@ -268,7 +263,7 @@ coord_t tsReadY(void) {
  *
  * @api
  */
-#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__)
+#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__)
 	bool_t tsPressed(void) {
 		return ts_lld_pressed();
 	}