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

clean up

ugfx_release_2.6
Tectu 2012-05-31 12:12:11 +02:00
parent 045cc3cac7
commit 976ab0ffd5
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glcd.c
View File

@ -257,40 +257,36 @@ void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, ui
uint16_t j = 0; uint16_t j = 0;
unsigned char buffer[16]; unsigned char buffer[16];
unsigned char tmp_char=0; unsigned char tmp_char=0;
GetASCIICode(buffer,c); GetASCIICode(buffer,c);
for (i=0;i<16;i++)
{ for (i=0;i<16;i++) {
tmp_char=buffer[i]; tmp_char=buffer[i];
for (j=0;j<8;j++) for (j=0;j<8;j++) {
{
if (((tmp_char >> (7-j)) & 0x01) == 0x01) if (((tmp_char >> (7-j)) & 0x01) == 0x01)
{
lcdDrawPixel(x+j,y+i,charcolor); lcdDrawPixel(x+j,y+i,charcolor);
}
else else
{
lcdDrawPixel(x+j,y+i,bkcolor); lcdDrawPixel(x+j,y+i,bkcolor);
} }
} }
}
} }
void lcdDrawString(uint16_t x, uint16_t y, uint8_t *str, uint16_t color, uint16_t bkcolor) { void lcdDrawString(uint16_t x, uint16_t y, uint8_t *str, uint16_t color, uint16_t bkcolor) {
uint8_t TempChar; uint8_t TempChar;
do { do {
TempChar=*str++; TempChar = *str++;
lcdDrawChar(x,y,TempChar,color,bkcolor); lcdDrawChar(x,y,TempChar,color,bkcolor);
if (x<232) { if(x<232) {
x+=8; x+=8;
} else if (y<304) { } else if(y<304) {
x=0; x=0;
y+=16; y+=16;
} else { } else {
x=0; x=0;
y=0; y=0;
} }
} while (*str!=0); } while(*str != 0);
} }
uint16_t lcdBGR2RGB(uint16_t color) { uint16_t lcdBGR2RGB(uint16_t color) {