font2b + default_font.h fix (hopefully), display and rom ld just to sync

(not yet finished)

diff --git a/betty/default_font.h b/betty/default_font.h
index cae4465..a63655d 100644 (file)
--- a/betty/default_font.h
+++ b/betty/default_font.h
@@ -1,514 +1,514 @@
-const unsigned char default_font[4096]={
+const unsigned char default_font[2048]={
        /* 0 0x00 */
        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
        /* 1 0x01 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x7e,0x81,0x95,0xb1,0xb1,0x95,0x81,0x7e,
        /* 2 0x02 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x7e,0xff,0xeb,0xcf,0xcf,0xeb,0xff,0x7e,
        /* 3 0x03 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x0e,0x1f,0x3f,0x7e,0x3f,0x1f,0x0e,0x00,
        /* 4 0x04 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x1c,0x3e,0x7f,0x3e,0x1c,0x08,0x00,
        /* 5 0x05 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x3a,0x9f,0xff,0x9f,0x3a,0x38,0x00,
        /* 6 0x06 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0x3c,0xbe,0xff,0xbe,0x3c,0x18,0x00,
        /* 7 0x07 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,
        /* 8 0x08 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,
        /* 9 0x09 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,
        /* 10 0x0a */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,
        /* 11 0x0b */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x70,0xf8,0x88,0x88,0xfd,0x7f,0x07,0x0f,
        /* 12 0x0c */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x4e,0x5f,0xf1,0xf1,0x5f,0x4e,0x00,
        /* 13 0x0d */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xc0,0xe0,0xff,0x7f,0x05,0x05,0x07,0x07,
        /* 14 0x0e */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xc0,0xff,0x7f,0x05,0x05,0x65,0x7f,0x3f,
        /* 15 0x0f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x5a,0x5a,0x3c,0xe7,0xe7,0x3c,0x5a,0x5a,
        /* 16 0x10 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x3e,0x3e,0x1c,0x1c,0x08,0x08,0x00,
        /* 17 0x11 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x08,0x1c,0x1c,0x3e,0x3e,0x7f,0x00,
        /* 18 0x12 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x24,0x66,0xff,0xff,0x66,0x24,0x00,
        /* 19 0x13 */
-       0x00,0x40,0x20,0x00,0x00,0x04,0x02,0x00,
+       0x00,0x5f,0x5f,0x00,0x00,0x5f,0x5f,0x00,
        /* 20 0x14 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x06,0x0f,0x09,0x7f,0x7f,0x01,0x7f,0x7f,
        /* 21 0x15 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x40,0x9a,0xbf,0xa5,0xa5,0xfd,0x59,0x02,
        /* 22 0x16 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x70,0x70,0x70,0x70,0x70,0x70,0x00,
        /* 23 0x17 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x80,0x94,0xb6,0xff,0xff,0xb6,0x94,0x80,
        /* 24 0x18 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x04,0x06,0x7f,0x7f,0x06,0x04,0x00,
        /* 25 0x19 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x10,0x30,0x7f,0x7f,0x30,0x10,0x00,
        /* 26 0x1a */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x08,0x08,0x2a,0x3e,0x1c,0x08,0x00,
        /* 27 0x1b */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x1c,0x3e,0x2a,0x08,0x08,0x08,0x00,
        /* 28 0x1c */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x3c,0x20,0x20,0x20,0x20,0x20,0x00,
        /* 29 0x1d */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x08,0x1c,0x3e,0x08,0x08,0x3e,0x1c,0x08,
        /* 30 0x1e */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x30,0x38,0x3c,0x3e,0x3e,0x3c,0x38,0x30,
        /* 31 0x1f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x06,0x0e,0x1e,0x3e,0x3e,0x1e,0x0e,0x06,
        /* 32 0x20   */
        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
        /* 33 0x21 ! */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x0e,0x5f,0x5f,0x0e,0x00,0x00,
        /* 34 0x22 " */
-       0x00,0x40,0x20,0x00,0x08,0x04,0x00,0x00,
+       0x00,0x03,0x03,0x00,0x03,0x03,0x00,0x00,
        /* 35 0x23 # */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x14,0x7f,0x7f,0x14,0x7f,0x7f,0x14,0x00,
        /* 36 0x24 $ */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x24,0x2e,0x6b,0x6b,0x3a,0x12,0x00,
        /* 37 0x25 % */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x46,0x66,0x30,0x18,0x0c,0x66,0x62,0x00,
        /* 38 0x26 & */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x30,0x7e,0x4f,0x59,0x37,0x7a,0x48,0x00,
        /* 39 0x27 ' */
-       0x00,0x00,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x04,0x07,0x03,0x00,0x00,0x00,
        /* 40 0x28 ( */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x1c,0x3e,0x63,0x41,0x00,0x00,
        /* 41 0x29 ) */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x41,0x63,0x3e,0x1c,0x00,0x00,
        /* 42 0x2a * */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x08,0x2a,0x3e,0x1c,0x1c,0x3e,0x2a,0x08,
        /* 43 0x2b + */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x08,0x08,0x3e,0x3e,0x08,0x08,0x00,
        /* 44 0x2c , */
-       0x00,0x00,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x80,0xe0,0x60,0x00,0x00,0x00,
        /* 45 0x2d - */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00,
        /* 46 0x2e . */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,
        /* 47 0x2f / */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x40,0x60,0x30,0x18,0x0c,0x06,0x03,0x01,
        /* 48 0x30 0 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x59,0x5d,0x4d,0x7f,0x3e,0x00,
        /* 49 0x31 1 */
-       0x00,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x02,0x02,0x7f,0x7f,0x00,0x00,0x00,
        /* 50 0x32 2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x42,0x63,0x71,0x59,0x4d,0x47,0x42,0x00,
        /* 51 0x33 3 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x22,0x63,0x41,0x49,0x49,0x7f,0x36,0x00,
        /* 52 0x34 4 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0x1c,0x16,0x13,0x7f,0x7f,0x10,0x00,
        /* 53 0x35 5 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x27,0x67,0x45,0x45,0x45,0x7d,0x39,0x00,
        /* 54 0x36 6 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x7e,0x4b,0x49,0x49,0x78,0x30,0x00,
        /* 55 0x37 7 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x01,0x61,0x71,0x19,0x0d,0x07,0x03,0x00,
        /* 56 0x38 8 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x36,0x7f,0x49,0x49,0x49,0x7f,0x36,0x00,
        /* 57 0x39 9 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x06,0x0f,0x49,0x49,0x69,0x3f,0x1e,0x00,
        /* 58 0x3a : */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0x66,0x66,0x00,0x00,0x00,
        /* 59 0x3b ; */
-       0x00,0x00,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x80,0xe6,0x66,0x00,0x00,0x00,
        /* 60 0x3c < */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x08,0x1c,0x36,0x63,0x41,0x00,0x00,
        /* 61 0x3d = */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x24,0x24,0x24,0x24,0x24,0x24,0x00,
        /* 62 0x3e > */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x00,0x41,0x63,0x36,0x1c,0x08,0x00,
        /* 63 0x3f ? */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x02,0x03,0x51,0x59,0x0f,0x06,0x00,
        /* 64 0x40 @ */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x41,0x5d,0x5d,0x5f,0x1e,0x00,
        /* 65 0x41 A */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x78,0x7c,0x16,0x13,0x16,0x7c,0x78,0x00,
        /* 66 0x42 B */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x49,0x49,0x49,0x7f,0x36,0x00,
        /* 67 0x43 C */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x41,0x41,0x41,0x63,0x22,0x00,
        /* 68 0x44 D */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x41,0x41,0x41,0x7f,0x3e,0x00,
        /* 69 0x45 E */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x49,0x49,0x49,0x41,0x41,0x00,
        /* 70 0x46 F */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x09,0x09,0x09,0x01,0x01,0x00,
        /* 71 0x47 G */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x41,0x41,0x49,0x7b,0x3a,0x00,
        /* 72 0x48 H */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x08,0x08,0x08,0x7f,0x7f,0x00,
        /* 73 0x49 I */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x41,0x41,0x7f,0x7f,0x41,0x41,0x00,
        /* 74 0x4a J */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x30,0x70,0x40,0x40,0x40,0x7f,0x3f,0x00,
        /* 75 0x4b K */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x08,0x1c,0x36,0x63,0x41,0x00,
        /* 76 0x4c L */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x40,0x40,0x40,0x40,0x40,0x00,
        /* 77 0x4d M */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7e,0x0c,0x18,0x0c,0x7e,0x7f,0x00,
        /* 78 0x4e N */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x06,0x0c,0x18,0x7f,0x7f,0x00,
        /* 79 0x4f O */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x41,0x41,0x41,0x7f,0x3e,0x00,
        /* 80 0x50 P */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x09,0x09,0x09,0x0f,0x06,0x00,
        /* 81 0x51 Q */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3e,0x7f,0x51,0x71,0x61,0xff,0xbe,0x00,
        /* 82 0x52 R */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x09,0x19,0x39,0x6f,0x46,0x00,
        /* 83 0x53 S */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x22,0x67,0x4d,0x49,0x59,0x73,0x22,0x00,
        /* 84 0x54 T */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x01,0x01,0x7f,0x7f,0x01,0x01,0x00,
        /* 85 0x55 U */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3f,0x7f,0x40,0x40,0x40,0x7f,0x3f,0x00,
        /* 86 0x56 V */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x03,0x0f,0x3c,0x70,0x70,0x3c,0x0f,0x03,
        /* 87 0x57 W */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x30,0x18,0x30,0x7f,0x7f,0x00,
        /* 88 0x58 X */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x41,0x63,0x36,0x1c,0x1c,0x36,0x63,0x41,
        /* 89 0x59 Y */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x03,0x07,0x0c,0x78,0x78,0x0c,0x07,0x03,
        /* 90 0x5a Z */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x41,0x61,0x71,0x59,0x4d,0x47,0x43,0x00,
        /* 91 0x5b [ */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x7f,0x7f,0x41,0x41,0x00,0x00,
        /* 92 0x5c \ */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x01,0x03,0x06,0x0c,0x18,0x30,0x60,0x40,
        /* 93 0x5d ] */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x41,0x41,0x7f,0x7f,0x00,0x00,
        /* 94 0x5e ^ */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x0c,0x06,0x03,0x06,0x0c,0x08,0x00,
        /* 95 0x5f _ */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,
        /* 96 0x60 ` */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x00,0x03,0x07,0x04,0x00,0x00,
        /* 97 0x61 a */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x20,0x74,0x54,0x54,0x54,0x7c,0x78,0x00,
        /* 98 0x62 b */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x44,0x44,0x44,0x7c,0x38,0x00,
        /* 99 0x63 c */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x44,0x44,0x6c,0x28,0x00,
        /* 100 0x64 d */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x44,0x44,0x7f,0x7f,0x00,
        /* 101 0x65 e */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x54,0x54,0x54,0x5c,0x18,0x00,
        /* 102 0x66 f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x7e,0x7f,0x09,0x01,0x03,0x02,0x00,
        /* 103 0x67 g */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0xbc,0xa4,0xa4,0xa4,0xfc,0x7c,0x00,
        /* 104 0x68 h */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x04,0x04,0x04,0x7c,0x78,0x00,
        /* 105 0x69 i */
-       0x00,0x00,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x04,0x7d,0x7d,0x00,0x00,0x00,
        /* 106 0x6a j */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x40,0xc0,0x80,0x80,0x80,0xfd,0x7d,0x00,
        /* 107 0x6b k */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x7f,0x7f,0x10,0x38,0x6c,0x44,0x00,0x00,
        /* 108 0x6c l */
-       0x00,0x00,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x01,0x7f,0x7f,0x00,0x00,0x00,
        /* 109 0x6d m */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7c,0x0c,0x18,0x0c,0x7c,0x78,0x00,
        /* 110 0x6e n */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7c,0x04,0x04,0x04,0x7c,0x78,0x00,
        /* 111 0x6f o */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x44,0x44,0x7c,0x38,0x00,
        /* 112 0x70 p */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0xfc,0xfc,0x24,0x24,0x24,0x3c,0x18,0x00,
        /* 113 0x71 q */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0x3c,0x24,0x24,0x24,0xfc,0xfc,0x00,
        /* 114 0x72 r */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7c,0x08,0x04,0x04,0x0c,0x08,0x00,
        /* 115 0x73 s */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x48,0x5c,0x54,0x54,0x54,0x74,0x24,0x00,
        /* 116 0x74 t */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x04,0x3f,0x7f,0x44,0x64,0x20,0x00,
        /* 117 0x75 u */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x7c,0x40,0x40,0x40,0x7c,0x3c,0x00,
        /* 118 0x76 v */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x1c,0x3c,0x60,0x40,0x60,0x3c,0x1c,0x00,
        /* 119 0x77 w */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x7c,0x60,0x30,0x60,0x7c,0x3c,0x00,
        /* 120 0x78 x */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x44,0x6c,0x38,0x10,0x38,0x6c,0x44,0x00,
        /* 121 0x79 y */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x04,0x8c,0xd8,0x70,0x30,0x18,0x0c,0x04,
        /* 122 0x7a z */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x44,0x64,0x74,0x54,0x5c,0x4c,0x44,0x00,
        /* 123 0x7b { */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x08,0x08,0x3e,0x77,0x41,0x41,0x00,
        /* 124 0x7c | */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0x7f,0x7f,0x00,0x00,0x00,
        /* 125 0x7d } */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x41,0x41,0x77,0x3e,0x08,0x08,0x00,
        /* 126 0x7e ~ */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x02,0x01,0x01,0x03,0x02,0x02,0x01,0x00,
        /* 127 0x7f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x70,0x78,0x4c,0x46,0x4c,0x78,0x70,0x00,
        /* 128 0x80 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x1e,0xbf,0xa1,0xa1,0xe1,0x73,0x12,0x00,
        /* 129 0x81 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3d,0x7d,0x40,0x40,0x3d,0x7d,0x40,0x00,
        /* 130 0x82 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x54,0x56,0x57,0x5d,0x18,0x00,
        /* 131 0x83 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x22,0x75,0x55,0x55,0x3d,0x79,0x42,0x00,
        /* 132 0x84 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x21,0x75,0x54,0x54,0x3c,0x79,0x41,0x00,
        /* 133 0x85 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x20,0x74,0x55,0x57,0x3e,0x78,0x40,0x00,
        /* 134 0x86 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x20,0x74,0x57,0x57,0x3c,0x78,0x40,0x00,
        /* 135 0x87 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0x3c,0xa4,0xa4,0xe4,0x64,0x24,0x00,
        /* 136 0x88 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3a,0x7d,0x55,0x55,0x55,0x5d,0x1a,0x00,
        /* 137 0x89 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x39,0x7d,0x54,0x54,0x54,0x5d,0x19,0x00,
        /* 138 0x8a */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x55,0x57,0x56,0x5c,0x18,0x00,
        /* 139 0x8b */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x01,0x45,0x7c,0x7c,0x41,0x01,0x00,
        /* 140 0x8c */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x02,0x01,0x45,0x7d,0x7d,0x41,0x02,0x00,
        /* 141 0x8d */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x49,0x7b,0x7a,0x40,0x00,0x00,
        /* 142 0x8e */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x79,0x7d,0x16,0x12,0x16,0x7d,0x79,0x00,
        /* 143 0x8f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x78,0x7e,0x17,0x15,0x17,0x7e,0x78,0x00,
        /* 144 0x90 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7c,0x56,0x57,0x55,0x44,0x44,0x00,
        /* 145 0x91 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x20,0x74,0x54,0x7c,0x7c,0x54,0x54,0x00,
        /* 146 0x92 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7e,0x0b,0x09,0x7f,0x7f,0x49,0x00,
        /* 147 0x93 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3a,0x7d,0x45,0x45,0x45,0x7d,0x3a,0x00,
        /* 148 0x94 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x39,0x7d,0x44,0x44,0x44,0x7d,0x39,0x00,
        /* 149 0x95 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x45,0x47,0x46,0x7c,0x38,0x00,
        /* 150 0x96 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3a,0x79,0x41,0x41,0x39,0x7a,0x40,0x00,
        /* 151 0x97 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x7d,0x43,0x42,0x3c,0x7c,0x40,0x00,
        /* 152 0x98 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x9d,0xbd,0xa0,0xa0,0xa0,0xfd,0x7d,0x00,
        /* 153 0x99 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x19,0x3d,0x66,0x42,0x66,0x3d,0x19,0x00,
        /* 154 0x9a */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3d,0x7d,0x40,0x40,0x40,0x7d,0x3d,0x00,
        /* 155 0x9b */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x18,0x3c,0x24,0xe7,0xe7,0x24,0x24,0x00,
        /* 156 0x9c */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x48,0x7e,0x7f,0x49,0x43,0x66,0x20,0x00,
        /* 157 0x9d */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x2b,0x2f,0xfc,0xfc,0x2f,0x2b,0x00,
        /* 158 0x9e */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xff,0xff,0x09,0x09,0x2f,0xf6,0xf8,0xa0,
        /* 159 0x9f */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x20,0x60,0x48,0x7e,0x3f,0x09,0x03,0x02,
        /* 160 0xa0 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x20,0x74,0x56,0x57,0x3d,0x78,0x40,0x00,
        /* 161 0xa1 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x48,0x7a,0x7b,0x41,0x00,0x00,
        /* 162 0xa2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x46,0x47,0x7d,0x38,0x00,
        /* 163 0xa3 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x3c,0x7c,0x42,0x43,0x3d,0x7c,0x40,0x00,
        /* 164 0xa4 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x0a,0x7b,0x71,0x0b,0x0a,0x7b,0x71,0x00,
        /* 165 0xa5 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7a,0x7b,0x19,0x33,0x62,0x7b,0x79,0x00,
        /* 166 0xa6 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x26,0x2f,0x29,0x2f,0x2f,0x28,0x00,
        /* 167 0xa7 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x26,0x2f,0x29,0x2f,0x26,0x00,0x00,
        /* 168 0xa8 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x20,0x70,0x5d,0x4d,0x40,0x60,0x20,
        /* 169 0xa9 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x38,0x08,0x08,0x08,0x08,0x08,0x00,
        /* 170 0xaa */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x08,0x08,0x08,0x08,0x08,0x38,0x38,0x00,
        /* 171 0xab */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x42,0x6f,0x3f,0x18,0xcc,0xee,0xbb,0x91,
        /* 172 0xac */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x42,0x6f,0x3f,0x58,0x6c,0xd6,0xfb,0x41,
        /* 173 0xad */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x30,0x7d,0x7d,0x30,0x00,0x00,
        /* 174 0xae */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x08,0x1c,0x36,0x22,0x08,0x1c,0x36,0x22,
        /* 175 0xaf */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x22,0x36,0x1c,0x08,0x22,0x36,0x1c,0x08,
        /* 176 0xb0 */
-       0x80,0x00,0x20,0x00,0x08,0x00,0x02,0x00,
+       0xaa,0x00,0x55,0x00,0xaa,0x00,0x55,0x00,
        /* 177 0xb1 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,
        /* 178 0xb2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xaa,0xff,0x55,0xff,0xaa,0xff,0x55,0xff,
        /* 179 0xb3 */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,
        /* 180 0xb4 */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x10,0x10,0x10,0xff,0xff,0x00,0x00,0x00,
        /* 181 0xb5 */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x14,0x14,0x14,0xff,0xff,0x00,0x00,0x00,
        /* 182 0xb6 */
-       0x80,0x40,0x20,0x10,0x00,0x04,0x02,0x00,
+       0x10,0x10,0xff,0xff,0x00,0xff,0xff,0x00,
        /* 183 0xb7 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x10,0x10,0xf0,0xf0,0x10,0xf0,0xf0,0x00,
        /* 184 0xb8 */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x14,0x14,0x14,0xfc,0xfc,0x00,0x00,0x00,
        /* 185 0xb9 */
-       0x80,0x40,0x20,0x10,0x00,0x04,0x02,0x00,
+       0x14,0x14,0xf7,0xf7,0x00,0xff,0xff,0x00,
        /* 186 0xba */
-       0x00,0x00,0x20,0x10,0x00,0x04,0x02,0x00,
+       0x00,0x00,0xff,0xff,0x00,0xff,0xff,0x00,
        /* 187 0xbb */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x14,0x14,0xf4,0xf4,0x04,0xfc,0xfc,0x00,
        /* 188 0xbc */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x14,0x14,0x17,0x17,0x10,0x1f,0x1f,0x00,
        /* 189 0xbd */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x10,0x10,0x1f,0x1f,0x10,0x1f,0x1f,0x00,
        /* 190 0xbe */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x14,0x14,0x14,0x1f,0x1f,0x00,0x00,0x00,
        /* 191 0xbf */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x10,0x10,0x10,0xf0,0xf0,0x00,0x00,0x00,
        /* 192 0xc0 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0x1f,0x1f,0x10,0x10,0x10,
        /* 193 0xc1 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0x10,0x1f,0x1f,0x10,0x10,0x10,
        /* 194 0xc2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0x10,0xf0,0xf0,0x10,0x10,0x10,
        /* 195 0xc3 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0xff,0xff,0x10,0x10,0x10,
        /* 196 0xc4 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
        /* 197 0xc5 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0x10,0xff,0xff,0x10,0x10,0x10,
        /* 198 0xc6 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0xff,0xff,0x14,0x14,0x14,
        /* 199 0xc7 */
-       0x00,0x00,0x20,0x10,0x00,0x04,0x02,0x01,
+       0x00,0x00,0xff,0xff,0x00,0xff,0xff,0x10,
        /* 200 0xc8 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x1f,0x1f,0x10,0x17,0x17,0x14,
        /* 201 0xc9 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0xfc,0xfc,0x04,0xf4,0xf4,0x14,
        /* 202 0xca */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0x17,0x17,0x10,0x17,0x17,0x14,
        /* 203 0xcb */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0xf4,0xf4,0x04,0xf4,0xf4,0x14,
        /* 204 0xcc */
-       0x00,0x00,0x20,0x10,0x00,0x04,0x02,0x01,
+       0x00,0x00,0xff,0xff,0x00,0xf7,0xf7,0x14,
        /* 205 0xcd */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,
        /* 206 0xce */
-       0x80,0x40,0x20,0x10,0x00,0x04,0x02,0x01,
+       0x14,0x14,0xf7,0xf7,0x00,0xf7,0xf7,0x14,
        /* 207 0xcf */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0x14,0x17,0x17,0x14,0x14,0x14,
        /* 208 0xd0 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0x1f,0x1f,0x10,0x1f,0x1f,0x10,
        /* 209 0xd1 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0x14,0xf4,0xf4,0x14,0x14,0x14,
        /* 210 0xd2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0xf0,0xf0,0x10,0xf0,0xf0,0x10,
        /* 211 0xd3 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x1f,0x1f,0x10,0x1f,0x1f,0x10,
        /* 212 0xd4 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0x1f,0x1f,0x14,0x14,0x14,
        /* 213 0xd5 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0xfc,0xfc,0x14,0x14,0x14,
        /* 214 0xd6 */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0xf0,0xf0,0x10,0xf0,0xf0,0x10,
        /* 215 0xd7 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x10,0xff,0xff,0x10,0xff,0xff,0x10,
        /* 216 0xd8 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x14,0x14,0x14,0xff,0xff,0x14,0x14,0x14,
        /* 217 0xd9 */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x10,0x10,0x10,0x1f,0x1f,0x00,0x00,0x00,
        /* 218 0xda */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0xf0,0xf0,0x10,0x10,0x10,
        /* 219 0xdb */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
        /* 220 0xdc */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,
        /* 221 0xdd */
-       0x80,0x40,0x20,0x10,0x00,0x00,0x00,0x00,
+       0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
        /* 222 0xde */
-       0x00,0x00,0x00,0x00,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
        /* 223 0xdf */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,
        /* 224 0xe0 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x6c,0x38,0x6c,0x44,0x00,
        /* 225 0xe1 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7e,0x7f,0x01,0x09,0x5f,0x76,0x20,0x00,
        /* 226 0xe2 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7f,0x7f,0x01,0x01,0x01,0x03,0x03,0x00,
        /* 227 0xe3 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x04,0x7c,0x7c,0x04,0x7c,0x7c,0x04,0x00,
        /* 228 0xe4 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x63,0x77,0x5d,0x49,0x41,0x63,0x63,0x00,
        /* 229 0xe5 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x38,0x7c,0x44,0x7c,0x3c,0x04,0x04,0x00,
        /* 230 0xe6 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x80,0xfc,0x7c,0x40,0x40,0x7c,0x3c,0x00,
        /* 231 0xe7 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x04,0x06,0x02,0x7e,0x7c,0x06,0x02,0x00,
        /* 232 0xe8 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x99,0xbd,0xe7,0xe7,0xbd,0x99,0x00,
        /* 233 0xe9 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x1c,0x3e,0x6b,0x49,0x6b,0x3e,0x1c,0x00,
        /* 234 0xea */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x4c,0x7e,0x73,0x01,0x73,0x7e,0x4c,0x00,
        /* 235 0xeb */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x30,0x78,0x4a,0x4f,0x7d,0x39,0x00,
        /* 236 0xec */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x18,0x3c,0x24,0x3c,0x3c,0x24,0x3c,0x18,
        /* 237 0xed */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x98,0xfc,0x64,0x3c,0x3e,0x27,0x3d,0x18,
        /* 238 0xee */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x1c,0x3e,0x6b,0x49,0x49,0x49,0x00,
        /* 239 0xef */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x7c,0x7e,0x02,0x02,0x02,0x7e,0x7c,0x00,
        /* 240 0xf0 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x00,
        /* 241 0xf1 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x44,0x44,0x5f,0x5f,0x44,0x44,0x00,
        /* 242 0xf2 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x40,0x51,0x5b,0x4e,0x44,0x40,0x00,
        /* 243 0xf3 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x40,0x44,0x4e,0x5b,0x51,0x40,0x00,
        /* 244 0xf4 */
-       0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
+       0x00,0x00,0x00,0xfe,0xff,0x01,0x07,0x06,
        /* 245 0xf5 */
-       0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x00,
+       0x60,0xe0,0x80,0xff,0x7f,0x00,0x00,0x00,
        /* 246 0xf6 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x08,0x08,0x2a,0x2a,0x08,0x08,0x00,
        /* 247 0xf7 */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x24,0x36,0x12,0x36,0x24,0x36,0x12,0x00,
        /* 248 0xf8 */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x06,0x0f,0x09,0x0f,0x06,0x00,0x00,
        /* 249 0xf9 */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,
        /* 250 0xfa */
-       0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,
+       0x00,0x00,0x00,0x08,0x08,0x00,0x00,0x00,
        /* 251 0xfb */
-       0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,
+       0x10,0x30,0x70,0xc0,0xff,0xff,0x01,0x01,
        /* 252 0xfc */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x00,
+       0x00,0x01,0x1f,0x1e,0x01,0x1f,0x1e,0x00,
        /* 253 0xfd */
-       0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x11,0x19,0x1d,0x17,0x12,0x00,0x00,
        /* 254 0xfe */
-       0x00,0x00,0x20,0x10,0x08,0x04,0x00,0x00,
+       0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x00,0x00,
        /* 255 0xff */
        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 };

diff --git a/betty/display.c b/betty/display.c
index 916ffa1..2da19ef 100644 (file)
--- a/betty/display.c
+++ b/betty/display.c
@@ -134,7 +134,7 @@ void display_draw_rectangle(int x,int y,int w,int h,u8 fill,u8 alpha) {
                DISPLAY_SET_PAGE_ADDR(p);
                for(c=x;c<x+w;c++) {
                        DISPLAY_SET_C_ADDR(c);
-                       b[0]=DISPLAY_DATA;              // dummy read
+                       b[0]=DISPLAY_DATA;              // dummy read (p.16)
                        b[0]=DISPLAY_DATA;
                        b[1]=DISPLAY_DATA;
                        rmax=y+8>y+h?y+h:y+8;

diff --git a/betty/font2b.c b/betty/font2b.c
index b0e9c7c..d155855 100644 (file)
--- a/betty/font2b.c
+++ b/betty/font2b.c
@@ -49,7 +49,7 @@ int main(int argc,char **argv) {
        }
 
        if(stat==CHAR)
-               printf("const unsigned char default_font[%d]={\n",256*8*2);
+               printf("const unsigned char default_font[%d]={\n",256*8);
 
        for(font=0;font<=0xff;font++) {
 
@@ -66,7 +66,7 @@ int main(int argc,char **argv) {
                for(col=0;col<8;col++) {
                        buf=0;
                        for(row=0;row<8;row++)
-                               buf|=(font_data[font*8+row]&(1<<(7-col)));
+                               buf|=(((font_data[font*8+row]>>(7-col))&1)<<row);
                        if(stat==CHAR) {
                                if(col==0)
                                        printf("\t");

diff --git a/betty/lpc2220_rom.ld b/betty/lpc2220_rom.ld
index 1109baa..ab48644 100644 (file)
--- a/betty/lpc2220_rom.ld
+++ b/betty/lpc2220_rom.ld
@@ -33,11 +33,11 @@ SECTIONS {
        . = ALIGN(4);
 
        /* initialized data */
-       .data : { *(.data) } > RAM
+       .data : { *(.data) } > RAM AT FLASH_BANK0
 
        . = ALIGN(4);
 
        /* uninitialized data */
-       .bss : { *(.bss) } > RAM
+       .bss : { *(.bss) } > RAM AT FLASH_BANK0
 }