Restructure

Create global include file called gfx.h which knows about sub-system
dependancies.
Deprecate Touchscreen (GINPUT touch is now working properly)
Merge Graph into GWIN
Change directory structure to reflect sub-system structure
Many small bugs fixed
Split Nokia6610 gdisp driver into GE8 and GE12 controller versions
Fixed broken demos.
GFX sub-systems are now clearly defined and new ones should be much
easier to add.

8 files changed, 378 insertions, 68 deletions

diff --git a/include/ginput/ginput_dial.h b/include/ginput/dial.h
index 71448c0b..90db94ac 100644
--- a/include/ginput/ginput_dial.h
+++ b/include/ginput/dial.h
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 /**

- * @file    ginput/ginput_dial.h

+ * @file    include/ginput/dial.h

  * @brief   GINPUT GFX User Input subsystem header file.

  *

  * @addtogroup GINPUT

@@ -27,26 +27,9 @@
 #ifndef _GINPUT_DIAL_H

 #define _GINPUT_DIAL_H

 

-/**

- * @name    GINPUT more complex functionality to be compiled

- * @{

- */

-	/**

-	 * @brief   Should analog dial functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_DIAL

-		#define GINPUT_NEED_DIAL	FALSE

-	#endif

-/** @} */

-

 #if GINPUT_NEED_DIAL || defined(__DOXYGEN__)

 

 /*===========================================================================*/

-/* Low Level Driver details and error checks.                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* Type definitions                                                          */

 /*===========================================================================*/

 

diff --git a/include/ginput/ginput.h b/include/ginput/ginput.h
new file mode 100644
index 00000000..ec8acca7
--- /dev/null
+++ b/include/ginput/ginput.h
@@ -0,0 +1,55 @@
+/*

+    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    include/ginput/ginput.h

+ * @brief   GINPUT GFX User Input subsystem header file.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+#ifndef _GINPUT_H

+#define _GINPUT_H

+

+#include "gfx.h"

+

+#if GFX_USE_GINPUT || defined(__DOXYGEN__)

+

+/* How to use...

+

+	1. Get source handles for all the inputs you are interested in.

+		- Attempting to get a handle for one instance of an input more than once will return the same handle

+	2. Create a listener

+	3. Assign inputs to your listener.

+		- Inputs can be assigned or released from a listener at any time.

+		- An input can be assigned to more than one listener.

+	4. Loop on getting listener events

+	5. When complete destroy the listener

+*/

+

+// Include various ginput types

+#include "ginput/mouse.h"

+#include "ginput/keyboard.h"

+#include "ginput/toggle.h"

+#include "ginput/dial.h"

+

+#endif /* GFX_USE_GINPUT */

+

+#endif /* _GINPUT_H */

+/** @} */

diff --git a/include/ginput/ginput_keyboard.h b/include/ginput/keyboard.h
index 850adf38..cbb11194 100644
--- a/include/ginput/ginput_keyboard.h
+++ b/include/ginput/keyboard.h
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 /**

- * @file    ginput/ginput_keyboard.h

+ * @file    include/ginput/keyboard.h

  * @brief   GINPUT GFX User Input subsystem header file.

  *

  * @addtogroup GINPUT

@@ -27,26 +27,9 @@
 #ifndef _GINPUT_KEYBOARD_H

 #define _GINPUT_KEYBOARD_H

 

-/**

- * @name    GINPUT more complex functionality to be compiled

- * @{

- */

-	/**

-	 * @brief   Should keyboard functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_KEYBOARD

-		#define GINPUT_NEED_KEYBOARD	FALSE

-	#endif

-/** @} */

-

 #if GINPUT_NEED_KEYBOARD || defined(__DOXYGEN__)

 

 /*===========================================================================*/

-/* Low Level Driver details and error checks.                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

 /* Type definitions                                                          */

 /*===========================================================================*/

 

diff --git a/include/ginput/lld/mouse.h b/include/ginput/lld/mouse.h
new file mode 100644
index 00000000..09a0fb6a
--- /dev/null
+++ b/include/ginput/lld/mouse.h
@@ -0,0 +1,118 @@
+/*

+    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    include/ginput/lld/mouse.h

+ * @brief   GINPUT LLD header file for mouse/touch drivers.

+ *

+ * @addtogroup GINPUT_MOUSE

+ * @{

+ */

