projects
/
hackover2013-badge-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI flash and makefile updated
[hackover2013-badge-firmware.git]
/
drivers
/
lcd
/
tft
/
drawing.c
diff --git
a/drivers/lcd/tft/drawing.c
b/drivers/lcd/tft/drawing.c
index
a6701ab
..
e90a8e6
100644
(file)
--- a/
drivers/lcd/tft/drawing.c
+++ b/
drivers/lcd/tft/drawing.c
@@
-350,7
+350,7
@@
void drawString(uint16_t x, uint16_t y, uint16_t color, const FONT_INFO *fontInf
// Send individual characters
// We need to manually calculate width in pages since this is screwy with variable width fonts
//uint8_t heightPages = charWidth % 8 ? charWidth / 8 : charWidth / 8 + 1;
// Send individual characters
// We need to manually calculate width in pages since this is screwy with variable width fonts
//uint8_t heightPages = charWidth % 8 ? charWidth / 8 : charWidth / 8 + 1;
- drawCharBitmap(currentX, y, color,
&fontInfo->data[charOffset]
, charWidth, fontInfo->height);
+ drawCharBitmap(currentX, y, color,
(const char *)(&fontInfo->data[charOffset])
, charWidth, fontInfo->height);
// next char X
currentX += charWidth + 1;
// next char X
currentX += charWidth + 1;
This page took
0.020357 seconds
and
4
git commands to generate.