From c176376b0b19f31b44054261d99cae2d3de3836e Mon Sep 17 00:00:00 2001 From: Christian Kroll Date: Wed, 21 Sep 2011 01:06:23 +0000 Subject: [PATCH] refined "Out Of Spec" logo to be more readable on typical borg hardware --- animations/outofspec.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/animations/outofspec.c b/animations/outofspec.c index ad5f294..047efef 100644 --- a/animations/outofspec.c +++ b/animations/outofspec.c @@ -6,12 +6,8 @@ #include "outofspec.h" -static uint8_t const aOutOfSpecBitmap [2][55][8] PROGMEM = - {{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, - {0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, - {0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, - {0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, +static uint8_t const aOutOfSpecBitmap [2][50][8] PROGMEM = + {{{0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, {0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, {0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}, @@ -22,15 +18,15 @@ static uint8_t const aOutOfSpecBitmap [2][55][8] PROGMEM = {0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe2, 0x80}, {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe8, 0x00}, {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00}, - {0x78, 0x98, 0x8d, 0x0b, 0x68, 0xff, 0xe8, 0x80}, + {0x78, 0x88, 0x88, 0x8b, 0x68, 0xff, 0xe8, 0x80}, {0x7a, 0xab, 0xaa, 0xdb, 0x6b, 0xff, 0xe8, 0x60}, - {0x7a, 0x98, 0xaa, 0xdb, 0x28, 0xff, 0xe4, 0xcc}, - {0x7a, 0xbb, 0xa8, 0xdb, 0x4b, 0xff, 0xe7, 0xf8}, - {0x7a, 0xbb, 0xaa, 0xdb, 0x6a, 0xff, 0x37, 0x78}, + {0x7a, 0x88, 0x8a, 0xdb, 0x2a, 0xff, 0xe4, 0xcc}, + {0x7a, 0xbb, 0x98, 0xdb, 0x4a, 0xff, 0xe7, 0xf8}, + {0x78, 0xb8, 0xaa, 0xdb, 0x68, 0xff, 0x37, 0x78}, {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x18}, {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x38}, {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x1c}, - {0x7f, 0xff, 0xff, 0xea, 0x8e, 0xa3, 0x0f, 0x7a}, + {0x7f, 0xff, 0xff, 0xe2, 0x86, 0x23, 0x0f, 0x7a}, {0x7f, 0xff, 0xff, 0xea, 0xae, 0xaf, 0x0f, 0xf8}, {0x7f, 0xff, 0xff, 0xea, 0xae, 0xa3, 0x03, 0xf8}, {0x7f, 0xff, 0xff, 0xe2, 0x2e, 0x2f, 0x11, 0xd0}, @@ -60,14 +56,9 @@ static uint8_t const aOutOfSpecBitmap [2][55][8] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0xfc, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x14, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00}}, {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, - {0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, - {0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, {0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, {0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}, @@ -80,8 +71,8 @@ static uint8_t const aOutOfSpecBitmap [2][55][8] PROGMEM = {0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00}, {0x38, 0x88, 0x88, 0x81, 0x68, 0xff, 0xf0, 0x40}, {0x3a, 0xab, 0xaa, 0xdb, 0x2b, 0xff, 0xe4, 0xc0}, - {0x3a, 0x88, 0x8a, 0xdb, 0x0a, 0xff, 0xff, 0xe0}, - {0x3a, 0xbb, 0x98, 0xdb, 0x4a, 0xff, 0xff, 0xfc}, + {0x3a, 0x88, 0x9a, 0xdb, 0x08, 0xff, 0xff, 0xe0}, + {0x3a, 0xbb, 0xa8, 0xdb, 0x4a, 0xff, 0xff, 0xfc}, {0x38, 0xb8, 0xaa, 0xd1, 0x68, 0xff, 0x8f, 0xfc}, {0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbe, 0x38}, {0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0x1c}, @@ -116,7 +107,6 @@ static uint8_t const aOutOfSpecBitmap [2][55][8] PROGMEM = {0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x9c, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0x88, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x80, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}; @@ -127,7 +117,7 @@ static uint8_t logo_OutOfSpec_getChunk(unsigned char const nBitPlane, { assert(nBitPlane < 2); assert(nChunkX < 8); - assert(nChunkY < 55); + assert(nChunkY < 50); return pgm_read_byte(&aOutOfSpecBitmap[nBitPlane][nChunkY][nChunkX]); } @@ -135,6 +125,6 @@ static uint8_t logo_OutOfSpec_getChunk(unsigned char const nBitPlane, void logo_OutOfSpec() { - // width 64, height 55, 2 bitplanes (4 colors), 600 frames à 50ms (20 fps) - bitmap_scroll(64, 55, 2, 600, 50, logo_OutOfSpec_getChunk); + // width 64, height 50, 2 bitplanes (4 colors), 600 frames à 50ms (20 fps) + bitmap_scroll(64, 50, 2, 600, 50, logo_OutOfSpec_getChunk); }