From d94de7edd982a432ec366e5deba23a66f5318095 Mon Sep 17 00:00:00 2001
From: Stefan Heinrichsen <stefan@heinrichsen.net>
Date: Fri, 28 Dec 2018 17:55:01 +0100
Subject: [PATCH] Added functions to load .c files created on piskel webpage
 and moved defaults.h to normal filename

---
 UNHB-Esel/Defaults.ino       | 622 +++++++++++++++++++++++++++++++++++
 UNHB-Esel/FileHandling.ino   |  79 +++++
 UNHB-Esel/UNHB-Esel.ino      |  31 +-
 UNHB-Esel/data/Terminator.c  | 100 ++++++
 UNHB-Esel/data/Terminator2.c | 100 ++++++
 UNHB-Esel/defaults.h         |   5 +-
 6 files changed, 925 insertions(+), 12 deletions(-)
 create mode 100644 UNHB-Esel/Defaults.ino
 create mode 100644 UNHB-Esel/FileHandling.ino
 create mode 100644 UNHB-Esel/data/Terminator.c
 create mode 100644 UNHB-Esel/data/Terminator2.c

diff --git a/UNHB-Esel/Defaults.ino b/UNHB-Esel/Defaults.ino
new file mode 100644
index 0000000..8988ff8
--- /dev/null
+++ b/UNHB-Esel/Defaults.ino
@@ -0,0 +1,622 @@
+// the default Colormap
+uint8_t colorMap[] = { 0x00, 0x00, 0x00,
+                       0x19, 0x10, 0x28,
+                       0x46, 0xaf, 0x45, 
+                       0xa1, 0xd6, 0x85,
+                       0x45, 0x3e, 0x78,
+                       0x76, 0x64, 0xfe,
+                       0x43, 0x10, 0x10,
+                       0x9e, 0xc2, 0xe8,
+                       0xff, 0x43, 0x4b,
+                       0xe1, 0x8d, 0x79,
+                       0xd6, 0xb9, 0x7b,
+                       0xe9, 0xd8, 0xa1,
+                       0x21, 0x6c, 0x4b,
+                       0xd3, 0x65, 0xc8,
+                       0xaf, 0xaa, 0xb9,
+                       0xf5, 0xf4, 0xeb };
+
+uint8_t terminator[][32] = { {
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x06, 0x60, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x06, 0x60, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x66, 0x00, 0x06, 
+0x66, 0x88, 0x60, 0x06, 
+0x66, 0x88, 0x60, 0x06, 
+0x60, 0x66, 0x00, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x66, 0x60, 0x00, 0x06, 
+0x68, 0x86, 0x00, 0x06, 
+0x68, 0x86, 0x00, 0x06, 
+0x66, 0x60, 0x00, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x66, 0x00, 0x06, 
+0x66, 0x88, 0x60, 0x06, 
+0x66, 0x88, 0x60, 0x06, 
+0x60, 0x66, 0x00, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x06, 0x60, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x06, 0x60, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x00, 0x66, 0x06, 
+0x60, 0x06, 0x88, 0x66, 
+0x60, 0x06, 0x88, 0x66, 
+0x60, 0x00, 0x66, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x00, 0x06, 0x66, 
+0x60, 0x00, 0x68, 0x86, 
+0x60, 0x00, 0x68, 0x86, 
+0x60, 0x00, 0x06, 0x66, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x00, 0x66, 0x06, 
+0x60, 0x06, 0x88, 0x66, 
+0x60, 0x06, 0x88, 0x66, 
+0x60, 0x00, 0x66, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+},
+{
+0x00, 0x66, 0x66, 0x00, 
+0x06, 0x00, 0x00, 0x60, 
+0x60, 0x06, 0x60, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x68, 0x86, 0x06, 
+0x60, 0x06, 0x60, 0x06, 
+0x06, 0x00, 0x00, 0x60, 
+0x00, 0x66, 0x66, 0x00
+}
+};
+
+uint8_t brightness = 50;
+
+uint8_t eye_blink_c[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B11100111,
+B11101111,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B11100111,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B00000000,
+B11111111,
+B11111111,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B11100111,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B11100111,
+B11101111,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_blink_l[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B10011111,
+B10111111,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B10011111,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B00000000,
+B11111111,
+B11111111,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B10011111,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B10011111,
+B10111111,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_blink_r[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B11111001,
+B11111011,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B11111001,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B00000000,
+B11111111,
+B11111111,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00000000,
+B01111110,
+B11111001,
+B01111110,
+B00000000,
+B00000000,
+B00000000
+},
+{
+B00000000,
+B00111100,
+B01111110,
+B11111001,
+B11111011,
+B01111110,
+B00111100,
+B00000000
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_move_cr[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11110011,
+B11110111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11110011,
+B11110111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_move_rc[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11111001,
+B11111011,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11110011,
+B11110111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11110011,
+B11110111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_move_cl[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11001111,
+B11011111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11001111,
+B11011111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+}
+};
+
+uint8_t eye_move_lc[][8] = { 
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B10011111,
+B10111111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11001111,
+B11011111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11001111,
+B11011111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+},
+{
+B00111100,
+B01111110,
+B11111111,
+B11100111,
+B11101111,
+B11111111,
+B01111110,
+B00111100
+}
+};
diff --git a/UNHB-Esel/FileHandling.ino b/UNHB-Esel/FileHandling.ino
new file mode 100644
index 0000000..7791e9f
--- /dev/null
+++ b/UNHB-Esel/FileHandling.ino
@@ -0,0 +1,79 @@
+
+int getFileFrames(char* file) {
+  File f = SPIFFS.open(file, "r");
+  String line;
+  int n = -1;
+  int result;
+  
+  if (!f) {
+    Serial.println("Cannot open file!");
+    return -1;
+  } else {
+      Serial.println("Reading file and trying to find frame counter...");
+      
+      while(f.available() && n<0) {
+        line = f.readStringUntil('\n');
+        n = line.lastIndexOf("FRAME_COUNT");
+      }
+      Serial.println("Frame Counter found at this line:");
+      Serial.println(line);
+      String strFrameNumber = line.substring(n+12);
+      result = strFrameNumber.toInt();
+  }
+  f.close();
+  return result;
+}
+
+void playFile(char* file, int framespeed) {
+  int frameNumber = getFileFrames(file);
+  int n = -1;
+  RgbColor *anim[frameNumber][64];;
+  //uint8_t anim[frameNumber][64*3];
+
+  File f = SPIFFS.open(file, "r");
+  String line;
+  char rgbChar[8];
+
+  // load file into array
+  if (!f) {
+    Serial.println("Cannot open file!");
+    return;
+  } else {
+      // forward to first hex number
+      while(f.available() && n<0) {
+        line = f.readStringUntil('\n');
+        n = line.lastIndexOf("0x");
+      }
+      for(int frame=0; frame<frameNumber; frame++) {
+        for(int j=0; j<8; j++) {
+          for(int i=0; i<8; i++) {
+            String rgbStr=line.substring(4+i*12,4+i*12+6);
+            uint32_t rgb = strtol(rgbStr.c_str(), NULL, 16);
+            anim[frame][i*8+j] = new RgbColor(rgb & 0xFF, rgb>>8 & 0xFF, rgb>>16);
+          }
+        line = f.readStringUntil('\n');
+      }
+      line = f.readStringUntil('\n'); line = f.readStringUntil('\n');
+    }
+  }
+  f.close();
+
+  Serial.println(frameNumber);
+  for(int frame=0; frame<frameNumber; frame++) {
+    //Serial.print("Sending Frame: "); Serial.println(frame);
+    for(int i=0; i<strip.PixelCount()/2; i++) {
+      strip.SetPixelColor( i     , *anim[frame][i]);
+      strip.SetPixelColor( 64+i  , *anim[frame][i]);
+    }
+    strip.Show();
+    delay(framespeed);
+  }
+
+  for(int frame=0; frame<frameNumber; frame++) {
+    for(int j=0; j<8; j++) {
+      for(int i=0; i<8; i++) {
+        delete anim[frame][i*8+j];
+        }
+      }
+    }  
+}
diff --git a/UNHB-Esel/UNHB-Esel.ino b/UNHB-Esel/UNHB-Esel.ino
index c0b1e2c..c21de90 100644
--- a/UNHB-Esel/UNHB-Esel.ino
+++ b/UNHB-Esel/UNHB-Esel.ino
@@ -9,6 +9,9 @@
 #include <NeoPixelBus.h>
 #include <NeoPixelBrightnessBus.h>
 #include "defaults.h"
+#include <FS.h>
+
+char* filename = "/Terminator2.c";
 
 RgbColor *c[16];
 RgbColor black(0);
@@ -17,27 +20,35 @@ const uint16_t PixelCount = 128; // Currently we have a 2x 8x8 matrix connected
 
 // make sure to set this to the correct pins
 // SPI Hardware Pins: CLK=GPIO14=Pin12=D5 (orange), MOSI=GPIO13=Pin13=D7 (yellow)
-//NeoPixelBrightnessBus<DotStarBgrFeature, DotStarSpiMethod> strip(PixelCount);
-NeoPixelBus<DotStarBgrFeature, DotStarSpiMethod> strip(PixelCount);
+NeoPixelBrightnessBus<DotStarBgrFeature, DotStarSpiMethod> strip(PixelCount);
+//NeoPixelBus<DotStarBgrFeature, DotStarSpiMethod> strip(PixelCount);
 
 void setup() {
   Serial.begin(115200);
   while (!Serial); // wait for serial attach
 
   Serial.println();
-  Serial.println("Initializing..."); Serial.flush();
+  Serial.println("Initializing everything..."); Serial.flush();
 
   // this resets all the neopixels to an off state
+  Serial.println("Switching off all LEDs");
   strip.Begin();
-  //strip.SetBrightness(brightness);
+  strip.SetBrightness(brightness);
   strip.ClearTo(black);
   strip.Show();
 
+  //Initialize File System
+  if(SPIFFS.begin()) {
+    Serial.println("SPIFFS Initialisierung....OK");
+  } else {
+    Serial.println("SPIFFS Initialisierung...Fehler!");
+  }
+ 
   Serial.println();
-
+  Serial.println("Loading default color map");
   loadColorMap(colorMap);
   
-  Serial.println("Running...");
+  Serial.println("\nSwitch to running...");
 
 }
 
@@ -88,7 +99,11 @@ void loop() {
   Serial.println("All off ...");
   strip.ClearTo(black);
 
-  Serial.println("Animation test ...");
+  Serial.print("Framecounter of file: ");
+  playFile(filename, 100);
+  
+
+/*  Serial.println("Animation test ...");
   playBwAnimation(50, eye_move_cr); delay(3000);
   playBwAnimation(50, eye_blink_r); delay(5000);
   playBwAnimation(50, eye_blink_r); delay(3000);
@@ -98,7 +113,7 @@ void loop() {
   playBwAnimation(50, eye_blink_c); delay(3000);
   playBwAnimation(50, eye_move_cl); delay(3000);
   playBwAnimation(50, eye_blink_l); delay(2000);
-  playBwAnimation(50, eye_move_lc); delay(3000);
+  playBwAnimation(50, eye_move_lc); delay(3000);*/
 
   /*playMapAnimation(150, terminator);delay(3000);*/
 
diff --git a/UNHB-Esel/data/Terminator.c b/UNHB-Esel/data/Terminator.c
new file mode 100644
index 0000000..9665573
--- /dev/null
+++ b/UNHB-Esel/data/Terminator.c
@@ -0,0 +1,100 @@
+#include <stdint.h>
+
+#define TERMINATOR_FRAME_COUNT 9
+#define TERMINATOR_FRAME_WIDTH 8
+#define TERMINATOR_FRAME_HEIGHT 8
+
+/* Piskel data for "Terminator" */
+
+static const uint32_t terminator_data[9][64] = {
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff293183, 0xff4b53dc, 0xff4b53dc, 0xff293183, 0xff000000, 0xff293183, 
+0xff293183, 0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff000000, 0xff000000, 0xff293183, 
+0xff000000, 0xff293183, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff293183, 0xff000000, 
+0xff000000, 0xff000000, 0xff293183, 0xff293183, 0xff293183, 0xff293183, 0xff000000, 0xff000000
+}
+};
diff --git a/UNHB-Esel/data/Terminator2.c b/UNHB-Esel/data/Terminator2.c
new file mode 100644
index 0000000..b9ca5b9
--- /dev/null
+++ b/UNHB-Esel/data/Terminator2.c
@@ -0,0 +1,100 @@
+#include <stdint.h>
+
+#define TERMINATOR_FRAME_COUNT 9
+#define TERMINATOR_FRAME_WIDTH 8
+#define TERMINATOR_FRAME_HEIGHT 8
+
+/* Piskel data for "Terminator" */
+
+static const uint32_t terminator_data[9][64] = {
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+},
+{
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff111199, 0xff0000ff, 0xff0000ff, 0xff111199, 0xff000000, 0xff111199, 
+0xff111199, 0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff000000, 0xff000000, 0xff111199, 
+0xff000000, 0xff111199, 0xff000000, 0xff000000, 0xff000000, 0xff000000, 0xff111199, 0xff000000, 
+0xff000000, 0xff000000, 0xff111199, 0xff111199, 0xff111199, 0xff111199, 0xff000000, 0xff000000
+}
+};
diff --git a/UNHB-Esel/defaults.h b/UNHB-Esel/defaults.h
index 17c4059..8988ff8 100644
--- a/UNHB-Esel/defaults.h
+++ b/UNHB-Esel/defaults.h
@@ -108,7 +108,7 @@ uint8_t terminator[][32] = { {
 }
 };
 
-uint8_t brightness = 24;
+uint8_t brightness = 50;
 
 uint8_t eye_blink_c[][8] = { 
 {
@@ -620,6 +620,3 @@ B01111110,
 B00111100
 }
 };
-
-
-