Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Revert changes for image compression while companion9x is not ready for this feature

Browse source
This commit is contained in:
bsongis 2012-05-25 07:34:56 +00:00
parent 3dd8338028
commit d3b14ea3e2
5 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile
View file

@ -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

11
src/asterisk.lbm
View file

@ -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,
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,

12
src/lcd.cpp
View file

@ -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<w; i++){
if (ocur==0)
{
b = pgm_read_byte(q++);
if (comp && b==0xf0)
{
b = pgm_read_byte(q++);
ocur = pgm_read_byte(q++)-1;
}
} else ocur--;
uint8_t b = pgm_read_byte(q++);
*p++ = inv ? ~b : b;
}
}

19
src/s9xsplash.lbm
View file

@ -1,10 +1,9 @@
128,64,1,
0xf0,0x00,0x80,
0xf0,0xfc,0x80,0xf0,0xff,0x09,0x7f,0x7f,0xf0,0x3f,0x06,0x7f,0x7f,0xf0,0xff,0x08,0xf0,0x3f,0x05,0xff,0x7f,0x7f,0xf0,0x3f,0x04,0x7f,0xf0,0xff,0x09,0x7f,0x7f,0xf0,0x3f,0x06,0x7f,0x7f,0xf0,0xff,0x09,0xf0,0x3f,0x05,0xff,0x7f,0xf0,0x3f,0x05,0x7f,0xf0,0xff,0x04,0x7f,0x0f,0x07,0x03,0x01,0x81,0xe0,0xf0,0xf0,0x03,0xe0,0x00,0x01,0x01,0x07,0x1f,0xf0,0xff,0x05,0xbf,0xf0,0x3f,0x04,0x7f,0xf0,0xff,0x05,0x7f,0xf0,0x3f,0x05,0xbf,
0xf0,0xff,0x08,0x3f,0x07,0x03,0x01,0x00,0xc0,0xf0,0xf0,0x01,0xf8,0xf0,0xfc,0x04,0xf8,0xf0,0x00,0x03,0x01,0x03,0xf0,0xff,0x03,0x3f,0x01,0xf0,0x00,0x03,0x80,0xe0,0xf8,0xf0,0xfc,0x03,0xf8,0xf0,0x00,0x04,0x01,0xff,0xff,0x3f,0x07,0x03,0x01,0x00,0x00,0x10,0x18,0xf0,0x1c,0x04,0x18,0xf0,0x00,0x03,0x01,0x03,0xf0,0xff,0x04,0x1f,0xf0,0x00,0x04,0xc0,0xf8,0xf0,0xfc,0x03,0x10,0xf0,0x00,0x04,0xc0,0xf0,0xff,0x03,0xe0,0x80,0xf0,0x00,0x03,0x0f,0xf0,0x1f,0x03,0x0f,0x03,0xf0,0x00,0x04,0xe0,0xf0,0xff,0x06,0xfe,0xf8,0xe0,0x00,0x00,0x01,0x07,0x07,0x01,0x80,0xe0,0xf0,0xf0,0x01,0xf8,0xfc,0xfe,
0xf0,0xff,0x0a,0xe0,0xc0,0x80,0x00,0x00,0x0f,0xf0,0x1f,0x04,0x0f,0x07,0x01,0x80,0xc0,0xe0,0xf0,0xf0,0x01,0xfe,0xff,0xff,0x07,0xf0,0x00,0x04,0xc0,0x0f,0xf0,0x1f,0x03,0x0f,0x07,0x01,0x00,0x80,0xe0,0xf0,0xf0,0x01,0xfe,0xff,0xff,0xe0,0xc0,0x80,0x00,0x00,0x0e,0x0e,0xf0,0x1e,0x07,0x0e,0xce,0xfe,0xfe,0xff,0xff,0x7f,0x03,0xf0,0x00,0x03,0x80,0xfc,0xf0,0xff,0x03,0x3f,0x03,0xf0,0x00,0x03,0x80,0xfc,0xff,0xff,0x1f,0x0f,0x0f,0x1f,0x1f,0xf0,0x1e,0x03,0x0e,0x0e,0x07,0x81,0xc0,0xe0,0xf0,0xf0,0x01,0xfc,0xf0,0xff,0x04,0x7f,0x3f,0x1f,0x0f,0x03,0x01,0x80,0xe0,0xf0,0xf0,0x01,0xf8,0xe0,0x80,0x00,0x01,0x07,0x1f,0x7f,
0xf0,0xff,0x11,0xf0,0xfe,0x06,0xf0,0xff,0x07,0x1f,0xf0,0x00,0x04,0xc0,0xfe,0xff,0xff,0xf0,0xfe,0x05,0xf0,0xff,0x0d,0xf0,0xfe,0x08,0xf0,0xff,0x07,0xf0,0xfe,0x05,0xf0,0xff,0x05,0xf0,0xfe,0x05,0xf0,0xff,0x06,0xf0,0xfe,0x07,0xf0,0xff,0x0a,0xf0,0xfe,0x06,0xf0,0xff,0x07,0xf0,0xfe,0x05,
0xf0,0xff,0x08,
0xf0,0x1f,0x80,
0xf0,0x00,0x80,
128,64,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,0xfc,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x7f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x7f,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x3f,0x3f,0x3f,0x3f,0xff,0x7f,0x7f,0x3f,0x3f,0x3f,0x3f,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x7f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x7f,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x3f,0x3f,0x3f,0x3f,0xff,0x7f,0x3f,0x3f,0x3f,0x3f,0x3f,0x7f,0xff,0xff,0xff,0xff,0x7f,0x0f,0x07,0x03,0x01,0x81,0xe0,0xf0,0xf0,0xf0,0xe0,0x00,0x01,0x01,0x07,0x1f,0xff,0xff,0xff,0xff,0xff,0xbf,0x3f,0x3f,0x3f,0x3f,0x7f,0xff,0xff,0xff,0xff,0xff,0x7f,0x3f,0x3f,0x3f,0x3f,0x3f,0xbf,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0x3f,0x07,0x03,0x01,0x00,0xc0,0xf0,0xf8,0xfc,0xfc,0xfc,0xfc,0xf8,0x00,0x00,0x00,0x01,0x03,0xff,0xff,0xff,0x3f,0x01,0x00,0x00,0x00,0x80,0xe0,0xf8,0xfc,0xfc,0xfc,0xf8,0x00,0x00,0x00,0x00,0x01,0xff,0xff,0x3f,0x07,0x03,0x01,0x00,0x00,0x10,0x18,0x1c,0x1c,0x1c,0x1c,0x18,0x00,0x00,0x00,0x01,0x03,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xc0,0xf8,0xfc,0xfc,0xfc,0x10,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xe0,0x80,0x00,0x00,0x00,0x0f,0x1f,0x1f,0x1f,0x0f,0x03,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xf8,0xe0,0x00,0x00,0x01,0x07,0x07,0x01,0x80,0xe0,0xf0,0xf8,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xe0,0xc0,0x80,0x00,0x00,0x0f,0x1f,0x1f,0x1f,0x1f,0x0f,0x07,0x01,0x80,0xc0,0xe0,0xf0,0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xc0,0x0f,0x1f,0x1f,0x1f,0x0f,0x07,0x01,0x00,0x80,0xe0,0xf0,0xfe,0xff,0xff,0xe0,0xc0,0x80,0x00,0x00,0x0e,0x0e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x0e,0xce,0xfe,0xfe,0xff,0xff,0x7f,0x03,0x00,0x00,0x00,0x80,0xfc,0xff,0xff,0xff,0x3f,0x03,0x00,0x00,0x00,0x80,0xfc,0xff,0xff,0x1f,0x0f,0x0f,0x1f,0x1f,0x1e,0x1e,0x1e,0x0e,0x0e,0x07,0x81,0xc0,0xe0,0xf0,0xfc,0xff,0xff,0xff,0xff,0x7f,0x3f,0x1f,0x0f,0x03,0x01,0x80,0xe0,0xf0,0xf8,0xe0,0x80,0x00,0x01,0x07,0x1f,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xc0,0xfe,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xfe,0xfe,0xfe,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,0x1f,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

2
src/sticks.lbm
View file

@ -1,4 +1,4 @@
18,8,0,
18,8,
0x00,0x08,0x1c,0x08,0x08,0x08,0x1c,0x08,0x00,0x00,0x08,0x22,0x00,0x49,0x00,0x22,0x08,0x00,
0x00,0x00,0x00,0x00,0x22,0x7f,0x22,0x00,0x00,0x00,0x08,0x22,0x00,0x49,0x00,0x22,0x08,0x00,
0x00,0x08,0x22,0x00,0x49,0x00,0x22,0x08,0x00,0x00,0x00,0x22,0x7f,0x22,0x00,0x00,0x00,0x00,