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

cleanups

ugfx_release_2.6
Tectu 2012-06-14 12:16:34 +02:00 committed by Kumar Abhishek
parent 3be667c90e
commit 452bfcc059
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glcd.c
View File

@ -117,8 +117,13 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
}
}
<<<<<<< HEAD
void lcdSetFont(const uint8_t *fnt) {
font = fnt;
=======
void lcdSetFont(const uint8_t *newFont) {
font = newFont;
>>>>>>> cleanups
}
void lcdSetFontTransparency(uint8_t transparency) {

4
glcd.h
View File

@ -55,7 +55,11 @@ void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const
void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);
void lcdSetFontTransparency(uint8_t transparency);
<<<<<<< HEAD
void lcdSetFont(const uint8_t *fnt);
=======
void lcdSetFont(const uint8_t *newFont);
>>>>>>> cleanups
void lcdDrawChar(char c);
void lcdPutString(const char *str);
void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkcolor);