diff options
| author | Tectu <tectu66@gmail.com> | 2012-06-14 04:53:01 -0700 |
|---|---|---|
| committer | Tectu <tectu66@gmail.com> | 2012-06-14 04:53:01 -0700 |
| commit | de7fb3f75695bf22825e93d94e62f38d9b86d4bf (patch) | |
| tree | 0ca52ebb41f3251bc2231aafe61f28585b4347b4 | |
| parent | cd7682c2c3d174ccd7e2b3acfec048917ec102dc (diff) | |
| parent | 04fdc1a2563342b142cf3d1fe7808fae286e27e0 (diff) | |
| download | uGFX-de7fb3f75695bf22825e93d94e62f38d9b86d4bf.tar.gz uGFX-de7fb3f75695bf22825e93d94e62f38d9b86d4bf.tar.bz2 uGFX-de7fb3f75695bf22825e93d94e62f38d9b86d4bf.zip | |
Merge pull request #7 from abhishek-kakkar/master
Critical bug fix in the Text Rendering Function
| -rw-r--r-- | drivers/s6d1121_lld.c | 20 | ||||
| -rw-r--r-- | glcd.c | 4 |
2 files changed, 8 insertions, 16 deletions
diff --git a/drivers/s6d1121_lld.c b/drivers/s6d1121_lld.c index aa13169e..dfadc19d 100644 --- a/drivers/s6d1121_lld.c +++ b/drivers/s6d1121_lld.c @@ -96,13 +96,9 @@ void lcdWriteData(uint16_t lcdData) { void lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) { LCD_CS_LOW; - LCD_RS_LOW; - - lld_lcdwrite(lcdReg); - - LCD_RS_HIGH; - lld_lcdwrite(lcdRegValue); + lcdWriteIndex(lcdReg); + lcdWriteData(lcdRegValue); LCD_CS_HIGH; } @@ -215,26 +211,22 @@ void lld_lcdSetOrientation(uint8_t newOrientation) { switch(orientation) { case portrait: - lcdWriteReg(0x0001, 0x2B3F); - lcdWriteReg(0x0011, 0x6070); + lcdWriteReg(0x03, 0x03); lcd_height = SCREEN_HEIGHT; lcd_width = SCREEN_WIDTH; break; case landscape: - lcdWriteReg(0x0001, 0x293F); - lcdWriteReg(0x0011, 0x6078); + // Not implemented yet lcd_height = SCREEN_WIDTH; lcd_width = SCREEN_HEIGHT; break; case portraitInv: - lcdWriteReg(0x0001, 0x693F); - lcdWriteReg(0x0011, 0x6040); + // Not implemented yet lcd_height = SCREEN_HEIGHT; lcd_width = SCREEN_WIDTH; break; case landscapeInv: - lcdWriteReg(0x0001, 0x6B3F); - lcdWriteReg(0x0011, 0x6048); + // Not implemented yet lcd_height = SCREEN_WIDTH; lcd_width = SCREEN_HEIGHT; break; @@ -5,7 +5,7 @@ uint16_t lcd_width, lcd_height; uint16_t bgcolor=White, fgcolor=Black; -uint16_t cx, cy; +uint16_t cx=0, cy=0; static uint8_t tpText=0; const uint8_t* font; @@ -151,7 +151,7 @@ void lcdDrawChar(char c) { cx += fontWidth; if(sps != 0) { if(!tpText) - lcdFillArea(cx, cy, sps, fontHeight, fgcolor); + lcdFillArea(cx, cy, cx+sps, cy+fontHeight, bgcolor); cx += sps; } } |