uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

touchscreen fixes

Browse source
This commit is contained in:
Joel Bodenmann 2012-11-10 17:04:20 +01:00
parent 8231e9738c
commit 5f90362261
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demos/notepad/main.c
View file

@ -53,8 +53,6 @@ TouchscreenDriver TOUCHPADD1 = {
void drawScreen(void) { void drawScreen(void) {
char *msg = "ChibiOS/GFX"; char *msg = "ChibiOS/GFX";
uint16_t colorsize = COLOR_SIZE;
uint16_t pensize = PEN_SIZE;
gdispSetOrientation(GDISP_ROTATE_90); gdispSetOrientation(GDISP_ROTATE_90);
gdispClear(White); gdispClear(White);
@ -86,7 +84,6 @@ int main(void) {
gdispInit(); gdispInit();
tsInit(&TOUCHPADD1); tsInit(&TOUCHPADD1);
tsCalibrate();
drawScreen(); drawScreen();

8
include/touchscreen.h
View file

@ -31,6 +31,14 @@
#if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) #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. * @brief specifies how many conversions are made for a readout.
* *

8
include/touchscreen_lld.h
View file

@ -49,14 +49,6 @@
#define TOUCHSCREEN_XY_INVERTED FALSE #define TOUCHSCREEN_XY_INVERTED FALSE
#endif #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 #ifndef TOUCHSCREEN_HAS_IRQ
#define TOUCHSCREEN_HAS_IRQ FALSE #define TOUCHSCREEN_HAS_IRQ FALSE
#endif #endif

10
src/touchscreen.c
View file

@ -159,7 +159,6 @@ static void _tsDo3PointCalibration(const coord_t (*cross)[2], coord_t (*points)[
* @api * @api
*/ */
void tsInit(const TouchscreenDriver *ts) { void tsInit(const TouchscreenDriver *ts) {
/* Initialise Mutex */ /* Initialise Mutex */
//MUTEX_INIT //MUTEX_INIT
@ -177,6 +176,7 @@ void tsInit(const TouchscreenDriver *ts) {
cal = (struct cal_t*)chHeapAlloc(NULL, sizeof(struct cal_t)); cal = (struct cal_t*)chHeapAlloc(NULL, sizeof(struct cal_t));
if(cal == NULL) if(cal == NULL)
return; return;
tsCalibrate(); tsCalibrate();
} }
@ -206,9 +206,9 @@ coord_t tsReadX(void) {
case GDISP_ROTATE_90: case GDISP_ROTATE_90:
return y; return y;
case GDISP_ROTATE_180: case GDISP_ROTATE_180:
return gdispGetWidth() - x - 1; return GDISP_SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_270: case GDISP_ROTATE_270:
return gdispGetHeight() - y - 1; return GDISP_SCREEN_HEIGHT - y - 1;
} }
return 0; return 0;
@ -238,9 +238,9 @@ coord_t tsReadY(void) {
case GDISP_ROTATE_0: case GDISP_ROTATE_0:
return y; return y;
case GDISP_ROTATE_90: case GDISP_ROTATE_90:
return gdispGetWidth() - x - 1; return GDISP_SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_180: case GDISP_ROTATE_180:
return gdispGetHeight() - y - 1; return GDISP_SCREEN_HEIGHT - y - 1;
case GDISP_ROTATE_270: case GDISP_ROTATE_270:
return x; return x;
} }