Merge branch 'm4eyes_arcadify' of github.com:ladyada/Adafruit_Learning_System_Guides into m4eyes_arcadify

Author: Adafruit Adabot

M4_Eyes/M4_Eyes.ino

@@ -137,12 +137,12 @@ void setup() {
   if (!arcada.arcadaBegin()) {
     while (1);
   }
+  arcada.displayBegin();
   // MUST set up flash filesystem before Serial.begin() or seesaw.begin()
-  arcada.filesysBeginMSD();
-
-  //  if(i == 1)      fatal("Flash init fail", 100);
-  //else if(i == 2) fatal("No filesys", 500);
-
+  if (!arcada.filesysBeginMSD()) {
+    arcada.setBacklight(255);
+    arcada.haltBox("No filesystem found, please load CircuitPython on in order to create one!");
+  }
 
   Serial.begin(115200);
   while(!Serial) delay(10);
@@ -259,13 +259,15 @@ void setup() {
   // of the nose booper when doing this...it self-calibrates on startup.
   char *filename = "config.eye";
 #if NUM_EYES > 1 // Only available on MONSTER M4SK
+/* MEMEFIX
   if(!(priorButtonState & 0b001000000000)) {
     filename = "config1.eye";
   } else if(!(priorButtonState & 0b010000000000)) {
     filename = "config2.eye";
   } else if(!(priorButtonState & 0b100000000000)) {
     filename = "config3.eye";
   }
+  */
 #endif
   loadConfig(filename);
 
@@ -909,9 +911,9 @@ void loop() {
         uint32_t newlyPressed = ~(buttonState | changedState);          // Bits SET if newly pressed
         if(       newlyPressed & 0b001000000000) { // Seesaw pin 9 (inner)
           currentPitch *= 1.05;
-        } else if(newlyPressed & 0b010000000000) { // Seesaw pin 10 (middle)
+        } else if(newlyPressed & ARCADA_BUTTONMASK_A) { // Seesaw pin 10 (middle)
           currentPitch = defaultPitch;
-        } else if(newlyPressed & 0b100000000000) { // Seesaw pin 11 (outer)
+        } else if(newlyPressed & ARCADA_BUTTONMASK_DOWN) { // Seesaw pin 11 (outer)
           currentPitch *= 0.95;
         }
         if(newlyPressed) {

M4_Eyes/globals.h

@@ -1,9 +1,5 @@
 //34567890123456789012345678901234567890123456789012345678901234567890123456
 
-#include <Adafruit_GFX.h>         // Core graphics for Adafruit displays
-#include <Adafruit_ST7789.h>      // TFT-specific display library
-#include <Adafruit_ZeroDMA.h>     // SAMD-specific DMA library
-#include <Adafruit_ImageReader.h> // ImageReturnCode type
 #include "Adafruit_Arcada.h"
 #include "DMAbuddy.h"             // DMA-bug-workaround class
 
@@ -24,7 +20,6 @@
   // Light sensor is not active by default. Use "lightSensor : 102" in config
 #else
   #define NUM_EYES 1
-  #define BACKLIGHT_PIN       47
 #endif
 
 // GLOBAL VARIABLES --------------------------------------------------------