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

Sync repo again

Browse source
This commit is contained in:
Kumar Abhishek 2012-06-14 17:16:32 +05:30
parent 01179bb945
commit 04fdc1a256
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glcd.h
View file

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