Merge pull request #2 from Tectu/master

merge Tectu Changes

3 files changed, 197 insertions, 0 deletions

diff --git a/halext/include/gdisp_lld.h b/halext/include/gdisp_lld.h
index 970fd712..e9edbe96 100644
--- a/halext/include/gdisp_lld.h
+++ b/halext/include/gdisp_lld.h
@@ -296,6 +296,8 @@
 	#define RED_OF(c)			(((c) & 0xF800)>>8)

 	#define GREEN_OF(c)			(((c)&0x007E)>>3)

 	#define BLUE_OF(c)			(((c)&0x001F)<<3)

+	#define RGB565CONVERT(red, green, blue) (uint16_t)( (( red   >> 3 ) << 11 ) | (( green >> 2 ) << 5  ) | ( blue  >> 3 ))

+

 

 #elif defined(GDISP_PIXELFORMAT_RGB888)

 	typedef uint32_t color_t;

diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h
new file mode 100644
index 00000000..445d3202
--- /dev/null
+++ b/halext/include/touchpad.h
@@ -0,0 +1,93 @@
+/*
+    ChibiOS-LCD-Driver/RT - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS-LCD-Driver.
+
+    ChibiOS-LCD-Driver 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-LCD-Driver 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	touchpad.h
+ * @brief	TOUCHPAD Touchpad Driver subsystem header file.
+ *
+ * @addgroup TOUCHPAD
+ * @{
+ */
+#ifndef _TOUCHPAD_H
+#define _TOUCHPAD_H
+
+#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+
+/**
+ * @brief	specifies how many conversions are made for a readout.
+ *
+ * @note	higher is more accurate, but takes more time
+ */
+#define	CONVERSIONS 3
+
+/*===========================================================================*/
+/* Driver constants.                                                         */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Low Level Driver details and error checks.                                */
+/*===========================================================================*/
+
+/* Include the low level driver information */
+#include "touchpad_lld.h"
+
+/*===========================================================================*/
+/* Type definitions                                                          */
+/*===========================================================================*/
+
+/**
+ * @brief	Struct used for calibration
+ */
+struct cal {
+    float xm; 
+    float ym; 
+    float xn; 
+    float yn; 
+};
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void tpInit(TOUCHPADDriver *tp);
+uint16_t tpReadX(void);
+uint16_t tpReadY(void);
+
+#if TOUCHPAD_HAS_IRQ
+	uint8_t tpIRQ(void);
+#endif
+
+#if TOUCHPAD_HAS_PRESSURE
+	uint16_t tpReadZ(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HAL_USE_TOUCHPAD */
+
+#endif /* _TOUCHPAD_H */
+/** @} */
+
diff --git a/halext/include/touchpad_lld.h b/halext/include/touchpad_lld.h
new file mode 100644
index 00000000..c0339e05
--- /dev/null
+++ b/halext/include/touchpad_lld.h
@@ -0,0 +1,102 @@
+/*
+    ChibiOS-LCD-Driver/RT - Copyright (C) 2012
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS-LCD-Driver.
+
+    ChibiOS-LCD-Driver 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-LCD-Driver 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	touchpad_lld.h
+ * @brief	TOUCHPAD Driver subsystem low level driver header.
+ *
+ * @addgroup TOUCHPAD
+ * @{
+ */
+
+#ifndef _TOUCHPAD_LLD_H
+#define _TOUCHPAD_LLD_H
+
+#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
+
+/*===========================================================================*/
+/* Include the low level driver configuration information                    */
+/*===========================================================================*/
+
+#include "touchpad_lld_config.h"
+
+/*===========================================================================*/
+/* Error checks.                                                             */
+/*===========================================================================*/
+
+#ifndef TOUCHPAD_HAS_IRQ
+	#define TOUCHPAD_HAS_IRQ	FALSE
+#endif
+
+#ifndef TOUCHPAD_HAS_PRESSURE
+	#define TOUCHPAD_HAS_PRESSURE	FALSE
+#endif
+
+/*===========================================================================*/
+/* Driver types.                                                             */
+/*===========================================================================*/
+
+typedef struct TOUCHPADDriver TOUCHPADDriver;
+
+/**
+ * @brief	Structure representing a Touchpad driver.
+ */
+struct TOUCHPADDriver {
+	/*
+	 * @brief	Pointer to SPI driver.
+	 * @note	SPI driver must be enabled in mcu- and halconf.h
+	 */
+	SPIDriver *spid;
+};
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#if !defined(__DOXYGEN__)
+    extern TOUCHPADDriver Touchpad;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	/* Core functions */
+	void tp_lld_init(TOUCHPADDriver *tp);
+	uint16_t tp_lld_read_x(void);
+	uint16_t tp_lld_read_y(void);
+
+	#if TOUCHPAD_HAS_IRQ
+	uint8_t tp_lld_irq(void);
+	#endif
+
+	#if TOUCHPAD_HAS_PRESSURE
+	uint16_t tp_lld_read_z(void);
+	#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* HAL_USE_TOUCHPAD */
+
+#endif /* _TOUCHPAD_LLD_H */
+/** @} */
+