 // options for remote controller
 // NOCONTROLLER - no remote
 // WEBCONTROLLER - esp8266
-#define NOCONTROLLER
+#define WEBCONTROLLER
 
 #include <Adafruit_GFX.h>
 #include <Adafruit_NeoMatrix.h>
 #include <Adafruit_NeoPixel.h>
-
-#ifdef WEBCONTROLLER
-#include <ESP8266WiFi.h>
-#include <ESP8266WebServer.h>
-#endif
 
 #include "TickerAnimation.h"
 #include "StackAnimation.h"

}

void loop() {
  #ifdef WEBCONTROLLER
  server.handleClient();
  #endif

  uberAnimation.update(millis());

  delay(1);
}


#include "AumAnimation.h"
#include "UberAnimation.h"

const char* ssid = "Thing";
const char* password = "sparkfun";

const int PIN = 5;
const int NUMPIXELS = 64;
const int DELAY = 100;

// to accomodate packaging of the LED matrix with different locations of the connector
const int rotationZero = NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_ROWS;
const int rotationNinety = NEO_MATRIX_TOP + NEO_MATRIX_RIGHT + NEO_MATRIX_COLUMNS;

Adafruit_NeoMatrix matrix = Adafruit_NeoMatrix(8, 8, PIN, 
  rotationZero + NEO_MATRIX_PROGRESSIVE,
  NEO_GRB + NEO_KHZ400);

TickerAnimation ticker(matrix);
