From 303405afd7c5c63b3cf6ad6b4a3cbcb2ffdba1d2 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Sun, 21 Jun 2020 19:02:22 +0200 Subject: [PATCH] Variable size font --- Font7x13b.c | 4044 ++++++++++++++++++++++----------------------------- ili9341.c | 7 +- nanovna.h | 9 +- plot.c | 19 +- si4432.c | 4 +- 5 files changed, 1795 insertions(+), 2288 deletions(-) diff --git a/Font7x13b.c b/Font7x13b.c index b3656b2..8262984 100644 --- a/Font7x13b.c +++ b/Font7x13b.c @@ -1,25 +1,31 @@ -/* Generated by convbdf on Mon Apr 29 14:40:18 2019. */ - -/* Font information: - name: 7x13B - facename: -Misc-Fixed-Bold-R-Normal--13-120-75-75-C-70-ISO8859-2 - w x h: 7x13 - size: 127 - ascent: 11 - descent: 2 - first char: 0 (0x00) - last char: 126 (0x7e) - default char: 0 (0x00) - proportional: no - Public domain font. Share and enjoy. Copyright (c) 1996 BIZNET Poland, Inc. All Rights Reserved. -*/ +/* + * Font size 7x11 pixels + * most font glyph have width 7 pixels + */ #include +/* + * Check 1 byte of char bitmap data for get width + */ +// Font definitions +#define FONT_GET_DATA(ch) (&x7x11b_bits[ch*11]) +#define FONT_GET_WIDTH(ch) (8-(x7x11b_bits[ch*11]&7)) +#define FONT_MAX_WIDTH 8 +#define FONT_WIDTH 7 +#define FONT_GET_HEIGHT 11 +#define FONT_STR_HEIGHT 11 + +#define CHAR7x11_WIDTH_MASK 0x07 +#define CHAR7x11_WIDTH_4px 0x04 +#define CHAR7x11_WIDTH_5px 0x03 +#define CHAR7x11_WIDTH_6px 0x02 +#define CHAR7x11_WIDTH_7px 0x01 +#define CHAR7x11_WIDTH_8px 0x00 + /* Font character bitmap data. */ -const uint16_t x7x13b_bits [] = +const uint8_t x7x11b_bits[127*11] = { - /* Character 0 (0x00): width 7 +-------+ @@ -34,22 +40,18 @@ const uint16_t x7x13b_bits [] = | ***** | | ***** | | ***** | - | ***** | - | | +-------+ */ - 0x0000, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x7c00, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, + 0b01111100, /* Character 1 (0x01): width 7 @@ -58,7 +60,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | ** | | **** | |****** | @@ -66,26 +67,22 @@ const uint16_t x7x13b_bits [] = | ** | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0xfc00, - 0x7800, - 0x3000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00110000, + 0b01111000, + 0b11111100, + 0b01111000, + 0b00110000, + 0b00000000, + 0b00000000, /* Character 2 (0x02): width 7 +-------+ - | | |** ** | | ** | |** ** | @@ -97,26 +94,22 @@ const uint16_t x7x13b_bits [] = |** ** | | ** | |** ** | - | | +-------+ */ - 0x0000, - 0xcc00, - 0x3000, - 0xcc00, - 0x3000, - 0xcc00, - 0x3000, - 0xcc00, - 0x3000, - 0xcc00, - 0x3000, - 0xcc00, - 0x0000, + 0b11001100|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b11001100, + 0b00110000, + 0b11001100, + 0b00110000, + 0b11001100, + 0b00110000, + 0b11001100, + 0b00110000, + 0b11001100, /* Character 3 (0x03): width 7 +-------+ - | | |** ** | |** ** | |***** | @@ -128,57 +121,49 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | | +-------+ */ - 0x0000, - 0xd800, - 0xd800, - 0xf800, - 0xd800, - 0xd800, - 0x0000, - 0x3c00, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x0000, + 0b11011000|CHAR7x11_WIDTH_7px, + 0b11011000, + 0b11111000, + 0b11011000, + 0b11011000, + 0b00000000, + 0b00111100, + 0b00011000, + 0b00011000, + 0b00011000, + 0b00011000, /* Character 4 (0x04): - width 7 + width 8 +-------+ | | - |**** | - |** | - |*** | - |** | - |** | - | | - | **** | - | ** | + | * | + | * | | *** | - | ** | - | ** | + | *** | + | ** ** | + | ** ** | + |** **| + |** **| + |*******| | | +-------+ */ - 0x0000, - 0xf000, - 0xc000, - 0xe000, - 0xc000, - 0xc000, - 0x0000, - 0x3c00, - 0x3000, - 0x3800, - 0x3000, - 0x3000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00010000, + 0b00010000, + 0b00111000, + 0b00111000, + 0b01101100, + 0b01101100, + 0b11000110, + 0b11000110, + 0b11111110, + 0b00000000, /* Character 5 (0x05): width 7 +-------+ - | | | *** | |** | |** | @@ -190,26 +175,22 @@ const uint16_t x7x13b_bits [] = | *** | | ** * | | ** * | - | | +-------+ */ - 0x0000, - 0x7000, - 0xc000, - 0xc000, - 0xc000, - 0x7000, - 0x0000, - 0x3800, - 0x3400, - 0x3800, - 0x3400, - 0x3400, - 0x0000, + 0b01110000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b01110000, + 0b00000000, + 0b00111000, + 0b00110100, + 0b00111000, + 0b00110100, + 0b00110100, /* Character 6 (0x06): width 7 +-------+ - | | |** | |** | |** | @@ -221,27 +202,23 @@ const uint16_t x7x13b_bits [] = | *** | | ** | | ** | - | | +-------+ */ - 0x0000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xf000, - 0x0000, - 0x3c00, - 0x3000, - 0x3800, - 0x3000, - 0x3000, - 0x0000, + 0b11000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11110000, + 0b00000000, + 0b00111100, + 0b00110000, + 0b00111000, + 0b00110000, + 0b00110000, /* Character 7 (0x07): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -252,27 +229,23 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 8 (0x08): width 7 +-------+ | | - | | | ** | | ** | |****** | @@ -283,26 +256,22 @@ const uint16_t x7x13b_bits [] = |****** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x3000, - 0xfc00, - 0xfc00, - 0x3000, - 0x3000, - 0x0000, - 0xfc00, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b11111100, + 0b11111100, + 0b00110000, + 0b00110000, + 0b00000000, + 0b11111100, + 0b11111100, + 0b00000000, /* Character 9 (0x09): width 7 +-------+ - | | |** ** | |*** ** | |****** | @@ -314,26 +283,22 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | **** | - | | +-------+ */ - 0x0000, - 0xcc00, - 0xec00, - 0xfc00, - 0xdc00, - 0xcc00, - 0x0000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3c00, - 0x0000, + 0b11001100|CHAR7x11_WIDTH_7px, + 0b11101100, + 0b11111100, + 0b11011100, + 0b11001100, + 0b00000000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00111100, /* Character 10 (0x0a): width 7 +-------+ - | | |** ** | |** ** | | * * | @@ -345,21 +310,18 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | | +-------+ */ - 0x0000, - 0xcc00, - 0xcc00, - 0x4800, - 0x7800, - 0x3000, - 0x0000, - 0x3c00, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x0000, + 0b11001100|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b01001000, + 0b01111000, + 0b00110000, + 0b00000000, + 0b00111100, + 0b00011000, + 0b00011000, + 0b00011000, + 0b00011000, /* Character 11 (0x0b): width 7 @@ -369,28 +331,24 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | |**** | |**** | | | | | | | | | - | | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xf000, - 0xf000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11110000, + 0b11110000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 12 (0x0c): width 7 @@ -399,8 +357,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - | | |**** | |**** | | ** | @@ -409,19 +365,17 @@ const uint16_t x7x13b_bits [] = | ** | | ** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xf000, - 0xf000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11110000, + 0b11110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, /* Character 13 (0x0d): width 7 @@ -430,8 +384,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - | | | *****| | *****| | ** | @@ -440,19 +392,17 @@ const uint16_t x7x13b_bits [] = | ** | | ** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3e00, - 0x3e00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00111110, + 0b00111110, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, /* Character 14 (0x0e): width 7 @@ -461,8 +411,6 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | - | ** | | *****| | *****| | | @@ -471,19 +419,17 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3e00, - 0x3e00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00111110, + 0b00111110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 15 (0x0f): width 7 @@ -492,8 +438,6 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | - | ** | |*******| |*******| | ** | @@ -502,25 +446,22 @@ const uint16_t x7x13b_bits [] = | ** | | ** | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfe00, - 0xfe00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11111110, + 0b11111110, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, /* Character 16 (0x10): width 7 +-------+ | | - | | |*******| |*******| | | @@ -531,21 +472,18 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111110, + 0b11111110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 17 (0x11): width 7 @@ -553,7 +491,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |*******| |*******| | | @@ -562,21 +499,18 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b11111110, + 0b11111110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 18 (0x12): width 7 @@ -586,28 +520,24 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |*******| |*******| | | | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111110, + 0b11111110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 19 (0x13): width 7 @@ -619,26 +549,22 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |*******| |*******| | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111110, + 0b11111110, + 0b00000000, + 0b00000000, /* Character 20 (0x14): width 7 @@ -652,24 +578,20 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |*******| |*******| - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111110, + 0b11111110, /* Character 21 (0x15): width 7 @@ -678,8 +600,6 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | - | ** | | *****| | *****| | ** | @@ -688,19 +608,17 @@ const uint16_t x7x13b_bits [] = | ** | | ** | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3e00, - 0x3e00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00111110, + 0b00111110, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, /* Character 22 (0x16): width 7 @@ -709,8 +627,6 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | - | ** | |**** | |**** | | ** | @@ -719,19 +635,17 @@ const uint16_t x7x13b_bits [] = | ** | | ** | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xf000, - 0xf000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11110000, + 0b11110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, /* Character 23 (0x17): width 7 @@ -740,8 +654,6 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | - | ** | |*******| |*******| | | @@ -750,143 +662,125 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfe00, - 0xfe00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00110000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11111110, + 0b11111110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 24 (0x18): - width 7 + width 5 +-------+ | | + |* | + |** | + |*** | + |**** | + |***** | + |**** | + |*** | + |** | + |* | | | - | | - | | - | | - | | - |*******| - |*******| - | ** | - | ** | - | ** | - | ** | - | ** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfe00, - 0xfe00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b10000000, + 0b11000000, + 0b11100000, + 0b11110000, + 0b11111000, + 0b11110000, + 0b11100000, + 0b11000000, + 0b10000000, + 0b00000000, /* Character 25 (0x19): - width 7 + width 8 + +--------+ + | | + | | + | ** *** | + |** ** **| + |* * *| + |* ** *| + |* ** *| + |* * *| + |** ** **| + | *** ** | + | | + +--------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00000000, + 0b01101110, + 0b11011011, + 0b10010001, + 0b10011001, + 0b10011001, + 0b10001001, + 0b11011011, + 0b01110110, + 0b00000000, + + /* Character 26 (0x1a): + width 8 +-------+ + | | + | | + | * | | ** | + | ** | + |*******| + |*******| + | ** | | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | + | * | + | | +-------+ */ - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00000000, + 0b00010000, + 0b00110000, + 0b01100000, + 0b11111110, + 0b11111110, + 0b01100000, + 0b00110000, + 0b00010000, + 0b00000000, - /* Character 26 (0x1a): - width 7 - +-------+ - | | - | | - | | - | * | - | ** | - |****** | - |****** | - | ** | - | * | - | | - | | - | | - | | - +-------+ */ -0x0000, -0x0000, -0x0000, -0x2000, -0x6000, -0xfc00, -0xfc00, -0x6000, -0x2000, -0x0000, -0x0000, -0x0000, -0x0000, /* Character 27 (0x1b): width 7 - +-------+ - | | - | | - | | - | * | - | ** | - |****** | - |****** | - | ** | - | * | - | | - | | - | | - | | - +-------+ */ -0x0000, -0x0000, -0x0000, -0x1000, -0x1800, -0xfc00, -0xfc00, -0x1800, -0x1000, -0x0000, -0x0000, -0x0000, -0x0000, - + +-------+ + | | + | | + | * | + | ** | + | ** | + |*******| + |*******| + | ** | + | ** | + | * | + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00010000, + 0b00011000, + 0b00001100, + 0b01111110, + 0b01111110, + 0b00001100, + 0b00011000, + 0b00010000, + 0b00000000, /* Character 28 (0x1c): width 7 @@ -895,7 +789,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |****** | | ** ** | | ** ** | @@ -903,121 +796,105 @@ const uint16_t x7x13b_bits [] = |*** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfc00, - 0x6c00, - 0x6c00, - 0x6c00, - 0xec00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111100, + 0b01101100, + 0b01101100, + 0b01101100, + 0b11101100, + 0b11001100, + 0b00000000, /* Character 29 (0x1d): - width 7 - +-------+ - | | - | | - | | - | | - | | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - |****** | - |** | - |** | - +-------+ */ -0x0000, -0x0000, -0x0000, -0x0000, -0x0000, -0xcc00, -0xcc00, -0xcc00, -0xcc00, -0xcc00, -0xfc00, -0xc000, -0xc000, + width 8 + +-------+ + | | + | | + | | + | | + |** **| + |** **| + |** **| + |** **| + |*** ***| + |** * **| + |** | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11000110, + 0b11000110, + 0b11000110, + 0b11000110, + 0b11101110, + 0b11010110, + 0b11000000, + /* Character 30 (0x1e): width 7 - +-------+ - | | - | | - | **** | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - | * * | - | * * | - |** ** | - | | - | | - +-------+ */ -0x0000, -0x0000, -0x7800, -0xcc00, -0xcc00, -0xcc00, -0xcc00, -0xcc00, -0x4800, -0x4800, -0xcc00, -0x0000, -0x0000, + +-------+ + | | + | ***** | + |** **| + |** **| + |** **| + |** **| + |** **| + | ** ** | + | ** ** | + |*** ***| + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b01111100, + 0b11000110, + 0b11000110, + 0b11000110, + 0b11000110, + 0b11000110, + 0b01101100, + 0b01101100, + 0b11101110, + 0b00000000, /* Character 31 (0x1f): - width 7 - +-------+ - | | - | | - | **** | - |** ** | - |** ** | - | **** | - | | - | | - | | - | | - | | - | | - | | - +-------+ */ -0x0000, -0x0000, -0x7800, -0xcc00, -0xcc00, -0x7800, -0x0000, -0x0000, -0x0000, -0x0000, -0x0000, -0x0000, -0x0000, - - /* Character 32 (0x20): - width 7 + width 6 +-------+ | | + | *** | + |** ** | + |** ** | + | *** | + | | + | | + | | | | | | | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_6px, + 0b01110000, + 0b11011000, + 0b11011000, + 0b01110000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + + /* Character 32 (0x20): + width 4 + +-------+ + | | + | | | | | | | | @@ -1028,25 +905,22 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 33 (0x21): - width 7 + width 4 +-------+ | | - | | | ** | | ** | | ** | @@ -1057,31 +931,26 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x0000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b00000000, + 0b01100000, + 0b01100000, + 0b00000000, /* Character 34 (0x22): - width 7 + width 6 +-------+ | | - | | - | ** ** | - | ** ** | - | ** ** | - | | + |** ** | + |** ** | + |** ** | | | | | | | @@ -1090,154 +959,134 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x0000, - 0x0000, - 0x6c00, - 0x6c00, - 0x6c00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_6px, + 0b11011000, + 0b11011000, + 0b11011000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 35 (0x23): - width 7 + width 6 +-------+ | | - | | - | * * | - | * * | - | ***** | - | ***** | - | * * | - | ***** | - | ***** | - | * * | - | * * | - | | - | | - +-------+ */ - 0x0000, - 0x0000, - 0x2800, - 0x2800, - 0x7c00, - 0x7c00, - 0x2800, - 0x7c00, - 0x7c00, - 0x2800, - 0x2800, - 0x0000, - 0x0000, + | * * | + | * * | + |***** | + |***** | + | * * | + |***** | + |***** | + | * * | + | * * | + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_6px, + 0b01010000, + 0b01010000, + 0b11111000, + 0b11111000, + 0b01010000, + 0b11111000, + 0b11111000, + 0b01010000, + 0b01010000, + 0b00000000, /* Character 36 (0x24): - width 7 + width 8 +-------+ | | - | | | ** | - | **** | - |* ** * | + | ***** | + |* ** | |* ** | | **** | | ** * | - |* ** * | - | **** | + | ** * | + |***** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0xb400, - 0xb000, - 0x7800, - 0x3400, - 0xb400, - 0x7800, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00110000, + 0b01111100, + 0b10110000, + 0b10110000, + 0b01111000, + 0b00110100, + 0b00110100, + 0b11111000, + 0b00110000, + 0b00000000, /* Character 37 (0x25): - width 7 + width 8 +-------+ - | | - | | - |*** * | - |* * ** | - |*** * | + | ** | + |* * *| + |* * **| + | ** ** | | ** | | ** | - | ** | - | * *** | - |** * * | - |* *** | - | | + | ** ** | + |** * *| + |* * *| + | ** | | | +-------+ */ - 0x0000, - 0x0000, - 0xe400, - 0xac00, - 0xe800, - 0x1800, - 0x3000, - 0x6000, - 0x5c00, - 0xd400, - 0x9c00, - 0x0000, - 0x0000, + 0b01100000|CHAR7x11_WIDTH_8px, + 0b10010010, + 0b10010110, + 0b01101100, + 0b00011000, + 0b00110000, + 0b01101100, + 0b11010010, + 0b10010010, + 0b00001100, + 0b00000000, /* Character 38 (0x26): - width 7 + width 8 +-------+ | | - | | | *** | |** ** | |** ** | - |** ** | | *** | - |** * * | + | *** *| |** *** | - |** ** | - | *** * | - | | + |** ** | + |** *** | + | *** *| | | +-------+ */ - 0x0000, - 0x0000, - 0x7000, - 0xd800, - 0xd800, - 0xd800, - 0x7000, - 0xd400, - 0xdc00, - 0xd800, - 0x7400, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b01110000, + 0b11011000, + 0b11011000, + 0b01110000, + 0b01110010, + 0b11011100, + 0b11001100, + 0b11011100, + 0b01110010, + 0b00000000, /* Character 39 (0x27): - width 7 + width 5 +-------+ | | - | | - | *** | - | *** | - | ** | + | *** | + | *** | | ** | - | | + |** | | | | | | | @@ -1245,112 +1094,98 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x0000, - 0x0000, - 0x3800, - 0x3800, - 0x3000, - 0x6000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b01110000, + 0b01110000, + 0b01100000, + 0b11000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 40 (0x28): - width 7 + width 5 +-------+ | | - | | - | ** | - | ** | | ** | | ** | | ** | + |** | + |** | + |** | + | ** | | ** | | ** | - | ** | - | ** | - | | | | +-------+ */ - 0x0000, - 0x0000, - 0x1800, - 0x3000, - 0x3000, - 0x6000, - 0x6000, - 0x6000, - 0x3000, - 0x3000, - 0x1800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b00110000, + 0b01100000, + 0b01100000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b01100000, + 0b01100000, + 0b00110000, + 0b00000000, /* Character 41 (0x29): - width 7 + width 5 +-------+ | | - | | + |** | + | ** | | ** | | ** | | ** | - | ** | - | ** | - | ** | - | ** | | ** | | ** | - | | + | ** | + |** | | | +-------+ */ - 0x0000, - 0x0000, - 0x6000, - 0x3000, - 0x3000, - 0x1800, - 0x1800, - 0x1800, - 0x3000, - 0x3000, - 0x6000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b11000000, + 0b01100000, + 0b01100000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b01100000, + 0b01100000, + 0b11000000, + 0b00000000, - /* Character 42 (0x2a): + /* Character 42 (0x2a): '*' width 7 +-------+ | | | | | | - | | - | * * | - | ** | - |****** | - |****** | - | ** | - | * * | + | * | + |* * * | + | *** | + |* * * | + | * | | | | | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x4800, - 0x3000, - 0xfc00, - 0xfc00, - 0x3000, - 0x4800, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00100000, + 0b10101000, + 0b01110000, + 0b10101000, + 0b00100000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 43 (0x2b): width 7 @@ -1358,7 +1193,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | ** | | ** | |****** | @@ -1367,24 +1201,21 @@ const uint16_t x7x13b_bits [] = | ** | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3000, - 0x3000, - 0xfc00, - 0xfc00, - 0x3000, - 0x3000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00110000, + 0b00110000, + 0b11111100, + 0b11111100, + 0b00110000, + 0b00110000, + 0b00000000, + 0b00000000, /* Character 44 (0x2c): - width 7 + width 4 +-------+ | | | | @@ -1393,26 +1224,22 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - | *** | - | *** | - | ** | + | * | + |*** | | ** | - | | + |** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3800, - 0x3800, - 0x3000, - 0x6000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01100000, + 0b11000000, /* Character 45 (0x2d): width 7 @@ -1422,31 +1249,27 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |****** | |****** | | | | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfc00, - 0xfc00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111100, + 0b11111100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 46 (0x2e): - width 7 + width 4 +-------+ | | | | @@ -1455,32 +1278,27 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - | | - | ** | - | **** | - | ** | + | * | + |*** | + | * | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0x3000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01000000, + 0b00000000, /* Character 47 (0x2f): width 7 +-------+ | | - | | | ** | | ** | | ** | @@ -1491,57 +1309,50 @@ const uint16_t x7x13b_bits [] = |** | |** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x0c00, - 0x1800, - 0x1800, - 0x3000, - 0x6000, - 0x6000, - 0xc000, - 0xc000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00001100, + 0b00011000, + 0b00011000, + 0b00110000, + 0b01100000, + 0b01100000, + 0b11000000, + 0b11000000, + 0b00000000, + /* Character 48 (0x30): width 7 +-------+ | | - | | - | ** | - | * * | + | **** | |** ** | |** ** | + |** *** | + |*** ** | |** ** | |** ** | |** ** | - | * * | - | ** | - | | + | **** | | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x4800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x4800, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11011100, + 0b11101100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 49 (0x31): width 7 +-------+ | | - | | | ** | | *** | |* ** | @@ -1552,27 +1363,23 @@ const uint16_t x7x13b_bits [] = | ** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x7000, - 0xb000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b01110000, + 0b10110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11111100, + 0b00000000, /* Character 50 (0x32): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -1583,58 +1390,50 @@ const uint16_t x7x13b_bits [] = |** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0x0c00, - 0x3800, - 0x6000, - 0xc000, - 0xc000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b00001100, + 0b00111000, + 0b01100000, + 0b11000000, + 0b11000000, + 0b11111100, + 0b00000000, /* Character 51 (0x33): width 7 +-------+ | | - | | - |****** | - | ** | - | ** | - | ** | | **** | + |** ** | + |** ** | | ** | + | *** | | ** | |** ** | + |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0x0c00, - 0x1800, - 0x3000, - 0x7800, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b00001100, + 0b00111000, + 0b00001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 52 (0x34): width 7 +-------+ | | - | | | ** | | *** | | **** | @@ -1645,27 +1444,23 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x1c00, - 0x3c00, - 0x6c00, - 0xcc00, - 0xcc00, - 0xfc00, - 0x0c00, - 0x0c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00011100, + 0b00111100, + 0b01101100, + 0b11001100, + 0b11001100, + 0b11111100, + 0b00001100, + 0b00001100, + 0b00000000, /* Character 53 (0x35): width 7 +-------+ | | - | | |****** | |** | |** | @@ -1676,27 +1471,23 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0xc000, - 0xc000, - 0xf800, - 0xcc00, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b11000000, + 0b11000000, + 0b11111000, + 0b11001100, + 0b00001100, + 0b00001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 54 (0x36): width 7 +-------+ | | - | | | **** | |** ** | |** | @@ -1707,27 +1498,23 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xc000, - 0xc000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11000000, + 0b11000000, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 55 (0x37): width 7 +-------+ | | - | | |****** | | ** | | ** | @@ -1738,27 +1525,23 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0x0c00, - 0x0c00, - 0x1800, - 0x1800, - 0x3000, - 0x3000, - 0x6000, - 0x6000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b00001100, + 0b00001100, + 0b00011000, + 0b00011000, + 0b00110000, + 0b00110000, + 0b01100000, + 0b01100000, + 0b00000000, /* Character 56 (0x38): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -1769,27 +1552,23 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 57 (0x39): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -1800,89 +1579,77 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111100, + 0b00001100, + 0b00001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 58 (0x3a): - width 7 + width 4 +-------+ | | | | + | * | + |*** | + | * | | | + | * | + |*** | + | * | | | - | ** | - | **** | - | ** | - | | - | | - | ** | - | **** | - | ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0x3000, - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0x3000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01000000, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01000000, + 0b00000000, + 0b00000000, /* Character 59 (0x3b): - width 7 + width 4 +-------+ | | | | + | * | + |*** | + | * | | | - | | - | ** | - | **** | - | ** | - | | - | *** | - | *** | - | ** | - | ** | + | * | + |*** | + | * | + |* | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0x3000, - 0x0000, - 0x3800, - 0x3800, - 0x3000, - 0x6000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_4px, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01000000, + 0b00000000, + 0b01000000, + 0b11100000, + 0b01000000, + 0b10000000, + 0b00000000, /* Character 60 (0x3c): width 7 +-------+ | | - | | | ** | | ** | | ** | @@ -1893,21 +1660,18 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x1800, - 0x3000, - 0x6000, - 0xc000, - 0x6000, - 0x3000, - 0x1800, - 0x0c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00011000, + 0b00110000, + 0b01100000, + 0b11000000, + 0b01100000, + 0b00110000, + 0b00011000, + 0b00001100, + 0b00000000, /* Character 61 (0x3d): width 7 @@ -1916,7 +1680,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |****** | | | | | @@ -1924,27 +1687,23 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfc00, - 0x0000, - 0x0000, - 0xfc00, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111100, + 0b00000000, + 0b00000000, + 0b11111100, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 62 (0x3e): width 7 +-------+ | | - | | |** | | ** | | ** | @@ -1955,89 +1714,77 @@ const uint16_t x7x13b_bits [] = | ** | |** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0x6000, - 0x3000, - 0x1800, - 0x0c00, - 0x1800, - 0x3000, - 0x6000, - 0xc000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b01100000, + 0b00110000, + 0b00011000, + 0b00001100, + 0b00011000, + 0b00110000, + 0b01100000, + 0b11000000, + 0b00000000, /* Character 63 (0x3f): width 7 +-------+ | | - | | | **** | |** ** | |** ** | | ** | - | *** | + | ** | | ** | | | | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0x0c00, - 0x3800, - 0x3000, - 0x0000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b00001100, + 0b00011000, + 0b00110000, + 0b00000000, + 0b00110000, + 0b00110000, + 0b00000000, /* Character 64 (0x40): width 7 +-------+ | | - | | | **** | |* ** | |* ** | |* **** | |* * ** | - |* **** | + |* *** | |* | |* ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0x8c00, - 0x8c00, - 0xbc00, - 0xac00, - 0xbc00, - 0x8000, - 0x8c00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b10001100, + 0b10001100, + 0b10111100, + 0b10101100, + 0b10111000, + 0b10000000, + 0b10001100, + 0b01111000, + 0b00000000, /* Character 65 (0x41): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -2048,27 +1795,23 @@ const uint16_t x7x13b_bits [] = |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xfc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 66 (0x42): width 7 +-------+ | | - | | |***** | |** ** | |** ** | @@ -2079,58 +1822,50 @@ const uint16_t x7x13b_bits [] = |** ** | |***** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b00000000, /* Character 67 (0x43): width 7 +-------+ | | - | | | **** | |** ** | + |** ** | |** | |** | |** | - |** | - |** | + |** ** | |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 68 (0x44): width 7 +-------+ | | - | | |***** | |** ** | |** ** | @@ -2141,27 +1876,23 @@ const uint16_t x7x13b_bits [] = |** ** | |***** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b00000000, /* Character 69 (0x45): width 7 +-------+ | | - | | |****** | |** | |** | @@ -2172,27 +1903,23 @@ const uint16_t x7x13b_bits [] = |** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0xc000, - 0xc000, - 0xc000, - 0xf800, - 0xc000, - 0xc000, - 0xc000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11111000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11111100, + 0b00000000, /* Character 70 (0x46): width 7 +-------+ | | - | | |****** | |** | |** | @@ -2203,58 +1930,50 @@ const uint16_t x7x13b_bits [] = |** | |** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0xc000, - 0xc000, - 0xc000, - 0xf800, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11111000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b00000000, /* Character 71 (0x47): width 7 +-------+ | | - | | | **** | |** ** | + |** ** | |** | |** | |** *** | |** ** | - |** ** | - |** ** | - | ***** | - | | + |** *** | + | ** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xc000, - 0xc000, - 0xdc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11000000, + 0b11000000, + 0b11011100, + 0b11001100, + 0b11011100, + 0b01101100, + 0b00000000, /* Character 72 (0x48): width 7 +-------+ | | - | | |** ** | |** ** | |** ** | @@ -2265,58 +1984,50 @@ const uint16_t x7x13b_bits [] = |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xfc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 73 (0x49): - width 7 + width 5 +-------+ | | - | | - |****** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - |****** | - | | + |**** | + | ** | + | ** | + | ** | + | ** | + | ** | + | ** | + | ** | + |**** | | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b11110000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b11110000, + 0b00000000, /* Character 74 (0x4a): width 7 +-------+ | | - | | | ** | | ** | | ** | @@ -2327,58 +2038,50 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 75 (0x4b): width 7 +-------+ | | - | | - |** * | + |** ** | + |** ** | |** ** | |** ** | |**** | - |*** | - |**** | |** ** | |** ** | - |** * | - | | + |** ** | + |** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0xc400, - 0xcc00, - 0xd800, - 0xf000, - 0xe000, - 0xf000, - 0xd800, - 0xcc00, - 0xc400, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11011000, + 0b11110000, + 0b11011000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 76 (0x4c): width 7 +-------+ | | - | | |** | |** | |** | @@ -2389,58 +2092,50 @@ const uint16_t x7x13b_bits [] = |** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11111100, + 0b00000000, /* Character 77 (0x4d): - width 7 - +-------+ - | | - | | - |* * | - |** ** | - |****** | - |****** | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - | | - | | - +-------+ */ - 0x0000, - 0x0000, - 0x8400, - 0xcc00, - 0xfc00, - 0xfc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + width 8 + +-------+ + | | + |** **| + |** **| + |*** ***| + |*** ***| + |** * **| + |** * **| + |** * **| + |** **| + |** **| + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b11000110, + 0b11000110, + 0b11101110, + 0b11101110, + 0b11010110, + 0b11010110, + 0b11010110, + 0b11000110, + 0b11000110, + 0b00000000, /* Character 78 (0x4e): width 7 +-------+ | | - | | |** ** | |** ** | |*** ** | @@ -2451,27 +2146,23 @@ const uint16_t x7x13b_bits [] = |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xec00, - 0xec00, - 0xfc00, - 0xdc00, - 0xdc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11101100, + 0b11101100, + 0b11111100, + 0b11011100, + 0b11011100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 79 (0x4f): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -2482,27 +2173,23 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 80 (0x50): width 7 +-------+ | | - | | |***** | |** ** | |** ** | @@ -2513,27 +2200,23 @@ const uint16_t x7x13b_bits [] = |** | |** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b00000000, /* Character 81 (0x51): width 7 +-------+ | | - | | | **** | |** ** | |** ** | @@ -2544,275 +2227,239 @@ const uint16_t x7x13b_bits [] = |** *** | | **** | | ** | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xec00, - 0xdc00, - 0x7800, - 0x0c00, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11101100, + 0b11011100, + 0b01111000, + 0b00001100, /* Character 82 (0x52): width 7 +-------+ | | - | | |***** | |** ** | |** ** | |** ** | |***** | - |**** | |** ** | |** ** | - |** * | - | | + |** ** | + |** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0xf000, - 0xd800, - 0xcc00, - 0xc400, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b11011000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 83 (0x53): width 7 +-------+ | | - | | | **** | |** ** | - |** | - |** | - | **** | - | ** | - | ** | + |** ** | + | ** | + | ** | + | ** | + |** ** | |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xc000, - 0xc000, - 0x7800, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01111000, + 0b11001100, + 0b11001100, + 0b01100000, + 0b00110000, + 0b00011000, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 84 (0x54): width 7 +-------+ | | - | | |****** | + |* ** * | + | ** | | ** | | ** | | ** | | ** | | ** | | ** | - | ** | - | ** | - | | - | | - +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, - - /* Character 85 (0x55): - width 7 - +-------+ - | | - | | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - |** ** | - | **** | - | | - | | - +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, - - /* Character 86 (0x56): - width 7 - +-------+ - | | - | | - |** ** | - |** ** | - |** ** | - | * * | - | * * | - | **** | - | ** | - | ** | - | ** | - | | | | +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0x4800, - 0x4800, - 0x7800, - 0x3000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b10110100, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00000000, - /* Character 87 (0x57): + /* Character 85 (0x55): width 7 +-------+ | | - | | |** ** | |** ** | |** ** | |** ** | |** ** | - |****** | - |****** | |** ** | - |* * | + |** ** | + |** ** | + | **** | + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, + + /* Character 86 (0x56): + width 8 + +-------+ | | + |** **| + |** **| + |** **| + | ** ** | + | ** ** | + | ** ** | + | *** | + | *** | + | * | | | +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xfc00, - 0xfc00, - 0xcc00, - 0x8400, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b11000110, + 0b11000110, + 0b11000110, + 0b01101100, + 0b01101100, + 0b01101100, + 0b00111000, + 0b00111000, + 0b00010000, + 0b00000000, - /* Character 88 (0x58): + /* Character 87 (0x57): width 7 +-------+ | | + |** **| + |** **| + |** * **| + |** * **| + |** * **| + |** * **| + |*******| + |*******| + | ** ** | | | - |* * | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b11000110, + 0b11000110, + 0b11000110, + 0b11010110, + 0b11010110, + 0b11010110, + 0b11010110, + 0b11111110, + 0b01101100, + 0b00000000, + + /* Character 88 (0x58): + width 7 + +-------+ + | | + |** ** | + |** ** | |** ** | | * * | - | **** | | ** | - | **** | | * * | |** ** | - |* * | - | | + |** ** | + |** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x8400, - 0xcc00, - 0x4800, - 0x7800, - 0x3000, - 0x7800, - 0x4800, - 0xcc00, - 0x8400, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01001000, + 0b00110000, + 0b01001000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, - /* Character 89 (0x59): + /* Character 89 (0x59):Y width 7 +-------+ | | - | | + |** ** | + |** ** | |** ** | |** ** | | **** | - | **** | - | ** | | ** | | ** | | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0x7800, - 0x7800, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00000000, /* Character 90 (0x5a): width 7 +-------+ | | - | | |****** | | ** | | ** | @@ -2823,27 +2470,23 @@ const uint16_t x7x13b_bits [] = |** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xfc00, - 0x0c00, - 0x0c00, - 0x1800, - 0x3000, - 0x6000, - 0xc000, - 0xc000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11111100, + 0b00001100, + 0b00001100, + 0b00011000, + 0b00110000, + 0b01100000, + 0b11000000, + 0b11000000, + 0b11111100, + 0b00000000, /* Character 91 (0x5b): - width 7 + width 5 +-------+ | | - | | | **** | | ** | | ** | @@ -2854,27 +2497,23 @@ const uint16_t x7x13b_bits [] = | ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0x6000, - 0x6000, - 0x6000, - 0x6000, - 0x6000, - 0x6000, - 0x6000, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b11110000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11110000, + 0b00000000, /* Character 92 (0x5c): width 7 +-------+ | | - | | |** | |** | | ** | @@ -2885,58 +2524,50 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0xc000, - 0x6000, - 0x6000, - 0x3000, - 0x1800, - 0x1800, - 0x0c00, - 0x0c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b01100000, + 0b01100000, + 0b00110000, + 0b00011000, + 0b00011000, + 0b00001100, + 0b00001100, + 0b00000000, /* Character 93 (0x5d): - width 7 + width 5 +-------+ | | - | | - | **** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | ** | - | **** | - | | + |**** | + | ** | + | ** | + | ** | + | ** | + | ** | + | ** | + | ** | + |**** | | | +-------+ */ - 0x0000, - 0x0000, - 0x7800, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x1800, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b11110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11110000, + 0b00000000, /* Character 94 (0x5e): width 7 +-------+ | | - | | | ** | | **** | |** ** | @@ -2947,21 +2578,18 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x7800, - 0xcc00, - 0x8400, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00110000, + 0b01111000, + 0b11001100, + 0b10000100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 95 (0x5f): width 7 @@ -2975,34 +2603,28 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |****** | |****** | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfc00, - 0xfc00, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111100, + 0b11111100, /* Character 96 (0x60): - width 7 + width 5 +-------+ | | + |** | | ** | | ** | - | ** | - | | - | | | | | | | | @@ -3011,19 +2633,17 @@ const uint16_t x7x13b_bits [] = | | | | +-------+ */ - 0x0000, - 0x6000, - 0x3000, - 0x1800, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b11000000, + 0b01100000, + 0b00110000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, /* Character 97 (0x61): width 7 @@ -3032,7 +2652,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | **** | | ** | | ***** | @@ -3040,52 +2659,45 @@ const uint16_t x7x13b_bits [] = |** ** | | ***** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7800, - 0x0c00, - 0x7c00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01111000, + 0b00001100, + 0b01111100, + 0b11001100, + 0b11001100, + 0b01111100, + 0b00000000, /* Character 98 (0x62): width 7 +-------+ | | - | | |** | |** | |** | - |***** | - |** ** | - |** ** | + |** ** | + |*** ** | |** ** | |** ** | - |***** | - | | + |*** ** | + |** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0xc000, - 0xc000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11011000, + 0b11101100, + 0b11001100, + 0b11001100, + 0b11101100, + 0b11011000, + 0b00000000, /* Character 99 (0x63): width 7 @@ -3094,7 +2706,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | **** | |** ** | |** | @@ -3102,52 +2713,45 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xc000, - 0xc000, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01111000, + 0b11001100, + 0b11000000, + 0b11000000, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 100 (0x64): width 7 +-------+ | | - | | | ** | | ** | | ** | - | ***** | - |** ** | - |** ** | + | ** ** | + |** *** | |** ** | |** ** | - | ***** | - | | + |** *** | + | ** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x0c00, - 0x0c00, - 0x7c00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00001100, + 0b00001100, + 0b01101100, + 0b11011100, + 0b11001100, + 0b11001100, + 0b11011100, + 0b01101100, + 0b00000000, /* Character 101 (0x65): width 7 @@ -3156,7 +2760,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | **** | |** ** | |****** | @@ -3164,27 +2767,23 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xfc00, - 0xc000, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01111000, + 0b11001100, + 0b11111100, + 0b11000000, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 102 (0x66): width 7 +-------+ | | - | | | *** | | ** ** | | ** | @@ -3195,120 +2794,104 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3800, - 0x6c00, - 0x6000, - 0x6000, - 0xf000, - 0x6000, - 0x6000, - 0x6000, - 0x6000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00111000, + 0b01101100, + 0b01100000, + 0b01100000, + 0b11110000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b00000000, - /* Character 103 (0x67): + /* Character 103 (0x67):g width 7 +-------+ | | | | | | | | - | | | *** * | |** ** | |** ** | - | **** | - |** | - | **** | |** ** | + | ***** | + | ** | | **** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7400, - 0xcc00, - 0xcc00, - 0x7800, - 0xc000, - 0x7800, - 0xcc00, - 0x7800, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01110100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111100, + 0b00001100, + 0b01111000, /* Character 104 (0x68): width 7 +-------+ | | - | | |** | |** | |** | - |***** | - |** ** | + |** ** | + |*** ** | |** ** | |** ** | |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0xc000, - 0xc000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11011000, + 0b11101100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 105 (0x69): width 7 +-------+ | | + | ** | + | ** | | | - | ** | - | ** | - | | - | *** | - | ** | - | ** | - | ** | - | ** | - |****** | - | | + |*** | + | ** | + | ** | + | ** | + | ** | + |**** | | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x3000, - 0x0000, - 0x7000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b01100000, + 0b01100000, + 0b00000000, + 0b11100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b11110000, + 0b00000000, /* Character 106 (0x6a): width 7 +-------+ | | - | | | ** | | ** | | | @@ -3317,29 +2900,25 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | ** | - | ** | |** ** | | **** | +-------+ */ - 0x0000, - 0x0000, - 0x0c00, - 0x0c00, - 0x0000, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0x0c00, - 0xcc00, - 0x7800, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00001100, + 0b00001100, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b00001100, + 0b11001100, + 0b01111000, /* Character 107 (0x6b): width 7 +-------+ | | - | | |** | |** | |** | @@ -3350,27 +2929,23 @@ const uint16_t x7x13b_bits [] = |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0xc000, - 0xc000, - 0xc000, - 0xcc00, - 0xd800, - 0xf000, - 0xf000, - 0xd800, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11001100, + 0b11011000, + 0b11110000, + 0b11110000, + 0b11011000, + 0b11001100, + 0b00000000, /* Character 108 (0x6c): width 7 +-------+ | | - | | | *** | | ** | | ** | @@ -3381,21 +2956,18 @@ const uint16_t x7x13b_bits [] = | ** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x7000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11111100, + 0b00000000, /* Character 109 (0x6d): width 7 @@ -3404,29 +2976,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |** ** | - |****** | - |****** | - |** ** | - |** ** | - |** ** | - | | - | | - +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xd800, - 0xfc00, - 0xfc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + |*** ** | + |*******| + |** * **| + |** * **| + |** * **| + |** * **| + | | + +-------+ */ + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11101100, + 0b11111110, + 0b11010110, + 0b11010110, + 0b11010110, + 0b11010110, + 0b00000000, /* Character 110 (0x6e): width 7 @@ -3435,29 +3003,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |***** | - |** ** | + |** ** | + |*** ** | |** ** | |** ** | |** ** | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11011000, + 0b11101100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b00000000, /* Character 111 (0x6f): width 7 @@ -3466,7 +3030,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | **** | |** ** | |** ** | @@ -3474,21 +3037,18 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01111000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 112 (0x70): width 7 @@ -3497,29 +3057,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |***** | - |** ** | + |** ** | + |*** ** | |** ** | |** ** | |***** | |** | |** | - |** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xcc00, - 0xcc00, - 0xf800, - 0xc000, - 0xc000, - 0xc000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11011000, + 0b11101100, + 0b11001100, + 0b11001100, + 0b11111000, + 0b11000000, + 0b11000000, /* Character 113 (0x71): width 7 @@ -3528,29 +3084,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - | ***** | - |** ** | + | ** ** | + |** *** | |** ** | |** ** | | ***** | | ** | | ** | - | ** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7c00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0c00, - 0x0c00, - 0x0c00, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01101100, + 0b11011100, + 0b11001100, + 0b11001100, + 0b01111100, + 0b00001100, + 0b00001100, /* Character 114 (0x72): width 7 @@ -3559,29 +3111,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |***** | - |** ** | + |* *** | + |*** ** | |** | |** | |** | |** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xf800, - 0xcc00, - 0xc000, - 0xc000, - 0xc000, - 0xc000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11011000, + 0b11101100, + 0b11000000, + 0b11000000, + 0b11000000, + 0b11000000, + 0b00000000, /* Character 115 (0x73): width 7 @@ -3590,7 +3138,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | | **** | |** ** | | ** | @@ -3598,28 +3145,24 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x7800, - 0xcc00, - 0x6000, - 0x1800, - 0xcc00, - 0x7800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b01111000, + 0b11001100, + 0b01100000, + 0b00011000, + 0b11001100, + 0b01111000, + 0b00000000, /* Character 116 (0x74): width 7 +-------+ | | | | - | | | ** | | ** | |***** | @@ -3629,21 +3172,18 @@ const uint16_t x7x13b_bits [] = | ** ** | | *** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x6000, - 0x6000, - 0xf800, - 0x6000, - 0x6000, - 0x6000, - 0x6c00, - 0x3800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b01100000, + 0b01100000, + 0b11111000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01101100, + 0b00111000, + 0b00000000, /* Character 117 (0x75): width 7 @@ -3652,29 +3192,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |** ** | |** ** | |** ** | |** ** | - |** ** | - | ***** | - | | + |** *** | + | ** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11001100, + 0b11011100, + 0b01101100, + 0b00000000, /* Character 118 (0x76): width 7 @@ -3683,29 +3219,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |** ** | |** ** | - |** ** | - | **** | - | **** | + | * * | + | * * | + | ** | | ** | - | | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7800, - 0x7800, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11001100, + 0b11001100, + 0b01001000, + 0b01001000, + 0b00110000, + 0b00110000, + 0b00000000, /* Character 119 (0x77): width 7 @@ -3714,29 +3246,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |** ** | - |** ** | - |** ** | - |****** | - |****** | - | * * | - | | + |** **| + |** **| + |** * **| + |** * **| + |*******| + | ** ** | | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xfc00, - 0xfc00, - 0x4800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_8px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11000110, + 0b11000110, + 0b11010110, + 0b11010110, + 0b11111110, + 0b01101100, + 0b00000000, /* Character 120 (0x78): width 7 @@ -3745,29 +3273,25 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |** ** | - |** ** | - | **** | - | **** | |** ** | + | * * | + | ** | + | ** | + | * * | |** ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0x7800, - 0x7800, - 0xcc00, - 0xcc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11001100, + 0b01001000, + 0b00110000, + 0b00110000, + 0b01001000, + 0b11001100, + 0b00000000, /* Character 121 (0x79): width 7 @@ -3776,8 +3300,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | - |** ** | |** ** | |** ** | |** ** | @@ -3786,19 +3308,17 @@ const uint16_t x7x13b_bits [] = |** ** | | **** | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xcc00, - 0xcc00, - 0xcc00, - 0xcc00, - 0x7c00, - 0x0c00, - 0xcc00, - 0x7800, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11001100, + 0b11001100, + 0b11001100, + 0b01111100, + 0b00001100, + 0b11001100, + 0b01111000, /* Character 122 (0x7a): width 7 @@ -3807,7 +3327,6 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | |****** | | ** | | ** | @@ -3815,58 +3334,50 @@ const uint16_t x7x13b_bits [] = |** | |****** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0xfc00, - 0x0c00, - 0x1800, - 0x6000, - 0xc000, - 0xfc00, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b00000000, + 0b00000000, + 0b00000000, + 0b11111100, + 0b00001100, + 0b00011000, + 0b01100000, + 0b11000000, + 0b11111100, + 0b00000000, /* Character 123 (0x7b): - width 7 + width 6 +-------+ | | - | | | *** | | ** | | ** | - | ** | | ** | - | ** | + |** | + | ** | | ** | | ** | | *** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3800, - 0x6000, - 0x6000, - 0x3000, - 0x6000, - 0x3000, - 0x6000, - 0x6000, - 0x3800, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_6px, + 0b00111000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b11000000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b00111000, + 0b00000000, /* Character 124 (0x7c): - width 7 + width 5 +-------+ | | - | | | ** | | ** | | ** | @@ -3877,58 +3388,50 @@ const uint16_t x7x13b_bits [] = | ** | | ** | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x3000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_5px, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b01100000, + 0b00000000, /* Character 125 (0x7d): - width 7 + width 6 +-------+ | | - | | - | *** | - | ** | - | ** | + |*** | + | ** | | ** | - | ** | | ** | | ** | - | ** | - | *** | - | | + | ** | + | ** | + | ** | + |*** | | | +-------+ */ - 0x0000, - 0x0000, - 0x7000, - 0x1800, - 0x1800, - 0x3000, - 0x1800, - 0x3000, - 0x1800, - 0x1800, - 0x7000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_6px, + 0b11100000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b00011000, + 0b00110000, + 0b00110000, + 0b00110000, + 0b11100000, + 0b00000000, /* Character 126 (0x7e): width 7 +-------+ | | - | | | ** * | |****** | |* ** | @@ -3939,21 +3442,16 @@ const uint16_t x7x13b_bits [] = | | | | | | - | | +-------+ */ - 0x0000, - 0x0000, - 0x6400, - 0xfc00, - 0x9800, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, - 0x0000, + 0b00000000|CHAR7x11_WIDTH_7px, + 0b01100100, + 0b11111100, + 0b10011000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, }; - - diff --git a/ili9341.c b/ili9341.c index 5496c3c..22f4878 100644 --- a/ili9341.c +++ b/ili9341.c @@ -610,9 +610,10 @@ void ili9341_drawstring_7x13(const char *str, int x, int y) { while (*str) { uint8_t ch = *str++; - const uint16_t *char_buf = &x7x13b_bits[(ch * 13)]; // All chars start at row 2 - blit16BitWidthBitmap(x, y, 7, 13, char_buf); // Only 'Q' has 12 rows, 'g' requires 13 rows - x += 7; + const uint8_t *char_buf = bFONT_GET_DATA(ch); + uint16_t w = bFONT_GET_WIDTH(ch); + blit8BitWidthBitmap(x, y, w, bFONT_GET_HEIGHT, char_buf); + x += w; } } diff --git a/nanovna.h b/nanovna.h index e93c028..0db38f6 100644 --- a/nanovna.h +++ b/nanovna.h @@ -312,12 +312,19 @@ extern int16_t area_height; // font extern const uint8_t x5x7_bits []; -extern const uint16_t x7x13b_bits []; +extern const uint8_t x7x11b_bits []; #define FONT_GET_DATA(ch) (&x5x7_bits[ch*7]) #define FONT_GET_WIDTH(ch) (8-(x5x7_bits[ch*7]&7)) #define FONT_MAX_WIDTH 7 #define FONT_GET_HEIGHT 7 +#define bFONT_GET_DATA(ch) (&x7x11b_bits[ch*11]) +#define bFONT_GET_WIDTH(ch) (8-(x7x11b_bits[ch*11]&7)) +#define bFONT_MAX_WIDTH 8 +#define bFONT_WIDTH 7 +#define bFONT_GET_HEIGHT 11 +#define bFONT_STR_HEIGHT 11 + extern const uint16_t numfont16x22[]; #define NUM_FONT_GET_DATA(ch) (&numfont16x22[ch*22]) #define NUM_FONT_GET_WIDTH 16 diff --git a/plot.c b/plot.c index d3da9f9..057404b 100644 --- a/plot.c +++ b/plot.c @@ -1833,21 +1833,22 @@ cell_drawstring_size(char *str, int x, int y, int size) } static int -cell_drawchar_7x13(uint8_t ch, int x, int y) +cell_draw_bchar(uint8_t ch, int x, int y) { - uint16_t bits; + uint8_t bits; int c, r, ch_size; - ch_size = 7; + const uint8_t *char_buf = bFONT_GET_DATA(ch); + ch_size = bFONT_GET_WIDTH(ch); // if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT || x <= -ch_size || x >= CELLWIDTH) // return ch_size; if (x <= -ch_size) return ch_size; - for (c = 0; c < 13; c++) { - bits = x7x13b_bits[(ch * 13) + c]; + for (c = 0; c < bFONT_GET_HEIGHT; c++) { + bits = *char_buf++; if ((y + c) < 0 || (y + c) >= CELLHEIGHT) continue; for (r = 0; r < ch_size; r++) { - if ((x+r) >= 0 && (x+r) < CELLWIDTH && (0x8000 & bits)) + if ((x+r) >= 0 && (x+r) < CELLWIDTH && (0x80 & bits)) cell_buffer[(y+c)*CELLWIDTH + (x+r)] = foreground_color; bits <<= 1; } @@ -1859,12 +1860,12 @@ cell_drawchar_7x13(uint8_t ch, int x, int y) void cell_drawstring_7x13(char *str, int x, int y) { - if (y <= -13 || y >= CELLHEIGHT) + if (y <= -bFONT_GET_HEIGHT || y >= CELLHEIGHT) return; while (*str) { if (x >= CELLWIDTH) return; - x += cell_drawchar_7x13(*str++, x, y); + x += cell_draw_bchar(*str++, x, y); } } @@ -2001,7 +2002,7 @@ static void cell_draw_marker_info(int x0, int y0) int t; int ref_marker = 0; int j = 0; - int count = 0; +// int count = 0; int active=0; for (int i = 0; i < MARKER_COUNT; i++) { if (markers[i].enabled) { diff --git a/si4432.c b/si4432.c index 0772ea0..0bd80a4 100644 --- a/si4432.c +++ b/si4432.c @@ -290,8 +290,8 @@ void set_10mhz(int f) } int SI4432_frequency_changed = false; -static int old_freq_band[2] = {-1,-1}; -static int written[2]= {0,0}; +//static int old_freq_band[2] = {-1,-1}; +//static int written[2]= {0,0}; void SI4432_Set_Frequency ( long Freq ) { int hbsel;