From 87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel.bodenmann@hevs.ch>
Date: Sat, 10 Nov 2012 00:05:01 +0100
Subject: renamed touchpad into touchscreen

---
 demos/notepad/main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'demos')

diff --git a/demos/notepad/main.c b/demos/notepad/main.c
index b84ff2db..5d9e5ffc 100644
--- a/demos/notepad/main.c
+++ b/demos/notepad/main.c
@@ -21,7 +21,7 @@
 #include "ch.h"
 #include "hal.h"
 #include "gdisp.h"
-#include "touchpad.h"
+#include "touchscreen.h"
 
 #define COLOR_SIZE	20
 #define PEN_SIZE	20
@@ -43,7 +43,7 @@ static const SPIConfig spicfg = {
     /* SPI_CR1_BR_2 | */ SPI_CR1_BR_1 | SPI_CR1_BR_0,
 };
 
-TOUCHPADDriver TOUCHPADD1 = {
+TouchscreenDriver TOUCHPADD1 = {
 	&SPID1,
 	&spicfg,
 	TP_IRQ_PORT,
@@ -85,14 +85,14 @@ int main(void) {
 	chSysInit();
 
 	gdispInit();
-	tpInit(&TOUCHPADD1);
-	tpCalibrate();
+	tsInit(&TOUCHPADD1);
+	tsCalibrate();
 
 	drawScreen();
 
 	while (TRUE) {
-		x = tpReadX();
-		y = tpReadY();
+		x = tsReadX();
+		y = tsReadY();
 
 		/* inside color box ? */
 		if(y >= OFFSET && y <= COLOR_SIZE) {	 
-- 
cgit v1.2.3