From 9fb0d4f78d39c291117db2bd5ed752d6a4c3a84a Mon Sep 17 00:00:00 2001
From: Christian Kroll <chris@das-labor.org>
Date: Fri, 13 Jun 2014 21:19:44 +0200
Subject: [PATCH] "This is not Detroit" logo added

---
 src/animations/bitmapscroller/Makefile        |   4 +
 src/animations/bitmapscroller/config.in       |   1 +
 .../bitmapscroller/thisisnotdetroit.c         | 141 ++++++++++++++++++
 .../bitmapscroller/thisisnotdetroit.h         |   6 +
 src/display_loop.c                            |  15 +-
 5 files changed, 163 insertions(+), 4 deletions(-)
 create mode 100644 src/animations/bitmapscroller/thisisnotdetroit.c
 create mode 100644 src/animations/bitmapscroller/thisisnotdetroit.h

diff --git a/src/animations/bitmapscroller/Makefile b/src/animations/bitmapscroller/Makefile
index 2bdc1c7..238e0e8 100644
--- a/src/animations/bitmapscroller/Makefile
+++ b/src/animations/bitmapscroller/Makefile
@@ -22,6 +22,10 @@ ifeq ($(ANIMATION_FAIRYDUST),y)
   SRC += fairydust.c
 endif
 
+ifeq ($(ANIMATION_THISISNOTDETROIT),y)
+  SRC += thisisnotdetroit.c
+endif
+
 include $(MAKETOPDIR)/rules.mk
 
 include $(MAKETOPDIR)/depend.mk
diff --git a/src/animations/bitmapscroller/config.in b/src/animations/bitmapscroller/config.in
index ba73eb1..f13ae9a 100644
--- a/src/animations/bitmapscroller/config.in
+++ b/src/animations/bitmapscroller/config.in
@@ -3,4 +3,5 @@ dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
 	dep_bool "Amphibian"        ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
 	dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS  $ANIMATION_BMSCROLLER
 	dep_bool "Fairydust"        ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER
+	dep_bool "This is not Detroit" ANIMATION_THISISNOTDETROIT $ANIMATION_BMSCROLLER
 endmenu	
