diff --git a/src/Makefile b/src/Makefile index 8f521d079..9aa83ad17 100644 --- a/src/Makefile +++ b/src/Makefile @@ -125,7 +125,7 @@ REMOVEDIR = rm -rf COPY = cp WINSHELL = cmd -XBM2LBM = ruby ../util/xbm2lbm.rb +IMG2LBM = python ../util/img2lbm.py AREV = $(shell sh -c "cat .svn/entries | sed -n '4p'") REV = $(shell echo $$(( $(AREV) + 1 ))) @@ -593,24 +593,24 @@ stamp: font.lbm: font_6x1.xbm @echo @echo "Convert font from xbm to lbm:" - $(XBM2LBM) yes $< - $(XBM2LBM) no translations/font_se.xbm + $(IMG2LBM) $< $@ char + $(IMG2LBM) translations/font_se.xbm translations/font_se.lbm char font_dblsize.lbm: font_dblsize.xbm @echo @echo "Convert font from xbm to lbm:" - $(XBM2LBM) yes $< - $(XBM2LBM) no translations/font_dblsize_se.xbm + $(IMG2LBM) $< $@ dblsize + $(IMG2LBM) translations/font_dblsize_se.xbm translations/font_dblsize_se.lbm dblsize sticks.lbm: sticks_4x1.xbm @echo - @echo "Convert font from xbm to lbm:" - $(XBM2LBM) yes $< + @echo "Convert sticks from xbm to lbm:" + $(IMG2LBM) $< $@ img 4 s9xsplash.lbm: s9xsplash.xbm @echo @echo "Convert font from xbm to lbm:" - $(XBM2LBM) yes $< + $(IMG2LBM) $< $@ img # Eye candy. # AVR Studio 3.x does not check make's exit code but relies on diff --git a/src/font.lbm b/src/font.lbm index a2f700f74..9f124b2e0 100644 --- a/src/font.lbm +++ b/src/font.lbm @@ -1,4 +1,3 @@ -80,8, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6f,0x00,0x00,0x07,0x00,0x07,0x00,0x14,0x7f,0x14,0x7f,0x14,0x24,0x2a,0x7f,0x2a,0x12,0x23,0x13,0x08,0x64,0x62,0x36,0x49,0x55,0x22,0x50,0x00,0x05,0x03,0x00,0x00,0x00,0x1c,0x22,0x41,0x00,0x00,0x41,0x22,0x1c,0x00,0x14,0x08,0x3e,0x08,0x14,0x08,0x08,0x3e,0x08,0x08,0x00,0x50,0x30,0x00,0x00,0x00,0x08,0x08,0x08,0x08,0x00,0x60,0x60,0x00,0x00,0x20,0x10,0x08,0x04,0x02, 0x00,0x3e,0x41,0x41,0x3e,0x00,0x00,0x42,0x7f,0x40,0x00,0x62,0x51,0x49,0x46,0x00,0x41,0x49,0x49,0x36,0x00,0x18,0x14,0x12,0x7f,0x00,0x27,0x45,0x45,0x39,0x00,0x3e,0x49,0x49,0x32,0x00,0x01,0x79,0x05,0x03,0x00,0x36,0x49,0x49,0x36,0x00,0x06,0x49,0x29,0x1e,0x00,0x00,0x36,0x36,0x00,0x00,0x00,0x56,0x36,0x00,0x00,0x08,0x14,0x22,0x41,0x14,0x14,0x14,0x14,0x14,0x41,0x22,0x14,0x08,0x00,0x02,0x01,0x51,0x09,0x06, 0x06,0x09,0x09,0x06,0x00,0x7e,0x09,0x09,0x09,0x7e,0x7f,0x49,0x49,0x49,0x36,0x3e,0x41,0x41,0x41,0x22,0x7f,0x41,0x41,0x22,0x1c,0x7f,0x49,0x49,0x49,0x41,0x7f,0x09,0x09,0x09,0x01,0x3e,0x41,0x49,0x49,0x7a,0x7f,0x08,0x08,0x08,0x7f,0x00,0x41,0x7f,0x41,0x00,0x20,0x40,0x41,0x3f,0x01,0x7f,0x08,0x14,0x22,0x41,0x7f,0x40,0x40,0x40,0x40,0x7f,0x02,0x0c,0x02,0x7f,0x7f,0x04,0x08,0x10,0x7f,0x3e,0x41,0x41,0x41,0x3e, diff --git a/src/font_dblsize.lbm b/src/font_dblsize.lbm index 30678a278..639bcffa9 100644 --- a/src/font_dblsize.lbm +++ b/src/font_dblsize.lbm @@ -1,13 +1,6 @@ -160,96, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x7e,0x00,0x00,0x7e,0x3e,0x00,0x00,0x60,0x60,0xfe,0xfe,0x60,0x60,0xfe,0xfe,0x60,0x60,0x60,0xf0,0x98,0x98,0xfe,0xfe,0x98,0x98,0x18,0x18,0x0c,0x1e,0x1e,0x0c,0x80,0xc0,0xe0,0x70,0x38,0x18,0x78,0xfc,0x8e,0xc6,0xe6,0x76,0x3c,0x18,0x00,0x00,0x00,0x00,0x66,0x76,0x3e,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xf0,0x38,0x1c,0x0e,0x06,0x00,0x00,0x00,0x00,0x06,0x0e,0x1c,0x38,0xf0,0xe0,0x00,0x00,0x60,0x60,0xc0,0x80,0xf8,0xf8,0x80,0xc0,0x60,0x60,0x80,0x80,0x80,0x80,0xf8,0xf8,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x18, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x71,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0x7f,0x7f,0x06,0x06,0x7f,0x7f,0x06,0x06,0x18,0x18,0x19,0x19,0x7f,0x7f,0x19,0x19,0x0f,0x06,0x18,0x1c,0x0e,0x07,0x03,0x01,0x30,0x78,0x78,0x30,0x1e,0x3f,0x71,0x63,0x67,0x66,0x3c,0x3c,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x0f,0x1c,0x38,0x70,0x60,0x00,0x00,0x00,0x00,0x60,0x70,0x38,0x1c,0x0f,0x07,0x00,0x00,0x06,0x06,0x03,0x01,0x1f,0x1f,0x01,0x03,0x06,0x06,0x01,0x01,0x01,0x01,0x1f,0x1f,0x01,0x01,0x01,0x01,0x00,0x00,0x66,0x76,0x3e,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x30,0x78,0x78,0x30,0x00,0x00,0x00,0x00,0x18,0x1c,0x0e,0x07,0x03,0x01,0x00,0x00,0x00,0x00, -0x00,0x00,0xf8,0xfc,0x0e,0x06,0x06,0x0e,0xfc,0xf8,0x00,0x00,0x18,0x1c,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x1c,0x0e,0x06,0x86,0xce,0xfc,0x78,0x00,0x00,0x06,0x06,0x86,0x86,0x86,0xce,0xfc,0x78,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0xfe,0xfe,0x00,0x00,0x7e,0x7e,0x66,0x66,0x66,0xe6,0xc6,0x86,0x00,0x00,0xf8,0xfc,0x8e,0x86,0x86,0x8e,0x1c,0x18,0x00,0x00,0x06,0x06,0x86,0xc6,0xe6,0x76,0x3e,0x1e,0x00,0x00,0x78,0xfc,0xce,0x86,0x86,0xce,0xfc,0x78,0x00,0x00,0x78,0xfc,0xce,0x86,0x86,0xce,0xfc,0xf8,0x00,0x00,0x30,0x78,0x78,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x78,0x78,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x06,0x0e,0x1c,0x38,0x70,0xe0,0xc0,0x80,0x00,0x00,0x18,0x1c,0x0e,0x06,0x06,0x06,0x86,0xce,0xfc,0x78, -0x00,0x00,0x1f,0x3f,0x70,0x60,0x60,0x70,0x3f,0x1f,0x00,0x00,0x60,0x60,0x7f,0x7f,0x60,0x60,0x00,0x00,0x00,0x00,0x78,0x7c,0x6e,0x67,0x63,0x61,0x60,0x60,0x00,0x00,0x60,0x60,0x61,0x61,0x61,0x73,0x3f,0x1e,0x00,0x00,0x07,0x07,0x06,0x06,0x06,0x06,0x7f,0x7f,0x00,0x00,0x18,0x38,0x70,0x60,0x60,0x70,0x3f,0x1f,0x00,0x00,0x1f,0x3f,0x71,0x61,0x61,0x73,0x3f,0x1e,0x00,0x00,0x00,0x00,0x7f,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x1e,0x3f,0x73,0x61,0x61,0x73,0x3f,0x1e,0x00,0x00,0x00,0x00,0x61,0x71,0x39,0x1d,0x0f,0x07,0x00,0x00,0x0c,0x1e,0x1e,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x76,0x3e,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0e,0x1c,0x38,0x70,0x60,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x60,0x70,0x38,0x1c,0x0e,0x07,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x67,0x03,0x01,0x00,0x00, -0x78,0xfc,0xce,0x86,0x86,0xce,0xfc,0x78,0x00,0x00,0xe0,0xf0,0xb8,0x9c,0x8e,0x8e,0x9c,0xb8,0xf0,0xe0,0xfe,0xfe,0x86,0x86,0x86,0x86,0x86,0xce,0xfc,0x78,0xf8,0xfc,0x0e,0x06,0x06,0x06,0x06,0x0e,0x1c,0x18,0xfe,0xfe,0x06,0x06,0x06,0x0e,0x1c,0x38,0xf0,0xe0,0xfe,0xfe,0x86,0x86,0x86,0x86,0x86,0x86,0x06,0x06,0xfe,0xfe,0x86,0x86,0x86,0x86,0x86,0x86,0x06,0x06,0xf8,0xfc,0x0e,0x06,0x86,0x86,0x86,0x8e,0x9c,0x98,0xfe,0xfe,0x80,0x80,0x80,0x80,0x80,0x80,0xfe,0xfe,0x00,0x00,0x06,0x06,0xfe,0xfe,0x06,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0xfe,0xfe,0x06,0x06,0xfe,0xfe,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x1c,0x38,0xf0,0xf0,0x38,0x1c,0xfe,0xfe,0xfe,0xfe,0x70,0xe0,0xc0,0x80,0x00,0x00,0xfe,0xfe,0xf8,0xfc,0x0e,0x06,0x06,0x06,0x06,0x0e,0xfc,0xf8, -0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x7f,0x7f,0x7f,0x7f,0x61,0x61,0x61,0x61,0x61,0x73,0x3f,0x1e,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x38,0x18,0x7f,0x7f,0x60,0x60,0x60,0x70,0x38,0x1c,0x0f,0x07,0x7f,0x7f,0x61,0x61,0x61,0x61,0x61,0x61,0x60,0x60,0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x1f,0x3f,0x70,0x60,0x61,0x61,0x61,0x71,0x7f,0x3f,0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x7f,0x7f,0x00,0x00,0x60,0x60,0x7f,0x7f,0x60,0x60,0x00,0x00,0x18,0x38,0x70,0x60,0x60,0x70,0x3f,0x1f,0x00,0x00,0x7f,0x7f,0x01,0x03,0x07,0x0e,0x1c,0x38,0x70,0x60,0x7f,0x7f,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x7f,0x7f,0x00,0x00,0x01,0x01,0x00,0x00,0x7f,0x7f,0x7f,0x7f,0x00,0x00,0x01,0x03,0x07,0x0e,0x7f,0x7f,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x3f,0x1f, -0xfe,0xfe,0x86,0x86,0x86,0x86,0x86,0xce,0xfc,0x78,0xf8,0xfc,0x0e,0x06,0x06,0x06,0x06,0x0e,0xfc,0xf8,0xfe,0xfe,0x86,0x86,0x86,0x86,0x86,0xce,0xfc,0x78,0x78,0xfc,0xce,0x86,0x86,0x86,0x86,0x8e,0x1c,0x18,0x06,0x06,0x06,0x06,0xfe,0xfe,0x06,0x06,0x06,0x06,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x1e,0x3e,0x70,0xe0,0xc0,0xc0,0xe0,0x70,0x3e,0x1e,0x7e,0xfe,0xc0,0x80,0x00,0x00,0x80,0xc0,0xfe,0x7e,0x06,0x06,0x06,0x06,0x86,0xc6,0xe6,0x76,0x3e,0x1e,0x00,0x00,0xfe,0xfe,0x06,0x06,0x06,0x06,0x00,0x00,0x18,0x38,0x70,0xe0,0xc0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0xfe,0xfe,0x00,0x00,0x60,0x70,0x38,0x1c,0x0e,0x0e,0x1c,0x38,0x70,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x1f,0x3f,0x70,0x60,0x66,0x6e,0x3c,0x38,0x7f,0x67,0x7f,0x7f,0x01,0x01,0x07,0x0f,0x1d,0x39,0x70,0x60,0x18,0x38,0x71,0x61,0x61,0x61,0x61,0x73,0x3f,0x1e,0x00,0x00,0x00,0x00,0x7f,0x7f,0x00,0x00,0x00,0x00,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x3f,0x1f,0x07,0x0f,0x1c,0x38,0x70,0x70,0x38,0x1c,0x0f,0x07,0x1f,0x3f,0x70,0x70,0x3e,0x3e,0x70,0x70,0x3f,0x1f,0x78,0x7c,0x0e,0x07,0x03,0x03,0x07,0x0e,0x7c,0x78,0x00,0x00,0x01,0x03,0x7f,0x7f,0x03,0x01,0x00,0x00,0x78,0x7c,0x6e,0x67,0x63,0x61,0x60,0x60,0x60,0x60,0x00,0x00,0x7f,0x7f,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0e,0x1c,0x18,0x00,0x00,0x60,0x60,0x60,0x60,0x7f,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60, -0x00,0x00,0x06,0x0e,0x1c,0x38,0x70,0x60,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0xe0,0xc0,0x80,0xfe,0xfe,0x80,0xc0,0xe0,0x60,0x60,0xe0,0xc0,0x80,0x80,0xc0,0xe0,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x80,0xc0,0xe0,0x60,0x60,0xe0,0xc0,0x80,0xfe,0xfe,0x80,0xc0,0xe0,0x60,0x60,0x60,0x60,0xe0,0xc0,0x80,0x80,0x80,0xf8,0xfc,0x8e,0x86,0x06,0x0e,0x1c,0x18,0xe0,0xf0,0x38,0x18,0x18,0x18,0x18,0x18,0xf8,0xf8,0xfe,0xfe,0x80,0xc0,0xe0,0x60,0x60,0xe0,0xc0,0x80,0x00,0x00,0x60,0x60,0xe6,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0xe6,0xe6,0x00,0x00,0xfe,0xfe,0x00,0x00,0x80,0xc0,0xe0,0x60,0x00,0x00,0x00,0x00,0x06,0x06,0xfe,0xfe,0x00,0x00,0x00,0x00,0xe0,0xe0,0x60,0xe0,0xc0,0xc0,0xe0,0xe0,0xc0,0x80,0xe0,0xe0,0x80,0xc0,0xe0,0x60,0x60,0xe0,0xc0,0x80,0x80,0xc0,0xe0,0x60,0x60,0x60,0x60,0xe0,0xc0,0x80, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x3c,0x7e,0x66,0x66,0x66,0x66,0x66,0x7f,0x7f,0x7f,0x7f,0x61,0x61,0x60,0x60,0x60,0x70,0x3f,0x1f,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x38,0x18,0x1f,0x3f,0x70,0x60,0x60,0x60,0x61,0x61,0x7f,0x7f,0x1f,0x3f,0x76,0x66,0x66,0x66,0x66,0x66,0x07,0x07,0x01,0x01,0x7f,0x7f,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x03,0x67,0x66,0x66,0x66,0x66,0x76,0x3f,0x1f,0x7f,0x7f,0x01,0x01,0x00,0x00,0x00,0x00,0x7f,0x7f,0x00,0x00,0x60,0x60,0x7f,0x7f,0x60,0x60,0x00,0x00,0x18,0x38,0x70,0x60,0x60,0x70,0x3f,0x1f,0x00,0x00,0x7f,0x7f,0x06,0x0f,0x1f,0x39,0x70,0x60,0x00,0x00,0x00,0x00,0x60,0x60,0x7f,0x7f,0x60,0x60,0x00,0x00,0x7f,0x7f,0x00,0x00,0x07,0x07,0x00,0x00,0x7f,0x7f,0x7f,0x7f,0x01,0x01,0x00,0x00,0x00,0x00,0x7f,0x7f,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x3f,0x1f, -0xe0,0xe0,0x60,0x60,0x60,0x60,0x60,0xe0,0xc0,0x80,0x80,0xc0,0xe0,0x60,0x60,0x60,0xc0,0x80,0xe0,0xe0,0xe0,0xe0,0x80,0xc0,0xe0,0x60,0x60,0xe0,0xc0,0x80,0x80,0xc0,0xe0,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x60,0x60,0xfe,0xfe,0x60,0x60,0x00,0x00,0x00,0x00,0xe0,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe0,0xe0,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe0,0xe0,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe0,0x60,0xe0,0xc0,0x80,0x00,0x00,0x80,0xc0,0xe0,0x60,0xe0,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0xe0,0xe0,0xe0,0x60,0x00,0x00,0x80,0xc0,0x78,0x7c,0x0e,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x0e,0x7c,0x78,0xc0,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x18,0x38,0xf0,0xe0,0xc0,0x80,0x80,0xc0,0xe0,0xf0,0x38,0x18,0x80,0x80,0x80,0x80, -0x7f,0x7f,0x06,0x06,0x06,0x06,0x06,0x07,0x03,0x01,0x01,0x03,0x07,0x06,0x06,0x06,0x07,0x07,0x7f,0x7f,0x7f,0x7f,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x61,0x63,0x67,0x66,0x66,0x66,0x66,0x7e,0x3c,0x18,0x00,0x00,0x1f,0x3f,0x70,0x60,0x60,0x70,0x38,0x18,0x1f,0x3f,0x70,0x60,0x60,0x70,0x38,0x18,0x7f,0x7f,0x07,0x0f,0x1c,0x38,0x70,0x70,0x38,0x1c,0x0f,0x07,0x1f,0x3f,0x70,0x70,0x38,0x38,0x70,0x70,0x3f,0x1f,0x60,0x70,0x39,0x1f,0x0f,0x0f,0x1f,0x39,0x70,0x60,0x01,0x03,0x67,0x66,0x66,0x66,0x66,0x76,0x3f,0x1f,0x60,0x70,0x78,0x7c,0x6e,0x67,0x63,0x61,0x60,0x60,0x00,0x00,0x01,0x03,0x1e,0x3e,0x70,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x70,0x3e,0x1e,0x03,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x18,0x1c,0x0f,0x07,0x03,0x01,0x01,0x03,0x07,0x0f,0x1c,0x18,0x01,0x01,0x01,0x01, +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,0x71,0xfe,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x3e,0x00,0x00,0x00,0x00,0x00,0x60,0x06,0x60,0x06,0xfe,0x7f,0xfe,0x7f,0x60,0x06,0x60,0x06,0xfe,0x7f,0xfe,0x7f,0x60,0x06,0x60,0x06,0x60,0x18,0xf0,0x18,0x98,0x19,0x98,0x19,0xfe,0x7f,0xfe,0x7f,0x98,0x19,0x98,0x19,0x18,0x0f,0x18,0x06,0x0c,0x18,0x1e,0x1c,0x1e,0x0e,0x0c,0x07,0x80,0x03,0xc0,0x01,0xe0,0x30,0x70,0x78,0x38,0x78,0x18,0x30,0x78,0x1e,0xfc,0x3f,0x8e,0x71,0xc6,0x63,0xe6,0x67,0x76,0x66,0x3c,0x3c,0x18,0x3c,0x00,0x66,0x00,0x66,0x00,0x00,0x00,0x00,0x66,0x00,0x76,0x00,0x3e,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0xf0,0x0f,0x38,0x1c,0x1c,0x38,0x0e,0x70,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x60,0x0e,0x70,0x1c,0x38,0x38,0x1c,0xf0,0x0f,0xe0,0x07,0x00,0x00,0x00,0x00,0x60,0x06,0x60,0x06,0xc0,0x03,0x80,0x01,0xf8,0x1f,0xf8,0x1f,0x80,0x01,0xc0,0x03,0x60,0x06,0x60,0x06,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0xf8,0x1f,0xf8,0x1f,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x66,0x00,0x76,0x00,0x3e,0x00,0x1e,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x78,0x00,0x78,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x1c,0x00,0x0e,0x00,0x07,0x80,0x03,0xc0,0x01,0xe0,0x00,0x70,0x00,0x38,0x00,0x18,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,0x00,0x00,0x00,0x00,0x30,0x0c,0x78,0x1e,0x78,0x1e,0x30,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x66,0x78,0x76,0x78,0x3e,0x30,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x01,0xc0,0x03,0xe0,0x07,0x70,0x0e,0x38,0x1c,0x1c,0x38,0x0e,0x70,0x06,0x60,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x06,0x60,0x0e,0x70,0x1c,0x38,0x38,0x1c,0x70,0x0e,0xe0,0x07,0xc0,0x03,0x80,0x01,0x00,0x00,0x00,0x00,0x18,0x00,0x1c,0x00,0x0e,0x00,0x06,0x00,0x06,0x66,0x06,0x67,0x86,0x03,0xce,0x01,0xfc,0x00,0x78,0x00, +0x78,0x00,0xfc,0x00,0xce,0x01,0x86,0x01,0x86,0x01,0xce,0x01,0xfc,0x00,0x78,0x00,0x00,0x00,0x00,0x00,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,0x00,0x00,0x00,0xfe,0x7f,0xfe,0x7f,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0x00,0x00,0x00,0x00,0x18,0x00,0x38,0x00,0x70,0x00,0xe0,0x00,0xc0,0x01,0x80,0x03,0x00,0x07,0x00,0x0e,0x00,0x1c,0x00,0x18,0x00,0x00,0x00,0x00,0x06,0x60,0x06,0x60,0x06,0x60,0x06,0x60,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x1c,0x00,0x0e,0x00,0x0e,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x60,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60, +0x00,0x00,0x00,0x00,0x06,0x00,0x0e,0x00,0x1c,0x00,0x38,0x00,0x70,0x00,0x60,0x00,0x00,0x00,0x00,0x00,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,0xfe,0x1f,0xfe,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,0x80,0x01,0xc0,0x03,0x78,0x1e,0x7c,0x3e,0x0e,0x70,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x7f,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x60,0x0e,0x70,0x7c,0x3e,0x78,0x1e,0xc0,0x03,0x80,0x01,0x00,0x00,0x00,0x00,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x18,0x18,0x38,0x1c,0xf0,0x0f,0xe0,0x07,0xc0,0x03,0x80,0x01,0x80,0x01,0xc0,0x03,0xe0,0x07,0xf0,0x0f,0x38,0x1c,0x18,0x18,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01, diff --git a/src/lcd.cpp b/src/lcd.cpp index a01d96a95..4c8bbcbcc 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -33,8 +33,8 @@ #include "open9x.h" -#define font_5x8_x20_x7f (font+2) -#define font_10x16_x20_x7f (font_dblsize+2) +#define font_5x8_x20_x7f (font) +#define font_10x16_x20_x7f (font_dblsize) uint8_t displayBuf[DISPLAY_W*DISPLAY_H/8]; #define DISPLAY_END (displayBuf+sizeof(displayBuf)) @@ -90,30 +90,23 @@ void lcd_putcAtt(uint8_t x, uint8_t y, const unsigned char c, uint8_t mode) { /* each letter consists of ten top bytes followed by * by ten bottom bytes (20 bytes per * char) */ - q = &font_10x16_x20_x7f[((uint16_t)c-0x20)*10 + (((uint16_t)c-0x20)/16)*160]; - for(char i=5; i>=0; i--) { - if (mode & CONDENSED && i==0) break; - uint8_t b1=0, b2=0, b3=0, b4=0; - if (i>0) { - b1 = pgm_read_byte(q); /*top byte*/ - b3 = pgm_read_byte((uint16_t)160+q); /*bottom byte*/ - b2 = pgm_read_byte(++q); /*top byte*/ - b4 = pgm_read_byte((uint16_t)160+q); /*bottom byte*/ + q = &font_10x16_x20_x7f[((uint16_t)c-0x20)*20]; + for(char i=11; i>=0; i--) { + if (mode & CONDENSED && i<=1) break; + uint8_t b1=0, b2=0; + if (i>1) { + b1 = pgm_read_byte(q++); /*top byte*/ + b2 = pgm_read_byte(q++); /*top byte*/ } if(inv) { b1=~b1; b2=~b2; - b3=~b3; - b4=~b4; } if(&p[DISPLAY_W+1] < DISPLAY_END) { p[0]=b1; - p[1]=b2; - p[DISPLAY_W] = b3; - p[DISPLAY_W+1] = b4; - p+=2; + p[DISPLAY_W] = b2; + p++; } - q++; } } else { diff --git a/src/translations/font_dblsize_se.lbm b/src/translations/font_dblsize_se.lbm index 761bba099..28169b468 100644 --- a/src/translations/font_dblsize_se.lbm +++ b/src/translations/font_dblsize_se.lbm @@ -1,2 +1 @@ -0x00,0x00,0x60,0x60,0x6e,0x6a,0x6e,0xe0,0xc0,0x80,0x00,0x00,0x6c,0x6c,0x60,0x60,0x6c,0xec,0xc0,0x80,0x80,0xc0,0xec,0x6c,0x60,0x60,0x6c,0xec,0xc0,0x80,0xe0,0xf0,0xb8,0x9e,0x9a,0x9a,0x9e,0xb8,0xf0,0xe0,0xe0,0xf6,0xba,0x9c,0x8e,0x8e,0x9c,0xba,0xf6,0xe0,0xe0,0xf6,0x36,0x18,0x18,0x18,0x18,0x36,0xf6,0xe0,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,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x18,0x3c,0x7e,0x66,0x66,0x66,0x66,0x66,0x7f,0x7f,0x18,0x3c,0x7e,0x66,0x66,0x66,0x66,0x66,0x7f,0x7f,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x3f,0x1f,0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x7f,0x7f,0x7f,0x7f,0x01,0x01,0x01,0x01,0x01,0x01,0x7f,0x7f,0x1f,0x3f,0x70,0x60,0x60,0x60,0x60,0x70,0x3f,0x1f,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,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x18,0x00,0x3c,0x60,0x7e,0x60,0x66,0x6e,0x66,0x6a,0x66,0x6e,0x66,0xe0,0x66,0xc0,0x7f,0x80,0x7f,0x00,0x18,0x00,0x3c,0x6c,0x7e,0x6c,0x66,0x60,0x66,0x60,0x66,0x6c,0x66,0xec,0x66,0xc0,0x7f,0x80,0x7f,0x80,0x1f,0xc0,0x3f,0xec,0x70,0x6c,0x60,0x60,0x60,0x60,0x60,0x6c,0x60,0xec,0x70,0xc0,0x3f,0x80,0x1f,0xe0,0x7f,0xf0,0x7f,0xb8,0x01,0x9e,0x01,0x9a,0x01,0x9a,0x01,0x9e,0x01,0xb8,0x01,0xf0,0x7f,0xe0,0x7f,0xe0,0x7f,0xf6,0x7f,0xba,0x01,0x9c,0x01,0x8e,0x01,0x8e,0x01,0x9c,0x01,0xba,0x01,0xf6,0x7f,0xe0,0x7f,0xe0,0x1f,0xf6,0x3f,0x36,0x70,0x18,0x60,0x18,0x60,0x18,0x60,0x18,0x60,0x36,0x70,0xf6,0x3f,0xe0,0x1f,0x00,0x00, diff --git a/src/translations/font_dblsize_se.xbm b/src/translations/font_dblsize_se.xbm index 3226ec633..dbe64b2c5 100644 --- a/src/translations/font_dblsize_se.xbm +++ b/src/translations/font_dblsize_se.xbm @@ -1,30 +1,14 @@ -#define font_dblsize_se_width 160 +#define font_dblsize_se_width 61 #define font_dblsize_se_height 16 static unsigned char font_dblsize_se_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, - 0x1e, 0xb6, 0x19, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x50, 0x30, 0xc3, 0x0c, 0x12, 0x7a, 0x19, 0x06, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x70, 0x30, 0xc3, 0x0c, 0x3f, 0xfc, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x7f, 0xce, 0xf9, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf0, 0xc3, 0xcf, 0xe1, 0x87, 0x1f, 0x0e, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfc, 0xf1, 0xe7, 0xdf, 0xc0, 0x03, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x7e, 0xf8, - 0xff, 0xff, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3c, 0xf0, 0xff, 0xff, 0x0f, 0x0c, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfc, 0xf3, 0x3f, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfb, 0x3f, 0xf0, - 0xc0, 0x03, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x07, 0x1f, 0x7c, 0xf8, 0xc0, 0x03, 0x1f, 0x0e, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfb, 0xef, 0xdf, - 0xc0, 0x03, 0xfb, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf3, 0xcf, 0xcf, 0xc0, 0x03, 0xf3, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1e, 0xb6, 0x19, 0x06, 0x50, 0x30, 0xc3, 0x0c, 0x12, 0x7a, 0x19, 0x06, + 0x70, 0x30, 0xc3, 0x0c, 0x3f, 0xfc, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x80, + 0x7f, 0xce, 0xf9, 0x07, 0xfc, 0xf0, 0xc3, 0xcf, 0xe1, 0x87, 0x1f, 0x0e, + 0xfc, 0xf1, 0xe7, 0xdf, 0xc0, 0x03, 0x0f, 0x0c, 0x80, 0x03, 0x7e, 0xf8, + 0xff, 0xff, 0x0f, 0x0c, 0x00, 0x03, 0x3c, 0xf0, 0xff, 0xff, 0x0f, 0x0c, + 0xfc, 0xf3, 0x3f, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, 0xfe, 0xfb, 0x3f, 0xf0, + 0xc0, 0x03, 0x0f, 0x0c, 0x07, 0x1f, 0x3c, 0xf0, 0xc0, 0x03, 0x0f, 0x0c, + 0x07, 0x1f, 0x7c, 0xf8, 0xc0, 0x03, 0x1f, 0x0e, 0xfe, 0xfb, 0xef, 0xdf, + 0xc0, 0x03, 0xfb, 0x07, 0xfc, 0xf3, 0xcf, 0xcf, 0xc0, 0x03, 0xf3, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/util/img2lbm.py b/util/img2lbm.py new file mode 100644 index 000000000..47392157a --- /dev/null +++ b/util/img2lbm.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python + +import sys +from PyQt4 import Qt, QtGui + +image = QtGui.QImage(sys.argv[1]) +width, height = image.size().width(), image.size().height() + +f = file(sys.argv[2], "w") + +if sys.argv[3] == "img": + rows = 1 + if len(sys.argv) > 4: + rows = int(sys.argv[4]) + f.write("%d,%d,\n" % (width, height/rows)) + for y in range(0, height, 8): + for x in range(width): + value = 0 + for z in range(8): + if image.pixel(x, y+z) == Qt.qRgb(0, 0, 0): + value += 1 << z + f.write("0x%02x," % value) + f.write("\n") +elif sys.argv[3] == "char": + for y in range(0, height, 8): + for x in range(width): + value = 0 + for z in range(8): + if image.pixel(x, y+z) == Qt.qRgb(0, 0, 0): + value += 1 << z + f.write("0x%02x," % value) + f.write("\n") +elif sys.argv[3] == "dblsize": + for y in range(0, height, 16): + for x in range(width): + for l in range(0, 16, 8): + value = 0 + for z in range(8): + if image.pixel(x, y+l+z) == Qt.qRgb(0, 0, 0): + value += 1 << z + f.write("0x%02x," % value) + f.write("\n") diff --git a/util/xbm2lbm.rb b/util/xbm2lbm.rb deleted file mode 100644 index 30c3dac75..000000000 --- a/util/xbm2lbm.rb +++ /dev/null @@ -1,50 +0,0 @@ -#! /usr/bin/env ruby - -require 'pp' - -def main(header, xbm) - base=xbm.sub(/\.xbm/,"") - cols,rows=1,1 - if base.sub! /_(\d+)x(\d+)/,"" - rows,cols = $1.to_i,$2.to_i - end - - File.read(xbm)=~/_width\s+(\d+).*_height\s+(\d+).*\{(.*)\}/m - w,h,bits=$1.to_i,$2.to_i,$3 - bits=eval "["+bits+"]" - #pp w,h,bits - - wb=(w+7)/8 - hb=(h+7)/8 - - out=Array.new(w*hb,0) - #pp out - h.times{|yp| yb=yp/8; msk= 1 << (yp%8) - w.times{|xp| xb=xp/8; msk2=1 << (xp%8) - out[yb*w+xp]|=msk if bits[wb*yp+xb]&msk2 != 0 - } - } - #pp out - -#prog_uchar img_4sticks_18x8[] = { -##include "sticks_lcd.h" -#}; - - File.open("#{base}.lbm","w"){|f| - col=0 - if header == "yes" - f.printf("%d,%d,\n",w/cols,h/rows) - end - rows.times{|row| - (hb/rows).times{|yb| yb - w.times{|xp| - f.printf("0x%02x,",out[row*w + yb*w + xp]) - } - f.puts - } - } - } -end - - -main(ARGV[0], ARGV[1])