From f695982620c4dbfa260c29a8886c628ff91159c4 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Sun, 16 Nov 2014 21:45:00 +0000 Subject: [PATCH] make tiny font the default --- TinyFont.h | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ utftdisplay.cpp | 5 ++- utftdisplay.h | 3 +- 3 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 TinyFont.h diff --git a/TinyFont.h b/TinyFont.h new file mode 100644 index 0000000..9dc8218 --- /dev/null +++ b/TinyFont.h @@ -0,0 +1,103 @@ +// TinyFont.c +// Font Size : 8x8 +// Memory usage : 764 bytes +// # characters : 95 + +const unsigned char TinyFont[764]={ +0x08,0x08,0x20,0x5F, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // +0x18,0x3C,0x3C,0x18,0x18,0x00,0x18,0x00, // ! +0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00, // " +0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00, // # +0x18,0x3E,0x60,0x3C,0x06,0x7C,0x18,0x00, // $ +0x00,0xC6,0xCC,0x18,0x30,0x66,0xC6,0x00, // % +0x38,0x6C,0x38,0x76,0xDC,0xCC,0x76,0x00, // & +0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00, // ' +0x0C,0x18,0x30,0x30,0x30,0x18,0x0C,0x00, // ( +0x30,0x18,0x0C,0x0C,0x0C,0x18,0x30,0x00, // ) +0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00, // * +0x00,0x18,0x18,0x7E,0x18,0x18,0x00,0x00, // + +0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x30, // , +0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00, // - +0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00, // . +0x06,0x0C,0x18,0x30,0x60,0xC0,0x80,0x00, // / +0x7C,0xC6,0xCE,0xD6,0xE6,0xC6,0x7C,0x00, // 0 +0x18,0x38,0x18,0x18,0x18,0x18,0x7E,0x00, // 1 +0x7C,0xC6,0x06,0x1C,0x30,0x66,0xFE,0x00, // 2 +0x7C,0xC6,0x06,0x3C,0x06,0xC6,0x7C,0x00, // 3 +0x1C,0x3C,0x6C,0xCC,0xFE,0x0C,0x1E,0x00, // 4 +0xFE,0xC0,0xC0,0xFC,0x06,0xC6,0x7C,0x00, // 5 +0x38,0x60,0xC0,0xFC,0xC6,0xC6,0x7C,0x00, // 6 +0xFE,0xC6,0x0C,0x18,0x30,0x30,0x30,0x00, // 7 +0x7C,0xC6,0xC6,0x7C,0xC6,0xC6,0x7C,0x00, // 8 +0x7C,0xC6,0xC6,0x7E,0x06,0x0C,0x78,0x00, // 9 +0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00, // : +0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x30, // ; +0x06,0x0C,0x18,0x30,0x18,0x0C,0x06,0x00, // < +0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00, // = +0x60,0x30,0x18,0x0C,0x18,0x30,0x60,0x00, // > +0x7C,0xC6,0x0C,0x18,0x18,0x00,0x18,0x00, // ? +0x7C,0xC6,0xDE,0xDE,0xDE,0xC0,0x78,0x00, // @ +0x38,0x6C,0xC6,0xFE,0xC6,0xC6,0xC6,0x00, // A +0xFC,0x66,0x66,0x7C,0x66,0x66,0xFC,0x00, // B +0x3C,0x66,0xC0,0xC0,0xC0,0x66,0x3C,0x00, // C +0xF8,0x6C,0x66,0x66,0x66,0x6C,0xF8,0x00, // D +0xFE,0x62,0x68,0x78,0x68,0x62,0xFE,0x00, // E +0xFE,0x62,0x68,0x78,0x68,0x60,0xF0,0x00, // F +0x3C,0x66,0xC0,0xC0,0xCE,0x66,0x3A,0x00, // G +0xC6,0xC6,0xC6,0xFE,0xC6,0xC6,0xC6,0x00, // H +0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, // I +0x1E,0x0C,0x0C,0x0C,0xCC,0xCC,0x78,0x00, // J +0xE6,0x66,0x6C,0x78,0x6C,0x66,0xE6,0x00, // K +0xF0,0x60,0x60,0x60,0x62,0x66,0xFE,0x00, // L +0xC6,0xEE,0xFE,0xFE,0xD6,0xC6,0xC6,0x00, // M +0xC6,0xE6,0xF6,0xDE,0xCE,0xC6,0xC6,0x00, // N +0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, // O +0xFC,0x66,0x66,0x7C,0x60,0x60,0xF0,0x00, // P +0x7C,0xC6,0xC6,0xC6,0xC6,0xCE,0x7C,0x0E, // Q +0xFC,0x66,0x66,0x7C,0x6C,0x66,0xE6,0x00, // R +0x7C,0xC6,0x60,0x38,0x0C,0xC6,0x7C,0x00, // S +0x7E,0x7E,0x5A,0x18,0x18,0x18,0x3C,0x00, // T +0xC6,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, // U +0xC6,0xC6,0xC6,0xC6,0xC6,0x6C,0x38,0x00, // V +0xC6,0xC6,0xC6,0xD6,0xD6,0xFE,0x6C,0x00, // W +0xC6,0xC6,0x6C,0x38,0x6C,0xC6,0xC6,0x00, // X +0x66,0x66,0x66,0x3C,0x18,0x18,0x3C,0x00, // Y +0xFE,0xC6,0x8C,0x18,0x32,0x66,0xFE,0x00, // Z +0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00, // [ +0xC0,0x60,0x30,0x18,0x0C,0x06,0x02,0x00, // +0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00, // ] +0x10,0x38,0x6C,0xC6,0x00,0x00,0x00,0x00, // ^ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF, // _ +0x30,0x18,0x0C,0x00,0x00,0x00,0x00,0x00, // ' +0x00,0x00,0x78,0x0C,0x7C,0xCC,0x76,0x00, // a +0xE0,0x60,0x7C,0x66,0x66,0x66,0xDC,0x00, // b +0x00,0x00,0x7C,0xC6,0xC0,0xC6,0x7C,0x00, // c +0x1C,0x0C,0x7C,0xCC,0xCC,0xCC,0x76,0x00, // d +0x00,0x00,0x7C,0xC6,0xFE,0xC0,0x7C,0x00, // e +0x3C,0x66,0x60,0xF8,0x60,0x60,0xF0,0x00, // f +0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0xF8, // g +0xE0,0x60,0x6C,0x76,0x66,0x66,0xE6,0x00, // h +0x18,0x00,0x38,0x18,0x18,0x18,0x3C,0x00, // i +0x06,0x00,0x06,0x06,0x06,0x66,0x66,0x3C, // j +0xE0,0x60,0x66,0x6C,0x78,0x6C,0xE6,0x00, // k +0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, // l +0x00,0x00,0xEC,0xFE,0xD6,0xD6,0xD6,0x00, // m +0x00,0x00,0xDC,0x66,0x66,0x66,0x66,0x00, // n +0x00,0x00,0x7C,0xC6,0xC6,0xC6,0x7C,0x00, // o +0x00,0x00,0xDC,0x66,0x66,0x7C,0x60,0xF0, // p +0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0x1E, // q +0x00,0x00,0xDC,0x76,0x60,0x60,0xF0,0x00, // r +0x00,0x00,0x7E,0xC0,0x7C,0x06,0xFC,0x00, // s +0x30,0x30,0xFC,0x30,0x30,0x36,0x1C,0x00, // t +0x00,0x00,0xCC,0xCC,0xCC,0xCC,0x76,0x00, // u +0x00,0x00,0xC6,0xC6,0xC6,0x6C,0x38,0x00, // v +0x00,0x00,0xC6,0xD6,0xD6,0xFE,0x6C,0x00, // w +0x00,0x00,0xC6,0x6C,0x38,0x6C,0xC6,0x00, // x +0x00,0x00,0xC6,0xC6,0xC6,0x7E,0x06,0xFC, // y +0x00,0x00,0x7E,0x4C,0x18,0x32,0x7E,0x00, // z +0x0E,0x18,0x18,0x70,0x18,0x18,0x0E,0x00, // { +0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00, // | +0x70,0x18,0x18,0x0E,0x18,0x18,0x70,0x00, // } +0x76,0xDC,0x00,0x00,0x00,0x00,0x00,0x00, // ~ +}; diff --git a/utftdisplay.cpp b/utftdisplay.cpp index e6dc4bb..60b4803 100644 --- a/utftdisplay.cpp +++ b/utftdisplay.cpp @@ -2,16 +2,17 @@ #include "memory.h" #include "utftdisplay.h" +#include "TinyFont.h" extern UTFT utft; -void UTFTDisplay::begin(unsigned bg, unsigned fg, uint8_t *font) { +void UTFTDisplay::begin(unsigned bg, unsigned fg) { _bg = bg; _fg = fg; _dx = utft.getDisplayXSize(); _dy = utft.getDisplayYSize(); - utft.setFont(font); + utft.setFont((uint8_t *)TinyFont); utft.setColor(fg); _cx = utft.getFontXsize(); _cy = utft.getFontYsize(); diff --git a/utftdisplay.h b/utftdisplay.h index 1029607..9a8e541 100644 --- a/utftdisplay.h +++ b/utftdisplay.h @@ -2,11 +2,10 @@ #define __UTFT_DISPLAY_H__ class Stream; -extern uint8_t SmallFont[]; class UTFTDisplay: public Memory::Device { public: - void begin(unsigned bg, unsigned fg, uint8_t *font = SmallFont); + void begin(unsigned bg, unsigned fg); void clear(); void error(char *); void status(const char *);