From ab37f828250537b15df6623b69ba80ebefe63ac0 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Tue, 11 Jun 2013 09:24:51 +0000 Subject: [PATCH] [all] A few fixes with DBLSIZE font. We should now use png instead of xbm files. Better supported by Qt! --- src/Makefile | 4 +- src/fonts/std/font_10x14_compressed.lbm | 5 +- src/fonts/std/font_10x14_compressed.png | Bin 0 -> 846 bytes src/fonts/std/font_10x14_compressed.xbm | 110 ------------------------ src/lcd.cpp | 12 +-- 5 files changed, 10 insertions(+), 121 deletions(-) create mode 100644 src/fonts/std/font_10x14_compressed.png delete mode 100644 src/fonts/std/font_10x14_compressed.xbm diff --git a/src/Makefile b/src/Makefile index 4f758df0c..33178cf17 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1089,7 +1089,7 @@ taranis-stamp: @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-taranis.txt @cat stamp-opentx-taranis.txt -fonts/std/font_05x07.lbm: fonts/std/font_03x05.xbm fonts/std/font_04x06.xbm fonts/std/font_05x07.xbm fonts/std/font_08x10.xbm fonts/std/font_10x14.xbm fonts/std/font_10x14_compressed.xbm fonts/std/font_04x06_extra.xbm fonts/std/font_05x07_extra.xbm fonts/std/font_10x14_extra.xbm fonts/std/font_se_05x07.xbm fonts/std/font_de_05x07.xbm fonts/std/font_it_05x07.xbm fonts/std/font_cz_05x07.xbm fonts/std/font_fr_05x07.xbm fonts/std/font_es_05x07.xbm fonts/std/font_se_10x14.xbm fonts/std/font_de_10x14.xbm fonts/std/font_it_10x14.xbm fonts/std/font_fr_10x14.xbm fonts/std/font_es_10x14.xbm +fonts/std/font_05x07.lbm: fonts/std/font_03x05.xbm fonts/std/font_04x06.xbm fonts/std/font_05x07.xbm fonts/std/font_08x10.xbm fonts/std/font_10x14.xbm fonts/std/font_10x14_compressed.png fonts/std/font_04x06_extra.xbm fonts/std/font_05x07_extra.xbm fonts/std/font_10x14_extra.xbm fonts/std/font_se_05x07.xbm fonts/std/font_de_05x07.xbm fonts/std/font_it_05x07.xbm fonts/std/font_cz_05x07.xbm fonts/std/font_fr_05x07.xbm fonts/std/font_es_05x07.xbm fonts/std/font_se_10x14.xbm fonts/std/font_de_10x14.xbm fonts/std/font_it_10x14.xbm fonts/std/font_fr_10x14.xbm fonts/std/font_es_10x14.xbm @echo @echo "Convert fonts from xbm to lbm:" $(IMG2LBM) fonts/std/font_03x05.xbm fonts/std/font_03x05.lbm 3x5 @@ -1097,7 +1097,7 @@ fonts/std/font_05x07.lbm: fonts/std/font_03x05.xbm fonts/std/font_04x06.xbm font $(IMG2LBM) fonts/std/font_05x07.xbm fonts/std/font_05x07.lbm 5x7 $(IMG2LBM) fonts/std/font_08x10.xbm fonts/std/font_08x10.lbm 8x10 $(IMG2LBM) fonts/std/font_10x14.xbm fonts/std/font_10x14.lbm 10x14 - $(IMG2LBM) fonts/std/font_10x14_compressed.xbm fonts/std/font_10x14_compressed.lbm 10x14 + $(IMG2LBM) fonts/std/font_10x14_compressed.png fonts/std/font_10x14_compressed.lbm 10x14 $(IMG2LBM) fonts/std/font_04x06_extra.xbm fonts/std/font_04x06_extra.lbm 4x6 $(IMG2LBM) fonts/std/font_05x07_extra.xbm fonts/std/font_05x07_extra.lbm 5x7 $(IMG2LBM) fonts/std/font_10x14_extra.xbm fonts/std/font_10x14_extra.lbm 10x14 diff --git a/src/fonts/std/font_10x14_compressed.lbm b/src/fonts/std/font_10x14_compressed.lbm index ae8660465..734cb7bea 100644 --- a/src/fonts/std/font_10x14_compressed.lbm +++ b/src/fonts/std/font_10x14_compressed.lbm @@ -1,4 +1 @@ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x0e,0x70,0xfc,0x3f,0xf8,0x1f,0x00,0x00,0x00,0x00,0x18,0x60,0x1c,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x78,0x1c,0x7c,0x0e,0x6e,0x06,0x67,0x86,0x63,0xce,0x61,0xfc,0x60,0x78,0x60,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0x86,0x61,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0x00,0x00,0x00,0x00,0x80,0x07,0xc0,0x07,0xe0,0x06,0x70,0x06,0x38,0x06,0x1c,0x06,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x7e,0x18,0x7e,0x38,0x66,0x70,0x66,0x60,0x66,0x60,0xe6,0x70,0xc6,0x3f,0x86,0x1f,0x00,0x00,0x00,0x00,0xf8,0x1f,0xfc,0x3f,0x8e,0x71,0x86,0x61,0x86,0x61,0x8e,0x73,0x1c,0x3f,0x18,0x1e,0x00,0x00,0x00,0x00,0x06,0x00,0x06,0x00,0x86,0x7f,0xc6,0x7f,0xe6,0x00,0x76,0x00,0x3e,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x78,0x1e,0xfc,0x3f,0xce,0x73,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0x00,0x00,0x00,0x00,0x78,0x00,0xfc,0x00,0xce,0x61,0x86,0x71,0x86,0x39,0xce,0x1d,0xfc,0x0f,0xf8,0x07,0xe0,0x7f,0xf0,0x7f,0xb8,0x01,0x9c,0x01,0x8e,0x01,0x8e,0x01,0x9c,0x01,0xb8,0x01,0xf0,0x7f,0xe0,0x7f,0xfe,0x7f,0xfe,0x7f,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0x1c,0x38,0x18,0x18,0xfe,0x7f,0xfe,0x7f,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0x1c,0x38,0x38,0x1c,0xf0,0x0f,0xe0,0x07,0xfe,0x7f,0xfe,0x7f,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x06,0x60,0x06,0x60, -0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x06,0x00,0x06,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x86,0x61,0x86,0x61,0x86,0x61,0x8e,0x71,0x9c,0x7f,0x98,0x3f,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x06,0x60,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x38,0x00,0x70,0x00,0x60,0x06,0x60,0x06,0x70,0xfe,0x3f,0xfe,0x1f,0x06,0x00,0x06,0x00,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0xc0,0x03,0xe0,0x07,0x70,0x0e,0x38,0x1c,0x1c,0x38,0x0e,0x70,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0xfe,0x7f,0xfe,0x7f,0x1c,0x00,0x38,0x00,0xf0,0x01,0xf0,0x01,0x38,0x00,0x1c,0x00,0xfe,0x7f,0xfe,0x7f,0xfe,0x7f,0xfe,0x7f,0x70,0x00,0xe0,0x00,0xc0,0x01,0x80,0x03,0x00,0x07,0x00,0x0e,0xfe,0x7f,0xfe,0x7f,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0xfc,0x3f,0xf8,0x1f,0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0xce,0x01,0xfc,0x00,0x78,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x66,0x06,0x6e,0x06,0x3c,0x0e,0x38,0xfc,0x7f,0xf8,0x67,0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x07,0x86,0x0f,0x86,0x1d,0xce,0x39,0xfc,0x70,0x78,0x60,0x78,0x18,0xfc,0x38,0xce,0x71,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x8e,0x73,0x1c,0x3f,0x18,0x1e,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xfe,0x7f,0xfe,0x7f,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xfe,0x1f,0xfe,0x3f,0x00,0x70,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x70,0xfe,0x3f,0xfe,0x1f, -0xfe,0x07,0xfe,0x0f,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x1c,0xfe,0x0f,0xfe,0x07,0xfe,0x1f,0xfe,0x3f,0x00,0x70,0x00,0x70,0x00,0x3e,0x00,0x3e,0x00,0x70,0x00,0x70,0xfe,0x3f,0xfe,0x1f,0x1e,0x78,0x3e,0x7c,0x70,0x0e,0xe0,0x07,0xc0,0x03,0xc0,0x03,0xe0,0x07,0x70,0x0e,0x3e,0x7c,0x1e,0x78,0x7e,0x00,0xfe,0x00,0xc0,0x01,0x80,0x03,0x00,0x7f,0x00,0x7f,0x80,0x03,0xc0,0x01,0xfe,0x00,0x7e,0x00,0x06,0x78,0x06,0x7c,0x06,0x6e,0x06,0x67,0x86,0x63,0xc6,0x61,0xe6,0x60,0x76,0x60,0x3e,0x60,0x1e,0x60,0x00,0x18,0x00,0x3c,0x60,0x7e,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0xe0,0x66,0xc0,0x7f,0x80,0x7f,0xfe,0x7f,0xfe,0x7f,0x80,0x61,0xc0,0x61,0xe0,0x60,0x60,0x60,0x60,0x60,0xe0,0x70,0xc0,0x3f,0x80,0x1f,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x70,0x00,0x38,0x00,0x18,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0xe0,0x60,0xc0,0x61,0x80,0x61,0xfe,0x7f,0xfe,0x7f,0x80,0x1f,0xc0,0x3f,0xe0,0x76,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0xe0,0x66,0xc0,0x07,0x80,0x07,0x80,0x01,0x80,0x01,0xf8,0x7f,0xfc,0x7f,0x8e,0x01,0x86,0x01,0x06,0x00,0x0e,0x00,0x1c,0x00,0x18,0x00,0xe0,0x01,0xf0,0x03,0x38,0x67,0x18,0x66,0x18,0x66,0x18,0x66,0x18,0x66,0x18,0x76,0xf8,0x3f,0xf8,0x1f,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0xe6,0x7f,0xe6,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x38,0x00,0x70,0x00,0x60,0x60,0x60,0x60,0x70,0xe6,0x3f,0xe6,0x1f,0x00,0x00,0x00,0x00,0xfe,0x7f,0xfe,0x7f,0x00,0x06,0x00,0x0f,0x80,0x1f,0xc0,0x39,0xe0,0x70,0x60,0x60,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0xe0,0x7f,0xe0,0x7f,0x60,0x00,0xe0,0x00,0xc0,0x07,0xc0,0x07,0xe0,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0xe0,0x7f,0xe0,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0xe0,0x70,0xc0,0x3f,0x80,0x1f,0xe0,0x7f,0xe0,0x7f,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0xe0,0x07,0xc0,0x03,0x80,0x01,0x80,0x01,0xc0,0x03,0xe0,0x07,0x60,0x06,0x60,0x06,0x60,0x06,0xc0,0x07,0x80,0x07,0xe0,0x7f,0xe0,0x7f,0xe0,0x7f,0xe0,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x01,0x80,0x01,0x80,0x61,0xc0,0x63,0xe0,0x67,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x7e,0x00,0x3c,0x00,0x18,0x60,0x00,0x60,0x00,0xf8,0x1f,0xf8,0x3f,0x60,0x70,0x60,0x60,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x18,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x00,0x60,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x18,0xe0,0x7f,0xe0,0x7f,0xe0,0x07,0xe0,0x0f,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x1c,0xe0,0x0f,0xe0,0x07,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x38,0x00,0x70,0x00,0x70,0xe0,0x3f,0xe0,0x1f,0x60,0x60,0xe0,0x70,0xc0,0x39,0x80,0x1f,0x00,0x0f,0x00,0x0f,0x80,0x1f,0xc0,0x39,0xe0,0x70,0x60,0x60,0xe0,0x01,0xe0,0x03,0x00,0x67,0x00,0x66,0x00,0x66,0x00,0x66,0x00,0x66,0x00,0x76,0xe0,0x3f,0xe0,0x1f,0x60,0x60,0x60,0x70,0x60,0x78,0x60,0x7c,0x60,0x6e,0x60,0x67,0xe0,0x63,0xe0,0x61,0xe0,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x60,0x18,0xf0,0x3c,0xf0,0x3c,0x60,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x0e,0x70,0xfc,0x3f,0xf8,0x1f,0x00,0x00,0x00,0x00,0x18,0x60,0x1c,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x78,0x1c,0x7c,0x0e,0x6e,0x06,0x67,0x86,0x63,0xce,0x61,0xfc,0x60,0x78,0x60,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0x86,0x61,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0x00,0x00,0x00,0x00,0x80,0x07,0xc0,0x07,0xe0,0x06,0x70,0x06,0x38,0x06,0x1c,0x06,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x7e,0x18,0x7e,0x38,0x66,0x70,0x66,0x60,0x66,0x60,0xe6,0x70,0xc6,0x3f,0x86,0x1f,0x00,0x00,0x00,0x00,0xf8,0x1f,0xfc,0x3f,0x8e,0x71,0x86,0x61,0x86,0x61,0x8e,0x73,0x1c,0x3f,0x18,0x1e,0x00,0x00,0x00,0x00,0x06,0x00,0x06,0x00,0x86,0x7f,0xc6,0x7f,0xe6,0x00,0x76,0x00,0x3e,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x78,0x1e,0xfc,0x3f,0xce,0x73,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0x00,0x00,0x00,0x00,0x78,0x00,0xfc,0x00,0xce,0x61,0x86,0x71,0x86,0x39,0xce,0x1d,0xfc,0x0f,0xf8,0x07,0xe0,0x7f,0xf0,0x7f,0xb8,0x01,0x9c,0x01,0x8e,0x01,0x8e,0x01,0x9c,0x01,0xb8,0x01,0xf0,0x7f,0xe0,0x7f,0xfe,0x7f,0xfe,0x7f,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0xce,0x73,0xfc,0x3f,0x78,0x1e,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0x1c,0x38,0x18,0x18,0xfe,0x7f,0xfe,0x7f,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0x1c,0x38,0x38,0x1c,0xf0,0x0f,0xe0,0x07,0xfe,0x7f,0xfe,0x7f,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x06,0x00,0x06,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x86,0x61,0x86,0x61,0x86,0x61,0x8e,0x71,0x9c,0x7f,0x98,0x3f,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x06,0x60,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x38,0x00,0x70,0x00,0x60,0x06,0x60,0x06,0x70,0xfe,0x3f,0xfe,0x1f,0x06,0x00,0x06,0x00,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0xc0,0x03,0xe0,0x07,0x70,0x0e,0x38,0x1c,0x1c,0x38,0x0e,0x70,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0xfe,0x7f,0xfe,0x7f,0x1c,0x00,0x38,0x00,0xf0,0x01,0xf0,0x01,0x38,0x00,0x1c,0x00,0xfe,0x7f,0xfe,0x7f,0xfe,0x7f,0xfe,0x7f,0x70,0x00,0xe0,0x00,0xc0,0x01,0x80,0x03,0x00,0x07,0x00,0x0e,0xfe,0x7f,0xfe,0x7f,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x0e,0x70,0xfc,0x3f,0xf8,0x1f,0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0x86,0x01,0xce,0x01,0xfc,0x00,0x78,0x00,0xf8,0x1f,0xfc,0x3f,0x0e,0x70,0x06,0x60,0x06,0x66,0x06,0x6e,0x06,0x3c,0x0e,0x38,0xfc,0x7f,0xf8,0x67,0xfe,0x7f,0xfe,0x7f,0x86,0x01,0x86,0x01,0x86,0x07,0x86,0x0f,0x86,0x1d,0xce,0x39,0xfc,0x70,0x78,0x60,0x78,0x18,0xfc,0x38,0xce,0x71,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x8e,0x73,0x1c,0x3f,0x18,0x1e,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xfe,0x7f,0xfe,0x7f,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0xfe,0x1f,0xfe,0x3f,0x00,0x70,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x70,0xfe,0x3f,0xfe,0x1f,0xfe,0x07,0xfe,0x0f,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x1c,0xfe,0x0f,0xfe,0x07,0xfe,0x1f,0xfe,0x3f,0x00,0x70,0x00,0x70,0x00,0x3e,0x00,0x3e,0x00,0x70,0x00,0x70,0xfe,0x3f,0xfe,0x1f,0x1e,0x78,0x3e,0x7c,0x70,0x0e,0xe0,0x07,0xc0,0x03,0xc0,0x03,0xe0,0x07,0x70,0x0e,0x3e,0x7c,0x1e,0x78,0x7e,0x00,0xfe,0x00,0xc0,0x01,0x80,0x03,0x00,0x7f,0x00,0x7f,0x80,0x03,0xc0,0x01,0xfe,0x00,0x7e,0x00,0x06,0x78,0x06,0x7c,0x06,0x6e,0x06,0x67,0x86,0x63,0xc6,0x61,0xe6,0x60,0x76,0x60,0x3e,0x60,0x1e,0x60,0x00,0x18,0x00,0x3c,0x60,0x7e,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0xe0,0x66,0xc0,0x7f,0x80,0x7f,0xfe,0x7f,0xfe,0x7f,0x80,0x61,0xc0,0x61,0xe0,0x60,0x60,0x60,0x60,0x60,0xe0,0x70,0xc0,0x3f,0x80,0x1f,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x70,0x00,0x38,0x00,0x18,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0xe0,0x60,0xc0,0x61,0x80,0x61,0xfe,0x7f,0xfe,0x7f,0x80,0x1f,0xc0,0x3f,0xe0,0x76,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0xe0,0x66,0xc0,0x07,0x80,0x07,0x80,0x01,0x80,0x01,0xf8,0x7f,0xfc,0x7f,0x8e,0x01,0x86,0x01,0x06,0x00,0x0e,0x00,0x1c,0x00,0x18,0x00,0xe0,0x01,0xf0,0x03,0x38,0x67,0x18,0x66,0x18,0x66,0x18,0x66,0x18,0x66,0x18,0x76,0xf8,0x3f,0xf8,0x1f,0xfe,0x7f,0xfe,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0xe6,0x7f,0xe6,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x38,0x00,0x70,0x00,0x60,0x60,0x60,0x60,0x70,0xe6,0x3f,0xe6,0x1f,0x00,0x00,0x00,0x00,0xfe,0x7f,0xfe,0x7f,0x00,0x06,0x00,0x0f,0x80,0x1f,0xc0,0x39,0xe0,0x70,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0xe0,0x7f,0xe0,0x7f,0x60,0x00,0xe0,0x00,0xc0,0x07,0xc0,0x07,0xe0,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0xe0,0x7f,0xe0,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x7f,0x80,0x7f,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0xe0,0x70,0xc0,0x3f,0x80,0x1f,0xe0,0x7f,0xe0,0x7f,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0xe0,0x07,0xc0,0x03,0x80,0x01,0x80,0x01,0xc0,0x03,0xe0,0x07,0x60,0x06,0x60,0x06,0x60,0x06,0xc0,0x07,0x80,0x07,0xe0,0x7f,0xe0,0x7f,0xe0,0x7f,0xe0,0x7f,0x80,0x01,0xc0,0x01,0xe0,0x00,0x60,0x00,0x60,0x00,0xe0,0x00,0xc0,0x01,0x80,0x01,0x80,0x61,0xc0,0x63,0xe0,0x67,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x7e,0x00,0x3c,0x00,0x18,0x60,0x00,0x60,0x00,0xf8,0x1f,0xf8,0x3f,0x60,0x70,0x60,0x60,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x18,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x00,0x60,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x18,0xe0,0x7f,0xe0,0x7f,0xe0,0x07,0xe0,0x0f,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x1c,0xe0,0x0f,0xe0,0x07,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x00,0x70,0x00,0x38,0x00,0x38,0x00,0x70,0x00,0x70,0xe0,0x3f,0xe0,0x1f,0x60,0x60,0xe0,0x70,0xc0,0x39,0x80,0x1f,0x00,0x0f,0x00,0x0f,0x80,0x1f,0xc0,0x39,0xe0,0x70,0x60,0x60,0xe0,0x01,0xe0,0x03,0x00,0x67,0x00,0x66,0x00,0x66,0x00,0x66,0x00,0x66,0x00,0x76,0xe0,0x3f,0xe0,0x1f,0x60,0x60,0x60,0x70,0x60,0x78,0x60,0x7c,0x60,0x6e,0x60,0x67,0xe0,0x63,0xe0,0x61,0xe0,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x30,0x0c,0x78,0x1e,0x78,0x1e,0x30,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01, diff --git a/src/fonts/std/font_10x14_compressed.png b/src/fonts/std/font_10x14_compressed.png new file mode 100644 index 0000000000000000000000000000000000000000..696cf8fa3b36f3f8297a8b078467ff85449d509a GIT binary patch literal 846 zcmV-U1F`&xP)Px#22e~?MF0Q*|NsA`*`M72000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*n> z2@o2BLrm5R?rlAo5Enbp^Q|MJ15L|}bX&UTIls9l@RrHP5=GuY+>egDud#h0pMOcJp7dOV{-6MF zTv&sOHItD^cY}YbfuxRn*dtz-O4>r>mm*LWqb<8mTP3CM|7YZxY}$oOp*dA6T&fse z$cKn7Rkp@u+LJC@H{tC_Zf6t3*)?UyXx?_6em5G(DU;t`$W!?2kMh(^g%F=&kirS+ z@t(;)lzD|>1s(Y~ouBA-wHc?k8b_MkAwGx|cUr7Az9Xwo{=i~S9>a}~No?}}kaJ}+ z6d~`)Tpq~;(#q&BipgDcCU6ZR45T^u-I+YJg^G)K+J$rBb|@Sd98OnKH}TA=uZJM{ zSCO@XN9ywEx?rtjD|_;(R{6Q`9Wkl7e>J|0#}4B`&E$SgJn?Dvz#mZ$B>j^Nk`nJZ z4^QC@oX3+BxSrhO&k$)25r4GBr-f&-`fz{r`Jo>y^2+JRh4*vj#5Z2O-aFpGO;4V7 z04=zyF&AFp&!~?%>c~;Y&-(pNuZ@vii)_8lQ=|s;sXBDzx+ni0Wtpfpe+^M@CQ6vi zW4h(>Ot4=_sAZH}f6Hq)yKKdBmM@d1`Z9Vk6QksIrYV79F*zD-X8-^I07*qoM6N<$f`ct~7XSbN literal 0 HcmV?d00001 diff --git a/src/fonts/std/font_10x14_compressed.xbm b/src/fonts/std/font_10x14_compressed.xbm deleted file mode 100644 index 512735437..000000000 --- a/src/fonts/std/font_10x14_compressed.xbm +++ /dev/null @@ -1,110 +0,0 @@ -#define font_dblsize_width 160 -#define font_dblsize_height 64 -static unsigned char font_dblsize_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x03, - 0x3c, 0xfc, 0x00, 0xcc, 0x3f, 0x3c, 0xfc, 0xc3, 0x03, 0x0f, 0x0c, 0xff, - 0xf0, 0xf3, 0xc3, 0xff, 0x00, 0xe0, 0x87, 0x03, 0x7e, 0xfc, 0x01, 0xce, - 0x3f, 0x7e, 0xfc, 0xe3, 0x87, 0x1f, 0x1e, 0xff, 0xf9, 0xf7, 0xc7, 0xff, - 0x00, 0x70, 0xce, 0x03, 0xe7, 0x80, 0x03, 0xcf, 0x00, 0xe7, 0x00, 0x73, - 0xce, 0x39, 0x3f, 0x83, 0x1f, 0x3e, 0xce, 0x00, 0x00, 0x30, 0xcc, 0x03, - 0xc3, 0x00, 0x83, 0xcf, 0x00, 0xc3, 0x80, 0x33, 0xcc, 0xb0, 0x73, 0x03, - 0x0f, 0x3c, 0xdc, 0x00, 0x00, 0x30, 0x0c, 0x03, 0xc0, 0x00, 0xc3, 0xcd, - 0x0f, 0x03, 0xc0, 0x31, 0xcc, 0xf0, 0xe1, 0x03, 0x0f, 0x30, 0xf8, 0x00, - 0x00, 0x30, 0x0c, 0x03, 0xe0, 0x80, 0xe3, 0xcc, 0x1f, 0x03, 0xe0, 0x70, - 0xce, 0xf9, 0xc0, 0x83, 0x0f, 0x30, 0xf0, 0x00, 0x00, 0x30, 0x0c, 0x03, - 0x70, 0xf0, 0x71, 0x0c, 0x38, 0x3f, 0x70, 0xe0, 0x87, 0xff, 0xff, 0xff, - 0x0d, 0x30, 0xf0, 0x3f, 0x00, 0x30, 0x0c, 0x03, 0x38, 0xf0, 0x31, 0x0c, - 0x30, 0x7f, 0x30, 0xe0, 0x07, 0xff, 0xff, 0xff, 0x0d, 0x30, 0xf0, 0x3f, - 0x00, 0x30, 0x0c, 0x03, 0x1c, 0x80, 0xf3, 0x0f, 0x30, 0xe3, 0x30, 0x70, - 0x0e, 0xf0, 0xc0, 0x83, 0x0f, 0x30, 0xf0, 0x00, 0x00, 0x30, 0x0c, 0x03, - 0x0e, 0x00, 0xf3, 0x0f, 0x30, 0xc3, 0x30, 0x30, 0x0c, 0xf8, 0xc0, 0x03, - 0x0f, 0x30, 0xf8, 0x00, 0x00, 0x30, 0x0c, 0x03, 0x07, 0x00, 0x03, 0xcc, - 0x30, 0xc3, 0x30, 0x30, 0x0c, 0xdc, 0xc0, 0x03, 0x0f, 0x3c, 0xdc, 0x00, - 0x00, 0x70, 0x0e, 0x03, 0x03, 0x80, 0x03, 0xcc, 0x39, 0xe7, 0x30, 0x70, - 0x0e, 0xce, 0xc0, 0x83, 0x1f, 0x3e, 0xce, 0x00, 0x00, 0xe0, 0xc7, 0x0f, - 0xff, 0xfc, 0x01, 0x8c, 0x1f, 0x7e, 0x30, 0xe0, 0x07, 0xc7, 0xc0, 0xff, - 0xf9, 0xf7, 0xc7, 0xff, 0x00, 0xc0, 0xc3, 0x0f, 0xff, 0xfc, 0x00, 0x0c, - 0x0f, 0x3c, 0x30, 0xc0, 0x03, 0xc3, 0xc0, 0xff, 0xf0, 0xf3, 0xc3, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xf3, 0x33, 0x30, 0x3f, 0xf0, 0x0f, 0x3c, - 0xc0, 0xc0, 0x03, 0xf3, 0xf3, 0x0f, 0x3f, 0xff, 0xf0, 0xf3, 0xff, 0xc0, - 0xff, 0xfb, 0x37, 0x30, 0x3f, 0xf0, 0x0f, 0x3e, 0xc0, 0xe1, 0x03, 0xfb, - 0xf7, 0x9f, 0x7f, 0xff, 0xf9, 0xf7, 0xff, 0xc0, 0x03, 0x1c, 0x3e, 0x30, - 0x0c, 0xc0, 0x0c, 0x37, 0xc0, 0xf3, 0x03, 0x1f, 0x3e, 0xf8, 0xe1, 0x83, - 0x1f, 0x0e, 0xc3, 0xc0, 0x03, 0x0c, 0x3c, 0x30, 0x0c, 0xc0, 0x8c, 0x33, - 0xc0, 0xff, 0x07, 0x0f, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, 0xc3, 0xc0, - 0x03, 0x0c, 0x30, 0x30, 0x0c, 0xc0, 0xcc, 0x31, 0xc0, 0xde, 0x0f, 0x0f, - 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0x00, 0xc3, 0xc0, 0x03, 0x0c, 0x30, 0x30, - 0x0c, 0xc0, 0xec, 0x30, 0xc0, 0xcc, 0x1f, 0x0f, 0x3c, 0xf8, 0xc0, 0x83, - 0x1f, 0x00, 0xc3, 0xc0, 0xff, 0xcc, 0xff, 0x3f, 0x0c, 0xc0, 0x7c, 0x30, - 0xc0, 0xcc, 0x3b, 0x0f, 0xfc, 0xdf, 0xc0, 0xff, 0xf9, 0x03, 0xc3, 0xc0, - 0xff, 0xcc, 0xff, 0x3f, 0x0c, 0xc0, 0x7c, 0x30, 0xc0, 0xcc, 0x73, 0x0f, - 0xfc, 0xcf, 0xc0, 0xff, 0xf0, 0x07, 0xc3, 0xc0, 0x03, 0x0c, 0x3c, 0x30, - 0x0c, 0xc0, 0xec, 0x30, 0xc0, 0xc0, 0xe3, 0x0f, 0x3c, 0xc0, 0xcc, 0x33, - 0x00, 0x0e, 0xc3, 0xc0, 0x03, 0x0c, 0x3c, 0x30, 0x0c, 0xc0, 0xcc, 0x31, - 0xc0, 0xc0, 0xc3, 0x0f, 0x3c, 0xc0, 0xdc, 0x73, 0x00, 0x0c, 0xc3, 0xc0, - 0x03, 0x0c, 0x3c, 0x30, 0x0c, 0xc3, 0x8c, 0x33, 0xc0, 0xc0, 0x83, 0x0f, - 0x3c, 0xc0, 0x78, 0xe3, 0x0c, 0x0c, 0xc3, 0xc0, 0x03, 0x1c, 0x3e, 0x30, - 0x0c, 0xe7, 0x0c, 0x37, 0xc0, 0xc0, 0x03, 0x1f, 0x3e, 0xc0, 0x71, 0xc3, - 0x1d, 0x0e, 0xc3, 0xe1, 0x03, 0xf8, 0x3f, 0x30, 0x3f, 0x7e, 0x0c, 0xfe, - 0xff, 0xc0, 0x03, 0xfb, 0x37, 0x80, 0xff, 0x83, 0xfb, 0x07, 0x83, 0x7f, - 0x03, 0xf0, 0x37, 0x30, 0x3f, 0x3c, 0x0c, 0xfc, 0xff, 0xc0, 0x03, 0xf3, - 0x33, 0x00, 0xcf, 0x03, 0xf3, 0x03, 0x03, 0x3f, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x0f, 0x3c, 0xf0, 0xc0, 0xff, 0x03, 0x30, 0x00, 0x00, 0x00, 0x03, - 0x00, 0x0f, 0x00, 0x03, 0xc0, 0x00, 0xcc, 0x00, 0x03, 0x0f, 0x3c, 0xf0, - 0xc0, 0xff, 0x03, 0x30, 0x00, 0x00, 0x00, 0x03, 0x80, 0x1f, 0x00, 0x03, - 0xc0, 0x00, 0xcc, 0x00, 0x03, 0x0f, 0x3c, 0xf0, 0xc0, 0x00, 0x03, 0x30, - 0x00, 0x00, 0x00, 0x03, 0xc0, 0x39, 0xff, 0x03, 0x00, 0x00, 0xc0, 0x00, - 0x03, 0x0f, 0x7c, 0xf8, 0xc0, 0x80, 0x03, 0x30, 0x00, 0x00, 0x00, 0x03, - 0xc0, 0xb0, 0xff, 0x03, 0x00, 0x00, 0xc0, 0x00, 0x03, 0x0f, 0xec, 0xdc, - 0xc0, 0xc0, 0xf1, 0x33, 0x0f, 0x3f, 0x3c, 0xf3, 0xc3, 0xc0, 0xc1, 0xf3, - 0xf0, 0x00, 0xcf, 0x30, 0x03, 0x0f, 0xcc, 0xcf, 0xe1, 0xe0, 0xf0, 0xb7, - 0x9f, 0x3f, 0x7e, 0xfb, 0xc7, 0xc0, 0xc0, 0xfb, 0xf1, 0x00, 0xcf, 0x38, - 0x03, 0x0f, 0x8c, 0x87, 0x73, 0x70, 0x00, 0xfe, 0xf9, 0x01, 0xe7, 0x1f, - 0xfe, 0xc3, 0xc0, 0x9f, 0xc3, 0x00, 0xcc, 0x1c, 0x03, 0x0f, 0x8c, 0x07, - 0x3f, 0x38, 0x00, 0xfc, 0xf0, 0x00, 0xc3, 0x0f, 0xfc, 0xc3, 0xc1, 0x0f, - 0xc3, 0x00, 0xcc, 0x0e, 0x03, 0xcf, 0xcc, 0x0f, 0x1e, 0x1c, 0xf0, 0x3f, - 0xf0, 0x00, 0x03, 0xff, 0xcf, 0x80, 0xff, 0x03, 0xc3, 0x00, 0xcc, 0x07, - 0x87, 0xcf, 0xec, 0x1c, 0x0c, 0x0e, 0xf8, 0x3f, 0xf0, 0x00, 0x03, 0xff, - 0xcf, 0x00, 0xff, 0x03, 0xc3, 0x00, 0xcc, 0x07, 0xce, 0xcd, 0x7c, 0x38, - 0x0c, 0x07, 0x1c, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0xc0, 0x00, 0xc0, 0x03, - 0xc3, 0x30, 0xcc, 0x0e, 0xfc, 0xfc, 0x3f, 0x30, 0x0c, 0x03, 0x1c, 0x3c, - 0xf8, 0xe1, 0x07, 0x1f, 0xc0, 0x00, 0xe0, 0x03, 0xc3, 0x70, 0xce, 0x1c, - 0x78, 0xf8, 0x37, 0x30, 0x0c, 0xff, 0xfb, 0xff, 0x9f, 0x7f, 0xfe, 0xfb, - 0xc3, 0x00, 0x7f, 0x03, 0xf3, 0xe3, 0xc7, 0x38, 0x30, 0x30, 0x33, 0x30, - 0x0c, 0xff, 0xf3, 0xff, 0x0f, 0x3f, 0xfc, 0xf3, 0xc3, 0x00, 0x3f, 0x03, - 0xf3, 0xc3, 0xc3, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x30, 0x3c, 0x33, 0x0f, 0x3f, 0xff, 0xf0, 0x3c, - 0x0f, 0x3f, 0x3f, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0xfc, 0x3f, 0x0f, - 0x30, 0xfc, 0xb7, 0x9f, 0x7f, 0xff, 0xf9, 0xbd, 0x9f, 0x3f, 0x3f, 0x0c, - 0x3c, 0xf0, 0xc0, 0x87, 0x0f, 0xfc, 0x3f, 0x0f, 0x30, 0xec, 0xff, 0xf9, - 0xe1, 0x83, 0x1f, 0xff, 0xf9, 0x01, 0x0c, 0x0c, 0x3c, 0xf0, 0xc0, 0xce, - 0x0d, 0x0c, 0x1c, 0x06, 0x30, 0xcc, 0xfc, 0xf0, 0xc0, 0x83, 0x1f, 0xff, - 0xf0, 0x01, 0x0c, 0x0c, 0x3c, 0xf0, 0xc0, 0xfc, 0x1c, 0x0c, 0x0e, 0x00, - 0x30, 0xcc, 0x3c, 0xf0, 0xc0, 0xff, 0xf9, 0x3f, 0x80, 0x3f, 0x0c, 0x0c, - 0x3c, 0xf0, 0xc0, 0x78, 0xf8, 0x0f, 0x07, 0x00, 0x30, 0xcc, 0x3c, 0xf0, - 0xc0, 0xff, 0xf0, 0x3f, 0x00, 0x7f, 0x0c, 0x0c, 0x7c, 0xf8, 0xc0, 0x78, - 0xf0, 0x8f, 0x03, 0x06, 0x30, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x00, 0x3c, - 0x00, 0xe0, 0x0c, 0x0f, 0xef, 0xdc, 0xcc, 0xfc, 0x00, 0xcc, 0x01, 0x0f, - 0x30, 0x0c, 0x3c, 0xf0, 0xe1, 0x03, 0x00, 0x3c, 0x00, 0xe0, 0x9c, 0x9f, - 0xcf, 0xcf, 0xff, 0xce, 0x01, 0xee, 0x00, 0x0f, 0xfc, 0x0c, 0x3c, 0xb0, - 0x7f, 0x03, 0x00, 0x3c, 0xc0, 0x7f, 0xf8, 0xf9, 0x8d, 0x87, 0x7f, 0x87, - 0xf3, 0xf7, 0x3f, 0x06, 0xfc, 0x0c, 0x3c, 0x30, 0x3f, 0x03, 0x00, 0x3c, - 0xc0, 0x3f, 0xf0, 0xf0, 0x0c, 0x03, 0x33, 0x03, 0xf3, 0xf3, 0x3f, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/src/lcd.cpp b/src/lcd.cpp index 84d50463f..8628dfe5f 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -110,20 +110,22 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags) // c has to be remapped. All non existing chars mapped to 0 (space) unsigned char c_remapped; - if( c>='0' && c <='9') + if (c>='0' && c<='9') c_remapped = c - '0' + 1; - else if( c>='A' && c <='Z') + else if (c>='A' && c<='Z') c_remapped = c - 'A' + 11; - else if( c>='a' && c <='z') + else if (c>='a' && c<='z') c_remapped = c - 'a' + 37; - else if( c==':') + else if (c==':') c_remapped = 63; + else if (c=='-') + c_remapped = 64; else c_remapped = 0; /* each letter consists of ten top bytes followed by * by ten bottom bytes (20 bytes per * char) */ - q = &font_10x14[c_remapped * 20]; + q = &font_10x14[((uint16_t)c_remapped)*20]; for (int8_t i=11; i>=0; i--) { if (flags & CONDENSED && i<=1) break; uint8_t b1=0, b2=0;