diff options
author | Joel Bodenmann <joel@unormal.org> | 2012-11-10 17:04:20 +0100 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2012-11-10 17:04:20 +0100 |
commit | 5f903622616a2f1686f3124bf56dd69479fd9454 (patch) | |
tree | 631fca189b82e1aab6d669534c846003ecd0575e | |
parent | 8231e9738c20bd676943638830fedeb71ca1195d (diff) | |
download | uGFX-5f903622616a2f1686f3124bf56dd69479fd9454.tar.gz uGFX-5f903622616a2f1686f3124bf56dd69479fd9454.tar.bz2 uGFX-5f903622616a2f1686f3124bf56dd69479fd9454.zip |
touchscreen fixes
-rw-r--r-- | demos/notepad/main.c | 3 | ||||
-rw-r--r-- | include/touchscreen.h | 8 | ||||
-rw-r--r-- | include/touchscreen_lld.h | 8 | ||||
-rw-r--r-- | src/touchscreen.c | 10 |
4 files changed, 13 insertions, 16 deletions
diff --git a/demos/notepad/main.c b/demos/notepad/main.c index 5d9e5ffc..7fec864f 100644 --- a/demos/notepad/main.c +++ b/demos/notepad/main.c @@ -53,8 +53,6 @@ TouchscreenDriver TOUCHPADD1 = { void drawScreen(void) {
char *msg = "ChibiOS/GFX";
- uint16_t colorsize = COLOR_SIZE;
- uint16_t pensize = PEN_SIZE;
gdispSetOrientation(GDISP_ROTATE_90);
gdispClear(White);
@@ -86,7 +84,6 @@ int main(void) { gdispInit();
tsInit(&TOUCHPADD1);
- tsCalibrate();
drawScreen();
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 diff --git a/src/touchscreen.c b/src/touchscreen.c index 7c2ec34f..d7abbe30 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -159,7 +159,6 @@ static void _tsDo3PointCalibration(const coord_t (*cross)[2], coord_t (*points)[ * @api
*/
void tsInit(const TouchscreenDriver *ts) {
-
/* Initialise Mutex */
//MUTEX_INIT
@@ -177,6 +176,7 @@ void tsInit(const TouchscreenDriver *ts) { cal = (struct cal_t*)chHeapAlloc(NULL, sizeof(struct cal_t));
if(cal == NULL)
return;
+
tsCalibrate();
}
@@ -206,9 +206,9 @@ coord_t tsReadX(void) { case GDISP_ROTATE_90:
return y;
case GDISP_ROTATE_180:
- return gdispGetWidth() - x - 1;
+ return GDISP_SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_270:
- return gdispGetHeight() - y - 1;
+ return GDISP_SCREEN_HEIGHT - y - 1;
}
return 0;
@@ -238,9 +238,9 @@ coord_t tsReadY(void) { case GDISP_ROTATE_0:
return y;
case GDISP_ROTATE_90:
- return gdispGetWidth() - x - 1;
+ return GDISP_SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_180:
- return gdispGetHeight() - y - 1;
+ return GDISP_SCREEN_HEIGHT - y - 1;
case GDISP_ROTATE_270:
return x;
}
|