more arcadifit=

Author: Adafruit Adabot

M4_Eyes/M4_Eyes.ino

@@ -398,7 +398,7 @@ void setup() {
       voiceGain(gain);
       currentPitch = voicePitch(currentPitch);
       if(waveform) voiceMod(modulate, waveform);
-      digitalWrite(20, HIGH); // Speaker on
+      arcada.enableSpeaker(true);
     }
   }
 #endif
@@ -417,15 +417,7 @@ void setup() {
   lastLightReadTime = micros() + 2000000; // Delay initial light reading
 }
 
-static inline uint16_t readLightSensor(void) {
-#if NUM_EYES > 1
-  if(lightSensorPin >= 100) {
-    return arcada.ss.analogRead(lightSensorPin - 100);
-  }
-#else
-  return analogRead(lightSensorPin);
-#endif
-}
+
 
 // LOOP FUNCTION - CALLED REPEATEDLY UNTIL POWER-OFF -----------------------
 
@@ -860,7 +852,7 @@ void loop() {
           // pupils will react even if the opposite eye is stimulated.
           // Meaning we can get away with using a single light sensor for
           // both eyes. This comment has nothing to do with the code.
-          uint16_t rawReading = readLightSensor();
+          uint16_t rawReading = arcada.readLightSensor();
           if(rawReading <= 1023) {
             if(rawReading < lightSensorMin)      rawReading = lightSensorMin; // Clamp light sensor range
             else if(rawReading > lightSensorMax) rawReading = lightSensorMax; // to within usable range
@@ -902,10 +894,10 @@ void loop() {
 #if defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
       if(voiceOn) {
         // Read buttons, change pitch
-        uint32_t buttonState  = arcada.ss.digitalReadBulk(0b111000000000); // Bits CLEAR if currently pressed
-        uint32_t changedState = ~(buttonState ^ priorButtonState);      // Bits CLEAR if changed from before
-        uint32_t newlyPressed = ~(buttonState | changedState);          // Bits SET if newly pressed
-        if(       newlyPressed & 0b001000000000) { // Seesaw pin 9 (inner)
+        uint32_t buttonState  = arcada.readButtons(); // Bits SET if currently pressed
+        uint32_t changedState = ~(buttonState ^ priorButtonState);   // Bits SET if changed from before
+        uint32_t newlyPressed = buttonState | changedState;          // Bits SET if newly pressed
+        if(       newlyPressed & ARCADA_BUTTONMASK_UP) { // Seesaw pin 9 (inner)
           currentPitch *= 1.05;
         } else if(newlyPressed & ARCADA_BUTTONMASK_A) { // Seesaw pin 10 (middle)
           currentPitch = defaultPitch;

M4_Eyes/globals.h

@@ -13,10 +13,6 @@
 
 #if defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
   #define NUM_EYES 2
-  #define SEESAW_TFT_RESET_PIN 8     // Left eye TFT reset
-  #define SEESAW_BACKLIGHT_PIN 5     // Left eye TFT backlight
-  #define BACKLIGHT_PIN       21     // Right eye TFT backlight
-  #define LIGHTSENSOR_PIN      2
   // Light sensor is not active by default. Use "lightSensor : 102" in config
 #else
   #define NUM_EYES 1
@@ -181,12 +177,10 @@ typedef struct {
   eyeStruct eye[NUM_EYES] = {
   #if defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
     // name     spi  cs  dc rst wink
-    { "right", &SPI , 5,  6,  4, -1 },
-    { "left" , &SPI1, 9, 10, -1, -1 } };
-  #elif defined(ADAFRUIT_HALLOWING_M4_EXPRESS)
-    {  NULL  , &SPI1, 44, 45, 46, -1 } };
+    { "right", &ARCADA_TFT_SPI , ARCADA_TFT_CS,  ARCADA_TFT_DC, ARCADA_TFT_RST, -1 },
+    { "left" , &ARCADA_LEFTTFT_SPI, ARCADA_LEFTTFT_CS, ARCADA_LEFTTFT_DC, ARCADA_LEFTTFT_RST, -1 } };
   #else
-    #error "This project supports Adafruit MONSTER M4SK and HALLOWING M4 only"
+    {  NULL  , &ARCADA_TFT_SPI, ARCADA_TFT_CS, ARCADA_TFT_DC, ARCADA_TFT_RST, -1 } };
   #endif
 #else
   extern eyeStruct eye[];