diff options
| author | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-10-23 02:34:20 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-10-23 02:34:20 +0200 |
| commit | 8da73efced9b016ef82b2540d1926229c51f3fb0 (patch) | |
| tree | 59d7426e0feec4cf7088dd6f6f8961d3a61f6213 | |
| parent | a4a815f6f3fdb0183a2263ef39622b779cb16946 (diff) | |
| download | uGFX-8da73efced9b016ef82b2540d1926229c51f3fb0.tar.gz uGFX-8da73efced9b016ef82b2540d1926229c51f3fb0.tar.bz2 uGFX-8da73efced9b016ef82b2540d1926229c51f3fb0.zip | |
SSD1289 setViewPort bugfix
| -rw-r--r-- | drivers/gdisp/SSD1289/ssd1289_lld.c.h | 6 | ||||
| -rw-r--r-- | src/touchpad.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gdisp/SSD1289/ssd1289_lld.c.h b/drivers/gdisp/SSD1289/ssd1289_lld.c.h index 47ca5378..14ca3341 100644 --- a/drivers/gdisp/SSD1289/ssd1289_lld.c.h +++ b/drivers/gdisp/SSD1289/ssd1289_lld.c.h @@ -299,8 +299,8 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) lld_lcdWriteReg(0x45, y & 0x01FF); lld_lcdWriteReg(0x46, (y+cy-1) & 0x01FF); break; - case GDISP_ROTATE_90: - lld_lcdWriteReg(0x44, (((x+cx-1) << 8) & 0xFF00) | ((y+cy) & 0x00FF)); + case GDISP_ROTATE_270: + lld_lcdWriteReg(0x44, (((x+cx-1) << 8) & 0xFF00 ) | (y & 0x00FF)); lld_lcdWriteReg(0x45, x & 0x01FF); lld_lcdWriteReg(0x46, (x+cx-1) & 0x01FF); break; @@ -309,7 +309,7 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) lld_lcdWriteReg(0x45, (GDISP_SCREEN_HEIGHT-(y+cy)) & 0x01FF); lld_lcdWriteReg(0x46, (GDISP_SCREEN_HEIGHT-y-1) & 0x01FF); break; - case GDISP_ROTATE_270: + case GDISP_ROTATE_90: lld_lcdWriteReg(0x44, (((GDISP_SCREEN_WIDTH - y - 1) & 0x00FF) << 8) | ((GDISP_SCREEN_WIDTH - (y+cy)) & 0x00FF)); lld_lcdWriteReg(0x45, (GDISP_SCREEN_HEIGHT - (x+cx)) & 0x01FF); lld_lcdWriteReg(0x46, (GDISP_SCREEN_HEIGHT - x - 1) & 0x01FF); diff --git a/src/touchpad.c b/src/touchpad.c index 0718e484..e4312bc8 100644 --- a/src/touchpad.c +++ b/src/touchpad.c @@ -214,6 +214,7 @@ void tpCalibrate(void) { uint16_t points[2][2]; uint8_t i; + gdispSetOrientation(GDISP_ROTATE_0); gdispClear(Red); gdispFillStringBox(0, 10, gdispGetWidth(), 30, "Calibration", &fontUI2Double, White, Red, justifyCenter); |