yuzu/MCUFRIEND_kbv
1
0
Fork 0
mirror of https://github.com/YuzuZensai/MCUFRIEND_kbv.git synced 2026-01-31 14:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

default to disable FreeFonts

Browse Source
This commit is contained in:
prenticedavid
2016-09-15 22:56:02 +01:00
parent c81d6a3286
commit c8ea8422b4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
UTFTGLUE.h
View File

@@ -20,7 +20,6 @@
#include <Adafruit_GFX.h> #include <Adafruit_GFX.h>
//#undef _GFXFONT_H_
#if defined(_GFXFONT_H_) #if defined(_GFXFONT_H_)
#include <FreeDefaultFonts.h> #include <FreeDefaultFonts.h>
#define SmallFont &FreeSmallFont #define SmallFont &FreeSmallFont
@@ -106,7 +105,7 @@ class UTFTGLUE : public MCUFRIEND_kbv
#if !defined(_GFXFONT_H_) #if !defined(_GFXFONT_H_)
void setFont(uint8_t* font) { MCUFRIEND_kbv::setTextSize(1);} void setFont(uint8_t* font) { MCUFRIEND_kbv::setTextSize(1);}
#endif #endif
void drawBitmap(int x, int y, int sx, int sy, uint16_t *data, int scale=1) { void drawBitmap(int x, int y, int sx, int sy, const uint16_t *data, int scale=1) {
uint16_t color; uint16_t color;
MCUFRIEND_kbv::setAddrWindow(x, y, x + sx*scale - 1, y + sy*scale - 1); MCUFRIEND_kbv::setAddrWindow(x, y, x + sx*scale - 1, y + sy*scale - 1);
if (scale == 1) MCUFRIEND_kbv::pushColors((const uint8_t*)data, sx * sy, 1); if (scale == 1) MCUFRIEND_kbv::pushColors((const uint8_t*)data, sx * sy, 1);