Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Fork of SharpLCD by
Revision 9:fc71206a6b64, committed 2015-05-13
- Comitter:
- pwright01
- Date:
- Wed May 13 08:14:07 2015 +0000
- Parent:
- 8:e52d21d34f26
- Commit message:
- new fonts
Changed in this revision
--- a/FrameBuffer.cpp Tue Apr 28 14:39:16 2015 +0000 +++ b/FrameBuffer.cpp Wed May 13 08:14:07 2015 +0000 @@ -258,7 +258,6 @@ * corner of the bitmap. */ ); } - - baselineX += (descriptor->charWidth + 2); + baselineX += (descriptor->charWidth + face->spacing); } }
--- a/dotfont.c Tue Apr 28 14:39:16 2015 +0000 +++ b/dotfont.c Wed May 13 08:14:07 2015 +0000 @@ -23,6 +23,8 @@ extern const FONT_CHAR_INFO centuryGothic_20ptDescriptors[]; extern const uint8_t centuryGothic_28ptBlackBitmaps[]; extern const FONT_CHAR_INFO centuryGothic_28ptDescriptors[]; +extern const uint8_t droidSansMono_9ptBlackBitmaps[]; +extern const FONT_CHAR_INFO droidSansMono_9ptDescriptors[]; /* Accumulation of all avaialble fonts */ const FONT_INFO dotfonts[] = { @@ -30,69 +32,87 @@ { "Lucida", 8, /* pointSize */ + 1, /* spacing */ lucidaConsole_8ptDescs, lucidaConsole_8ptmaps }, { "Comic Sans", 10, /* pointSize */ + 2, /* spacing */ comicSansMS_10ptDescriptors, comicSansMS_10ptBitmaps }, { "Square Head Black", 8, /* pointSize */ + 2, /* spacing */ sFSquareHead_8ptDescriptors, sFSquareHead_8ptBlackBitmaps }, { "Square Head", 10, /* pointSize */ + 2, /* spacing */ sFSquareHead_10ptDescriptors, sFSquareHead_10ptBitmaps }, { "Square Head Black", 10, /* pointSize */ + 2, /* spacing */ sFSquareHead_10ptDescriptors, sFSquareHead_10ptBlackBitmaps }, { "Square Head", 16, /* pointSize */ + 2, /* spacing */ sFSquareHead_16ptDescriptors, sFSquareHead_16ptBitmaps }, { "Square Head Black", 16, /* pointSize */ + 2, /* spacing */ sFSquareHead_16ptDescriptors, sFSquareHead_16ptBlackBitmaps }, { "Square Head Black", 20, /* pointSize */ + 2, /* spacing */ sFSquareHead_20ptDescriptors, sFSquareHead_20ptBlackBitmaps }, { "Century Gothic Black", 9, /* pointSize */ + 2, /* spacing */ centuryGothic_9ptDescriptors, centuryGothic_9ptBlackBitmaps }, { "Century Gothic Black", 20, /* pointSize */ + 2, /* spacing */ centuryGothic_20ptDescriptors, centuryGothic_20ptBlackBitmaps }, { "Century Gothic Black", 28, /* pointSize */ + 2, /* spacing */ centuryGothic_28ptDescriptors, centuryGothic_28ptBlackBitmaps }, + { + "Droid Sans Mono Black", + 9, /* pointSize */ + 0, /* spacing */ + droidSansMono_9ptDescriptors, + droidSansMono_9ptBlackBitmaps + },
--- a/dotfont.h Tue Apr 28 14:39:16 2015 +0000 +++ b/dotfont.h Wed May 13 08:14:07 2015 +0000 @@ -20,6 +20,7 @@ typedef struct FONT_INFO { const char *familyName; unsigned int pointSize; + unsigned int spacing; const FONT_CHAR_INFO* descriptors; const uint8_t* bitmaps; } FONT_INFO;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/droid_sans_mono.c Wed May 13 08:14:07 2015 +0000 @@ -0,0 +1,199 @@ +#include "dotfont.h" + +const uint8_t droidSansMono_9ptBlackBitmaps[] = +{ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x48, 0x48, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x24, 0x24, 0xFE, 0x24, 0x48, 0xFE, 0x48, 0x48, 0x48, 0x00, 0x00, 0x00, + 0x10, 0x3C, 0x50, 0x50, 0x70, 0x38, 0x1C, 0x14, 0x14, 0x78, 0x10, 0x00, 0x00, + 0x00, 0x44, 0xA8, 0xA8, 0x50, 0x10, 0x14, 0x2A, 0x2A, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x48, 0x48, 0x30, 0x30, 0x54, 0x4C, 0x4C, 0x36, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x10, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x10, 0x18, 0x00, + 0x00, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30, 0x00, + 0x00, 0x10, 0x10, 0x7C, 0x28, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x20, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x08, 0x08, 0x10, 0x10, 0x10, 0x20, 0x20, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x6C, 0x44, 0x44, 0x44, 0x44, 0x44, 0x6C, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x30, 0x50, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x04, 0x04, 0x04, 0x08, 0x10, 0x20, 0x20, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x44, 0x04, 0x0C, 0x38, 0x04, 0x04, 0x04, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x18, 0x18, 0x28, 0x28, 0x48, 0x7C, 0x08, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x40, 0x40, 0x78, 0x0C, 0x04, 0x04, 0x0C, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x1C, 0x20, 0x40, 0x78, 0x44, 0x44, 0x44, 0x64, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x44, 0x44, 0x68, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x4C, 0x44, 0x44, 0x44, 0x3C, 0x04, 0x08, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x10, 0x30, 0x20, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x04, 0x38, 0x40, 0x38, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x38, 0x04, 0x38, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x78, 0x04, 0x04, 0x08, 0x10, 0x20, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x44, 0x82, 0x9A, 0xAA, 0xAA, 0xB4, 0x80, 0x40, 0x3C, 0x00, 0x00, + 0x00, 0x10, 0x28, 0x28, 0x28, 0x44, 0x7C, 0x44, 0xC6, 0x82, 0x00, 0x00, 0x00, + 0x00, 0x78, 0x44, 0x44, 0x44, 0x78, 0x44, 0x44, 0x44, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x1C, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x70, 0x48, 0x44, 0x44, 0x44, 0x44, 0x44, 0x48, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x3C, 0x20, 0x40, 0x40, 0x4C, 0x44, 0x44, 0x24, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x44, 0x44, 0x44, 0x44, 0x7C, 0x44, 0x44, 0x44, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x42, 0x44, 0x48, 0x50, 0x70, 0x48, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x44, 0x44, 0x44, 0x6C, 0x6C, 0x6C, 0x74, 0x54, 0x54, 0x00, 0x00, 0x00, + 0x00, 0x44, 0x44, 0x64, 0x54, 0x54, 0x54, 0x4C, 0x44, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x6C, 0x44, 0x44, 0x44, 0x44, 0x44, 0x6C, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x78, 0x44, 0x44, 0x44, 0x4C, 0x78, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x6C, 0x44, 0x44, 0x44, 0x44, 0x44, 0x6C, 0x38, 0x08, 0x04, 0x00, + 0x00, 0x78, 0x44, 0x44, 0x44, 0x78, 0x48, 0x4C, 0x44, 0x42, 0x00, 0x00, 0x00, + 0x00, 0x3C, 0x40, 0x40, 0x60, 0x38, 0x0C, 0x04, 0x04, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x7E, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x6C, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x82, 0xC6, 0x44, 0x44, 0x6C, 0x28, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x82, 0x82, 0x82, 0x92, 0x92, 0x6C, 0x6C, 0x44, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x82, 0x44, 0x28, 0x28, 0x10, 0x28, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, + 0x00, 0x82, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x7C, 0x04, 0x08, 0x18, 0x10, 0x30, 0x20, 0x60, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x38, 0x00, + 0x00, 0x40, 0x20, 0x20, 0x10, 0x10, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x00, + 0x00, 0x10, 0x28, 0x28, 0x28, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, + 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x04, 0x3C, 0x44, 0x44, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x44, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x3C, 0x60, 0x40, 0x40, 0x60, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x04, 0x04, 0x3C, 0x44, 0x44, 0x44, 0x44, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x7C, 0x40, 0x60, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x1C, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x3E, 0x44, 0x44, 0x38, 0x40, 0x3C, 0x42, 0x42, 0x3C, + 0x00, 0x40, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x44, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x70, + 0x00, 0x40, 0x40, 0x40, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, + 0x00, 0x70, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x7C, 0x54, 0x54, 0x54, 0x54, 0x54, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x78, 0x44, 0x44, 0x44, 0x44, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x78, 0x44, 0x44, 0x44, 0x44, 0x78, 0x40, 0x40, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x3C, 0x44, 0x44, 0x44, 0x44, 0x3C, 0x04, 0x04, 0x04, + 0x00, 0x00, 0x00, 0x00, 0x2C, 0x30, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x3C, 0x40, 0x70, 0x0C, 0x04, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x1C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x28, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x92, 0xAA, 0xAA, 0xAA, 0x4C, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x44, 0x28, 0x10, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x28, 0x28, 0x18, 0x10, 0x10, 0x10, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x7C, 0x08, 0x08, 0x10, 0x20, 0x7C, 0x00, 0x00, 0x00, + 0x00, 0x0C, 0x10, 0x10, 0x10, 0x10, 0x60, 0x10, 0x10, 0x10, 0x10, 0x0C, 0x00, + 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, + 0x00, 0x60, 0x10, 0x10, 0x10, 0x10, 0x0C, 0x10, 0x10, 0x10, 0x10, 0x60, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x70, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +const FONT_CHAR_INFO droidSansMono_9ptDescriptors[] = +{ + {3, 13, 0}, /* */ + {7, 13, 13}, /* ! */ + {7, 13, 26}, /* " */ + {7, 13, 39}, /* # */ + {7, 13, 52}, /* $ */ + {7, 13, 65}, /* % */ + {7, 13, 78}, /* & */ + {7, 13, 91}, /* ' */ + {7, 13, 104}, /* ( */ + {7, 13, 117}, /* ) */ + {7, 13, 130}, /* * */ + {7, 13, 143}, /* + */ + {7, 13, 156}, /* , */ + {7, 13, 169}, /* - */ + {7, 13, 182}, /* . */ + {7, 13, 195}, /* / */ + {7, 13, 208}, /* 0 */ + {7, 13, 221}, /* 1 */ + {7, 13, 234}, /* 2 */ + {7, 13, 247}, /* 3 */ + {7, 13, 260}, /* 4 */ + {7, 13, 273}, /* 5 */ + {7, 13, 286}, /* 6 */ + {7, 13, 299}, /* 7 */ + {7, 13, 312}, /* 8 */ + {7, 13, 325}, /* 9 */ + {7, 13, 338}, /* : */ + {7, 13, 351}, /* ; */ + {7, 13, 364}, /* < */ + {7, 13, 377}, /* = */ + {7, 13, 390}, /* > */ + {7, 13, 403}, /* ? */ + {7, 13, 416}, /* @ */ + {7, 13, 429}, /* A */ + {7, 13, 442}, /* B */ + {7, 13, 455}, /* C */ + {7, 13, 468}, /* D */ + {7, 13, 481}, /* E */ + {7, 13, 494}, /* F */ + {7, 13, 507}, /* G */ + {7, 13, 520}, /* H */ + {7, 13, 533}, /* I */ + {7, 13, 546}, /* J */ + {7, 13, 559}, /* K */ + {7, 13, 572}, /* L */ + {7, 13, 585}, /* M */ + {7, 13, 598}, /* N */ + {7, 13, 611}, /* O */ + {7, 13, 624}, /* P */ + {7, 13, 637}, /* Q */ + {7, 13, 650}, /* R */ + {7, 13, 663}, /* S */ + {7, 13, 676}, /* T */ + {7, 13, 689}, /* U */ + {7, 13, 702}, /* V */ + {7, 13, 715}, /* W */ + {7, 13, 728}, /* X */ + {7, 13, 741}, /* Y */ + {7, 13, 754}, /* Z */ + {7, 13, 767}, /* [ */ + {7, 13, 780}, /* \ */ + {7, 13, 793}, /* ] */ + {7, 13, 806}, /* ^ */ + {7, 13, 819}, /* _ */ + {7, 13, 832}, /* ` */ + {7, 13, 845}, /* a */ + {7, 13, 858}, /* b */ + {7, 13, 871}, /* c */ + {7, 13, 884}, /* d */ + {7, 13, 897}, /* e */ + {7, 13, 910}, /* f */ + {7, 13, 923}, /* g */ + {7, 13, 936}, /* h */ + {7, 13, 949}, /* i */ + {7, 13, 962}, /* j */ + {7, 13, 975}, /* k */ + {7, 13, 988}, /* l */ + {7, 13, 1001}, /* m */ + {7, 13, 1014}, /* n */ + {7, 13, 1027}, /* o */ + {7, 13, 1040}, /* p */ + {7, 13, 1053}, /* q */ + {7, 13, 1066}, /* r */ + {7, 13, 1079}, /* s */ + {7, 13, 1092}, /* t */ + {7, 13, 1105}, /* u */ + {7, 13, 1118}, /* v */ + {7, 13, 1131}, /* w */ + {7, 13, 1144}, /* x */ + {7, 13, 1157}, /* y */ + {7, 13, 1170}, /* z */ + {7, 13, 1183}, /* { */ + {7, 13, 1196}, /* | */ + {7, 13, 1209}, /* } */ + {7, 13, 1222}, /* ~ */ +};