diff options
| author | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-11-10 00:05:01 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-11-10 00:05:01 +0100 |
| commit | 87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57 (patch) | |
| tree | 515085fe2b901604f1e88c6645583827ee3922b1 /demos | |
| parent | 995c9835c282e8904ff918e325f0491249bdcc89 (diff) | |
| download | uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.tar.gz uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.tar.bz2 uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.zip | |
renamed touchpad into touchscreen
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/notepad/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
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) {
|