diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-09 18:47:05 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-09 18:47:05 -0800 |
| commit | 0eeb2a2b8f0c6bfb77256522c720e6915d57c217 (patch) | |
| tree | 03ce8e6d759d5482185ae4a4797555ac0a922bfa /demos | |
| parent | d3b4c499ab0267dbcad3d5972bb0317fdba9043e (diff) | |
| parent | affd9792ff42fab8f376bd2c87a71b25fd52baf7 (diff) | |
| download | uGFX-0eeb2a2b8f0c6bfb77256522c720e6915d57c217.tar.gz uGFX-0eeb2a2b8f0c6bfb77256522c720e6915d57c217.tar.bz2 uGFX-0eeb2a2b8f0c6bfb77256522c720e6915d57c217.zip | |
Merge pull request #1 from Tectu/master
Included Tectu changes
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) {
|