Revert "rework xymap"

This reverts commit 091bead.

Author: BlitzCityDIY

GemmaM0_Band_Jacket/DiscoBandCamp/DiscoBandCamp.ino

@@ -96,7 +96,7 @@ void loop()
   }
 
   // run a fade effect too if the confetti or myConfetti is running:
-  if (effectList[currentEffect] == confetti || effectList[currentEffect] == myConfetti) fadeAll(1);
+  if (effectList[currentEffect] == confetti or myConfetti) fadeAll(1);
 
   FastLED.show(); // send the contents of the led memory to the LEDs
 }

GemmaM0_Band_Jacket/DiscoBandCamp/XYmap.cpp

@@ -23,34 +23,15 @@
 //  XY(x,y) takes x and y coordinates and returns an LED index number,
 //  for use like this:  leds[ XY(x,y) ] == CRGB::Red;
 
-#ifndef XYMAP_H
-#define XYMAP_H
-
 #include <FastLED.h>
 
-// Parameters for width and height
-const uint8_t kMatrixWidth = 24;
-const uint8_t kMatrixHeight = 8;
-const uint8_t kBorderWidth = 2;
-
-#define NUM_LEDS (kMatrixWidth * kMatrixHeight)
-extern CRGB leds[NUM_LEDS];
-
-// XY Function
-uint16_t XY(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
-
-// Declare XYMap
-extern XYMap myXYMap;
-
-#endif // XYMAP_H
-
 // Parameters for width and height
 const uint8_t kMatrixWidth = 24;
 const uint8_t kMatrixHeight = 8;
 const uint8_t kBorderWidth = 2; //for swirly
 
 #define NUM_LEDS (kMatrixWidth * kMatrixHeight)
-extern CRGB leds[ NUM_LEDS ];
+CRGB leds[ NUM_LEDS ];
 
 // This function will return the right 'led index number' for 
 // a given set of X and Y coordinates on DiscoBandCamp