aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormobyfab <mobyfab@free.fr>2012-09-18 22:55:02 +0200
committermobyfab <mobyfab@free.fr>2012-09-18 22:55:02 +0200
commitda83b0955f86f22799186df294d0ab32488798fb (patch)
tree63809b77979482b09c3124252c2582384628603d /src
parent8e89654081ff1f62690f09a2fbcc23f0aed1f0a0 (diff)
downloaduGFX-da83b0955f86f22799186df294d0ab32488798fb.tar.gz
uGFX-da83b0955f86f22799186df294d0ab32488798fb.tar.bz2
uGFX-da83b0955f86f22799186df294d0ab32488798fb.zip
Some cleaning.
Fixed and tested DMA blitarea for SSD1963.
Diffstat (limited to 'src')
-rw-r--r--src/touchpad.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/touchpad.c b/src/touchpad.c
index 5e81738b..e531af80 100644
--- a/src/touchpad.c
+++ b/src/touchpad.c
@@ -52,7 +52,7 @@
/*===========================================================================*/
/* Driver local variables. */
/*===========================================================================*/
-volatile static struct cal cal = {
+static volatile struct cal cal = {
1, 1, 0, 0
};
@@ -167,7 +167,8 @@ uint16_t tpReadX(void) {
return SCREEN_WIDTH - x;
case landscapeInv:
return y;
- }
+ }
+ return 0;
}
/**
@@ -193,6 +194,7 @@ uint16_t tpReadY(void) {
case landscapeInv:
return SCREEN_WIDTH - x;
}
+ return 0;
}
void tpCalibrate(void) {
@@ -202,7 +204,7 @@ void tpCalibrate(void) {
uint16_t points[2][2];
uint8_t i;
- gdispClear(Red);
+ gdispClear(Red);
gdispFillStringBox(0, 10, gdispGetWidth(), 30, "Calibration", &fontUI2Double, White, Red, justifyCenter);
for(i = 0; i < 2; i++) {