+#ifndef _LLD_GINPUT_MOUSE_H

+#define _LLD_GINPUT_MOUSE_H

+

+#if GINPUT_NEED_MOUSE || defined(__DOXYGEN__)

+

+#include "ginput_lld_mouse_config.h"

+

+// GEVENT_MOUSE or GEVENT_TOUCH - What type of device is this.

+#ifndef GINPUT_MOUSE_EVENT_TYPE

+	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE

+#endif

+

+// TRUE/FALSE - Does the mouse/touch driver require calibration?

+#ifndef GINPUT_MOUSE_NEED_CALIBRATION

+	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE

+#endif

+

+// TRUE/FALSE	- Can the mouse/touch driver itself save calibration data?

+#ifndef GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE

+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE

+#endif

+

+// n or -1		- n means to test calibration result (+/- pixels), -1 means not to.

+#ifndef GINPUT_MOUSE_MAX_CALIBRATION_ERROR

+	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		-1

+#endif

+

+// n			- How many times to read (and average) per poll

+#ifndef GINPUT_MOUSE_READ_CYCLES

+	#define GINPUT_MOUSE_READ_CYCLES				1

+#endif

+

+// n			 - Millisecs between poll's

+#ifndef GINPUT_MOUSE_POLL_PERIOD

+	#define GINPUT_MOUSE_POLL_PERIOD				25

+#endif

+

+// n			- Movement allowed without discarding the CLICK or CLICKCXT event (+/- pixels)

+#ifndef GINPUT_MOUSE_MAX_CLICK_JITTER

+	#define GINPUT_MOUSE_MAX_CLICK_JITTER			1

+#endif

+

+// n			- Movement allowed without discarding the MOVE event (+/- pixels)

+#ifndef GINPUT_MOUSE_MAX_MOVE_JITTER

+	#define GINPUT_MOUSE_MAX_MOVE_JITTER			0

+#endif

+

+// ms			- Millisecs seperating a CLICK from a CXTCLICK

+#ifndef GINPUT_MOUSE_CLICK_TIME

+	#define GINPUT_MOUSE_CLICK_TIME					700

+#endif

+

+

+typedef struct MouseReading_t {

+	coord_t		x, y, z;

+	uint16_t	buttons;

+	} MouseReading;

+

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

+/* External declarations.                                                    */

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

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	void ginput_lld_mouse_init(void);

+	void ginput_lld_mouse_get_reading(MouseReading *pt);

+

+	#if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE

+		const char *ginput_lld_mouse_calibration_load(uint16_t instance);

+		void ginput_lld_mouse_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz);

+	#endif

+

+	/* This routine is provided to low level drivers to wakeup a value read from a thread context.

+	 *	Particularly useful if GINPUT_MOUSE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputMouseWakeup(void);

+

+	/* This routine is provided to low level drivers to wakeup a value read from an ISR

+	 *	Particularly useful if GINPUT_MOUSE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputMouseWakeupI(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GINPUT_NEED_MOUSE || GINPUT_NEED_TOUCH */

+

+#endif /* _LLD_GINPUT_MOUSE_H */

+/** @} */

diff --git a/include/ginput/lld/toggle.h b/include/ginput/lld/toggle.h
new file mode 100644
index 00000000..2b437ed9
--- /dev/null
+++ b/include/ginput/lld/toggle.h
@@ -0,0 +1,70 @@
+/*

+    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    include/ginput/lld/toggle.h

+ * @brief   GINPUT header file for toggle drivers.

+ *

+ * @addtogroup GINPUT_TOGGLE

+ * @{

+ */

+#ifndef _LLD_GINPUT_TOGGLE_H

+#define _LLD_GINPUT_TOGGLE_H

+

+#if GINPUT_NEED_TOGGLE || defined(__DOXYGEN__)

+

+// Describes how the toggle bits are obtained

+typedef struct GToggleConfig_t {

+	void		*id;

+	unsigned	mask;

+	unsigned	invert;

+	iomode_t	mode;

+} GToggleConfig;

+

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

+/* External declarations.                                                    */

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

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+	extern const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES];

