Merge pull request #10 from Tectu/master

Merge Tectu Changes

drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h

@@ -30,12 +30,12 @@
 #define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH
 #define GINPUT_MOUSE_NEED_CALIBRATION			TRUE
 #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
-#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		4
+#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		5
 #define GINPUT_MOUSE_READ_CYCLES				4
-#define GINPUT_MOUSE_POLL_PERIOD				100
+#define GINPUT_MOUSE_POLL_PERIOD				25
-#define GINPUT_MOUSE_MAX_CLICK_JITTER			2
+#define GINPUT_MOUSE_MAX_CLICK_JITTER			10
 #define GINPUT_MOUSE_MAX_MOVE_JITTER			2
-#define GINPUT_MOUSE_CLICK_TIME					700
+#define GINPUT_MOUSE_CLICK_TIME					500
 
 #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
 /** @} */

drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h

@@ -106,7 +106,7 @@ static __inline void release_bus(void) {
  * @notapi
  */
 static __inline uint16_t read_x_value(void) {
-    uint16_t val1, val2;
+	uint16_t val1, val2;
     adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
 
     palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_ANALOG);
@@ -114,13 +114,13 @@ static __inline uint16_t read_x_value(void) {
     palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
     palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
     
-    palSetPad(GPIOC, 2);
+	palSetPad(GPIOC, 2);
     palClearPad(GPIOC, 3); 
     chThdSleepMilliseconds(1);
     adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);  
     val1 = ((samples[0] + samples[1])/2);
-
+    
-    palClearPad(GPIOC, 2);
+	palClearPad(GPIOC, 2);
     palSetPad(GPIOC, 3);
     chThdSleepMilliseconds(1);
     adcConvert(&ADCD1, &adc_x_config, samples, ADC_BUF_DEPTH);
@@ -136,22 +136,22 @@ static __inline uint16_t read_x_value(void) {
  * @notapi
  */
 static __inline uint16_t read_y_value(void) {
-    uint16_t val1, val2;
+	uint16_t val1, val2;
     adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
 
     palSetPadMode(GPIOC, 2, PAL_MODE_INPUT_ANALOG);
     palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
     palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
     palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
-
+	return 42;
     palSetPad(GPIOC, 1);
     palClearPad(GPIOC, 0);
     chThdSleepMilliseconds(1);
     adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
     val1 = ((samples[0] + samples[1])/2);
 
-    palClearPad(GPIOC, 0);
+    palClearPad(GPIOC, 1);
-    palSetPad(GPIOC, 1);
+    palSetPad(GPIOC, 0);
     chThdSleepMilliseconds(1);
     adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
     val2 = ((samples[0] + samples[1])/2);

drivers/ginput/touch/XPT2046/ginput_lld.mk

@@ -0,0 +1,5 @@
+# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/ginput/touchXPT20466

drivers/ginput/touch/XPT2046/ginput_lld_mouse.c

@@ -0,0 +1,143 @@
+/*
+    ChibiOS/GFX - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    drivers/ginput/touch/XPT2046/ginput_lld_mouse.c
+ * @brief   GINPUT Touch low level driver source for the XPT2046.
+ *
+ * @addtogroup GINPUT_MOUSE
+ * @{
+ */
+
+#include "ch.h"
+#include "hal.h"
+
+#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
+
+#include "gdisp.h" /* for coord_t */
+#include "gevent.h"
+#include "ginput/ginput_mouse.h" /* for GINPUT_TOUCH_PRESSED */
+#include "lld/ginput/mouse.h"
+
+#if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD
+	#include "ginput_lld_mouse_board.h"
+#elif defined(BOARD_FIREBULL_STM32_F103)
+	#include "ginput_lld_mouse_board_firebull_stm32f103.h"
+#else
+	#include "ginput_lld_mouse_board_example.h"
+#endif
+
+static uint16_t sampleBuf[7];
+static coord_t	lastx, lasty;
+
+/**
+ * @brief   7-point median filtering code for touch samples
+ *
+ * @note    This is an internally used routine only.
+ *
+ * @notapi
+ */
+static void filter(void) {
+	uint16_t temp;
+	int i,j;
+
+	for(i = 0; i < 4; i++) {
+		for(j = i; j < 7; j++) {
+			if(sampleBuf[i] > sampleBuf[j]) {
+				/* Swap the values */
+				temp = sampleBuf[i];
+				sampleBuf[i] = sampleBuf[j];
+				sampleBuf[j] = temp;
+			}
+		}
+	}
+}
+
+/**
+ * @brief   Initialise the mouse/touch.
+ *
+ * @notapi
+ */
+void ginput_lld_mouse_init(void) {
+	init_board();
+}
+
+/**
+ * @brief   Read the mouse/touch position.
+ *
+ * @param[in] pt	A pointer to the structure to fill
+ *
+ * @note			For drivers that don't support returning a position
+ *					when the touch is up (most touch devices), it should
+ *					return the previous position with the new Z value.
+ *					The z value is the pressure for those touch devices
+ *					that support it (-100 to 100 where > 0 is touched)
+ *					or, 0 or 100 for those drivers that don't.
+ *
+ * @notapi
+ */
+void ginput_lld_mouse_get_reading(MouseReading *pt) {
+	uint16_t i;
+
+	// If touch-off return the previous results
+	if (!getpin_pressed()) {
+		pt->x = lastx;
+		pt->y = lasty;
+		pt->z = 0;
+		pt->buttons = 0;
+		return;
+	}
+	
+	// Read the port to get the touch settings
+	aquire_bus();
+
+	/* Get the X value
+	 * Discard the first conversion - very noisy and keep the ADC on hereafter
+	 * till we are done with the sampling. Note that PENIRQ is disabled while reading.
+	 * Finally switch on PENIRQ once again - perform a dummy read.
+	 * Once we have the readings, find the medium using our filter function
+ 	 */
+	read_value(0xD1);
+	for(i = 0; i < 7; i++)
+		sampleBuf[i] = read_value(0xD1);
+	read_value(0xD0);
+	filter();
+	lastx = (coord_t)sampleBuf[3];
+
+	/* Get the Y value using the same process as above */
+	read_value(0x91);
+	for(i = 0; i < 7; i++)
+		sampleBuf[i] = read_value(0x91);
+	read_value(0x90);
+	filter();
+	lasty = (coord_t)sampleBuf[3];
+
+	// Release the bus
+	release_bus();
+	
+	// Return the results
+	pt->x = lastx;
+	pt->y = lasty;
+	pt->z = 100;
+	pt->buttons = GINPUT_TOUCH_PRESSED;
+}
+
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */
+/** @} */

drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h

@@ -0,0 +1,87 @@
+/*
+    ChibiOS/GFX - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h
+ * @brief   GINPUT Touch low level driver source for the XPT2046 on the example board.
+ *
+ * @addtogroup GINPUT_MOUSE
+ * @{
+ */
+
+#ifndef _GINPUT_LLD_MOUSE_BOARD_H
+#define _GINPUT_LLD_MOUSE_BOARD_H
+
+/**
+ * @brief   Initialise the board for the touch.
+ *
+ * @notapi
+ */
+static __inline void init_board(void) {
+	/* Code here */
+	#error "ginputXPT2046: You must supply a definition for init_board for your board"
+}
+
+/**
+ * @brief   Check whether the surface is currently touched
+ * @return	TRUE if the surface is currently touched
+ *
+ * @notapi
+ */
+static __inline bool_t getpin_pressed(void) {
+	/* Code here */
+	#error "ginputXPT2046: You must supply a definition for getpin_pressed for your board"
+}
+
+/**
+ * @brief   Aquire the bus ready for readings
+ *
+ * @notapi
+ */
+static __inline void aquire_bus(void) {
+	/* Code here */
+	#error "ginputXPT2046: You must supply a definition for aquire_bus for your board"
+}
+
+/**
+ * @brief   Release the bus after readings
+ *
+ * @notapi
+ */
+static __inline void release_bus(void) {
+	/* Code here */
+	#error "ginputXPT2046: You must supply a definition for release_bus for your board"
+}
+
+/**
+ * @brief   Read a value from touch controller
+ * @return	The value read from the controller
+ *
+ * params[in] port	The controller port to read.
+ *
+ * @notapi
+ */
+static __inline uint16_t read_value(uint16_t port) {
+	/* Code here */
+	#error "ginputXPT2046: You must supply a definition for read_value for your board"
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
+/** @} */

drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_firebull_stm32f103.h

@@ -0,0 +1,102 @@
+/*
+    ChibiOS/GFX - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    drivers/ginput/touch/XPT2046/ginput_lld_mouse_board_example.h
+ * @brief   GINPUT Touch low level driver source for the XPT2046 on the example board.
+ *
+ * @addtogroup GINPUT_MOUSE
+ * @{
+ */
+
+#ifndef _GINPUT_LLD_MOUSE_BOARD_H
+#define _GINPUT_LLD_MOUSE_BOARD_H
+
+static const SPIConfig spicfg = { 
+    NULL,
+	GPIOC, 
+    6,
+    /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0,
+};
+
+/**
+ * @brief   Initialise the board for the touch.
+ *
+ * @notapi
+ */
+static __inline void init_board(void) {
+	spiStart(&SPID1, &spicfg);
+}
+
+/**
+ * @brief   Check whether the surface is currently touched
+ * @return	TRUE if the surface is currently touched
+ *
+ * @notapi
+ */
+static __inline bool_t getpin_pressed(void) {
+	return (!palReadPad(GPIOC, 4));
+}
+/**
+ * @brief   Aquire the bus ready for readings
+ *
+ * @notapi
+ */
+static __inline void aquire_bus(void) {
+	spiAcquireBus(&SPID1);
+    //TOUCHSCREEN_SPI_PROLOGUE();
+    palClearPad(GPIOC, 6);
+}
+
+/**
+ * @brief   Release the bus after readings
+ *
+ * @notapi
+ */
+static __inline void release_bus(void) {
+	palSetPad(GPIOC, 6);
+	spiReleaseBus(&SPID1);
+    //TOUCHSCREEN_SPI_EPILOGUE();
+}
+
+/**
+ * @brief   Read a value from touch controller
+ * @return	The value read from the controller
+ *
+ * params[in] port	The controller port to read.
+ *
+ * @notapi
+ */
+static __inline uint16_t read_value(uint16_t port) {
+    static uint8_t txbuf[3] = {0};
+    static uint8_t rxbuf[3] = {0};
+    uint16_t ret;
+
+    txbuf[0] = port;
+
+    spiExchange(&SPID1, 3, txbuf, rxbuf);
+
+    ret = (rxbuf[1] << 5) | (rxbuf[2] >> 3); 
+    
+	return ret;
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
+/** @} */

drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h

@@ -0,0 +1,41 @@
+/*
+    ChibiOS/GFX - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @file    drivers/ginput/touch/XPT2046/ginput_lld_mouse_config.h
+ * @brief   GINPUT LLD header file for mouse/touch driver.
+ *
+ * @addtogroup GINPUT_LLD_MOUSE
+ * @{
+ */
+#ifndef _LLD_GINPUT_MOUSE_CONFIG_H
+#define _LLD_GINPUT_MOUSE_CONFIG_H
+
+#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH
+#define GINPUT_MOUSE_NEED_CALIBRATION			TRUE
+#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
+#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		5
+#define GINPUT_MOUSE_READ_CYCLES				4
+#define GINPUT_MOUSE_POLL_PERIOD				25
+#define GINPUT_MOUSE_MAX_CLICK_JITTER			10
+#define GINPUT_MOUSE_MAX_MOVE_JITTER			2
+#define GINPUT_MOUSE_CLICK_TIME					500
+
+#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
+/** @} */

drivers/ginput/touch/XPT2046/readme.txt

@@ -0,0 +1,9 @@
+To use this driver:
+
+1. Add in your halconf.h:
+	a) #define GFX_USE_GINPUT			TRUE
+	b) #define GINPUT_NEED_MOUSE		TRUE
+
+2. To your makefile add the following lines:
+	include $(GFXLIB)/drivers/ginput/touch/XPT2046/ginput_lld.mk
+