From 8515ed53f517eb497ca619ec2c24429a9dcd580e Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Sat, 17 Nov 2012 14:05:23 +0100
Subject: more SSD1289 and touchscreen workaround

---
 src/touchscreen.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/touchscreen.c b/src/touchscreen.c
index 14eba4c5..7b562c32 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -294,7 +294,10 @@ void tsCalibrate(void) {
 	int32_t px, py;
 	uint8_t i, j;
 
+	#if GDISP_NEED_CONTROL
 	gdispSetOrientation(GDISP_ROTATE_0);
+	#endif
+
 	gdispClear(Blue);
 
 	gdispFillStringBox(0, 5, gdispGetWidth(), 30, "Calibration", &fontUI2Double,  White, Blue, justifyCenter);
-- 
cgit v1.2.3


From 19d45eaeda0730c658f3dd9c1b4acacd400e20b1 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 19 Nov 2012 20:39:20 +0100
Subject: GTimer doxygen bugfix

---
 src/gtimer.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/gtimer.c b/src/gtimer.c
index 84518a23..9467d079 100644
--- a/src/gtimer.c
+++ b/src/gtimer.c
@@ -286,6 +286,7 @@ void gtimerJab(GTimer *pt) {
  * @note				If the timer is not active this does nothing.
  * @note				Repeated Jabs before the callback function actually happens are ignored.
  *
+ * @iclass
  * @api
  */
 void gtimerJabI(GTimer *pt) {
-- 
cgit v1.2.3


From cafb45474528f3246cc4e1d39deef4677fe69848 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 19 Nov 2012 21:43:22 +0100
Subject: GEVENT doxygen

---
 src/gevent.c | 104 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/gevent.c b/src/gevent.c
index bfda6d53..0c486058 100644
--- a/src/gevent.c
+++ b/src/gevent.c
@@ -40,14 +40,14 @@
 	#define GEVENT_ASSERT(x)
 #endif
 
-// This mutex protects access to our tables
+/* This mutex protects access to our tables */
 static MUTEX_DECL(geventMutex);
 
-// Our table of listener/source pairs
+/* Our table of listener/source pairs */
 static GSourceListener		Assignments[MAX_SOURCE_LISTENERS];
 
-// Loop through the assignment table deleting this listener/source pair.
-//	Null is treated as a wildcard.
+/* Loop through the assignment table deleting this listener/source pair. */
+/*	Null is treated as a wildcard. */
 static void deleteAssignments(GListener *pl, GSourceHandle gsh) {
 	GSourceListener *psl;
 
@@ -64,9 +64,12 @@ static void deleteAssignments(GListener *pl, GSourceHandle gsh) {
 	}
 }
 
-/* Create a Listener.
- *	If insufficient resources are available it will either assert or return NULL
- *	depending on the value of GEVENT_ASSERT_NO_RESOURCE.
+/**
+ * @brief	Create a Listener
+ * @details	If insufficient resources are available it will either assert or return NULL
+ *			depending on the value of GEVENT_ASSERT_NO_RESOURCE.
+ *
+ * @param[in] pl	A listener
  */
 void geventListenerInit(GListener *pl) {
 	chSemInit(&pl->waitqueue, 0);			// Next wait'er will block
@@ -74,11 +77,18 @@ void geventListenerInit(GListener *pl) {
 	pl->event.type = GEVENT_NULL;			// Always safety
 }
 
-/* Attach a source to a listener.
- *	Flags are interpreted by the source when generating events for each listener.
- *	If this source is already assigned to the listener it will update the flags.
- *	If insufficient resources are available it will either assert or return FALSE
- *	depending on the value of GEVENT_ASSERT_NO_RESOURCE.
+/**
+ * @brief 	Attach a source to a listener
+ * @details	Flags are interpreted by the source when generating events for each listener.
+ *			If this source is already assigned to the listener it will update the flags.
+ *			If insufficient resources are available it will either assert or return FALSE
+ *			depending on the value of GEVENT_ASSERT_NO_RESOURCE.
+ *
+ * @param[in] pl	The listener
+ * @param[in] gsh	The source which has to be attached to the listener
+ * @param[in] flags	The flags
+ *
+ * @return TRUE if succeeded, FALSE otherwise
  */
 bool_t geventAttachSource(GListener *pl, GSourceHandle gsh, unsigned flags) {
 	GSourceListener *psl, *pslfree;
@@ -119,9 +129,13 @@ bool_t geventAttachSource(GListener *pl, GSourceHandle gsh, unsigned flags) {
 	return pslfree != 0;
 }
 
-/* Detach a source from a listener
- *	If gsh is NULL detach all sources from this listener and if there is still
- *		a thread waiting for events on this listener, it is sent the exit event.
+/**
+ * @brief	Detach a source from a listener
+ * @details	If gsh is NULL detach all sources from this listener and if there is still
+ *			a thread waiting for events on this listener, it is sent the exit event.
+ *
+ * @param[in] pl	The listener
+ * @param[in] gsh	The source
  */
 void geventDetachSource(GListener *pl, GSourceHandle gsh) {
 	if (pl && gsh) {
@@ -137,24 +151,34 @@ void geventDetachSource(GListener *pl, GSourceHandle gsh) {
 	}
 }
 
-/* Wait for an event on a listener from an assigned source.
- *		The type of the event should be checked (pevent->type) and then pevent should be typecast to the
- *		actual event type if it needs to be processed.
- * timeout specifies the time to wait in system ticks.
- *		TIME_INFINITE means no timeout - wait forever for an event.
- *		TIME_IMMEDIATE means return immediately
- * Returns NULL on timeout.
- * Note: The GEvent buffer is staticly allocated within the GListener so the event does not
+/**
+ * @brief	Wait for an event on a listener from an assigned source.
+ * @details	The type of the event should be checked (pevent->type) and then pevent should
+ *			be typecast to the actual event type if it needs to be processed.
+ * 			timeout specifies the time to wait in system ticks.
+ *			TIME_INFINITE means no timeout - wait forever for an event.
+ *			TIME_IMMEDIATE means return immediately
+ * @note	The GEvent buffer is staticly allocated within the GListener so the event does not
  *			need to be dynamicly freed however it will get overwritten by the next call to
  *			this routine.
+ *
+ * @param[in] pl		The listener
+ * @param[in] timeout	The timeout
+ *
+ * @return	NULL on timeout
  */
 GEvent *geventEventWait(GListener *pl, systime_t timeout) {
 	return chSemWaitTimeout(&pl->waitqueue, timeout) == RDY_OK ? &pl->event : 0;
 }
 
-/* Called by a source with a possible event to get a listener record.
- *	'lastlr' should be NULL on the first call and thereafter the result of the previous call.
- *	It will return NULL when there are no more listeners for this source.
+/**
+ * @brief	Called by a source with a possible event to get a listener record.
+ * @details	@p lastlr should be NULL on the first call and thereafter the result of the previous call.
+ *
+ * @param[in] gsh		The source handler
+ * @param[in] lastlr	The source listener
+ *
+ * @return	NULL when there are no more listeners for this source
  */
 GSourceListener *geventGetSourceListener(GSourceHandle gsh, GSourceListener *lastlr) {
 	GSourceListener *psl;
@@ -181,19 +205,27 @@ GSourceListener *geventGetSourceListener(GSourceHandle gsh, GSourceListener *las
 	return 0;
 }
 
-/* Get the event buffer from the GSourceListener.
- *	Returns NULL if the listener is not currently listening.
- *	A NULL return allows the source to record (perhaps in glr->scrflags) that the listener has missed events.
- *	This can then be notified as part of the next event for the listener.
- *	The buffer can only be accessed untill the next call to geventGetSourceListener or geventSendEvent
+/**
+ * @brief	Get the event buffer from the GSourceListener.
+ * @details	A NULL return allows the source to record (perhaps in glr->scrflags) that the listener
+ *			has missed events. This can then be notified as part of the next event for the listener.
+ *			The buffer can only be accessed untill the next call to geventGetSourceListener
+ *			or geventSendEvent
+ *
+ * @param[in] psl	The source listener
+ *
+ * @return	NULL if the listener is not currently listening.
  */
 GEvent *geventGetEventBuffer(GSourceListener *psl) {
 	// We already know we have the event lock
 	return chSemGetCounterI(&psl->pListener->waitqueue) < 0 ? &psl->pListener->event : 0;
 }
 
-/* Called by a source to indicate the listener's event buffer has been filled.
- *	After calling this function the source must not reference in fields in the GSourceListener or the event buffer.
+/** 
+ * @brief	Called by a source to indicate the listener's event buffer has been filled.
+ * @details	After calling this function the source must not reference in fields in the GSourceListener or the event buffer.
+ *
+ * @param[in] psl	The source listener
  */
 void geventSendEvent(GSourceListener *psl) {
 	chMtxLock(&geventMutex);
@@ -203,7 +235,11 @@ void geventSendEvent(GSourceListener *psl) {
 	chMtxUnlock();
 }
 
-/* Detach any listener that has this source attached */
+/**
+ * @brief	Detach any listener that has this source attached
+ *
+ * @param[in] gsh	The source handle
+ */
 void geventDetachSourceListeners(GSourceHandle gsh) {
 	chMtxLock(&geventMutex);
 	deleteAssignments(0, gsh);
-- 
cgit v1.2.3


From 1b30c77ab3f624e4235e6b370703a7234fd7f7d8 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Wed, 21 Nov 2012 10:21:43 +0100
Subject: in gwin.c GDISP_SET_CLIP -> GDISP_NEED_CLIP

---
 src/gwin.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/gwin.c b/src/gwin.c
index 022f5959..10293c4c 100644
--- a/src/gwin.c
+++ b/src/gwin.c
@@ -157,7 +157,7 @@ void gwinSetFont(GHandle gh, font_t font) {
  * @api
  */
 void gwinClear(GHandle gh) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillArea(gh->x, gh->y, gh->width, gh->height, gh->bgcolor);
@@ -174,7 +174,7 @@ void gwinClear(GHandle gh) {
  * @api
  */
 void gwinDrawPixel(GHandle gh, coord_t x, coord_t y) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawPixel(gh->x+x, gh->y+y, gh->color);
@@ -192,7 +192,7 @@ void gwinDrawPixel(GHandle gh, coord_t x, coord_t y) {
  * @api
  */
 void gwinDrawLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawLine(gh->x+x0, gh->y+y0, gh->x+x1, gh->y+y1, gh->color);
@@ -210,7 +210,7 @@ void gwinDrawLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1) {
  * @api
  */
 void gwinDrawBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawBox(gh->x+x, gh->y+y, cx, cy, gh->color);
@@ -228,7 +228,7 @@ void gwinDrawBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy) {
  * @api
  */
 void gwinFillArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillArea(gh->x+x, gh->y+y, cx, cy, gh->color);
@@ -252,7 +252,7 @@ void gwinFillArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy) {
  * @api
  */
 void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispBlitAreaEx(gh->x+x, gh->y+y, cx, cy, srcx, srcy, srccx, buffer);
@@ -271,7 +271,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor
  * @api
  */
 void gwinDrawCircle(GHandle gh, coord_t x, coord_t y, coord_t radius) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawCircle(gh->x+x, gh->y+y, radius, gh->color);
@@ -291,7 +291,7 @@ void gwinDrawCircle(GHandle gh, coord_t x, coord_t y, coord_t radius) {
  * @api
  */
 void gwinFillCircle(GHandle gh, coord_t x, coord_t y, coord_t radius) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillCircle(gh->x+x, gh->y+y, radius, gh->color);
@@ -311,7 +311,7 @@ void gwinFillCircle(GHandle gh, coord_t x, coord_t y, coord_t radius) {
  * @api
  */
 void gwinDrawEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawEllipse(gh->x+x, gh->y+y, a, b, gh->color);
@@ -331,7 +331,7 @@ void gwinDrawEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b) {
  * @api
  */
 void gwinFillEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillEllipse(gh->x+x, gh->y+y, a, b, gh->color);
@@ -353,7 +353,7 @@ void gwinFillEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b) {
  * @api
  */
 void gwinDrawArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawArc(gh->x+x, gh->y+y, radius, startangle, endangle, gh->color);
@@ -375,7 +375,7 @@ void gwinDrawArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t start
  * @api
  */
 void gwinFillArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillArc(gh->x+x, gh->y+y, radius, startangle, endangle, gh->color);
@@ -394,7 +394,7 @@ void gwinFillArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t start
  * @api
  */
 color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) {
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	return gdispGetPixelColor(gh->x+x, gh->y+y);
@@ -416,7 +416,7 @@ color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) {
  */
 void gwinDrawChar(GHandle gh, coord_t x, coord_t y, char c) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawChar(gh->x+x, gh->y+y, c, gh->font, gh->color);
@@ -438,7 +438,7 @@ void gwinDrawChar(GHandle gh, coord_t x, coord_t y, char c) {
  */
 void gwinFillChar(GHandle gh, coord_t x, coord_t y, char c) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillChar(gh->x+x, gh->y+y, c, gh->font, gh->color, gh->bgcolor);
@@ -460,7 +460,7 @@ void gwinFillChar(GHandle gh, coord_t x, coord_t y, char c) {
  */
 void gwinDrawString(GHandle gh, coord_t x, coord_t y, const char *str) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawString(gh->x+x, gh->y+y, str, gh->font, gh->color);
@@ -482,7 +482,7 @@ void gwinDrawString(GHandle gh, coord_t x, coord_t y, const char *str) {
  */
 void gwinFillString(GHandle gh, coord_t x, coord_t y, const char *str) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillString(gh->x+x, gh->y+y, str, gh->font, gh->color, gh->bgcolor);
@@ -507,7 +507,7 @@ void gwinFillString(GHandle gh, coord_t x, coord_t y, const char *str) {
  */
 void gwinDrawStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispDrawStringBox(gh->x+x, gh->y+y, cx, cy, str, gh->font, gh->color, justify);
@@ -532,7 +532,7 @@ void gwinDrawStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy,
  */
 void gwinFillStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify) {
 	if (!gh->font) return;
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	gdispFillStringBox(gh->x+x, gh->y+y, cx, cy, str, gh->font, gh->color, gh->bgcolor, justify);
@@ -631,7 +631,7 @@ void gwinPutChar(GHandle gh, char c) {
 
 	if (gh->type != GW_CONSOLE || !gh->font) return;
 
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	
@@ -836,7 +836,7 @@ void gwinButtonDraw(GHandle gh) {
 	if (gh->type != GW_BUTTON)
 		return;
 
-	#if GDISP_SET_CLIP
+	#if GDISP_NEED_CLIP
 		gdispSetClip(gh->x, gh->y, gh->width, gh->height);
 	#endif
 	
-- 
cgit v1.2.3


From e0052718e39f9314fe449aa50c195d25f5115165 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Wed, 21 Nov 2012 10:22:00 +0100
Subject: typo

---
 src/gdisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gdisp.c b/src/gdisp.c
index 81c06599..5c807db5 100644
--- a/src/gdisp.c
+++ b/src/gdisp.c
@@ -1244,7 +1244,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
 	/**
 	 * @brief   Pack a pixel into a pixel buffer.
 	 * @note    This function performs no buffer boundary checking
-	 *			regardless of whether GDISP_NEED_CLIPPING has been specified.
+	 *			regardless of whether GDISP_NEED_CLIP has been specified.
 	 *
 	 * @param[in] buf		The buffer to put the pixel in
 	 * @param[in] cx		The width of a pixel line
-- 
cgit v1.2.3


From dfb9f92eb1561bcca61dfc9ab516cfba46bc575d Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Wed, 21 Nov 2012 11:06:04 +0100
Subject: cleanup of source files

---
 src/gdisp.c       | 5 -----
 src/gdisp_fonts.c | 1 -
 src/gevent.c      | 5 -----
 src/ginput.c      | 5 -----
 src/gtimer.c      | 5 -----
 src/gwin.c        | 5 -----
 src/touchscreen.c | 8 --------
 7 files changed, 34 deletions(-)

(limited to 'src')

diff --git a/src/gdisp.c b/src/gdisp.c
index 5c807db5..92bb060d 100644
--- a/src/gdisp.c
+++ b/src/gdisp.c
@@ -29,9 +29,6 @@
 #include "hal.h"
 #include "gdisp.h"
 
-#ifndef _GDISP_C
-#define _GDISP_C
-
 #if GFX_USE_GDISP || defined(__DOXYGEN__)
 
 #ifdef GDISP_NEED_TEXT
@@ -1268,7 +1265,5 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
 #endif
 
 #endif /* GFX_USE_GDISP */
-
-#endif /* _GDISP_C */
 /** @} */
 
diff --git a/src/gdisp_fonts.c b/src/gdisp_fonts.c
index bd30342c..4384a72e 100644
--- a/src/gdisp_fonts.c
+++ b/src/gdisp_fonts.c
@@ -31,7 +31,6 @@
 
 #include "gdisp_fonts.h"
 
-
 /* fontSmall - for side buttons */
 #if 1
     /* Forward Declarations of internal arrays */
diff --git a/src/gevent.c b/src/gevent.c
index 0c486058..d9c7e4f1 100644
--- a/src/gevent.c
+++ b/src/gevent.c
@@ -29,9 +29,6 @@
 #include "hal.h"
 #include "gevent.h"
 
-#ifndef _GEVENT_C
-#define _GEVENT_C
-
 #if GFX_USE_GEVENT || defined(__DOXYGEN__)
 
 #if GEVENT_ASSERT_NO_RESOURCE
@@ -247,6 +244,4 @@ void geventDetachSourceListeners(GSourceHandle gsh) {
 }
 
 #endif /* GFX_USE_GEVENT */
-
-#endif /* _GEVENT_C */
 /** @} */
diff --git a/src/ginput.c b/src/ginput.c
index d12bef2b..9b6b180a 100644
--- a/src/ginput.c
+++ b/src/ginput.c
@@ -29,14 +29,9 @@
 #include "hal.h"
 #include "ginput.h"
 
-#ifndef _GINPUT_C
-#define _GINPUT_C
-
 #if GFX_USE_GINPUT || defined(__DOXYGEN__)
 
 #error "GINPUT: Not Implemented Yet"
 
 #endif /* GFX_USE_GINPUT */
-
-#endif /* _GINPUT_C */
 /** @} */
diff --git a/src/gtimer.c b/src/gtimer.c
index 9467d079..98556607 100644
--- a/src/gtimer.c
+++ b/src/gtimer.c
@@ -29,9 +29,6 @@
 #include "hal.h"
 #include "gtimer.h"
 
-#ifndef _GTIMER_C
-#define _GTIMER_C
-
 #if GFX_USE_GTIMER || defined(__DOXYGEN__)
 
 #define GTIMER_FLG_PERIODIC		0x0001
@@ -298,6 +295,4 @@ void gtimerJabI(GTimer *pt) {
 }
 
 #endif /* GFX_USE_GTIMER */
-
-#endif /* _GTIMER_C */
 /** @} */
diff --git a/src/gwin.c b/src/gwin.c
index 10293c4c..86765935 100644
--- a/src/gwin.c
+++ b/src/gwin.c
@@ -29,9 +29,6 @@
 #include "hal.h"
 #include "gwin.h"
 
-#ifndef _GWIN_C
-#define _GWIN_C
-
 #if GFX_USE_GWIN || defined(__DOXYGEN__)
 
 #include <string.h>
@@ -894,7 +891,5 @@ void gwinButtonDraw(GHandle gh) {
 #endif
 
 #endif /* GFX_USE_GWIN */
-
-#endif /* _GWIN_C */
 /** @} */
 
diff --git a/src/touchscreen.c b/src/touchscreen.c
index 7b562c32..0fa5402e 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -32,14 +32,6 @@
 
 #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__)
 
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables.                                                */
-/*===========================================================================*/
-
 /*===========================================================================*/
 /* Driver local variables.                                                   */
 /*===========================================================================*/
-- 
cgit v1.2.3


From 9c74a081313a8681d2a47a15b9a0e228289a5c25 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Sun, 25 Nov 2012 23:33:10 +0100
Subject: implemented MCU touchscreen driver

---
 src/touchscreen.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/touchscreen.c b/src/touchscreen.c
index 0fa5402e..265243a4 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -184,7 +184,7 @@ coord_t tsReadX(void) {
 	y = _tsReadRealY();
 #endif
 
-	_tsTransform(&x, &y);
+	//_tsTransform(&x, &y);
 
     switch(gdispGetOrientation()) {
         case GDISP_ROTATE_0:
@@ -218,7 +218,7 @@ coord_t tsReadY(void) {
     y = _tsReadRealY();
 #endif
 
-    _tsTransform(&x, &y);
+    //_tsTransform(&x, &y);
 
     switch(gdispGetOrientation()) {
         case GDISP_ROTATE_0:
@@ -276,6 +276,9 @@ coord_t tsReadY(void) {
  * @api
  */
 void tsCalibrate(void) {
+#if 0
+	
+	
 	const uint16_t height  =  gdispGetHeight();
 	const uint16_t width  =  gdispGetWidth();
 	const coord_t cross[][2]  =  {{(width / 4), (height / 4)},
@@ -362,6 +365,7 @@ calibrate:
 	#if TOUCHSCREEN_STORE_CALIBRATION
 	ts_store_calibration_lld(cal);
 	#endif
+#endif
 }
 
 #endif /* GFX_USE_TOUCHSCREEN */
-- 
cgit v1.2.3


From ac5267af6af5508d4391fddb3d27c8d45879950a Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 26 Nov 2012 00:35:02 +0100
Subject: touchscreen fix

---
 src/touchscreen.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/touchscreen.c b/src/touchscreen.c
index 265243a4..0fa5402e 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -184,7 +184,7 @@ coord_t tsReadX(void) {
 	y = _tsReadRealY();
 #endif
 
-	//_tsTransform(&x, &y);
+	_tsTransform(&x, &y);
 
     switch(gdispGetOrientation()) {
         case GDISP_ROTATE_0:
@@ -218,7 +218,7 @@ coord_t tsReadY(void) {
     y = _tsReadRealY();
 #endif
 
-    //_tsTransform(&x, &y);
+    _tsTransform(&x, &y);
 
     switch(gdispGetOrientation()) {
         case GDISP_ROTATE_0:
@@ -276,9 +276,6 @@ coord_t tsReadY(void) {
  * @api
  */
 void tsCalibrate(void) {
-#if 0
-	
-	
 	const uint16_t height  =  gdispGetHeight();
 	const uint16_t width  =  gdispGetWidth();
 	const coord_t cross[][2]  =  {{(width / 4), (height / 4)},
@@ -365,7 +362,6 @@ calibrate:
 	#if TOUCHSCREEN_STORE_CALIBRATION
 	ts_store_calibration_lld(cal);
 	#endif
-#endif
 }
 
 #endif /* GFX_USE_TOUCHSCREEN */
-- 
cgit v1.2.3