diff options
| author | Tectu <joel@unormal.org> | 2012-06-14 12:16:34 +0200 |
|---|---|---|
| committer | Kumar Abhishek <abhishek@kumar> | 2012-06-14 17:13:17 +0530 |
| commit | 452bfcc059918e1b10c64ad81d224f9684540ce6 (patch) | |
| tree | 9b68f0585f2fe85d892d0d1d60483e8020d99dfa /glcd.h | |
| parent | 3be667c90e2ef8f1de5f85b16a7b78d6e910e2f7 (diff) | |
| download | uGFX-452bfcc059918e1b10c64ad81d224f9684540ce6.tar.gz uGFX-452bfcc059918e1b10c64ad81d224f9684540ce6.tar.bz2 uGFX-452bfcc059918e1b10c64ad81d224f9684540ce6.zip | |
cleanups
Diffstat (limited to 'glcd.h')
| -rw-r--r-- | glcd.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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); |