archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

if ESP8266 move LCD_FONT_4X6[] to flash and read from flash

Browse Source
This commit is contained in:
MaBecker 2016-03-20 05:56:26 +01:00
parent 2d30d810ba
commit bf4e6c61f5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/graphics/bitmap_font_4x6.c
View File

@ -26,7 +26,8 @@
// 48
#define LCD_FONT_4X6_CHARS 95
const unsigned short LCD_FONT_4X6[] = { // from 33 up to 127
//const unsigned short LCD_FONT_4X6[] = { // from 33 up to 127
unsigned short LCD_FONT_4X6[] IN_FLASH_MEMORY = {
PACK_5_TO_16( _X_ , X_X , X_X , _X_ , X_X ),
PACK_5_TO_16( _X_ , X_X , XXX , XXX , __X ),
PACK_5_TO_16( _X_ , ___ , X_X , XX_ , _X_ ),
@ -168,7 +169,11 @@ void graphicsDrawChar4x6(JsGraphics *gfx, short x1, short y1, char ch) {
idx = (idx/5)*6;
int y;
for (y=0;y<6;y++) {
#if defined(ESP8266)
unsigned short line = READ_FLASH_UINT16(&LCD_FONT_4X6[idx + y]) >> (cidx*3);
#else
int line = LCD_FONT_4X6[idx + y] >> (cidx*3);
#endif
if (line&4) graphicsSetPixel(gfx, (short)(x1+0), (short)(y+y1), gfx->data.fgColor);
if (line&2) graphicsSetPixel(gfx, (short)(x1+1), (short)(y+y1), gfx->data.fgColor);
if (line&1) graphicsSetPixel(gfx, (short)(x1+2), (short)(y+y1), gfx->data.fgColor);