Merge pull request #4 from Tectu/master

Merge Tectu changes

5 files changed, 195 insertions, 0 deletions

diff --git a/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp b/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp
new file mode 100644
index 00000000..595c456f
--- /dev/null
+++ b/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp
diff --git a/drivers/touchscreen/MCU/readme.txt b/drivers/touchscreen/MCU/readme.txt
new file mode 100644
index 00000000..105e7462
--- /dev/null
+++ b/drivers/touchscreen/MCU/readme.txt
@@ -0,0 +1,8 @@
+To use this driver:

+

+1. Add in your halconf.h:

+	a) #define GFX_USE_TOUCHSCREEN		TRUE

+

+2. To your makefile add the following lines:

+	include $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.mk

+

diff --git a/drivers/touchscreen/MCU/touchscreen_lld.c b/drivers/touchscreen/MCU/touchscreen_lld.c
new file mode 100644
index 00000000..46db4fa0
--- /dev/null
+++ b/drivers/touchscreen/MCU/touchscreen_lld.c
@@ -0,0 +1,125 @@
+/*

+    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/touchscreen/MCU/touchscreen_lld.c

+ * @brief   Touchscreen Driver subsystem low level driver source.

+ *

+ * @addtogroup TOUCHSCREEN

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+#include "touchscreen.h"

+

+#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/

+

+

+/*===========================================================================*/

+/* Driver local variables.                                                   */

+/*===========================================================================*/

+

+#if !defined(__DOXYGEN__)

+    /* Local copy of the current touchpad driver */

+    static const TouchscreenDriver *tsDriver;

+

+#endif

+

+/**

+ * @brief   Low level Touchscreen driver initialization.

+ *

+ * @param[in] ts	The touchscreen driver struct

+ *

+ * @notapi

+ */

+void ts_lld_init(const TouchscreenDriver *ts) {

+	tsDriver = ts;

+

+	/* set pins to analog input */

+	palSetPadMode(ts->ts_yd_port, ts->ts_yd_pin, PAL_MODE_INPUT_ANALOG);

+	palSetPadMode(ts->ts_yu_port, ts->ts_yu_pin, PAL_MODE_INPUT_ANALOG);

+	palSetPadMode(ts->ts_xl_port, ts->ts_xl_pin, PAL_MODE_INPUT_ANALOG);

+	palSetPadMode(ts->ts_xr_port, ts->ts_xr_pin, PAL_MODE_INPUT_ANALOG);

+}

+

+

+/**

+ * @brief   Reads a conversion from the touchscreen

+ *

+ * @param[in] cmd    The command bits to send to the touchscreen

+ *

+ * @return  The read value 12-bit right-justified

+ *

+ * @note    This function only reads data, it is assumed that the pins are

+ *          configured properly and the bus has been acquired beforehand

+ *

+ * @notapi

+ */

+uint16_t ts_lld_read_value(uint8_t cmd) {

+	return 0;

+}

+

+/**

+ * @brief   7-point median filtering code for touchscreen samples

+ *

+ * @note    This is an internally used routine only.

+ *

+ * @notapi

+ */

+static void ts_lld_filter(void) {

+	return 0;

+}

+

+/**

+ * @brief   Reads out the X direction.

+ *

+ * @note    The samples are median filtered for greater noise reduction

+ *

+ * @notapi

+ */

+uint16_t ts_lld_read_x(void) {

+	return 0;

+}

+

+/**

+ * @brief	Reads out the Y direction.

+ *

+ * @notapi

+ */

+uint16_t ts_lld_read_y(void) {

+	return 0;

+}

+

+/*

+ * @brief	Checks if touchscreen is pressed or not.

+ *

+ * @return	1 if pressed, 0 otherwise

+ *

+ * @notapi

+ */

+uint8_t ts_lld_pressed(void) {

+	return 0;

+}

+

+

+#endif /* GFX_USE_TOUCHSCREEN */

+/** @} */

+

diff --git a/drivers/touchscreen/MCU/touchscreen_lld.mk b/drivers/touchscreen/MCU/touchscreen_lld.mk
new file mode 100644
index 00000000..8d594c2c
--- /dev/null
+++ b/drivers/touchscreen/MCU/touchscreen_lld.mk
@@ -0,0 +1,6 @@
+# List the required driver.

+GFXSRC += $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.c

+

+# Required include directories

+GFXINC += $(GFXLIB)/drivers/touchscreen/MCU

+

diff --git a/drivers/touchscreen/MCU/touchscreen_lld_config.h b/drivers/touchscreen/MCU/touchscreen_lld_config.h
new file mode 100644
index 00000000..e57d5723
--- /dev/null
+++ b/drivers/touchscreen/MCU/touchscreen_lld_config.h
@@ -0,0 +1,56 @@
+/*

+    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/touchscreen/MCU/touchscreen_lld_config.h

+ * @brief   Touchscreen Driver subsystem low level driver.

+ *

+ * @addtogroup TOUCHSCREEN

+ * @{

+ */

+

+#ifndef TOUCHSCREEN_LLD_CONFIG_H

+#define TOUCHSCREEN_LLD_CONFIG_H

+

+#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/

+

+/*===========================================================================*/

+/* Driver hardware support.                                                  */

+/*===========================================================================*/

+

+#define TOUCHSCREEN_HAS_PRESSED				TRUE

+#define TOUCHSCREEN_HAS_PRESSURE			FALSE

+

+struct TouchscreenDriver {

+	ioportid_t 		ts_yd_port;

+	ioportmask_t	ts_yd_pin;

+	ioportid_t 		ts_yu_port;

+	ioportmask_t	ts_yu_pin;

+	ioportid_t 		ts_xl_port;

+	ioportmask_t	ts_xl_pin;

+	ioportid_t 		ts_xr_port;

+	ioportmask_t	ts_xr_pin;

+};

+

+#endif	/* GFX_USE_TOUCHSCREEN */

+

+#endif	/* TOUCHSCREEN_LLD_CONFIG_H */

+/** @} */

+