+	

+	void ginput_lld_toggle_init(const GToggleConfig *ptc);

+	unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc);

+

+	/* This routine is provided to low level drivers to wakeup a value read from a thread context.

+	 *	Particularly useful if GINPUT_TOGGLE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputToggleWakeup(void);

+

+	/* This routine is provided to low level drivers to wakeup a value read from an ISR

+	 *	Particularly useful if GINPUT_TOGGLE_POLL_PERIOD = TIME_INFINITE

+	 */

+	void ginputToggleWakeupI(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */

+

+#endif /* _LLD_GINPUT_TOGGLE_H */

+/** @} */

diff --git a/include/ginput/ginput_mouse.h b/include/ginput/mouse.h
index 1b596ac9..0aaea77b 100644
--- a/include/ginput/ginput_mouse.h
+++ b/include/ginput/mouse.h
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 /**

- * @file    ginput/ginput_mouse.h

+ * @file    include/ginput/mouse.h

  * @brief   GINPUT GFX User Input subsystem header file for mouse and touch.

  *

  * @addtogroup GINPUT

@@ -27,25 +27,12 @@
 #ifndef _GINPUT_MOUSE_H

 #define _GINPUT_MOUSE_H

 

-/**

- * @name    GINPUT more complex functionality to be compiled

- * @{

- */

-	/**

-	 * @brief   Should mouse/touch functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_MOUSE

-		#define GINPUT_NEED_MOUSE	FALSE

-	#endif

-/** @} */

+#if GINPUT_NEED_MOUSE || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Type definitions                                                          */

 /*===========================================================================*/

 

-#if GINPUT_NEED_MOUSE || defined(__DOXYGEN__)

-

 /* This type definition is also used by touch */

 typedef struct GEventMouse_t {

 	GEventType		type;				// The type of this event (GEVENT_MOUSE or GEVENT_TOUCH)

diff --git a/include/ginput/options.h b/include/ginput/options.h
new file mode 100644
index 00000000..e7635fb5
--- /dev/null
+++ b/include/ginput/options.h
@@ -0,0 +1,127 @@
+/*

+    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    include/ginput/options.h

+ * @brief   GINPUT sub-system options header file.

+ *

+ * @addtogroup GINPUT

+ * @{

+ */

+

+#ifndef _GINPUT_OPTIONS_H

+#define _GINPUT_OPTIONS_H

+

+/**

+ * @name    GINPUT Functionality to be included

+ * @{

+ */

+	/**

+	 * @brief   Should mouse/touch functions be included.

+	 * @details	Defaults to FALSE

+	 * @note	Also add the a mouse/touch hardware driver to your makefile.

+	 * 			Eg.

+	 * 				include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk

+	 */

+	#ifndef GINPUT_NEED_MOUSE

+		#define GINPUT_NEED_MOUSE		FALSE

+	#endif

+	/**

+	 * @brief   Should keyboard functions be included.

+	 * @details	Defaults to FALSE

+	 * @note	Also add the a keyboard hardware driver to your makefile.

+	 * 			Eg.

+	 * 				include $(GFXLIB)/drivers/ginput/keyboard/XXXX/ginput_lld.mk

+	 */

+	#ifndef GINPUT_NEED_KEYBOARD

+		#define GINPUT_NEED_KEYBOARD	FALSE

+	#endif

+	/**

+	 * @brief   Should hardware toggle/switch/button functions be included.

+	 * @details	Defaults to FALSE

+	 * @note	Also add the a toggle hardware driver to your makefile.

+	 * 			Eg.

+	 * 				include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk

+	 */

+	#ifndef GINPUT_NEED_TOGGLE

+		#define GINPUT_NEED_TOGGLE		FALSE

+	#endif

+	/**

+	 * @brief   Should analog dial functions be included.

+	 * @details	Defaults to FALSE

+	 * @note	Also add the a dial hardware driver to your makefile.

+	 * 			Eg.

+	 * 				include $(GFXLIB)/drivers/ginput/dial/analog/ginput_lld.mk

+	 */

+	#ifndef GINPUT_NEED_DIAL

+		#define GINPUT_NEED_DIAL		FALSE

+	#endif

+/**

+ * @}

+ *

+ * @name    GINPUT Optional Sizing Parameters

+ * @{

+ */

+/**

+ * @}

+ *

+ * @name    GINPUT Optional Low Level Driver Defines

+ * @{

+ */

+	/**

+	 * @brief   Use a custom board definition for the mouse/touch driver even if a board definition exists.

+	 * @details	Defaults to FALSE

+	 * @details	If TRUE, add ginput_lld_mouse_board.h to your project directory and customise it.

+	 * @note	Not all GINPUT mouse/touch low level drivers use board definition files.

+	 */

+	#ifndef GINPUT_MOUSE_USE_CUSTOM_BOARD

+		#define GINPUT_MOUSE_USE_CUSTOM_BOARD		FALSE

+	#endif

+	/**

+	 * @brief   Use a custom board definition for the keyboard driver even if a board definition exists.

+	 * @details	Defaults to FALSE

+	 * @details	If TRUE, add ginput_lld_keyboard_board.h to your project directory and customise it.

+	 * @note	Not all GINPUT keyboard low level drivers use board definition files.

+	 */

+	#ifndef GINPUT_KEYBOARD_USE_CUSTOM_BOARD

+		#define GINPUT_KEYBOARD_USE_CUSTOM_BOARD	FALSE

+	#endif

+	/**

+	 * @brief   Use a custom board definition for the toggle driver even if a board definition exists.

+	 * @details	Defaults to FALSE

+	 * @details	If TRUE, add ginput_lld_toggle_board.h to your project directory and customise it.

+	 * @note	Not all GINPUT toggle low level drivers use board definition files.

+	 */

+	#ifndef GINPUT_TOGGLE_USE_CUSTOM_BOARD

+		#define GINPUT_TOGGLE_USE_CUSTOM_BOARD		FALSE

+	#endif

+	/**

+	 * @brief   Use a custom board definition for the dial driver even if a board definition exists.

+	 * @details	Defaults to FALSE

+	 * @details	If TRUE, add ginput_lld_dial_board.h to your project directory and customise it.

+	 * @note	Not all GINPUT dial low level drivers use board definition files.

+	 */

+	#ifndef GINPUT_DIAL_USE_CUSTOM_BOARD

+		#define GINPUT_DIAL_USE_CUSTOM_BOARD		FALSE

+	#endif

+/** @} */

+

+#endif /* _GINPUT_OPTIONS_H */

+/** @} */

diff --git a/include/ginput/ginput_toggle.h b/include/ginput/toggle.h
index 10be1da9..2dce9726 100644
--- a/include/ginput/ginput_toggle.h
+++ b/include/ginput/toggle.h
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 /**

- * @file    ginput/ginput_toggle.h

+ * @file    include/ginput/toggle.h

  * @brief   GINPUT GFX User Input subsystem header file.

  *

  * @addtogroup GINPUT

@@ -27,25 +27,15 @@
 #ifndef _GINPUT_TOGGLE_H

 #define _GINPUT_TOGGLE_H

 

-/**

- * @name    GINPUT more complex functionality to be compiled

- * @{

- */

-	/**

-	 * @brief   Should hardware toggle/switch/button (pio) functions be included.

-	 * @details	Defaults to FALSE

-	 */

-	#ifndef GINPUT_NEED_TOGGLE

-		#define GINPUT_NEED_TOGGLE	FALSE

-	#endif

-/** @} */

-

 #if GINPUT_NEED_TOGGLE || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Low Level Driver details and error checks.                                */

 /*===========================================================================*/

 

+// Get the hardware definitions - Number of instances etc.

+#include "ginput_lld_toggle_config.h"

+

 /*===========================================================================*/

 /* Type definitions                                                          */

 /*===========================================================================*/

@@ -53,9 +43,6 @@
 // Event types for various ginput sources

 #define GEVENT_TOGGLE		(GEVENT_GINPUT_FIRST+3)

 

-// Get the hardware definitions - Number of instances etc.

-#include "ginput_lld_toggle_config.h"

-

 typedef struct GEventToggle_t {

 	GEventType		type;				// The type of this event (GEVENT_TOGGLE)

 	uint16_t		instance;			// The toggle instance