From 711d8426c92badccce8a7fe18f4210400af5597a Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Sat, 20 Feb 2021 15:14:35 +0100 Subject: [PATCH] Add 10pt font. Reduce frequency line on GD-77 to avoid overlap --- .../include/fonts/adafruit/FreeSans10pt7b.h | 216 ++++++++++++++++++ openrtx/include/interfaces/graphics.h | 3 + openrtx/src/ui/ui.c | 8 +- 3 files changed, 223 insertions(+), 4 deletions(-) create mode 100644 openrtx/include/fonts/adafruit/FreeSans10pt7b.h diff --git a/openrtx/include/fonts/adafruit/FreeSans10pt7b.h b/openrtx/include/fonts/adafruit/FreeSans10pt7b.h new file mode 100644 index 00000000..481e0253 --- /dev/null +++ b/openrtx/include/fonts/adafruit/FreeSans10pt7b.h @@ -0,0 +1,216 @@ +static const uint8_t FreeSans10pt7bBitmaps[] PROGMEM = { + 0x00, 0xFF, 0xFD, 0x54, 0xF0, 0xDE, 0xF7, 0xB8, 0x80, 0x0C, 0x81, 0x10, + 0x22, 0x04, 0xC7, 0xFE, 0xFF, 0xC4, 0x40, 0x88, 0x11, 0x1F, 0xF8, 0xCC, + 0x19, 0x02, 0x20, 0x44, 0x00, 0x08, 0x1F, 0x1A, 0xD9, 0x38, 0x9E, 0x43, + 0x20, 0xF8, 0x1F, 0x05, 0xC2, 0x71, 0x18, 0x9E, 0x4D, 0xFC, 0x10, 0x08, + 0x00, 0x00, 0x10, 0x78, 0x20, 0xCC, 0x20, 0x84, 0x40, 0x84, 0x40, 0xCC, + 0x80, 0x79, 0x80, 0x01, 0x00, 0x03, 0x3E, 0x02, 0x62, 0x06, 0x63, 0x04, + 0x63, 0x0C, 0x62, 0x08, 0x3E, 0x1E, 0x07, 0xE0, 0x8C, 0x10, 0x83, 0x30, + 0x3C, 0x07, 0x01, 0xE2, 0x66, 0x58, 0x7B, 0x06, 0x60, 0xCE, 0x3C, 0xFC, + 0xC0, 0xFF, 0x80, 0x11, 0x88, 0x46, 0x21, 0x18, 0xC6, 0x10, 0x84, 0x30, + 0x84, 0x10, 0x80, 0x84, 0x62, 0x23, 0x33, 0x33, 0x33, 0x32, 0x64, 0x48, + 0x22, 0xAF, 0x9C, 0x58, 0x08, 0x04, 0x02, 0x01, 0x0F, 0xF8, 0x40, 0x20, + 0x10, 0x08, 0x00, 0xF5, 0x80, 0xF8, 0xF0, 0x08, 0x20, 0x84, 0x10, 0x42, + 0x08, 0x21, 0x04, 0x10, 0xC2, 0x00, 0x1C, 0x3F, 0x18, 0xD8, 0x2C, 0x1E, + 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x78, 0x26, 0x31, 0xF0, 0x08, 0xCF, + 0xF1, 0x8C, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x3E, 0x3F, 0xB0, 0x78, 0x3C, + 0x18, 0x0C, 0x0C, 0x1C, 0x1C, 0x38, 0x18, 0x18, 0x0F, 0xFF, 0xFC, 0x3C, + 0x3F, 0xB0, 0xD8, 0x2C, 0x10, 0x18, 0x78, 0x3E, 0x01, 0x80, 0xE0, 0x78, + 0x3E, 0x33, 0xF0, 0x02, 0x03, 0x03, 0x83, 0xC1, 0x61, 0xB1, 0x98, 0x8C, + 0xC6, 0x7F, 0xFF, 0xE0, 0xC0, 0x60, 0x30, 0x7F, 0x3F, 0x90, 0x08, 0x04, + 0x07, 0xF3, 0x9D, 0x83, 0x01, 0x80, 0xC0, 0x78, 0x3E, 0x33, 0xF0, 0x1E, + 0x1F, 0x98, 0x58, 0x3C, 0x06, 0x63, 0xFD, 0xC7, 0xC1, 0xE0, 0xF0, 0x78, + 0x36, 0x31, 0xF0, 0xFF, 0xFF, 0xC0, 0x60, 0x60, 0x20, 0x30, 0x30, 0x18, + 0x18, 0x0C, 0x04, 0x06, 0x03, 0x01, 0x80, 0x3C, 0x3F, 0xB0, 0xD8, 0x3C, + 0x13, 0x18, 0xF8, 0xEE, 0xC1, 0xE0, 0xE0, 0x78, 0x3E, 0x33, 0xF0, 0x3C, + 0x3F, 0xB0, 0xD8, 0x3C, 0x1E, 0x0F, 0x06, 0xCF, 0x3D, 0x80, 0xC0, 0x78, + 0x66, 0x33, 0xF0, 0xF0, 0x00, 0xF0, 0xF0, 0x00, 0xF5, 0x80, 0x00, 0x83, + 0xC7, 0x0E, 0x0C, 0x03, 0x80, 0x78, 0x0F, 0x00, 0x80, 0xFF, 0x80, 0x00, + 0x1F, 0xFF, 0xF8, 0xC0, 0x1C, 0x01, 0xE0, 0x1E, 0x00, 0xC1, 0xE1, 0xC3, + 0xC0, 0xC0, 0x00, 0x00, 0x1F, 0x98, 0xE8, 0x34, 0x18, 0x0C, 0x0C, 0x0C, + 0x0C, 0x06, 0x02, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x01, 0xFE, + 0x01, 0xC0, 0xE0, 0xE0, 0x0C, 0x60, 0x01, 0x98, 0x7B, 0x6C, 0x33, 0x8B, + 0x18, 0x63, 0x8C, 0x18, 0xE3, 0x04, 0x28, 0xC3, 0x1B, 0x30, 0xC4, 0xC7, + 0xF7, 0x18, 0xE7, 0x07, 0x00, 0x00, 0xE0, 0x00, 0x0F, 0xF8, 0x00, 0xF8, + 0x00, 0x07, 0x00, 0x38, 0x03, 0x60, 0x1B, 0x00, 0xC8, 0x0C, 0x60, 0x63, + 0x02, 0x08, 0x3F, 0xE1, 0xFF, 0x0C, 0x0C, 0xC0, 0x66, 0x03, 0x20, 0x0C, + 0xFF, 0x20, 0xE8, 0x0A, 0x03, 0x80, 0xA0, 0x6F, 0xF2, 0x0E, 0x80, 0xE0, + 0x38, 0x0E, 0x03, 0xFF, 0xBF, 0xC0, 0x00, 0x01, 0xFC, 0x30, 0xE6, 0x06, + 0x40, 0x3C, 0x00, 0xC0, 0x0C, 0x00, 0xC0, 0x0C, 0x00, 0xC0, 0x36, 0x03, + 0x60, 0x73, 0x8E, 0x1F, 0xC0, 0xFF, 0x18, 0x73, 0x03, 0x60, 0x3C, 0x07, + 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x03, 0x60, 0x6F, 0xF9, 0xFE, + 0x00, 0xFF, 0xF0, 0x0C, 0x03, 0x00, 0xC0, 0x30, 0x0F, 0xFB, 0x00, 0xC0, + 0x30, 0x0C, 0x03, 0x00, 0xFF, 0xFF, 0xF0, 0xFF, 0xE0, 0x30, 0x18, 0x0C, + 0x06, 0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x00, 0x00, + 0x00, 0xFF, 0x0E, 0x1C, 0xC0, 0x64, 0x01, 0xE0, 0x03, 0x00, 0x18, 0x3F, + 0xC1, 0xFE, 0x00, 0xF0, 0x06, 0xC0, 0x36, 0x03, 0x9C, 0x3C, 0x7F, 0x20, + 0x80, 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x00, 0xFF, 0xFC, 0x03, 0x80, + 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0xF0, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xC1, 0xC3, 0xC3, + 0x63, 0x7E, 0x80, 0xD0, 0x32, 0x0C, 0x43, 0x08, 0xC1, 0x30, 0x2F, 0x07, + 0x60, 0xC6, 0x10, 0x62, 0x0C, 0x40, 0xC8, 0x0D, 0x01, 0xC0, 0x80, 0x80, + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xFF, 0xFF, + 0xE0, 0x1F, 0xC0, 0x7F, 0x03, 0xF4, 0x0F, 0xD8, 0x2F, 0x61, 0xBC, 0x86, + 0xF3, 0x13, 0xCC, 0xCF, 0x13, 0x3C, 0x68, 0xF1, 0xE3, 0xC3, 0x8F, 0x0C, + 0x30, 0xE0, 0x3F, 0x03, 0xF0, 0x3D, 0x83, 0xCC, 0x3C, 0xC3, 0xC6, 0x3C, + 0x63, 0xC3, 0x3C, 0x1B, 0xC1, 0xBC, 0x0F, 0xC0, 0x7C, 0x07, 0x00, 0x00, + 0x7F, 0x03, 0x87, 0x18, 0x0C, 0xC0, 0x1B, 0x00, 0x6C, 0x00, 0xB0, 0x03, + 0xC0, 0x0F, 0x00, 0x2C, 0x01, 0xB0, 0x06, 0x60, 0x30, 0xE1, 0xC1, 0xFC, + 0x00, 0xFF, 0xB0, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x3F, 0xFB, 0xFC, 0xC0, + 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x30, 0x00, 0x00, 0x00, 0x7F, 0x03, 0x87, + 0x18, 0x0C, 0xC0, 0x1B, 0x00, 0x6C, 0x00, 0xB0, 0x03, 0xC0, 0x0F, 0x00, + 0x2C, 0x01, 0xB0, 0x26, 0x60, 0xF0, 0xE3, 0xC1, 0xFF, 0x80, 0x02, 0xFF, + 0x98, 0x3B, 0x01, 0xE0, 0x3C, 0x07, 0x81, 0xBF, 0xE7, 0xFC, 0xC0, 0xD8, + 0x0B, 0x01, 0x60, 0x2C, 0x07, 0x80, 0xC0, 0x00, 0x07, 0xF1, 0x83, 0x20, + 0x2C, 0x07, 0xC0, 0x1C, 0x01, 0xF8, 0x07, 0xC0, 0x1F, 0x01, 0xE0, 0x3C, + 0x06, 0xE1, 0x8F, 0xE0, 0xFF, 0xF0, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, + 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, + 0x60, 0x80, 0x70, 0x0E, 0x01, 0xC0, 0x38, 0x07, 0x00, 0xE0, 0x1C, 0x03, + 0x80, 0x70, 0x0F, 0x01, 0xE0, 0x6E, 0x1C, 0x7F, 0x00, 0xC0, 0x6C, 0x06, + 0x60, 0x66, 0x0C, 0x60, 0xC3, 0x0C, 0x31, 0x83, 0x18, 0x19, 0x81, 0xB0, + 0x1B, 0x00, 0xF0, 0x0E, 0x00, 0x60, 0x60, 0xC0, 0xD8, 0x38, 0x36, 0x0E, + 0x09, 0x86, 0x86, 0x31, 0xB1, 0x8C, 0x4C, 0x63, 0x33, 0x10, 0xCC, 0x4C, + 0x1B, 0x1B, 0x06, 0x86, 0xC1, 0xE0, 0xA0, 0x78, 0x38, 0x0E, 0x0E, 0x03, + 0x03, 0x80, 0x60, 0x31, 0x83, 0x06, 0x38, 0x31, 0x80, 0xD8, 0x03, 0x80, + 0x1C, 0x00, 0xE0, 0x0D, 0x80, 0x66, 0x06, 0x30, 0x60, 0xC7, 0x07, 0x30, + 0x18, 0x60, 0x33, 0x81, 0x8C, 0x18, 0x30, 0xC1, 0x8C, 0x06, 0xC0, 0x1E, + 0x00, 0xE0, 0x03, 0x00, 0x18, 0x00, 0xC0, 0x06, 0x00, 0x30, 0x01, 0x80, + 0xFF, 0xC0, 0x30, 0x1C, 0x0E, 0x03, 0x01, 0x80, 0xC0, 0x70, 0x18, 0x0C, + 0x06, 0x03, 0x80, 0xFF, 0xFF, 0xF0, 0xFC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, + 0xCC, 0xCC, 0xCF, 0x82, 0x04, 0x10, 0x40, 0x82, 0x08, 0x10, 0x41, 0x02, + 0x08, 0x20, 0xF3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x10, + 0x70, 0xA3, 0x64, 0x48, 0xB0, 0xC1, 0xFF, 0xE0, 0x61, 0x80, 0x08, 0x3F, + 0xB0, 0xD8, 0x20, 0x31, 0xFB, 0xC5, 0x82, 0xC3, 0x63, 0x9F, 0x60, 0xC0, + 0x60, 0x30, 0x19, 0x8F, 0xF7, 0x1B, 0x07, 0x83, 0xC0, 0xE0, 0x70, 0x78, + 0x3E, 0x37, 0xF0, 0x08, 0x7E, 0xE3, 0xC3, 0x80, 0x80, 0x80, 0x81, 0xC3, + 0xE3, 0x7E, 0x01, 0x80, 0xC0, 0x63, 0x37, 0xFF, 0x1F, 0x07, 0x03, 0x81, + 0xC0, 0xE0, 0x78, 0x7E, 0x3B, 0xFC, 0x08, 0x1F, 0x18, 0xD8, 0x3C, 0x1F, + 0xFE, 0x01, 0x80, 0xC1, 0xB1, 0x8F, 0x80, 0x39, 0x88, 0x4F, 0x90, 0x84, + 0x21, 0x08, 0x42, 0x10, 0x18, 0x3E, 0xF8, 0xF8, 0x78, 0x1C, 0x0E, 0x07, + 0x03, 0xC3, 0xF1, 0xDF, 0x60, 0x2C, 0x16, 0x19, 0xF8, 0xC0, 0x60, 0x30, + 0x18, 0x8D, 0xF7, 0x1B, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x78, 0x3C, 0x1E, + 0x0C, 0xF0, 0xFF, 0xFF, 0xF0, 0x6C, 0x06, 0xDB, 0x6D, 0xB6, 0xDB, 0x7C, + 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x66, 0x63, 0x61, 0xF0, 0xF8, 0x66, 0x31, + 0x98, 0xCC, 0x36, 0x0C, 0xFF, 0xFF, 0xFF, 0xF0, 0x0C, 0x33, 0xFB, 0xEE, + 0x38, 0xF0, 0xC3, 0xC3, 0x0F, 0x0C, 0x3C, 0x30, 0xF0, 0xC3, 0xC3, 0x0F, + 0x0C, 0x3C, 0x30, 0xC0, 0x04, 0x6F, 0xB8, 0xD8, 0x3C, 0x1E, 0x0F, 0x07, + 0x83, 0xC1, 0xE0, 0xF0, 0x60, 0x08, 0x3F, 0x18, 0xD8, 0x3C, 0x1C, 0x0E, + 0x07, 0x83, 0xC1, 0xB1, 0x9F, 0x80, 0x0C, 0x7F, 0xB8, 0xD8, 0x3C, 0x1E, + 0x07, 0x03, 0x83, 0xC1, 0xF1, 0xBF, 0xD8, 0x0C, 0x06, 0x03, 0x00, 0x18, + 0x3F, 0xF8, 0xF8, 0x38, 0x1C, 0x0E, 0x07, 0x03, 0xC1, 0xF1, 0xDF, 0x60, + 0x30, 0x18, 0x0C, 0x06, 0x0E, 0xF9, 0x8C, 0x63, 0x18, 0xC6, 0x30, 0x18, + 0x7E, 0xC6, 0xC3, 0xC0, 0x7C, 0x1E, 0x03, 0x83, 0xC3, 0x7E, 0x21, 0x09, + 0xF2, 0x10, 0x84, 0x21, 0x08, 0x43, 0x80, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, + 0xC1, 0xC1, 0xC3, 0xC3, 0x7D, 0xC1, 0x98, 0x66, 0x10, 0x8C, 0x33, 0x0C, + 0x81, 0x60, 0x78, 0x1C, 0x03, 0x00, 0xC3, 0x0D, 0x0C, 0x26, 0x79, 0x99, + 0xE6, 0x24, 0x90, 0x92, 0x43, 0xCF, 0x0F, 0x3C, 0x18, 0x60, 0x61, 0x80, + 0x61, 0x99, 0x8D, 0x83, 0xC0, 0xC0, 0xE0, 0x78, 0x66, 0x63, 0x30, 0xC0, + 0x41, 0xB0, 0xD8, 0x44, 0x63, 0x31, 0x90, 0x58, 0x3C, 0x1C, 0x06, 0x02, + 0x03, 0x01, 0x83, 0x80, 0xFF, 0x06, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, + 0xC0, 0xFF, 0x36, 0x66, 0x66, 0x66, 0xCC, 0x66, 0x66, 0x66, 0x63, 0xFF, + 0xFF, 0xC0, 0xC6, 0x66, 0x66, 0x66, 0x33, 0x66, 0x66, 0x66, 0x6C, 0x20, + 0x3C, 0x53, 0xE0, 0x60 }; + +static const GFXglyph FreeSans10pt7bGlyphs[] PROGMEM = { + { 0, 1, 1, 5, 0, 0 }, // 0x20 ' ' + { 1, 2, 14, 5, 2, -13 }, // 0x21 '!' + { 5, 5, 5, 7, 1, -13 }, // 0x22 '"' + { 9, 11, 14, 11, 0, -13 }, // 0x23 '#' + { 29, 9, 17, 11, 1, -14 }, // 0x24 '$' + { 49, 16, 14, 17, 1, -13 }, // 0x25 '%' + { 77, 11, 14, 13, 1, -13 }, // 0x26 '&' + { 97, 2, 5, 4, 1, -13 }, // 0x27 ''' + { 99, 5, 18, 7, 1, -13 }, // 0x28 '(' + { 111, 4, 18, 7, 1, -13 }, // 0x29 ')' + { 120, 6, 5, 8, 1, -13 }, // 0x2A '*' + { 124, 9, 9, 11, 1, -8 }, // 0x2B '+' + { 135, 2, 5, 5, 2, -1 }, // 0x2C ',' + { 137, 5, 1, 7, 1, -5 }, // 0x2D '-' + { 138, 2, 2, 5, 2, -1 }, // 0x2E '.' + { 139, 6, 14, 5, 0, -13 }, // 0x2F '/' + { 150, 9, 14, 11, 1, -13 }, // 0x30 '0' + { 166, 5, 14, 11, 2, -13 }, // 0x31 '1' + { 175, 9, 14, 11, 1, -13 }, // 0x32 '2' + { 191, 9, 14, 11, 1, -13 }, // 0x33 '3' + { 207, 9, 14, 11, 1, -13 }, // 0x34 '4' + { 223, 9, 14, 11, 1, -13 }, // 0x35 '5' + { 239, 9, 14, 11, 1, -13 }, // 0x36 '6' + { 255, 9, 14, 11, 1, -13 }, // 0x37 '7' + { 271, 9, 14, 11, 1, -13 }, // 0x38 '8' + { 287, 9, 14, 11, 1, -13 }, // 0x39 '9' + { 303, 2, 10, 5, 2, -9 }, // 0x3A ':' + { 306, 2, 13, 5, 2, -9 }, // 0x3B ';' + { 310, 9, 9, 11, 1, -8 }, // 0x3C '<' + { 321, 9, 5, 11, 1, -6 }, // 0x3D '=' + { 327, 10, 9, 11, 1, -8 }, // 0x3E '>' + { 339, 9, 15, 11, 1, -14 }, // 0x3F '?' + { 356, 18, 18, 20, 1, -14 }, // 0x40 '@' + { 397, 13, 14, 13, 0, -13 }, // 0x41 'A' + { 420, 10, 14, 13, 2, -13 }, // 0x42 'B' + { 438, 12, 15, 14, 1, -14 }, // 0x43 'C' + { 461, 11, 14, 14, 2, -13 }, // 0x44 'D' + { 481, 10, 14, 13, 2, -13 }, // 0x45 'E' + { 499, 9, 14, 12, 2, -13 }, // 0x46 'F' + { 515, 13, 15, 15, 1, -14 }, // 0x47 'G' + { 540, 11, 14, 14, 2, -13 }, // 0x48 'H' + { 560, 2, 14, 5, 2, -13 }, // 0x49 'I' + { 564, 8, 14, 10, 0, -13 }, // 0x4A 'J' + { 578, 11, 14, 13, 2, -13 }, // 0x4B 'K' + { 598, 8, 14, 11, 2, -13 }, // 0x4C 'L' + { 612, 14, 14, 16, 1, -13 }, // 0x4D 'M' + { 637, 12, 14, 14, 1, -13 }, // 0x4E 'N' + { 658, 14, 15, 15, 1, -14 }, // 0x4F 'O' + { 685, 10, 14, 13, 2, -13 }, // 0x50 'P' + { 703, 14, 16, 15, 1, -14 }, // 0x51 'Q' + { 731, 11, 14, 14, 2, -13 }, // 0x52 'R' + { 751, 11, 15, 13, 1, -14 }, // 0x53 'S' + { 772, 12, 14, 12, 0, -13 }, // 0x54 'T' + { 793, 11, 14, 14, 2, -13 }, // 0x55 'U' + { 813, 12, 14, 13, 1, -13 }, // 0x56 'V' + { 834, 18, 14, 18, 0, -13 }, // 0x57 'W' + { 866, 13, 14, 13, 0, -13 }, // 0x58 'X' + { 889, 13, 14, 13, 0, -13 }, // 0x59 'Y' + { 912, 10, 14, 12, 1, -13 }, // 0x5A 'Z' + { 930, 4, 18, 5, 1, -13 }, // 0x5B '[' + { 939, 6, 14, 5, 0, -13 }, // 0x5C '\' + { 950, 4, 18, 5, 0, -13 }, // 0x5D ']' + { 959, 7, 8, 9, 1, -13 }, // 0x5E '^' + { 966, 11, 1, 11, 0, 3 }, // 0x5F '_' + { 968, 5, 2, 7, 0, -13 }, // 0x60 '`' + { 970, 9, 11, 11, 1, -10 }, // 0x61 'a' + { 983, 9, 14, 11, 1, -13 }, // 0x62 'b' + { 999, 8, 11, 10, 1, -10 }, // 0x63 'c' + { 1010, 9, 14, 11, 1, -13 }, // 0x64 'd' + { 1026, 9, 11, 11, 1, -10 }, // 0x65 'e' + { 1039, 5, 14, 5, 0, -13 }, // 0x66 'f' + { 1048, 9, 15, 11, 1, -10 }, // 0x67 'g' + { 1065, 9, 14, 11, 1, -13 }, // 0x68 'h' + { 1081, 2, 14, 4, 1, -13 }, // 0x69 'i' + { 1085, 3, 18, 4, 0, -13 }, // 0x6A 'j' + { 1092, 9, 14, 10, 1, -13 }, // 0x6B 'k' + { 1108, 2, 14, 4, 1, -13 }, // 0x6C 'l' + { 1112, 14, 11, 16, 1, -10 }, // 0x6D 'm' + { 1132, 9, 11, 11, 1, -10 }, // 0x6E 'n' + { 1145, 9, 11, 11, 1, -10 }, // 0x6F 'o' + { 1158, 9, 15, 11, 1, -10 }, // 0x70 'p' + { 1175, 9, 15, 11, 1, -10 }, // 0x71 'q' + { 1192, 5, 11, 7, 1, -10 }, // 0x72 'r' + { 1199, 8, 11, 10, 1, -10 }, // 0x73 's' + { 1210, 5, 13, 5, 0, -12 }, // 0x74 't' + { 1219, 8, 10, 11, 1, -9 }, // 0x75 'u' + { 1229, 10, 10, 10, 0, -9 }, // 0x76 'v' + { 1242, 14, 10, 14, 0, -9 }, // 0x77 'w' + { 1260, 9, 10, 10, 0, -9 }, // 0x78 'x' + { 1272, 9, 14, 10, 0, -9 }, // 0x79 'y' + { 1288, 8, 10, 10, 1, -9 }, // 0x7A 'z' + { 1298, 4, 18, 7, 1, -13 }, // 0x7B '{' + { 1307, 1, 18, 5, 2, -13 }, // 0x7C '|' + { 1310, 4, 18, 7, 1, -13 }, // 0x7D '}' + { 1319, 9, 4, 11, 1, -8 } }; // 0x7E '~' + +static const GFXfont FreeSans10pt7b PROGMEM = { + (uint8_t *)FreeSans10pt7bBitmaps, + (GFXglyph *)FreeSans10pt7bGlyphs, + 0x20, 0x7E, 33 }; + +// Approx. 1996 bytes diff --git a/openrtx/include/interfaces/graphics.h b/openrtx/include/interfaces/graphics.h index 8ea62d94..d9c8815f 100644 --- a/openrtx/include/interfaces/graphics.h +++ b/openrtx/include/interfaces/graphics.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -87,6 +88,7 @@ typedef enum FONT_SIZE_6PT, FONT_SIZE_8PT, FONT_SIZE_9PT, + FONT_SIZE_10PT, FONT_SIZE_12PT, FONT_SIZE_16PT, FONT_SIZE_18PT, @@ -107,6 +109,7 @@ static GFXfont const fonts[] = { TomThumb, // 5pt FreeSans6pt7b, // 6pt FreeSans8pt7b, // 8pt FreeSans9pt7b, // 9pt + FreeSans10pt7b, // 10pt FreeSans12pt7b, // 12pt FreeSans16pt7b, // 16pt FreeSans18pt7b, // 16pt diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 9d2fda2b..5ec1e917 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -232,9 +232,9 @@ layout_t _ui_calculateLayout() const uint16_t top_pad = 1; const uint16_t line1_h = 10; const uint16_t line2_h = 10; - const uint16_t line3_h = 18; - const uint16_t bottom_h = top_h; - const uint16_t bottom_pad = 1; + const uint16_t line3_h = 16; + const uint16_t bottom_h = 8; + const uint16_t bottom_pad = 0; const uint16_t status_v_pad = 1; const uint16_t small_line_v_pad = 1; const uint16_t big_line_v_pad = 0; @@ -245,7 +245,7 @@ layout_t _ui_calculateLayout() // Middle line fonts: 5, 8, 8 pt const fontSize_t line1_font = FONT_SIZE_6PT; const fontSize_t line2_font = FONT_SIZE_6PT; - const fontSize_t line3_font = FONT_SIZE_12PT; + const fontSize_t line3_font = FONT_SIZE_10PT; // Bottom bar font: 6 pt const fontSize_t bottom_font = FONT_SIZE_6PT; // TimeDate/Frequency input font