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

clean up

Browse source
This commit is contained in:
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

44
glcd.c
View file

@ -253,44 +253,40 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
} }
void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor) { void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor) {
uint16_t i = 0; uint16_t i = 0;
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);
for (i=0;i<16;i++) GetASCIICode(buffer,c);
{
tmp_char=buffer[i]; for (i=0;i<16;i++) {
for (j=0;j<8;j++) tmp_char=buffer[i];
{ 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
} lcdDrawPixel(x+j,y+i,bkcolor);
else }
{ }
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) {