gray scale palette changes + com out reversal (want to start counting

from top) -> adjusting bmp2b (bmp stores bottom rows first!)

diff --git a/betty/bmp2b.c b/betty/bmp2b.c
index b61ac49..e006609 100644 (file)
--- a/betty/bmp2b.c
+++ b/betty/bmp2b.c
@@ -99,7 +99,8 @@ int main(int argc,char **argv) {
                        buf[0]=0;
                        buf[1]=0;
                        for(i=0;i<8;i++) {
-                               pix=((page*8+i)*DX)+col;
+                               // bmp: bottom rows first ... (i forgot that!)
+                               pix=((DY-1-(page*8+i))*DX)+col;
                                b=src.map[pix].r+src.map[pix].g+src.map[pix].b;
                                b/=3;
                                if(b<=(0.25*255)) {

diff --git a/betty/default_logo.h b/betty/default_logo.h
index 83ef302..613ddce 100644 (file)
--- a/betty/default_logo.h
+++ b/betty/default_logo.h
@@ -1,56 +1,51 @@
 unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
-       0x00,0x00,
-       0xfe,0x00,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0x3e,0x1e,
-       0x1e,0x9e,
-       0x1e,0x9e,
-       0x1e,0x1e,
-       0x3e,0x7e,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0x3e,0x7e,
-       0x1e,0x3e,
-       0x1e,0x1e,
-       0x1e,0x1e,
-       0x3e,0x1e,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
-       0xfe,0xfe,
+       0x00,0xe0,
+       0xf0,0xe8,
+       0xfc,0xfa,
+       0xfe,0xfc,
        0xfe,0xfe,
-       0xfe,0x00,
+       0xfe,0xfd,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xff,0xfe,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xff,
+       0xfe,0xfc,
+       0xfc,0xfe,
+       0xfc,0xf8,
+       0xf0,0xe8,
+       0x00,0x40,
        0x00,0x00,
        0x00,0x00,
-       0xe0,0x00,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x80,0x60,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0x70,0xb0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -60,20 +55,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x80,
-       0xc0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xe0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -91,36 +72,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x80,
-       0x80,0x80,
-       0x80,0xc0,
-       0xc0,0xc0,
-       0xc0,0xe0,
-       0xe0,0xc0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xf0,
-       0xf0,0xe0,
-       0xf0,0xe0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xe0,
-       0xf0,0xe0,
-       0xe0,0xf0,
-       0xe0,0xf0,
-       0xe0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xc0,
-       0xc0,0xe0,
-       0xc0,0xc0,
-       0xc0,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x00,0x80,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -130,51 +81,8 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x9f,
-       0xff,0x0f,
-       0xff,0x1f,
-       0xfe,0xfc,
-       0xfc,0xfc,
-       0xfc,0xfc,
-       0xfc,0xfe,
-       0xfe,0x1f,
-       0xff,0x0f,
-       0xff,0x1f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xbf,
-       0x1f,0x8f,
-       0x1f,0x0f,
-       0x9e,0x3f,
-       0xfc,0xfe,
-       0xfc,0xfd,
-       0xfc,0xfc,
-       0xfe,0xbd,
-       0xdf,0x3f,
-       0x5f,0xbf,
-       0xff,0x9f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -185,23 +93,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xc0,0x80,
-       0xf0,0xf8,
-       0xfc,0xfe,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -212,44 +103,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x80,
-       0xc0,0xc0,
-       0xf0,0xe0,
-       0xf8,0xf0,
-       0xfc,0xfc,
-       0xfe,0xfe,
-       0xff,0xfe,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x7f,
-       0x7f,0x7f,
-       0x3f,0x7f,
-       0x3f,0x3f,
-       0x1f,0x3f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x3f,
-       0x3f,0xdf,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -258,41 +111,32 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xf7,0xeb,
-       0xe3,0x4b,
-       0xe3,0x63,
-       0xff,0xf7,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xef,0x73,
-       0x63,0xdf,
-       0xe3,0x7f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,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,0xff,
        0xff,0xff,
-       0xe3,0x77,
-       0x63,0xc3,
-       0xe7,0xfb,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xf7,
-       0xe3,0x7f,
-       0xe3,0x5b,
-       0xf7,0xeb,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0xff,0x00,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
@@ -302,24 +146,11 @@ unsigned char default_logo[5120]={
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0xc0,0x80,
-       0xf0,0xe0,
-       0xfc,0xf8,
-       0xff,0xfe,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x3f,0x7f,
-       0x1f,0xef,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
@@ -330,29 +161,31 @@ unsigned char default_logo[5120]={
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0xfb,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0xc0,0xa0,
-       0xfc,0xfa,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
+       0xf0,0xe8,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0x3f,
-       0x0f,0x1f,
-       0x03,0x07,
-       0x01,0x00,
+       0x8f,0xb7,
+       0xc0,0xc0,
+       0xe0,0xc0,
+       0xe0,0x60,
+       0x70,0x60,
+       0x70,0x70,
+       0x70,0x70,
+       0x70,0xf0,
+       0xf0,0x70,
+       0xf0,0xe0,
+       0xe0,0xf0,
+       0xe0,0xe0,
+       0xc0,0xc0,
+       0x80,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -361,23 +194,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -386,78 +202,11 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x80,
-       0xff,0xff,
-       0xff,0xff,
-       0x7f,0xff,
-       0x3c,0x7f,
-       0x38,0x3e,
-       0x38,0x3e,
-       0x7f,0x3c,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xfc,0xfa,
-       0xf8,0xfc,
-       0xfc,0x7a,
-       0x3f,0x7f,
-       0x3f,0x3f,
-       0x3f,0x3f,
-       0x3f,0x7f,
-       0xfc,0x7a,
-       0xf8,0xfe,
-       0xfc,0xfb,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x7f,0x3c,
-       0x38,0x3e,
-       0x38,0x3e,
-       0x3e,0x79,
-       0x7f,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x80,0xc0,
-       0xe0,0xf0,
-       0xf8,0xfc,
-       0xfe,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x3f,0x7f,
-       0x0f,0x1f,
-       0x03,0x07,
-       0x00,0x01,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -466,18 +215,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x00,0x81,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -489,23 +226,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
-       0x7f,0x7f,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -514,78 +234,87 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x7c,0xbf,
-       0x38,0x58,
-       0x18,0x73,
-       0x18,0x39,
-       0x38,0x3c,
-       0xff,0x7e,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x7c,
-       0x38,0x3c,
-       0x18,0x33,
-       0x18,0x73,
-       0x38,0x3c,
-       0xff,0x7c,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x7e,
-       0x38,0x7c,
-       0x18,0x7b,
-       0x18,0x73,
-       0x38,0x1e,
-       0x7e,0xbd,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xf0,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,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,
+       0x00,0x00,
+       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
+       0xff,0x7f,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xf0,
-       0xf8,0xf0,
-       0xfe,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x00,0xff,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x80,0x60,
+       0xfe,0xf9,
        0xff,0xff,
        0xff,0xff,
-       0x7f,0x3f,
+       0xff,0x7f,
        0x1f,0x0f,
        0x07,0x03,
-       0x01,0x00,
+       0x01,0x03,
+       0x00,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
+       0x00,0x00,
+       0x01,0x00,
+       0x03,0x07,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xfe,0xfc,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -594,21 +323,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x07,0x09,
-       0x7f,0x3f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xfe,0xfd,
-       0xf0,0xe0,
-       0xc0,0x80,
-       0x00,0x80,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -642,125 +356,113 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,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,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x3e,0xfd,
-       0x1c,0x38,
-       0x18,0xdf,
-       0x18,0x5c,
-       0x3c,0x1c,
-       0xff,0x7e,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x3e,
-       0x1c,0x38,
-       0x18,0xdf,
-       0x18,0x9f,
-       0x1c,0x38,
-       0xff,0x3e,
        0xff,0xff,
        0xff,0xff,
+       0x00,0xdf,
+       0x02,0x35,
+       0x02,0x35,
+       0x00,0x37,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x34,
+       0x00,0x36,
+       0x20,0x9e,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0x7e,
-       0x3c,0x1c,
-       0x18,0xdd,
-       0x18,0xdf,
-       0x1c,0x78,
-       0x3e,0xfd,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
-       0xff,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
+       0xf0,0xe8,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x7f,0xff,
-       0x1f,0x3f,
-       0x07,0x0b,
-       0x01,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
+       0x80,0xc1,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x80,
+       0x80,0xc0,
+       0xe0,0xc0,
+       0xf0,0xf8,
+       0xfe,0xfd,
+       0x7f,0xff,
+       0x3f,0x9f,
+       0x8f,0xc7,
+       0xc1,0xc2,
+       0xe0,0xc0,
+       0xe0,0xe0,
+       0xe0,0xf0,
+       0x70,0xe0,
+       0x70,0x70,
+       0x70,0x70,
+       0x70,0x70,
+       0x70,0xf0,
+       0xf0,0x70,
+       0xf0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xc0,
+       0xc0,0xc0,
+       0x80,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x01,0x00,
-       0x07,0x03,
-       0x0f,0x0f,
-       0x1f,0x3f,
-       0x3f,0x7f,
-       0x7f,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xfe,0xff,
-       0xfe,0xfc,
-       0xfc,0xfc,
-       0xf8,0xfc,
-       0xf8,0xf8,
-       0xf8,0xf0,
-       0xf0,0xf8,
-       0xf0,0xf8,
-       0xf0,0xf8,
-       0xf0,0xf0,
-       0xf0,0xf8,
-       0xf0,0xf8,
-       0xf0,0xf8,
-       0xf8,0xf0,
-       0xf8,0xf8,
-       0xf8,0xf8,
-       0xf8,0xfc,
-       0xfc,0xf8,
-       0xfc,0xfc,
-       0xfc,0xfe,
-       0xfe,0xfe,
-       0xfe,0xff,
-       0xff,0xff,
-       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -770,54 +472,8 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x3e,0xdf,
-       0x1c,0x0c,
-       0x0d,0xd8,
-       0x0c,0x3c,
-       0x1c,0x1e,
-       0xff,0x3f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x3e,
-       0x1c,0x1e,
-       0x0c,0xfd,
-       0x0c,0xfd,
-       0x1c,0x1e,
-       0xff,0x3e,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x3f,
-       0x1c,0x1e,
-       0x0c,0x7d,
-       0x0c,0xfd,
-       0x1c,0x0e,
-       0x3f,0xde,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
-       0x07,0x08,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x07,0x0f,
-       0x01,0x03,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -831,17 +487,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x0f,0x07,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -859,36 +504,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x01,0x01,
-       0x01,0x03,
-       0x03,0x03,
-       0x03,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x0f,0x07,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x1f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x07,
-       0x0f,0x07,
-       0x07,0x0f,
-       0x07,0x07,
-       0x07,0x03,
-       0x03,0x07,
-       0x03,0x03,
-       0x01,0x03,
-       0x01,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -898,39 +513,20 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x7f,0x9e,
-       0x0e,0x1c,
-       0x0c,0x4e,
-       0x0c,0x4e,
-       0x0e,0x1e,
-       0xff,0x1f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x7f,
-       0x3e,0x7c,
-       0x3c,0x9e,
-       0x3c,0xbe,
-       0x3e,0x7c,
-       0xff,0x7f,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x3f,0xdf,
-       0x0e,0x1e,
-       0x0c,0x4e,
-       0x0c,0x4e,
-       0x0e,0x1c,
-       0xff,0x1e,
-       0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x00,0x6f,
+       0x00,0xc0,
        0x00,0x00,
+       0x00,0xc0,
+       0x00,0xc0,
+       0x00,0xc0,
+       0x00,0xc0,
+       0x00,0xc0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -939,11 +535,67 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x60,
+       0x00,0xf7,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
+       0x0e,0x09,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x03,0x05,
+       0x01,0x03,
+       0x03,0x07,
+       0x07,0x07,
+       0x0e,0x07,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0f,
+       0x0f,0x07,
+       0x07,0x0f,
+       0x07,0x07,
+       0x83,0x43,
+       0xf1,0xe3,
+       0xfc,0xf9,
+       0xfe,0xfe,
+       0xff,0xff,
+       0xcf,0xdf,
+       0xc7,0xc3,
+       0xc1,0xc3,
+       0xc0,0xc1,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc1,
+       0xc3,0xc5,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xfe,0x7c,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x80,
+       0xf8,0xf0,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0x78,
+       0x00,0x18,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -989,8 +641,40 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
+       0x00,0x3f,
+       0x00,0x10,
+       0x00,0x3f,
+       0x00,0x3f,
+       0x00,0x3f,
+       0x00,0x3f,
+       0x00,0x3f,
+       0x00,0x33,
+       0x00,0x33,
+       0x00,0x30,
+       0x00,0x30,
+       0x00,0x30,
+       0x00,0x30,
+       0x00,0x30,
        0x00,0x00,
+       0x00,0x78,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1008,60 +692,53 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       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,0xff,
-       0xff,0xff,
-       0xff,0xbf,
-       0x00,0x03,
-       0x00,0x04,
-       0x00,0x44,
-       0x00,0x04,
-       0x00,0xe0,
-       0xff,0xf8,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0x7f,
-       0x7f,0xff,
-       0x7f,0x7c,
-       0x78,0x3d,
-       0x79,0x38,
-       0x78,0x3b,
-       0x78,0x3c,
-       0x7f,0x7c,
-       0x7f,0xff,
-       0xff,0xff,
+       0x7f,0x3f,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xf0,
-       0x00,0x04,
-       0x00,0x04,
-       0x00,0x44,
-       0x00,0x04,
-       0x00,0x07,
        0xff,0xff,
+       0xc1,0xe1,
+       0x81,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x81,
+       0x81,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x00,
+       0x00,0x10,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0xdc,0xbc,
+       0xff,0xfc,
        0xff,0xff,
        0xff,0xff,
+       0x3f,0x5f,
+       0x1d,0x1e,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0x1c,0x1c,
+       0x00,0x0c,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xc0,0x80,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0x00,0xc0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1092,6 +769,40 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xf7,
+       0xf0,0xfc,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0xf9,
+       0xf0,0x79,
+       0xf0,0x7d,
+       0xf0,0xfd,
+       0xf0,0xff,
+       0xf0,0xff,
+       0xf0,0xff,
+       0xf0,0xff,
+       0xf0,0xff,
+       0xf0,0xff,
+       0xff,0xf7,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1110,10 +821,34 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x01,0x00,
+       0x03,0x01,
+       0x03,0x07,
+       0x07,0x07,
+       0x07,0x0f,
+       0x0f,0x07,
+       0x0f,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x07,
+       0x0f,0x06,
+       0x07,0x0f,
+       0x07,0x07,
+       0x01,0x02,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x80,
+       0xf8,0xf4,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x7f,
+       0x07,0x1b,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1122,17 +857,25 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x00,
-       0x30,0x50,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0xf0,0xf0,
-       0xf0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xc0,
-       0xc0,0x80,
        0x00,0x80,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xf8,0xe4,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xef,0xf3,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0x00,0x60,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1154,38 +897,40 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x3f,0x3f,
+       0x3f,0x9f,
+       0x3f,0x3f,
        0xff,0xff,
-       0xfe,0xff,
-       0xfe,0xfc,
-       0xfe,0xfc,
-       0xfe,0x7e,
-       0x0f,0x1e,
-       0x07,0x03,
-       0x01,0x03,
-       0x00,0x01,
-       0x80,0x40,
-       0xe0,0xe0,
-       0xf0,0xf0,
-       0xf0,0xf8,
-       0xf8,0x70,
-       0xf8,0x70,
-       0xf0,0xf8,
-       0xf0,0xf0,
-       0xe0,0xe0,
-       0x80,0x40,
-       0x00,0x01,
-       0x01,0x03,
-       0x07,0x03,
-       0x1f,0x0e,
-       0xfe,0xfe,
-       0xfe,0xfc,
-       0xfe,0xfc,
-       0xfe,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0xff,
+       0x3f,0xff,
+       0x3d,0x9e,
+       0x3d,0x1f,
+       0xfd,0x3f,
+       0xff,0xfd,
+       0xfd,0xff,
+       0xff,0xfd,
+       0xff,0xff,
+       0xff,0x3c,
+       0x3d,0x1e,
+       0x3f,0x1c,
+       0x3f,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x3f,0x3f,
+       0x3f,0x9f,
+       0x3f,0x9f,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1226,17 +971,39 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x3f,0x7c,
+       0xff,0x7f,
+       0xff,0xff,
+       0xff,0xff,
+       0xe1,0xe2,
+       0xc0,0xe0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0xc0,
+       0xc0,0x40,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xc0,0xa0,
+       0xfe,0xfd,
+       0xff,0xff,
+       0xff,0xff,
+       0x3f,0xdf,
+       0x01,0x02,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x30,0x50,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xc0,0xa0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1247,73 +1014,51 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x80,0x00,
+       0xc0,0xe0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0x70,0x30,
+       0x10,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x01,0x00,
-       0x03,0x07,
-       0x0f,0x0f,
-       0x3f,0x9f,
+       0x00,0x7f,
        0xff,0xff,
-       0xfe,0xfc,
-       0xf8,0xfc,
-       0xe0,0xf0,
-       0xc0,0x80,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       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,0xff,
+       0x8f,0xee,
+       0x8e,0xa6,
+       0xcf,0xae,
        0xff,0xff,
+       0xe7,0xff,
+       0xff,0xf7,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xfe,0x7f,
+       0x7e,0xff,
+       0x7f,0x7f,
+       0x7f,0x3f,
+       0x7f,0x3f,
+       0x7f,0x3f,
+       0x7f,0x3f,
+       0x7f,0x7f,
+       0x7e,0xff,
+       0xfe,0x7f,
        0xff,0xff,
-       0xff,0xfe,
-       0xf0,0xf8,
-       0xe0,0xc0,
-       0x80,0xc0,
-       0x80,0x00,
-       0x01,0x02,
-       0x07,0x0f,
-       0x0f,0x0f,
-       0x0f,0x1f,
-       0x1f,0x0e,
-       0x1f,0x0e,
-       0x0f,0x1f,
-       0x0f,0x0f,
-       0x07,0x0f,
-       0x01,0x02,
-       0x00,0x80,
-       0x80,0xc0,
-       0xe0,0xc0,
-       0xf0,0xfc,
-       0xff,0xfe,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xcf,0xbe,
+       0x8e,0xa7,
+       0x8f,0xce,
        0xff,0xff,
+       0xff,0xff,
+       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1357,10 +1102,23 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x01,0x00,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x00,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xf8,0xe4,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x0f,0x13,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1370,38 +1128,25 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x80,0xc0,
-       0xe0,0xc0,
-       0xe0,0xe0,
-       0xf0,0xe0,
-       0xf0,0xf0,
-       0x70,0xf0,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x60,0x50,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0xf0,0xe8,
-       0xff,0xfe,
+       0x07,0x0b,
+       0x7f,0xbf,
        0xff,0xff,
        0xff,0xff,
-       0x1f,0x2f,
-       0x1f,0x0f,
-       0x3f,0x7f,
-       0xff,0xfe,
-       0xfc,0xfe,
-       0xf0,0xf8,
-       0xe0,0xc0,
-       0x80,0x80,
-       0x00,0x00,
+       0xfc,0xfa,
+       0x80,0x40,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x80,
+       0xc0,0x80,
+       0xf0,0xe0,
+       0xf8,0xfc,
+       0xfe,0xfe,
+       0x7f,0xff,
+       0x3f,0x1f,
+       0x0f,0x07,
+       0x03,0x03,
+       0x00,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1409,40 +1154,38 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xfe,
-       0xff,0xff,
-       0xff,0xff,
-       0xf1,0x77,
-       0x71,0x65,
-       0xf3,0x75,
        0xff,0xff,
-       0xe7,0xff,
-       0xff,0xef,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x7f,0xfe,
-       0x7e,0xff,
-       0xfe,0xfe,
-       0xfe,0xfc,
-       0xfe,0xfc,
-       0xfe,0xfc,
-       0xfe,0xfc,
-       0xfe,0xfe,
-       0x7e,0xff,
-       0x7f,0xfe,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x7f,
+       0x0f,0x1f,
+       0x07,0x03,
+       0x01,0x03,
+       0x01,0x00,
+       0x80,0x40,
+       0xe0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf8,
+       0xf8,0x70,
+       0xf8,0x70,
+       0xf0,0xf8,
+       0xf0,0xf0,
+       0xe0,0xf0,
+       0x80,0x40,
+       0x00,0x01,
+       0x01,0x03,
+       0x07,0x03,
+       0x0f,0x3f,
+       0xff,0x7f,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xf3,0x7d,
-       0x71,0xe5,
-       0xf1,0x73,
        0xff,0xff,
        0xff,0xff,
-       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1486,23 +1229,10 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x80,0x00,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x00,0x80,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x1f,0x27,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xf0,0xc8,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1512,65 +1242,78 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xe0,0xd0,
-       0xfe,0xfd,
+       0x01,0x03,
+       0x07,0x03,
+       0x07,0x07,
+       0x0f,0x07,
+       0x0f,0x0f,
+       0x0e,0x0f,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x06,0x0a,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x0f,0x17,
+       0xff,0x7f,
        0xff,0xff,
        0xff,0xff,
-       0x3f,0x5f,
-       0x01,0x02,
+       0xf8,0xf4,
+       0xf8,0xf0,
+       0xfc,0xfe,
+       0xff,0x7f,
+       0x3f,0x7f,
+       0x0f,0x1f,
+       0x07,0x03,
+       0x01,0x01,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x01,
-       0x03,0x01,
-       0x0f,0x07,
-       0x1f,0x3f,
-       0x7f,0x7f,
-       0xfe,0xff,
-       0xfc,0xf8,
-       0xf0,0xe0,
-       0xc0,0xc0,
-       0x00,0x80,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xfc,0xfc,
-       0xfc,0xf9,
-       0xfc,0xfc,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xfc,0xff,
-       0xbc,0x79,
-       0xbc,0xf8,
-       0xbf,0xfc,
-       0xff,0xbf,
-       0xbf,0xff,
-       0xff,0xbf,
-       0xff,0xff,
-       0xff,0x3c,
-       0xbc,0x78,
-       0xfc,0x38,
-       0xfc,0xff,
-       0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x7f,0xff,
+       0x7f,0x3f,
+       0x7f,0x3f,
+       0x7f,0x7e,
+       0xf0,0x78,
+       0xe0,0xc0,
+       0x80,0xc0,
+       0x00,0x80,
+       0x01,0x02,
+       0x07,0x07,
+       0x0f,0x0f,
+       0x0f,0x1f,
+       0x1f,0x0e,
+       0x1f,0x0e,
+       0x0f,0x1f,
+       0x0f,0x0f,
+       0x07,0x07,
+       0x01,0x02,
+       0x00,0x80,
+       0x80,0xc0,
+       0xe0,0xc0,
+       0xf8,0x70,
+       0x7f,0x7f,
+       0x7f,0x3f,
+       0x7f,0x3f,
+       0x7f,0xff,
        0xff,0xff,
-       0xfc,0xfc,
-       0xfc,0xf9,
-       0xfc,0xf9,
        0xff,0xff,
        0xff,0xff,
-       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1611,39 +1354,17 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xfc,0x3e,
-       0xff,0xfe,
-       0xff,0xff,
-       0xff,0xff,
-       0x87,0x47,
-       0x03,0x07,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x02,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x03,0x05,
-       0x7f,0xbf,
-       0xff,0xff,
-       0xff,0xff,
-       0xfc,0xfb,
-       0x80,0x40,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x0c,0x0a,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x03,0x05,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1654,56 +1375,24 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x01,0x00,
-       0x03,0x07,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0e,0x0c,
-       0x08,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xef,
-       0x0f,0x3f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9f,
-       0x0f,0x9e,
-       0x0f,0xbe,
-       0x0f,0xbf,
-       0x0f,0xff,
-       0x0f,0xff,
-       0x0f,0xff,
-       0x0f,0xff,
-       0x0f,0xff,
-       0x0f,0xff,
-       0xff,0xef,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x80,0x00,
+       0xc0,0xe0,
+       0xf0,0xf0,
+       0xfc,0xf9,
+       0xff,0xff,
+       0x7f,0x3f,
+       0x1f,0x3f,
+       0x07,0x0f,
+       0x03,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1717,34 +1406,42 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x80,0x00,
-       0xc0,0x80,
-       0xc0,0xe0,
-       0xe0,0xe0,
-       0xe0,0xf0,
-       0xf0,0xe0,
-       0xf0,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0xe0,
-       0xf0,0x60,
-       0xe0,0xf0,
-       0xe0,0xe0,
-       0x80,0x40,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x01,
-       0x1f,0x2f,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xfd,
+       0x00,0xc0,
+       0x00,0x20,
+       0x00,0x22,
+       0x00,0x20,
+       0x00,0x07,
+       0xff,0x1f,
        0xff,0xff,
        0xff,0xff,
        0xff,0xfe,
-       0xe0,0xd8,
+       0xfe,0xff,
+       0xfe,0x3e,
+       0x1e,0xbc,
+       0x9e,0x1c,
+       0x1e,0xdc,
+       0x1e,0x3c,
+       0xfe,0x3e,
+       0xfe,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x0f,
+       0x00,0x20,
+       0x00,0x20,
+       0x00,0x22,
+       0x00,0x20,
+       0x00,0xe0,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1753,22 +1450,6 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x01,
-       0x07,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x1f,0x27,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xf7,0xcf,
-       0x07,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x07,0x07,
-       0x00,0x06,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1793,40 +1474,8 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
        0x00,0x00,
-       0x00,0xfc,
-       0x00,0x08,
-       0x00,0xfc,
-       0x00,0xfc,
-       0x00,0xfc,
-       0x00,0xfc,
-       0x00,0xfc,
-       0x00,0xcc,
-       0x00,0xcc,
-       0x00,0x0c,
-       0x00,0x0c,
-       0x00,0x0c,
-       0x00,0x0c,
-       0x00,0x0c,
        0x00,0x00,
-       0x00,0x1e,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x00,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1844,53 +1493,10 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0xfe,0xfc,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x83,0x87,
-       0x81,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x81,
-       0x81,0x80,
-       0x80,0x80,
-       0x80,0x80,
-       0x80,0x00,
-       0x00,0x08,
-       0x38,0x38,
-       0x38,0x38,
-       0x3b,0x3d,
-       0xff,0x3f,
-       0xff,0xff,
-       0xff,0xff,
-       0xfc,0xfa,
-       0xb8,0x78,
-       0x38,0x38,
-       0x38,0x38,
-       0x38,0x38,
-       0x38,0x38,
-       0x38,0x38,
-       0x38,0x38,
-       0x00,0x30,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x03,0x01,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x00,0x03,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1901,6 +1507,17 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x0c,0x0a,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0e,0x0e,
+       0x0f,0x0f,
+       0x0f,0x07,
+       0x07,0x07,
+       0x07,0x03,
+       0x03,0x01,
+       0x00,0x01,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -1921,95 +1538,38 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xfe,0x79,
+       0x70,0x38,
+       0x30,0x72,
+       0x30,0x72,
+       0x70,0x78,
+       0xff,0xf8,
        0xff,0xff,
        0xff,0xff,
-       0x00,0xf6,
-       0x00,0x03,
-       0x00,0x00,
-       0x00,0x03,
-       0x00,0x03,
-       0x00,0x03,
-       0x00,0x03,
-       0x00,0x03,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x06,
-       0x00,0xef,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0xfe,
+       0x7c,0x3e,
+       0x3c,0x79,
+       0x3c,0x7d,
+       0x7c,0x3e,
+       0xff,0xfe,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x00,0xff,
-       0x00,0x00,
-       0x70,0x90,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xf0,0xf0,
-       0xc0,0xa0,
-       0x80,0xc0,
-       0xc0,0xe0,
-       0xe0,0xe0,
-       0x70,0xe0,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0x70,
-       0x70,0xf0,
-       0xf0,0xe0,
-       0xe0,0xf0,
-       0xe0,0xe0,
-       0xc1,0xc2,
-       0x8f,0xc7,
-       0x3f,0x9f,
-       0x7f,0x7f,
        0xff,0xff,
-       0xf3,0xfb,
-       0xe3,0xc3,
-       0x83,0xc3,
-       0x03,0x83,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x03,
-       0x03,0x83,
-       0xc3,0xa3,
+       0xfc,0xfb,
+       0x70,0x78,
+       0x30,0x72,
+       0x30,0x72,
+       0x70,0x38,
+       0xff,0x78,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x7f,0x3e,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x01,
-       0x1f,0x0f,
-       0x1f,0x1f,
-       0x1f,0x1f,
-       0x1f,0x1e,
-       0x00,0x18,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2049,78 +1609,7 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x00,0xfb,
-       0x40,0xac,
-       0x40,0xac,
-       0x00,0xec,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x2c,
-       0x00,0x6c,
-       0x04,0x79,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0x00,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x00,0xff,
-       0x00,0x00,
-       0x00,0x00,
-       0x0f,0x17,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0xff,0xff,
-       0x01,0x83,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
        0x00,0x00,
-       0x00,0x01,
-       0x01,0x03,
-       0x07,0x03,
-       0x0f,0x1f,
-       0x7f,0xbf,
-       0xfe,0xff,
-       0xfc,0xf9,
-       0xf1,0xe3,
-       0x83,0x43,
-       0x07,0x03,
-       0x07,0x07,
-       0x07,0x0f,
-       0x0e,0x07,
-       0x0e,0x0e,
-       0x0e,0x0e,
-       0x0e,0x0e,
-       0x0e,0x0f,
-       0x0f,0x0e,
-       0x0f,0x07,
-       0x07,0x07,
-       0x07,0x03,
-       0x03,0x03,
-       0x01,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2177,89 +1666,54 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x7c,0xfb,
+       0x38,0x30,
+       0xb0,0x1b,
+       0x30,0x3c,
+       0x38,0x78,
+       0xff,0xfc,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xfe,
-       0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x7c,
+       0x38,0x78,
+       0x30,0xbf,
+       0x30,0xbf,
+       0x38,0x78,
+       0xff,0x7c,
        0xff,0xff,
        0xff,0xff,
-       0x00,0xff,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x01,0x06,
-       0x7f,0x9f,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xfe,
-       0xf8,0xf0,
-       0xe0,0xc0,
-       0x80,0xc0,
-       0x00,0x80,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
-       0x80,0x00,
-       0xc0,0xe0,
+       0xff,0xfc,
+       0x38,0x78,
+       0x30,0xbe,
+       0x30,0xbf,
+       0x38,0x70,
+       0xfc,0x7b,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0x7f,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,
-       0x00,0x00,
-       0x00,0x00,
-       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xe0,0x10,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xe0,0xf0,
+       0x80,0xc0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2273,6 +1727,17 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xe0,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2290,6 +1755,38 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x80,0x80,
+       0x80,0xc0,
+       0xc0,0xc0,
+       0xc0,0xe0,
+       0xe0,0xe0,
+       0xe0,0xe0,
+       0xf0,0xe0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf8,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xf0,
+       0xf0,0xe0,
+       0xf0,0xe0,
+       0xe0,0xf0,
+       0xe0,0xe0,
+       0xe0,0xc0,
+       0xc0,0xe0,
+       0xc0,0xc0,
+       0x80,0xc0,
+       0x80,0x00,
+       0x00,0x00,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2297,6 +1794,59 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x7c,0xbf,
+       0x38,0x1c,
+       0x18,0xfb,
+       0x18,0x3a,
+       0x3c,0x38,
+       0xff,0x7e,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x7c,
+       0x38,0x1c,
+       0x18,0xfb,
+       0x18,0xf9,
+       0x38,0x1c,
+       0xff,0x7c,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x7e,
+       0x3c,0x38,
+       0x18,0xbb,
+       0x18,0xfb,
+       0x38,0x1e,
+       0x7c,0xbf,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0x00,
+       0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xfe,0xff,
+       0xf8,0xfc,
+       0xe0,0xd0,
+       0x80,0x00,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2316,13 +1866,97 @@ unsigned char default_logo[5120]={
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x80,0x00,
+       0xe0,0xc0,
+       0xf0,0xf0,
+       0xf8,0xfc,
+       0xfc,0xfe,
+       0xfe,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x7f,0xff,
+       0x7f,0x3f,
+       0x3f,0x3f,
+       0x1f,0x3f,
+       0x1f,0x1f,
+       0x1f,0x0f,
+       0x0f,0x1f,
+       0x0f,0x1f,
+       0x0f,0x1f,
+       0x0f,0x0f,
+       0x0f,0x1f,
+       0x0f,0x1f,
+       0x0f,0x1f,
+       0x1f,0x0f,
+       0x1f,0x1f,
+       0x1f,0x1f,
+       0x1f,0x3f,
+       0x3f,0x1f,
+       0x3f,0x3f,
+       0x3f,0x7f,
+       0x7f,0x7f,
+       0x7f,0xff,
+       0xff,0xff,
+       0xff,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x3e,0xfd,
+       0x1c,0x1a,
+       0x18,0xce,
+       0x18,0x9c,
+       0x1c,0x3c,
+       0xff,0x7e,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0xff,0xff,
+       0xff,0x3e,
+       0x1c,0x3c,
+       0x18,0xcc,
+       0x18,0xce,
+       0x1c,0x3c,
+       0xff,0x3e,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x7e,
+       0x1c,0x3e,
+       0x18,0xde,
+       0x18,0xce,
+       0x1c,0x78,
+       0x7e,0xbd,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x0f,
+       0x00,0x00,
+       0x00,0x00,
+       0xff,0x00,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
@@ -2332,36 +1966,34 @@ unsigned char default_logo[5120]={
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
+       0xff,0x0f,
+       0x1f,0x0f,
+       0x7f,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xff,0xdf,
-       0x00,0xff,
+       0xfe,0xfc,
+       0xf8,0xf0,
+       0xe0,0xc0,
+       0x80,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x0f,0x17,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0xff,0xff,
        0xff,0xff,
        0xff,0xff,
-       0xf1,0xed,
-       0x03,0x03,
-       0x07,0x03,
-       0x07,0x06,
-       0x0e,0x06,
-       0x0e,0x0e,
-       0x0e,0x0e,
-       0x0e,0x0f,
-       0x0f,0x0e,
-       0x0f,0x07,
-       0x07,0x0f,
-       0x07,0x07,
-       0x03,0x03,
-       0x01,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2370,6 +2002,21 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xe0,0x90,
+       0xfe,0xfc,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x7f,0xbf,
+       0x0f,0x07,
+       0x03,0x01,
+       0x00,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2403,11 +2050,78 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0x01,
+       0xff,0xff,
+       0xff,0xff,
+       0xfe,0xff,
+       0x3c,0xfe,
+       0x1c,0x7c,
+       0x1c,0x7c,
+       0xfe,0x3c,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x3f,0x5f,
+       0x1f,0x3f,
+       0x3f,0x5e,
+       0xfc,0xfe,
+       0xfc,0xfc,
+       0xfc,0xfc,
+       0xfc,0xfe,
+       0x3f,0x5e,
+       0x1f,0x7f,
+       0x3f,0xdf,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xfe,0x3c,
+       0x1c,0x7c,
+       0x1c,0x7c,
+       0x7c,0x9e,
+       0xfe,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x01,0x03,
+       0x07,0x0f,
+       0x1f,0x3f,
+       0x7f,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xfc,0xfe,
+       0xf0,0xf8,
+       0xc0,0xe0,
+       0x00,0x80,
        0x00,0x00,
+       0x00,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2416,6 +2130,18 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0x81,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2427,59 +2153,126 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
+       0xfe,0xfe,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x00,0x07,
-       0x0f,0x17,
-       0x3f,0x5f,
-       0x7f,0x3f,
-       0x7f,0x7f,
-       0x7f,0xbf,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0xff,0x7f,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0xff,
-       0x7f,0x3f,
-       0x3f,0x7f,
+       0x00,0x00,
+       0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xef,0xd7,
+       0xc7,0xd2,
+       0xc7,0xc6,
+       0xff,0xef,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xf7,0xce,
+       0xc6,0xfb,
+       0xc7,0xfe,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xc7,0xee,
+       0xc6,0xc3,
+       0xe7,0xdf,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xef,
+       0xc7,0xfe,
+       0xc7,0xda,
+       0xef,0xd7,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x03,0x01,
+       0x0f,0x07,
        0x3f,0x1f,
-       0x0f,0x17,
-       0x00,0x02,
+       0xff,0x7f,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xfc,0xfe,
+       0xf8,0xf7,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
-       0x01,0x06,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0f,0x0f,
-       0x0e,0x0d,
        0x00,0x00,
        0x00,0x00,
+       0x03,0x05,
+       0x3f,0x5f,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xfc,
+       0xf0,0xf8,
+       0xc0,0xe0,
+       0x80,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2488,11 +2281,76 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x01,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
+       0x00,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xf9,
+       0xff,0xf0,
+       0xff,0xf8,
+       0x7f,0x3f,
+       0x3f,0x3f,
+       0x3f,0x3f,
+       0x3f,0x7f,
+       0x7f,0xf8,
+       0xff,0xf0,
+       0xff,0xf8,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xfd,
+       0xf8,0xf1,
+       0xf8,0xf0,
+       0x79,0xfc,
+       0x3f,0x7f,
+       0x3f,0xbf,
+       0x3f,0x3f,
+       0x7f,0xbd,
+       0xfb,0xfc,
+       0xfa,0xfd,
+       0xff,0xf9,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
+       0xff,0x00,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2503,6 +2361,23 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x03,0x01,
+       0x0f,0x1f,
+       0x3f,0x7f,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2513,6 +2388,44 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x01,
+       0x03,0x03,
+       0x0f,0x07,
+       0x1f,0x0f,
+       0x3f,0x3f,
+       0x7f,0x7f,
+       0xff,0x7f,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xfe,
+       0xfe,0xfe,
+       0xfc,0xfe,
+       0xfc,0xfc,
+       0xf8,0xfc,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xf8,
+       0xf8,0xfc,
+       0xfc,0xfb,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
+       0xff,0xff,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2521,8 +2434,51 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x7f,0x00,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7c,0x78,
+       0x78,0x79,
+       0x78,0x79,
+       0x78,0x78,
+       0x7c,0x7e,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7c,0x7e,
+       0x78,0x7c,
+       0x78,0x78,
+       0x78,0x78,
+       0x7c,0x78,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x7f,
+       0x7f,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x07,0x00,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x00,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2536,6 +2492,20 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x01,
+       0x03,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x07,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
@@ -2553,6 +2523,36 @@ unsigned char default_logo[5120]={
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,
+       0x00,0x01,
+       0x01,0x01,
+       0x01,0x03,
+       0x03,0x03,
+       0x03,0x07,
+       0x07,0x03,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x0f,
+       0x0f,0x07,
+       0x0f,0x07,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x0f,
+       0x0f,0x07,
+       0x0f,0x07,
+       0x07,0x0f,
+       0x07,0x0f,
+       0x07,0x07,
+       0x07,0x07,
+       0x07,0x03,
+       0x03,0x07,
+       0x03,0x03,
+       0x03,0x01,
+       0x01,0x01,
+       0x01,0x01,
+       0x00,0x01,
        0x00,0x00,
        0x00,0x00,
        0x00,0x00,

diff --git a/betty/display.c b/betty/display.c
index 1248279..916ffa1 100644 (file)
--- a/betty/display.c
+++ b/betty/display.c
@@ -71,14 +71,15 @@ void display_init(void) {
 
        // gray scale palette
        DISPLAY_SET_WHITE(0,0,0,0);
-       DISPLAY_SET_LGRAY(3,3,3,3);
-       DISPLAY_SET_DGRAY(6,6,6,6);
+       DISPLAY_SET_LGRAY(5,5,5,5);     // obviously 3, but it's too bright!
+       DISPLAY_SET_DGRAY(7,7,7,7);     // obviously 6, but again too bright!
        DISPLAY_SET_BLACK(9,9,9,9);
 
        /* normal mode, display depending ram content */
        DISPLAY_RAM_CONTENTS_ON;
        display_clear_screen();
-       DISPLAY_NORMAL;
+       DISPLAY_NORMAL;                 // 00 -> white, 11 -> black
+       DISPLAY_SET_COM_ODIR_REMAPPED;  // start counting at the top
 
        /* switch on the display */
        DISPLAY_SET_ON;