Ginput and structure changes

GINPUT Touch including drivers
GTIMER fixes
GEVENT fixes
GWIN button completion
Structure changes to better seperate sections of a sub-system

6 files changed, 461 insertions, 0 deletions

diff --git a/drivers/ginput/touch/MCU/ginput_lld.mk b/drivers/ginput/touch/MCU/ginput_lld.mk
new file mode 100644
index 00000000..eb8fb2d8
--- /dev/null
+++ b/drivers/ginput/touch/MCU/ginput_lld.mk
@@ -0,0 +1,5 @@
+# List the required driver.

+GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld_mouse.c

+

+# Required include directories

+GFXINC += $(GFXLIB)/drivers/ginput/touch/MCU

diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse.c b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
new file mode 100644
index 00000000..ac42033b
--- /dev/null
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
@@ -0,0 +1,136 @@
+/*

+    ChibiOS/RT - 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/MCU/ginput_lld_mouse.c

+ * @brief   GINPUT Touch low level driver source for the MCU.

+ *

+ * @addtogroup GINPUT_MOUSE

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+

+#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/

+

+#include "lld/ginput/touch.h"

+

+#if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD

+	/* Include the user supplied board definitions */

+	#include "ginput_lld_mouse_board.h"

+//#elif defined(BOARD_OLIMEX_SAM7_EX256)

+//	#include "ginput_lld_mouse_board_olimexsam7ex256.h"

+#else

+	#include "ginput_lld_mouse_board.h"

+#endif

+

+static uint16_t sampleBuf[7];

+static coord_t	lastx, lasty;

+

+/**

+ * @brief   7-point median filtering code for touchscreen 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) {

+	// 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.

+	 * Once we have the readings, find the medium using our filter function

+ 	 */

+	read_x_value();

+	for(i = 0; i < 7; i++)

+		sampleBuf[i] = read_x_value();

+	filter();

+	lastx = (coord_t)sampleBuf[3];

+

+	/* Get the Y value using the same process as above */

+	read_y_value();

+	for(i = 0; i < 7; i++)

+		sampleBuf[i] = read_y_value();

+	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 */

+/** @} */

diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
new file mode 100644
index 00000000..21e55e74
--- /dev/null
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
@@ -0,0 +1,96 @@
+/*

+    ChibiOS/RT - 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/MCU/ginput_lld_mouse_board_example.h

+ * @brief   GINPUT Touch low level driver source for the MCU 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 "ginputMCU: 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 "ginputMCU: 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 "ginputMCU: 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 "ginputMCU: You must supply a definition for release_bus for your board"

+}

+

+/**

+ * @brief   Read an x value from touch controller

+ * @return	The value read from the controller

+ *

+ * @notapi

+ */

+static __inline uint16_t read_x_value(void) {

+	/* Code here */

+	#error "ginputMCU: You must supply a definition for read_x_value for your board"

+}

+

+/**

+ * @brief   Read an y value from touch controller

+ * @return	The value read from the controller

+ *

+ * @notapi

+ */

+static __inline uint16_t read_y_value(void) {

+	/* Code here */

+	#error "ginputMCU: You must supply a definition for read_y_value for your board"

+}

+

+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */

+/** @} */

diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h
new file mode 100644
index 00000000..4780806e
--- /dev/null
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_unknown.h
@@ -0,0 +1,174 @@
+/*

+    ChibiOS/RT - 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/MCU/ginput_lld_mouse_board_unknown.h

+ * @brief   GINPUT Touch low level driver source for the MCU on some unknown board.

+ *

+ * @addtogroup GINPUT_MOUSE

+ * @{

+ */

+

+#ifndef _GINPUT_LLD_MOUSE_BOARD_H

+#define _GINPUT_LLD_MOUSE_BOARD_H

+

+#define ADC_NUM_CHANNELS   2

+#define ADC_BUF_DEPTH      1

+

+static const ADCConversionGroup adc_y_config = {

+    FALSE,

+    ADC_NUM_CHANNELS,

+    NULL,

+    NULL,

+    0, 0,

+    0, 0,

+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),

+    0,

+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN12) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN13)

+};

+

+static const ADCConversionGroup adc_x_config = {

+    FALSE,

+    ADC_NUM_CHANNELS,

+    NULL,

+    NULL,

+    0, 0,

+    0, 0,

+    ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS),

+    0,

+    ADC_SQR3_SQ2_N(ADC_CHANNEL_IN10) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN11)

+};

+

+/**

+ * @brief   Initialise the board for the mouse/touch.

+ *

+ * @notapi

+ */

