diff --git a/src/Makefile b/src/Makefile index 4e5be8197..b9a8c0c3a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -569,12 +569,12 @@ sticks.lbm: sticks_4x1.xbm s9xsplash.lbm: s9xsplash.xbm @echo @echo "Convert splash from xbm to lbm:" - $(IMG2LBM) $< $@ imgc + $(IMG2LBM) $< $@ img asterisk.lbm: asterisk.xbm @echo @echo "Convert asterisk from xbm to lbm:" - $(IMG2LBM) $< $@ imgc + $(IMG2LBM) $< $@ img # Eye candy. # AVR Studio 3.x does not check make's exit code but relies on diff --git a/src/asterisk.lbm b/src/asterisk.lbm index 6e78c3ff5..72b02a422 100644 --- a/src/asterisk.lbm +++ b/src/asterisk.lbm @@ -1,6 +1,5 @@ -27,32,1, -0x00,0xe0,0xf8,0xf0,0xfc,0x03,0x7c,0x78,0x78,0x70,0x70,0x60,0xe0,0xc0,0xc0,0x80,0x80, -0xf0,0x00,0x0b,0xf0,0xff,0x05,0xfc,0xf0,0xf0,0x01,0xc0,0x00,0x00,0x80,0x87,0xf0,0xff,0x06,0xfe,0xfe,0xfc,0xfc,0xf8,0xf8,0xf0,0xf0, -0xe0,0xf0,0xff,0x09,0xf3,0xf0,0xe1,0x04,0xf3,0xff,0x7f,0x3f,0x3f,0x1f,0x0f,0x0f,0x07,0x03,0x03,0x01, -0x00,0x07,0x1f,0xf0,0x3f,0x04,0x1f,0x1f,0x0f,0x07,0x07,0x03,0x01,0x01, -0xf0,0x00,0x0d, \ No newline at end of file +27,32, +0xe0,0xf8,0xfc,0xfc,0xfc,0x7c,0x78,0x78,0x70,0x70,0x60,0xe0,0xc0,0xc0,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0xff,0xff,0xff,0xfc,0xf0,0xc0,0x00,0x00,0x80,0x87,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfc,0xfc,0xf8,0xf8,0xf0,0xf0,0xe0, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf3,0xe1,0xe1,0xe1,0xe1,0xf3,0xff,0x7f,0x3f,0x3f,0x1f,0x0f,0x0f,0x07,0x03,0x03,0x01,0x00, +0x07,0x1f,0x3f,0x3f,0x3f,0x3f,0x1f,0x1f,0x0f,0x07,0x07,0x03,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/src/lcd.cpp b/src/lcd.cpp index 4f789d7dc..92926cba7 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -54,22 +54,12 @@ void lcd_img(uint8_t x, uint8_t y, const pm_uchar * img, uint8_t idx, uint8_t mo const pm_uchar *q = img; uint8_t w = pgm_read_byte(q++); uint8_t hb = (pgm_read_byte(q++)+7)/8; - bool comp = pgm_read_byte(q++); bool inv = (mode & INVERS) ? true : (mode & BLINK ? BLINK_ON_PHASE : false); q += idx*w*hb; - uint8_t ocur=0, b; for (uint8_t yb = 0; yb < hb; yb++) { uint8_t *p = &displayBuf[ (y / 8 + yb) * DISPLAY_W + x ]; for (uint8_t i=0; i