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

Revert "lcdFillArea() is now lld"

Browse source 
This reverts commit 5defef1c1d.
This commit is contained in:
Tectu 2012-06-15 21:55:31 +02:00
parent 5defef1c1d
commit 8ebd8887d3
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/ssd1289_lld.c
View file

@ -150,10 +150,6 @@ void lld_lcdClear(uint16_t color) {
Set_CS; 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 lld_lcdGetPixelColor(uint16_t x, uint16_t y) {
uint16_t dummy; uint16_t dummy;

3
drivers/ssd1289_lld.h
View file

@ -21,8 +21,7 @@ void lld_lcdSetOrientation(uint8_t newOrientation);
void lld_lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1); void lld_lcdSetWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
void lld_lcdClear(uint16_t color); void lld_lcdClear(uint16_t color);
void lld_lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color); void lld_lcdDrawPixel(uint16_t x, uint16_t y, 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_lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
uint16_t lld_lcdGetOrientation(void); uint16_t lld_lcdGetOrientation(void);
uint16_t lld_lcdGetHeight(void); uint16_t lld_lcdGetHeight(void);
uint16_t lld_lcdGetWidth(void); uint16_t lld_lcdGetWidth(void);

14
glcd.c
View file

@ -218,7 +218,19 @@ uint16_t lcdBGR2RGB(uint16_t color) {
} }
void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) { void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {
lld_lcdFillArea(x0, y0, x1, y1, 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;
*/
} }
void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color) { void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color) {