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

cleanups

Browse source
This commit is contained in:
Tectu 2012-06-14 12:16:34 +02:00
parent a5ae067960
commit 76fafb7dbb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glcd.c
View file

@ -7,7 +7,7 @@ uint16_t lcd_width, lcd_height;
uint16_t bgcolor=White, fgcolor=Black; uint16_t bgcolor=White, fgcolor=Black;
uint16_t cx, cy; uint16_t cx, cy;
static uint8_t tpText=0; static uint8_t tpText=0;
uint8_t* font; const uint8_t* font;
void lcdInit(void) { void lcdInit(void) {
lld_lcdInit(); lld_lcdInit();
@ -117,8 +117,8 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
} }
} }
void lcdSetFont(uint8_t *fnt) { void lcdSetFont(const uint8_t *newFont) {
font = fnt; font = newFont;
} }
void lcdSetFontTransparency(uint8_t transparency) { void lcdSetFontTransparency(uint8_t transparency) {

4
glcd.h
View file

@ -35,7 +35,7 @@ enum transparency {solid, transparent};
// For text rendering only // For text rendering only
extern uint16_t bgcolor, fgcolor; extern uint16_t bgcolor, fgcolor;
extern uint16_t cx, cy; extern uint16_t cx, cy;
extern uint8_t* font; extern const uint8_t* font;
// A few macros // A few macros
#define lcdGotoXY(x,y) { cx=x; cy=y; } #define lcdGotoXY(x,y) { cx=x; cy=y; }
@ -55,7 +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);
void lcdSetFont(uint8_t *fnt); void lcdSetFont(const uint8_t *newFont);
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);