From 5defef1c1dccddea6706ffdb13a124f4a57a3c5b Mon Sep 17 00:00:00 2001 From: Tectu Date: Fri, 15 Jun 2012 21:32:40 +0200 Subject: [PATCH] lcdFillArea() is now lld --- drivers/ssd1289_lld.c | 4 ++++ drivers/ssd1289_lld.h | 3 ++- glcd.c | 14 +------------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/ssd1289_lld.c b/drivers/ssd1289_lld.c index c6295918..0301f4da 100644 --- a/drivers/ssd1289_lld.c +++ b/drivers/ssd1289_lld.c @@ -150,6 +150,10 @@ void lld_lcdClear(uint16_t color) { Set_CS; } +void lld_lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) { + +} + uint16_t lld_lcdGetPixelColor(uint16_t x, uint16_t y) { uint16_t dummy; diff --git a/drivers/ssd1289_lld.h b/drivers/ssd1289_lld.h index 1ca187f3..44b404ca 100644 --- a/drivers/ssd1289_lld.h +++ b/drivers/ssd1289_lld.h @@ -21,7 +21,8 @@ void lld_lcdSetOrientation(uint8_t newOrientation); void lld_lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1); void lld_lcdClear(uint16_t color); void lld_lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color); -uint16_t lld_lcdGetPixelColor(uint16_t x, uint16_t y); +void lld_lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color); +void lld_lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color); uint16_t lld_lcdGetOrientation(void); uint16_t lld_lcdGetHeight(void); uint16_t lld_lcdGetWidth(void); diff --git a/glcd.c b/glcd.c index 8c86c8cf..1af145cf 100644 --- a/glcd.c +++ b/glcd.c @@ -218,19 +218,7 @@ uint16_t lcdBGR2RGB(uint16_t color) { } void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) { - lcdDrawRect(x0, y0, x1, y1, filled, color); - /* - uint32_t index = 0, area; - - area = ((x1-x0)*(y1-y0)); - - lcdSetWindow(x0, y0, x1, y1); - Clr_CS; - lcdWriteIndex(0x0022); - for(index = 0; index < area; index++) - lcdWriteData(color); - Set_CS; - */ + lld_lcdFillArea(x0, y0, x1, y1, color); } void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color) {