+static __inline void init_board(void) {

+	/* Code here */

+	#error "ginputMCU: You must supply a definition for init_board for your board

+	

+	adcStart(ts->adc_driver, NULL);

+}

+

+/**

+ * @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 "ginputMCU: You must supply a definition for getpin_pressed for your board"

+	palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_INPUT_PULLDOWN);

+	palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_INPUT);

+	palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_INPUT);

+	palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_OUTPUT_PUSHPULL);

+	palSetPad(ts->xr_port, ts->xr_pin);

+

+	return palReadPad(ts->yd_port, ts->yd_pin);

+}

+

+/**

+ * @brief   Aquire the bus ready for readings

+ *

+ * @notapi

+ */

+static __inline void aquire_bus(void) {

+	/* Code here */

+	#error "ginputMCU: 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 "ginputMCU: You must supply a definition for release_bus for your board"

+}

+

+/**

+ * @brief   Read an x value from touch controller

+ * @return	The value read from the controller

+ *

+ * @notapi

+ */

+static __inline uint16_t read_x_value(void) {

+	/* Code here */

+	#error "ginputMCU: You must supply a definition for read_x_value for your board"

+	uint16_t val1, val2;

+	adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];

+

+    palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_INPUT_ANALOG);

+    palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_INPUT_ANALOG);

+    palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_OUTPUT_PUSHPULL);

+    palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_OUTPUT_PUSHPULL);

+

+    palSetPad(ts->xl_port, ts->xl_pin);

+    palClearPad(ts->xr_port, ts->xr_pin);

+    chThdSleepMilliseconds(1);

+    adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH);

+    val1 = ((samples[0] + samples[1])/2);

+

+    palClearPad(ts->xl_port, ts->xl_pin);

+    palSetPad(ts->xr_port, ts->xr_pin);

+    chThdSleepMilliseconds(1);

+    adcConvert(ts->adc_driver, &adc_x_config, samples, ADC_BUF_DEPTH);

+    val2 = ((samples[0] + samples[1])/2);

+

+	return ((val1+((1<<12)-val2))/4);

+}

+

+/**

+ * @brief   Read an y value from touch controller

+ * @return	The value read from the controller

+ *

+ * @notapi

+ */

+static __inline uint16_t read_y_value(void) {

+	/* Code here */

+	#error "ginputMCU: You must supply a definition for read_y_value for your board"

+	uint16_t val1, val2;

+	adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];

+

+	palSetPadMode(ts->xl_port, ts->xl_pin, PAL_MODE_INPUT_ANALOG);

+	palSetPadMode(ts->xr_port, ts->xr_pin, PAL_MODE_INPUT_ANALOG);

+	palSetPadMode(ts->yd_port, ts->yd_pin, PAL_MODE_OUTPUT_PUSHPULL);

+	palSetPadMode(ts->yu_port, ts->yu_pin, PAL_MODE_OUTPUT_PUSHPULL);

+

+	palSetPad(ts->yu_port, ts->yu_pin);

+	palClearPad(ts->yd_port, ts->yd_pin);

+	chThdSleepMilliseconds(1);

+	adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH);

+	val1 = ((samples[0] + samples[1])/2);

+

+	palClearPad(ts->yu_port, ts->yu_pin);

+	palSetPad(ts->yd_port, ts->yd_pin);

+	chThdSleepMilliseconds(1);

+	adcConvert(ts->adc_driver, &adc_y_config, samples, ADC_BUF_DEPTH);

+	val2 = ((samples[0] + samples[1])/2);

+

+	return ((val1+((1<<12)-val2))/4);

+}

+

+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */

+/** @} */

diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
new file mode 100644
index 00000000..d56be229
--- /dev/null
+++ b/drivers/ginput/touch/MCU/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/MCU/ginput_lld_mouse_config.h

+ * @brief   GINPUT LLD header file for 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		2

+#define GINPUT_MOUSE_READ_CYCLES				4

+#define GINPUT_MOUSE_POLL_PERIOD				100

+#define GINPUT_MOUSE_MAX_CLICK_JITTER			2

+#define GINPUT_MOUSE_MAX_MOVE_JITTER			2

+#define GINPUT_MOUSE_CLICK_TIME					700

+

+#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */

+/** @} */

diff --git a/drivers/ginput/touch/MCU/readme.txt b/drivers/ginput/touch/MCU/readme.txt
new file mode 100644
index 00000000..4dbe5543
--- /dev/null
+++ b/drivers/ginput/touch/MCU/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/MCU/ginput_lld.mk

+