From 63407597c502fe691ddf025a8289f7f76534b90a Mon Sep 17 00:00:00 2001 From: "kjell.kernen@gmail.com" Date: Mon, 10 Jun 2013 21:25:39 +0000 Subject: [PATCH] Saved 600 bytes by removing a lot of 10x14 chars and all language specific 10x14 chars. I have left the old code commented out for the decision if Taranis should have full character support or not (no memory problem there). --- src/Makefile | 3 +- src/fonts/std/font_10x14_compressed.lbm | 4 + src/fonts/std/font_10x14_compressed.xbm | 220 ++++++++++++------------ src/lcd.cpp | 16 +- src/translations.cpp | 33 ++-- 5 files changed, 148 insertions(+), 128 deletions(-) create mode 100644 src/fonts/std/font_10x14_compressed.lbm diff --git a/src/Makefile b/src/Makefile index a620de521..ad928a9d8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1085,7 +1085,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_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.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 @echo @echo "Convert fonts from xbm to lbm:" $(IMG2LBM) fonts/std/font_03x05.xbm fonts/std/font_03x05.lbm 3x5 @@ -1093,6 +1093,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_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 new file mode 100644 index 000000000..a0bae98a0 --- /dev/null +++ b/src/fonts/std/font_10x14_compressed.lbm @@ -0,0 +1,4 @@ +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,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60, diff --git a/src/fonts/std/font_10x14_compressed.xbm b/src/fonts/std/font_10x14_compressed.xbm index 63e78e2fd..9ca600d9c 100644 --- a/src/fonts/std/font_10x14_compressed.xbm +++ b/src/fonts/std/font_10x14_compressed.xbm @@ -1,110 +1,110 @@ -#define font_10x14_compressed_width 160 -#define font_10x14_compressed_height 64 -static unsigned char font_10x14_compressed_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, 0xfe, 0xe7, 0x67, 0x60, 0x7e, 0xe0, 0x1f, 0x78, - 0x80, 0x81, 0x07, 0xe6, 0xf7, 0x0f, 0x3f, 0xff, 0xf0, 0xf3, 0xff, 0xc0, - 0xfe, 0xf7, 0x6f, 0x60, 0x7e, 0xe0, 0x1f, 0x7c, 0x80, 0xc3, 0x07, 0xf6, - 0xff, 0x9f, 0x7f, 0xff, 0xf9, 0xf7, 0xff, 0xc0, 0x06, 0x38, 0x7c, 0x60, - 0x18, 0x80, 0x19, 0x6e, 0x80, 0xe7, 0x07, 0x3e, 0x3c, 0xf8, 0xe1, 0x83, - 0x1f, 0x0e, 0xc3, 0xc0, 0x06, 0x18, 0x78, 0x60, 0x18, 0x80, 0x19, 0x67, - 0x80, 0xff, 0x0f, 0x1e, 0x38, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, 0xc3, 0xc0, - 0x06, 0x18, 0x60, 0x60, 0x18, 0x80, 0x99, 0x63, 0x80, 0xbd, 0x1f, 0x1e, - 0x38, 0xf0, 0xc0, 0x03, 0x0f, 0x00, 0xc3, 0xc0, 0x06, 0x18, 0x60, 0x60, - 0x18, 0x80, 0xd9, 0x61, 0x80, 0x99, 0x3f, 0x1e, 0x38, 0xf8, 0xc0, 0x83, - 0x1f, 0x00, 0xc3, 0xc0, 0xfe, 0x99, 0xff, 0x7f, 0x18, 0x80, 0xf9, 0x60, - 0x80, 0x99, 0x77, 0x1e, 0xf8, 0xdf, 0xc0, 0xff, 0xf9, 0x03, 0xc3, 0xc0, - 0xfe, 0x99, 0xff, 0x7f, 0x18, 0x80, 0xf9, 0x60, 0x80, 0x99, 0xe7, 0x1e, - 0xf8, 0xcf, 0xc0, 0xff, 0xf0, 0x07, 0xc3, 0xc0, 0x06, 0x18, 0x78, 0x60, - 0x18, 0x80, 0xd9, 0x61, 0x80, 0x81, 0xc7, 0x1f, 0x38, 0xc0, 0xcc, 0x33, - 0x00, 0x0e, 0xc3, 0xc0, 0x06, 0x18, 0x78, 0x60, 0x18, 0x80, 0x99, 0x63, - 0x80, 0x81, 0x87, 0x1f, 0x38, 0xc0, 0xdc, 0x73, 0x00, 0x0c, 0xc3, 0xc0, - 0x06, 0x18, 0x78, 0x60, 0x18, 0x86, 0x19, 0x67, 0x80, 0x81, 0x07, 0x1f, - 0x38, 0xc0, 0x78, 0xe3, 0x0c, 0x0c, 0xc3, 0xc0, 0x06, 0x38, 0x7c, 0x60, - 0x18, 0xce, 0x19, 0x6e, 0x80, 0x81, 0x07, 0x3e, 0x3c, 0xc0, 0x71, 0xc3, - 0x1d, 0x0e, 0xc3, 0xe1, 0x06, 0xf0, 0x7f, 0x60, 0x7e, 0xfc, 0x18, 0xfc, - 0xff, 0x81, 0x07, 0xf6, 0x3f, 0x80, 0xff, 0x83, 0xfb, 0x07, 0x83, 0x7f, - 0x06, 0xe0, 0x6f, 0x60, 0x7e, 0x78, 0x18, 0xf8, 0xff, 0x81, 0x07, 0xe6, - 0x37, 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, - 0x06, 0x1e, 0x78, 0xe0, 0x81, 0xff, 0x07, 0x60, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x1e, 0x00, 0x06, 0x80, 0x01, 0x98, 0x01, 0x06, 0x1e, 0x78, 0xe0, - 0x81, 0xff, 0x07, 0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3f, 0x00, 0x06, - 0x80, 0x01, 0x98, 0x01, 0x06, 0x1e, 0x78, 0xe0, 0x81, 0x01, 0x06, 0x60, - 0x00, 0x00, 0x00, 0x06, 0x80, 0x73, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x01, - 0x06, 0x1e, 0xf8, 0xf0, 0x81, 0x01, 0x07, 0x60, 0x00, 0x00, 0x00, 0x06, - 0x80, 0x61, 0xff, 0x07, 0x00, 0x00, 0x80, 0x01, 0x06, 0x1e, 0xd8, 0xb9, - 0x81, 0x81, 0xe3, 0x67, 0x1e, 0x7e, 0x78, 0xe6, 0x87, 0x81, 0x83, 0xe7, - 0xe1, 0x01, 0x9e, 0x61, 0x06, 0x1e, 0x98, 0x9f, 0xc3, 0xc1, 0xe1, 0x6f, - 0x3f, 0x7f, 0xfc, 0xf6, 0x8f, 0x81, 0x81, 0xf7, 0xe3, 0x01, 0x9e, 0x71, - 0x06, 0x1e, 0x18, 0x0f, 0xe7, 0xe0, 0x00, 0xfc, 0xf3, 0x03, 0xce, 0x3f, - 0xfc, 0x87, 0x81, 0x3f, 0x87, 0x01, 0x98, 0x39, 0x06, 0x1e, 0x18, 0x0f, - 0x7e, 0x70, 0x00, 0xf8, 0xe1, 0x01, 0x86, 0x1f, 0xf8, 0x87, 0x83, 0x1f, - 0x86, 0x01, 0x98, 0x1d, 0x06, 0x9e, 0x99, 0x1f, 0x3c, 0x38, 0xe0, 0x7f, - 0xe0, 0x01, 0x06, 0xfe, 0x9f, 0x01, 0xff, 0x07, 0x86, 0x01, 0x98, 0x0f, - 0x0e, 0x9f, 0xd9, 0x39, 0x18, 0x1c, 0xf0, 0x7f, 0xe0, 0x01, 0x06, 0xfe, - 0x9f, 0x01, 0xfe, 0x07, 0x86, 0x01, 0x98, 0x0f, 0x9c, 0x9b, 0xf9, 0x70, - 0x18, 0x0e, 0x38, 0x78, 0xe0, 0x81, 0x07, 0x1e, 0x80, 0x01, 0x80, 0x07, - 0x86, 0x61, 0x98, 0x1d, 0xf8, 0xf9, 0x7f, 0x60, 0x18, 0x06, 0x38, 0x78, - 0xf0, 0xc3, 0x0f, 0x3e, 0x80, 0x01, 0xc0, 0x07, 0x86, 0xe1, 0x9c, 0x39, - 0xf0, 0xf0, 0x6f, 0x60, 0x18, 0xfe, 0xf7, 0xff, 0x3f, 0xff, 0xfc, 0xf7, - 0x87, 0x01, 0xfe, 0x06, 0xe6, 0xc7, 0x8f, 0x71, 0x60, 0x60, 0x66, 0x60, - 0x18, 0xfe, 0xe7, 0xff, 0x1f, 0x7e, 0xf8, 0xe7, 0x87, 0x01, 0x7e, 0x06, - 0xe6, 0x87, 0x87, 0x61, 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, 0x00, 0x30, 0x3c, 0x33, 0x0f, 0x3f, 0xff, 0xf0, 0x3c, - 0x0f, 0x3f, 0x3f, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0xfc, 0x3f, 0x00, - 0x30, 0xfc, 0xb7, 0x9f, 0x7f, 0xff, 0xf9, 0xbd, 0x9f, 0x3f, 0x3f, 0x0c, - 0x3c, 0xf0, 0xc0, 0x87, 0x0f, 0xfc, 0x3f, 0x00, 0x30, 0xec, 0xff, 0xf9, - 0xe1, 0x83, 0x1f, 0xff, 0xf9, 0x01, 0x0c, 0x0c, 0x3c, 0xf0, 0xc0, 0xce, - 0x0d, 0x0c, 0x1c, 0x00, 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, 0x00, 0x30, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x00, 0x3c, - 0x00, 0xe0, 0x0c, 0x0f, 0xef, 0xdc, 0xcc, 0xfc, 0x00, 0xcc, 0x01, 0x00, - 0x30, 0x0c, 0x3c, 0xf0, 0xe1, 0x03, 0x00, 0x3c, 0x00, 0xe0, 0x9c, 0x9f, - 0xcf, 0xcf, 0xff, 0xce, 0x01, 0xee, 0x00, 0x00, 0xfc, 0x0c, 0x3c, 0xb0, - 0x7f, 0x03, 0x00, 0x3c, 0xc0, 0x7f, 0xf8, 0xf9, 0x8d, 0x87, 0x7f, 0x87, - 0xf3, 0xf7, 0x3f, 0x00, 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 }; +#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, 0x00, 0x30, 0x3c, 0x33, 0x0f, 0x3f, 0xff, 0xf0, 0x3c, + 0x0f, 0x3f, 0x3f, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0xfc, 0x3f, 0x00, + 0x30, 0xfc, 0xb7, 0x9f, 0x7f, 0xff, 0xf9, 0xbd, 0x9f, 0x3f, 0x3f, 0x0c, + 0x3c, 0xf0, 0xc0, 0x87, 0x0f, 0xfc, 0x3f, 0x00, 0x30, 0xec, 0xff, 0xf9, + 0xe1, 0x83, 0x1f, 0xff, 0xf9, 0x01, 0x0c, 0x0c, 0x3c, 0xf0, 0xc0, 0xce, + 0x0d, 0x0c, 0x1c, 0x00, 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, 0x00, 0x30, 0x0c, 0x3c, 0xf0, 0xc0, 0x03, 0x00, 0x3c, + 0x00, 0xe0, 0x0c, 0x0f, 0xef, 0xdc, 0xcc, 0xfc, 0x00, 0xcc, 0x01, 0x00, + 0x30, 0x0c, 0x3c, 0xf0, 0xe1, 0x03, 0x00, 0x3c, 0x00, 0xe0, 0x9c, 0x9f, + 0xcf, 0xcf, 0xff, 0xce, 0x01, 0xee, 0x00, 0x00, 0xfc, 0x0c, 0x3c, 0xb0, + 0x7f, 0x03, 0x00, 0x3c, 0xc0, 0x7f, 0xf8, 0xf9, 0x8d, 0x87, 0x7f, 0x87, + 0xf3, 0xf7, 0xff, 0xff, 0xfc, 0x0c, 0x3c, 0x30, 0x3f, 0x03, 0x00, 0x3c, + 0xc0, 0x3f, 0xf0, 0xf0, 0x0c, 0x03, 0x33, 0x03, 0xf3, 0xf3, 0xff, 0xff, + 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 74298731d..ea5064ca3 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -106,9 +106,23 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags) } if (flags & DBLSIZE) { + // To save space only some DBLSIZE chars are available + // c has to be remapped. All non existing chars mapped to 0 (space) + unsigned char c_remapped; + + if( c>='0' && c <='9') + c_remapped = c - '0' + 1; + else if( c>='A' && c <='Z') + c_remapped = c - 'A' + 11; + else if( c>='a' && c <='z') + c_remapped = c - 'a' + 37; + else + c_remapped = 0; + /* each letter consists of ten top bytes followed by * by ten bottom bytes (20 bytes per * char) */ - q = &font_10x14[((uint16_t)c-0x20)*20]; + q = &font_10x14[((uint16_t)c_remapped)*20]; +// q = &font_10x14[((uint16_t)c - 0x20)*20]; for (int8_t i=11; i>=0; i--) { if (flags & CONDENSED && i<=1) break; uint8_t b1=0, b2=0; diff --git a/src/translations.cpp b/src/translations.cpp index 850d336d8..829ce8ef4 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -518,22 +518,23 @@ const pm_uchar font_5x7[] PROGMEM = { }; const pm_uchar font_10x14[] PROGMEM = { -#include "fonts/std/font_10x14.lbm" -#if defined(TRANSLATIONS_DE) -#include "fonts/std/font_de_10x14.lbm" -#elif defined(TRANSLATIONS_CZ) -#include "fonts/std/font_cz_10x14.lbm" -#elif defined(TRANSLATIONS_ES) -#include "fonts/std/font_es_10x14.lbm" -#elif defined(TRANSLATIONS_FR) -#include "fonts/std/font_fr_10x14.lbm" -#elif defined(TRANSLATIONS_IT) -#include "fonts/std/font_it_10x14.lbm" -#elif defined(TRANSLATIONS_PT) -#include "fonts/std/font_pt_10x14.lbm" -#elif defined(TRANSLATIONS_SE) -#include "fonts/std/font_se_10x14.lbm" -#endif +#include "fonts/std/font_10x14_compressed.lbm" +//#include "fonts/std/font_10x14.lbm" +//#if defined(TRANSLATIONS_DE) +//#include "fonts/std/font_de_10x14.lbm" +//#elif defined(TRANSLATIONS_CZ) +//#include "fonts/std/font_cz_10x14.lbm" +//#elif defined(TRANSLATIONS_ES) +//#include "fonts/std/font_es_10x14.lbm" +//#elif defined(TRANSLATIONS_FR) +//#include "fonts/std/font_fr_10x14.lbm" +//#elif defined(TRANSLATIONS_IT) +//#include "fonts/std/font_it_10x14.lbm" +//#elif defined(TRANSLATIONS_PT) +//#include "fonts/std/font_pt_10x14.lbm" +//#elif defined(TRANSLATIONS_SE) +//#include "fonts/std/font_se_10x14.lbm" +//#endif }; #if defined(CPUARM)