From 31e21e170faf4a979ca824a5cc400cecf13945b6 Mon Sep 17 00:00:00 2001
From: Christian Kroll <chris@das-labor.org>
Date: Sat, 15 Oct 2011 06:42:06 +0000
Subject: [PATCH] removed 27c3 animation (don't live in the past, dude)

---
 animations/27c3.c    | 60 --------------------------------------------
 animations/27c3.h    |  6 -----
 animations/Makefile  |  4 ---
 animations/config.in |  1 -
 display_loop.c       | 13 +++-------
 5 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100644 animations/27c3.c
 delete mode 100644 animations/27c3.h

diff --git a/animations/27c3.c b/animations/27c3.c
deleted file mode 100644
index f1096da..0000000
--- a/animations/27c3.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <stdint.h>
-#include <assert.h>
-
-#include "../compat/pgmspace.h"
-#include "bitmapscroller.h"
-#include "27c3.h"
-
-static uint8_t const aBitmap27c3 [2][16][7] PROGMEM =
-	{{{0x08, 0x00, 0x40, 0x04, 0x00, 0x40, 0x00}, // bit plane 0
-	  {0x08, 0x00, 0x40, 0x04, 0x00, 0x40, 0x00},
-	  {0x08, 0x00, 0x40, 0x04, 0x00, 0x40, 0x00},
-	  {0x0F, 0xF0, 0x7F, 0x04, 0x00, 0x7F, 0x00},
-	  {0x00, 0x10, 0x01, 0x04, 0x70, 0x01, 0x00},
-	  {0x00, 0x10, 0x01, 0x04, 0x10, 0x01, 0x00},
-	  {0x08, 0x00, 0x00, 0x04, 0x10, 0x40, 0x00},
-	  {0x08, 0x00, 0x00, 0x04, 0x10, 0x40, 0x00},
-	  {0x08, 0x00, 0x00, 0x04, 0x10, 0x40, 0x00},
-	  {0x08, 0x7F, 0xFF, 0x04, 0x1E, 0x7F, 0x00},
-	  {0x08, 0x00, 0x01, 0x04, 0x00, 0x01, 0x00},
-	  {0x08, 0x00, 0x01, 0x04, 0x00, 0x01, 0x00},
-	  {0x08, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00},
-	  {0x08, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00},
-	  {0x08, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00},
-	  {0x0F, 0xFF, 0xF9, 0x07, 0xFF, 0xFF, 0xF0}},
-
-	 {{0x0F, 0xFE, 0x7F, 0xE7, 0xFE, 0x7F, 0xF0}, // bit plane 1
-	  {0x0F, 0xFE, 0x7F, 0xE7, 0xFE, 0x7F, 0xF0},
-	  {0x0F, 0xFE, 0x7F, 0xE7, 0xFE, 0x7F, 0xF0},
-	  {0x08, 0x0E, 0x40, 0xE7, 0xFE, 0x40, 0xF0},
-	  {0x00, 0x1E, 0x01, 0xE7, 0x8E, 0x01, 0xF0},
-	  {0x00, 0x1E, 0x01, 0xE7, 0x9E, 0x01, 0xF0},
-	  {0x0F, 0xFF, 0xFF, 0xE7, 0x9E, 0x7F, 0xF0},
-	  {0x0F, 0xFF, 0xFF, 0xE7, 0x9E, 0x7F, 0xF0},
-	  {0x0F, 0xFF, 0xFF, 0xE7, 0x9E, 0x7F, 0xF0},
-	  {0x0F, 0x80, 0x00, 0xE7, 0x90, 0x40, 0xF0},
-	  {0x0F, 0x80, 0x01, 0xE7, 0x80, 0x01, 0xF0},
-	  {0x0F, 0x80, 0x01, 0xE7, 0x80, 0x01, 0xF0},
-	  {0x0F, 0xFF, 0xF9, 0xE7, 0xFF, 0xFF, 0xF0},
-	  {0x0F, 0xFF, 0xF9, 0xE7, 0xFF, 0xFF, 0xF0},
-	  {0x0F, 0xFF, 0xF9, 0xE7, 0xFF, 0xFF, 0xF0},
-	  {0x08, 0x00, 0x01, 0xE4, 0x00, 0x00, 0x00}}};
-
-
-static uint8_t logo_27c3_getChunk(unsigned char const nBitPlane,
-                                  unsigned char const nChunkX,
-                                  unsigned char const nChunkY,
-                                  unsigned int const nFrame)
-{
-	assert(nBitPlane < 2);
-	assert(nChunkX < 7);
-	assert(nChunkY < 16);
-
-	return pgm_read_byte(&aBitmap27c3[nBitPlane][nChunkY][nChunkX]);
-}
-
-void logo_27c3()
-{
-	// width 56, height 16, 2 bitplanes (4 colors), 600 frames à 50ms (20 fps)
-	bitmap_scroll(56, 16, 2, 600, 50, logo_27c3_getChunk);
-}
diff --git a/animations/27c3.h b/animations/27c3.h
deleted file mode 100644
index eba3309..0000000
--- a/animations/27c3.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef LOGO_27C3_H_
-#define LOGO_27C3_H_
-
-void logo_27c3();
-
-#endif /* LOGO_27C3_H_ */
diff --git a/animations/Makefile b/animations/Makefile
index b6a5c19..683ba51 100644
--- a/animations/Makefile
+++ b/animations/Makefile
@@ -49,10 +49,6 @@ ifeq ($(ANIMATION_AMPHIBIAN),y)
   SRC += amphibian.c
 endif
 
-ifeq ($(ANIMATION_LOGO_27C3),y)
-  SRC += 27c3.c
-endif
-
 ifeq ($(ANIMATION_LOGO_OOS),y)
   SRC += outofspec.c
 endif
diff --git a/animations/config.in b/animations/config.in
index 72527cb..d1d02dd 100644
--- a/animations/config.in
+++ b/animations/config.in
@@ -18,7 +18,6 @@ comment "Animations"
 	dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
 		dep_bool "LABOR Logo"       ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
 		dep_bool "Amphibian"        ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
-		dep_bool "27c3 Logo"        ANIMATION_LOGO_27C3 $ANIMATION_BMSCROLLER
 		dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS  $ANIMATION_BMSCROLLER
 	endmenu
 
diff --git a/display_loop.c b/display_loop.c
index 06bd563..32b4368 100644
--- a/display_loop.c
+++ b/display_loop.c
@@ -14,7 +14,6 @@
 #include "animations/ltn_ant.h"
 #include "animations/amphibian.h"
 #include "animations/laborlogo.h"
-#include "animations/27c3.h"
 #include "animations/outofspec.h"
 #include "animations/fpmath_patterns.h"
 #include "animations/mherweg.h"
@@ -173,26 +172,20 @@ void display_loop(){
 			break;
 #endif
 
-#ifdef ANIMATION_LOGO_27C3
-		case 17:
-			logo_27c3();
-			break;
-#endif
-
 #ifdef ANIMATION_LOGO_OOS
-		case 18:
+		case 17:
 			logo_OutOfSpec();
 			break;
 #endif
 
 #ifdef ANIMATION_PLASMA
-		case 19:
+		case 18:
 			plasma();
 			break;
 #endif
 
 #ifdef ANIMATION_PSYCHEDELIC
-		case 20:
+		case 19:
 			psychedelic();
 			break;
 #endif