From 5a5db64288414162a31a7e755757c32ddf55bf6c Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Sat, 10 Nov 2012 16:46:02 +0100
Subject: renamed tsIRQ() into tsPressed()

---
 include/touchscreen.h     | 2 +-
 include/touchscreen_lld.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/touchscreen.h b/include/touchscreen.h
index 4d48e38d..65c6400f 100644
--- a/include/touchscreen.h
+++ b/include/touchscreen.h
@@ -82,7 +82,7 @@ coord_t tsReadY(void);
 void tsCalibrate(void);
 
 #if TOUCHSCREEN_HAS_IRQ
-	bool_t tsIRQ(void);
+	bool_t tsPressed(void);
 #endif
 
 #if TOUCHSCREEN_HAS_PRESSURE
diff --git a/include/touchscreen_lld.h b/include/touchscreen_lld.h
index 53c66b53..ab035ae3 100644
--- a/include/touchscreen_lld.h
+++ b/include/touchscreen_lld.h
@@ -137,7 +137,7 @@ extern "C" {
 	uint16_t ts_lld_read_y(void);
 
 	#if TOUCHSCREEN_HAS_IRQ
-	uint8_t ts_lld_irq(void);
+	uint8_t ts_lld_pressed(void);
 	#endif
 
 	#if TOUCHSCREEN_HAS_PRESSURE
-- 
cgit v1.2.3


From 8231e9738c20bd676943638830fedeb71ca1195d Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Sat, 10 Nov 2012 16:49:03 +0100
Subject: removed unused RGB565CONVERT. Please use RGB2COLOR instead

---
 include/gdisp.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include')

diff --git a/include/gdisp.h b/include/gdisp.h
index db865284..9be97a12 100644
--- a/include/gdisp.h
+++ b/include/gdisp.h
@@ -293,7 +293,6 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
  
 /* Now obsolete functions */
 #define gdispBlitArea(x, y, cx, cy, buffer)						gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
-#define RGB565CONVERT(r,g,b) 									RGB2COLOR(r,g,b)
 
 /* Macro definitions for common gets and sets */
 #define gdispSetPowerMode(powerMode)			gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
-- 
cgit v1.2.3


From 5f903622616a2f1686f3124bf56dd69479fd9454 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Sat, 10 Nov 2012 17:04:20 +0100
Subject: touchscreen fixes

---
 include/touchscreen.h     | 8 ++++++++
 include/touchscreen_lld.h | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/touchscreen.h b/include/touchscreen.h
index 65c6400f..a6673cbd 100644
--- a/include/touchscreen.h
+++ b/include/touchscreen.h
@@ -31,6 +31,14 @@
 
 #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__)
 
+#ifndef TOUCHSCREEN_STORE_CALIBRATION
+	#define TOUCHSCREEN_STORE_CALIBRATION FALSE
+#endif
+
+#ifndef TOUCHSCREEN_VERIFY_CALIBRATION
+	#define TOUCHSCREEN_VERIFY_CALIBRATION FALSE
+#endif
+
 /**
  * @brief	specifies how many conversions are made for a readout.
  *
diff --git a/include/touchscreen_lld.h b/include/touchscreen_lld.h
index ab035ae3..3053b0e5 100644
--- a/include/touchscreen_lld.h
+++ b/include/touchscreen_lld.h
@@ -49,14 +49,6 @@
 	#define TOUCHSCREEN_XY_INVERTED	FALSE
 #endif
 
-#ifndef TOUCHSCREEN_STORE_CALIBRATION
-	#define TOUCHSCREEN_STORE_CALIBRATION FALSE
-#endif 
-
-#ifndef TOUCHSCREEN_VERIFY_CALIBRATION
-	#define TOUCHSCREEN_VERIFY_CALIBRATION FALSE
-#endif
-
 #ifndef TOUCHSCREEN_HAS_IRQ
 	#define TOUCHSCREEN_HAS_IRQ	FALSE
 #endif
-- 
cgit v1.2.3