\ No newline at end of file
diff --git a/src/animations/bitmapscroller/thisisnotdetroit.c b/src/animations/bitmapscroller/thisisnotdetroit.c
new file mode 100644
index 0000000..bcd149e
--- /dev/null
+++ b/src/animations/bitmapscroller/thisisnotdetroit.c
@@ -0,0 +1,141 @@
+#include <stdint.h>
+#include <assert.h>
+
+#include "../../compat/pgmspace.h"
+#include "bitmapscroller.h"
+#include "thisisnotdetroit.h"
+
+
+static uint8_t const athisIsNotDetroitBitmap[2][55][8] PROGMEM =
+	{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x80},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x60},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x20, 0x64},
+	  {0x00, 0x00, 0x00, 0x01, 0x01, 0x18, 0x03, 0x24},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0xe1, 0xd4},
+	  {0x00, 0x00, 0x00, 0x00, 0x01, 0x5f, 0xeb, 0x22},
+	  {0x00, 0x00, 0x00, 0x01, 0x11, 0xfe, 0x10, 0x00},
+	  {0x00, 0x00, 0x06, 0x8f, 0xa5, 0x18, 0x00, 0x00},
+	  {0x00, 0x00, 0x3f, 0xf0, 0xc0, 0x00, 0x00, 0x01},
+	  {0x01, 0x82, 0x7f, 0xfa, 0x00, 0x00, 0x00, 0x00},
+	  {0x03, 0xff, 0xff, 0x40, 0x00, 0x00, 0x00, 0x00},
+	  {0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x1f, 0xf6, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00},
+	  {0x09, 0xc0, 0x00, 0x37, 0xc0, 0x00, 0x00, 0x00},
+	  {0x38, 0x00, 0x0a, 0xe7, 0x40, 0x00, 0x00, 0x00},
+	  {0x38, 0x01, 0xce, 0xff, 0x00, 0x00, 0x00, 0x00},
+	  {0x3c, 0xbe, 0xce, 0xf7, 0xc0, 0x00, 0x00, 0x00},
+	  {0x3c, 0xfd, 0xce, 0xf3, 0xe0, 0x00, 0x00, 0x00},
+	  {0x1c, 0xf8, 0xfe, 0xf0, 0x60, 0x00, 0x00, 0x00},
+	  {0x04, 0x70, 0xfe, 0xf2, 0xe0, 0x00, 0x00, 0x00},
+	  {0x00, 0x70, 0xee, 0xff, 0xe0, 0x00, 0x00, 0x00},
+	  {0x00, 0x70, 0xce, 0xf0, 0x80, 0x06, 0xc0, 0x00},
+	  {0x00, 0x71, 0xce, 0x60, 0x02, 0x1f, 0x80, 0x00},
+	  {0x00, 0x71, 0xc0, 0x00, 0x1f, 0xdf, 0x40, 0x00},
+	  {0x00, 0x70, 0x00, 0x03, 0xbf, 0xd6, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0xf3, 0x3d, 0xc6, 0x00, 0x00},
+	  {0x00, 0x01, 0x40, 0xfb, 0xf1, 0xe6, 0x00, 0x00},
+	  {0x00, 0x21, 0xf0, 0xfb, 0xb8, 0xc6, 0x00, 0x00},
+	  {0x00, 0x77, 0x80, 0xfb, 0xf0, 0xe6, 0x00, 0x00},
+	  {0x00, 0x73, 0x80, 0xef, 0xbf, 0xc6, 0x00, 0x00},
+	  {0x00, 0x77, 0xe0, 0xef, 0xbf, 0x84, 0x00, 0x0c},
+	  {0x00, 0x71, 0xf0, 0xef, 0x8e, 0x00, 0x00, 0xf8},
+	  {0x00, 0x70, 0x70, 0xe7, 0x80, 0x00, 0x1b, 0xfc},
+	  {0x00, 0x73, 0xf0, 0xc0, 0x00, 0x0f, 0x1b, 0xf0},
+	  {0x00, 0x73, 0xe0, 0x00, 0x0c, 0x3f, 0x98, 0xf0},
+	  {0x00, 0x70, 0x40, 0x03, 0x7f, 0x7b, 0x98, 0xf0},
+	  {0x00, 0x60, 0x00, 0x5f, 0x7e, 0x73, 0xd8, 0xf0},
+	  {0x00, 0x00, 0x1f, 0x7f, 0x67, 0xf1, 0xd8, 0xf0},
+	  {0x00, 0x0e, 0x1f, 0x7c, 0x77, 0xe3, 0x98, 0xf0},
+	  {0x00, 0x3f, 0x1e, 0x1c, 0x7c, 0xf7, 0x9c, 0xe0},
+	  {0x00, 0x7f, 0xdb, 0x1c, 0x6e, 0x7f, 0x1c, 0x00},
+	  {0x00, 0x71, 0xdf, 0x1c, 0x7f, 0x3f, 0x00, 0x00},
+	  {0x00, 0x71, 0xdb, 0x1c, 0x67, 0x80, 0x00, 0x00},
+	  {0x00, 0x71, 0xdd, 0x1c, 0x50, 0x00, 0x00, 0x00},
+	  {0x00, 0x73, 0xdf, 0x18, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x7f, 0x1f, 0x80, 0x00, 0x00, 0xfc, 0x00},
+	  {0x00, 0x7e, 0x10, 0x00, 0x00, 0x7f, 0xf0, 0x00},
+	  {0x00, 0x68, 0x00, 0x00, 0x2f, 0xff, 0x90, 0x00},
+	  {0x00, 0x00, 0x00, 0x03, 0xfe, 0xa3, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x1f, 0xfd, 0x00, 0x00, 0x00},
+	  {0x00, 0x3c, 0x00, 0x0f, 0xa0, 0x00, 0x00, 0x00},
+	  {0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+
+	 {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x60},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x08},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 0x2a},
+	  {0x00, 0x00, 0x00, 0x02, 0x40, 0x3f, 0xf0, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x80, 0x7f, 0xc0, 0x00},
+	  {0x00, 0x00, 0x01, 0x41, 0xd7, 0xe0, 0x00, 0x02},
+	  {0x00, 0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x00},
+	  {0x00, 0x7d, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00},
+	  {0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00},
+	  {0x1f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x0f, 0xf8, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00},
+	  {0x3e, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 0x00},
+	  {0x38, 0x00, 0x06, 0x77, 0xc0, 0x00, 0x00, 0x00},
+	  {0x18, 0x00, 0xce, 0x66, 0x00, 0x00, 0x00, 0x00},
+	  {0x18, 0x7d, 0xce, 0x67, 0xc0, 0x00, 0x00, 0x00},
+	  {0x1d, 0xfd, 0xce, 0x67, 0xe0, 0x00, 0x00, 0x00},
+	  {0x0d, 0xf1, 0xfe, 0x60, 0xe0, 0x00, 0x00, 0x00},
+	  {0x0c, 0x31, 0xfe, 0x67, 0xe0, 0x00, 0x00, 0x00},
+	  {0x00, 0x31, 0xce, 0x67, 0xc0, 0x00, 0x00, 0x00},
+	  {0x00, 0x31, 0xce, 0x67, 0x00, 0x01, 0xc0, 0x00},
+	  {0x00, 0x31, 0xce, 0x00, 0x00, 0x1f, 0xc0, 0x00},
+	  {0x00, 0x31, 0xc0, 0x00, 0x0f, 0x9f, 0x80, 0x00},
+	  {0x00, 0x30, 0x00, 0x03, 0x1f, 0xc7, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x73, 0xb9, 0xe7, 0x00, 0x00},
+	  {0x00, 0x00, 0xe0, 0x73, 0x38, 0xe7, 0x00, 0x00},
+	  {0x00, 0x13, 0xe0, 0x7b, 0x70, 0xe7, 0x00, 0x00},
+	  {0x00, 0x33, 0xe0, 0x7f, 0x39, 0xc7, 0x00, 0x00},
+	  {0x00, 0x37, 0x00, 0x7f, 0x3f, 0xc7, 0x00, 0x00},
+	  {0x00, 0x33, 0xe0, 0x6f, 0x3f, 0x80, 0x00, 0x00},
+	  {0x00, 0x33, 0xf0, 0x67, 0x1f, 0x00, 0x01, 0xfc},
+	  {0x00, 0x30, 0x70, 0x67, 0x00, 0x00, 0x1d, 0xf8},
+	  {0x00, 0x33, 0xf0, 0x60, 0x00, 0x1f, 0x1d, 0xe0},
+	  {0x00, 0x37, 0xe0, 0x00, 0x00, 0x3f, 0x9c, 0x60},
+	  {0x00, 0x33, 0x80, 0x00, 0x7e, 0x7f, 0xdc, 0x60},
+	  {0x00, 0x00, 0x00, 0x3f, 0x7f, 0x71, 0xdc, 0x60},
+	  {0x00, 0x00, 0x0f, 0x7f, 0x77, 0x61, 0xdc, 0x60},
+	  {0x00, 0x00, 0x1f, 0x7c, 0x7e, 0x71, 0xdc, 0x60},
+	  {0x00, 0x3f, 0x9c, 0x1c, 0x7e, 0x7b, 0x98, 0x60},
+	  {0x00, 0x3f, 0x9f, 0x1c, 0x7e, 0x7f, 0x98, 0x00},
+	  {0x00, 0x33, 0xdf, 0x1c, 0x67, 0x3e, 0x00, 0x00},
+	  {0x00, 0x31, 0xdc, 0x1c, 0x77, 0x00, 0x00, 0x00},
+	  {0x00, 0x31, 0xdb, 0x9c, 0x60, 0x00, 0x00, 0x00},
+	  {0x00, 0x33, 0x9f, 0x9c, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x3f, 0x9f, 0x00, 0x00, 0x01, 0xf8, 0x00},
+	  {0x00, 0x3f, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00},
+	  {0x00, 0x30, 0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00},
+	  {0x00, 0x00, 0x00, 0x0f, 0xff, 0x5c, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00},
+	  {0x00, 0x1e, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}};
+
+
+static uint8_t logo_thisIsNotDetroit_getChunk(unsigned char const nBitPlane,
+                                              unsigned char const nChunkX,
+                                              unsigned char const nChunkY,
+                                              unsigned int const nFrame)
+{
+	assert(nBitPlane < 2);
+	assert(nChunkX < 8);
+	assert(nChunkY < 55);
+
+	return pgm_read_byte(&athisIsNotDetroitBitmap[nBitPlane][nChunkY][nChunkX]);
+}
+
+
+void logo_thisIsNotDetroit()
+{
+	// width 64, height 55, 2 bitplanes (4 colors), 600 frames à 100ms
+	// frame change and viewport movement after every cyle (both dividers are 1)
+	bitmap_scroll(64, 55, 2, 600, 100, 1, 1, logo_thisIsNotDetroit_getChunk);
+}
diff --git a/src/animations/bitmapscroller/thisisnotdetroit.h b/src/animations/bitmapscroller/thisisnotdetroit.h
new file mode 100644
index 0000000..b2f78fd
--- /dev/null
+++ b/src/animations/bitmapscroller/thisisnotdetroit.h
@@ -0,0 +1,6 @@
+#ifndef THISISNOTDETROIT_H_
+#define THISISNOTDETROIT_H_
+
+void logo_thisIsNotDetroit();
+
+#endif /* THISISNOTDETROIT_H_ */
diff --git a/src/display_loop.c b/src/display_loop.c
index 42929e2..06b1d0f 100644
--- a/src/display_loop.c
+++ b/src/display_loop.c
@@ -16,6 +16,7 @@
 #include "animations/bitmapscroller/amphibian.h"
 #include "animations/bitmapscroller/outofspec.h"
 #include "animations/bitmapscroller/fairydust.h"
+#include "animations/bitmapscroller/thisisnotdetroit.h"
 #include "animations/fpmath_patterns.h"
 #include "animations/mherweg.h"
 #include "animations/moire.h"
@@ -226,26 +227,32 @@ void display_loop(){
 			break;
 #endif
 
-#ifdef ANIMATION_PLASMA
+#ifdef ANIMATION_THISISNOTDETROIT
 		case 22:
+			logo_thisIsNotDetroit();
+			break;
+#endif
+
+#ifdef ANIMATION_PLASMA
+		case 23:
 			plasma();
 			break;
 #endif
 
 #ifdef ANIMATION_PSYCHEDELIC
-		case 23:
+		case 24:
 			psychedelic();
 			break;
 #endif
 
 #ifdef ANIMATION_BLACKHOLE
-		case 24:
+		case 25:
 			blackhole();
 			break;
 #endif
 
 #ifdef ANIMATION_SQUARES
-		case 25:
+		case 26:
 			squares();
 			break;
 #endif