From 8bc4bc974437c64cc22ae74c1f227588239842c0 Mon Sep 17 00:00:00 2001 From: Tectu Date: Sun, 22 Jul 2012 02:26:16 +0200 Subject: [PATCH] small fix --- drivers/lcd/ssd1289_lld.c | 5 +++-- drivers/lcd/ssd1289_lld.h | 2 +- glcd/glcd.c | 2 +- glcd/glcd.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/lcd/ssd1289_lld.c b/drivers/lcd/ssd1289_lld.c index 3fc48921..c5b2fd0f 100644 --- a/drivers/lcd/ssd1289_lld.c +++ b/drivers/lcd/ssd1289_lld.c @@ -415,9 +415,10 @@ uint16_t lld_lcdGetWidth(void) { } /* a positive lines value shifts the screen up, negative down */ -void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines) { +void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines) { uint16_t row0, row1; uint16_t i; + lld_lcdSetWindow(x0, y0, x1, y1); for(i = 0; i < ((y1-y0) - abs(lines)); i++) { @@ -443,4 +444,4 @@ void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, i } #endif - +T diff --git a/drivers/lcd/ssd1289_lld.h b/drivers/lcd/ssd1289_lld.h index 16a9ef0d..bea4bedf 100644 --- a/drivers/lcd/ssd1289_lld.h +++ b/drivers/lcd/ssd1289_lld.h @@ -24,7 +24,7 @@ uint16_t lld_lcdGetPixelColor(uint16_t x, uint16_t y); uint16_t lld_lcdGetOrientation(void); uint16_t lld_lcdGetHeight(void); uint16_t lld_lcdGetWidth(void); -void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines); +void lld_lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines); #ifdef __cplusplus } diff --git a/glcd/glcd.c b/glcd/glcd.c index 87fd790b..a419b7f2 100644 --- a/glcd/glcd.c +++ b/glcd/glcd.c @@ -257,7 +257,7 @@ static void lcdWriteStream(uint16_t *buffer, uint16_t size) { chMsgSend(workerThread, (msg_t)&msg); } -void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines) { +void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines) { struct glcd_msg_vertical_scroll msg; msg.action = GLCD_VERTICAL_SCROLL; diff --git a/glcd/glcd.h b/glcd/glcd.h index a80dc1b8..850d6f35 100644 --- a/glcd/glcd.h +++ b/glcd/glcd.h @@ -88,7 +88,7 @@ uint16_t lcdBGR2RGB(uint16_t color); uint16_t lcdGetPixelColor(uint16_t x, uint16_t y); /* Scrolling function */ -void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines); +void lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t lines); #ifdef __cplusplus }