Merge pull request #863 from ladyada/master

more tweekz

Author: PaintYourDragon

M4_Eyes/M4_Eyes.ino

@@ -145,6 +145,10 @@ void setup() {
 
   arcada.displayBegin();
 
+  DISPLAY_SIZE = min(ARCADA_TFT_WIDTH, ARCADA_TFT_HEIGHT);
+  DISPLAY_X_OFFSET = (ARCADA_TFT_WIDTH - DISPLAY_SIZE) / 2;
+  DISPLAY_Y_OFFSET = (ARCADA_TFT_HEIGHT - DISPLAY_SIZE) / 2;
+
   Serial.begin(115200);
 //  while(!Serial) delay(10);
 
@@ -161,22 +165,24 @@ void setup() {
   // of the nose booper when doing this...it self-calibrates on startup.
   // DO THIS BEFORE THE SPLASH SO IT DOESN'T REQUIRE A LENGTHY HOLD.
   char *filename = "config.eye";
-  arcada.readButtons();
-  uint32_t buttonState = arcada.justPressedButtons();
-  if(buttonState & ARCADA_BUTTONMASK_UP) {
+ 
+  uint32_t buttonState = arcada.readButtons();
+  if((buttonState & ARCADA_BUTTONMASK_UP) && arcada.exists("config1.eye")) {
     filename = "config1.eye";
-  } else if(buttonState & ARCADA_BUTTONMASK_A) {
+  } else if((buttonState & ARCADA_BUTTONMASK_A) && arcada.exists("config2.eye")) {
     filename = "config2.eye";
-  } else if(buttonState & ARCADA_BUTTONMASK_DOWN) {
+  } else if((buttonState & ARCADA_BUTTONMASK_DOWN) && arcada.exists("config3.eye")) {
     filename = "config3.eye";
   }
 
   yield();
   // Initialize displays
-  eye[0].display = arcada._display;
-  if (NUM_EYES > 1) {
+  #if (NUM_EYES > 1)
+    eye[0].display = arcada._display;
     eye[1].display = arcada.display2;  
-  }
+  #else
+    eye[0].display = arcada.display;
+  #endif
 
   yield();
   if (arcada.drawBMP("/splash.bmp", 0, 0, (eye[0].display)) == IMAGE_SUCCESS) {
@@ -200,10 +206,11 @@ void setup() {
 
   // Initialize DMAs
   yield();
-  uint8_t e, rtna = 0x01; // Screen refresh rate control (datasheet 9.2.18, FRCTRL2)
+  uint8_t e;
   for(e=0; e<NUM_EYES; e++) {
+#if (ARCADA_TFT_WIDTH != 160) && (ARCADA_TFT_HEIGHT != 128)   // 160x128 is ST7735 which isn't able to deal
     eye[e].spi->setClockSource(DISPLAY_CLKSRC);
-    eye[e].display->sendCommand(0xC6, &rtna, 1);
+#endif
     eye[e].display->fillScreen(0);
     eye[e].dma.allocate();
     eye[e].dma.setTrigger(eye[e].spi->getDMAC_ID_TX());
@@ -836,7 +843,7 @@ void loop() {
     // Initialize new SPI transaction & address window...
     eye[eyeNum].spi->beginTransaction(settings);
     digitalWrite(eye[eyeNum].cs, LOW);  // Chip select
-    eye[eyeNum].display->setAddrWindow(0, 0, DISPLAY_SIZE, DISPLAY_SIZE);
+    eye[eyeNum].display->setAddrWindow(DISPLAY_X_OFFSET, DISPLAY_Y_OFFSET, DISPLAY_SIZE, DISPLAY_SIZE);
     delayMicroseconds(1);
     digitalWrite(eye[eyeNum].dc, HIGH); // Data mode
     if(eyeNum == (NUM_EYES-1)) {
@@ -888,6 +895,7 @@ void loop() {
         irisValue = irisMin + (sum * irisRange); // 0.0-1.0 -> iris min/max
         if((++iris_frame) >= (1 << IRIS_LEVELS)) iris_frame = 0;
       }
+#if defined(ADAFRUIT_MONSTER_M4SK_EXPRESS)
       if(voiceOn) {
         // Read buttons, change pitch
         arcada.readButtons();
@@ -906,6 +914,7 @@ void loop() {
           Serial.println(currentPitch);
         }
       }
+#endif
       user_loop();
     }
   } // end first-column check

M4_Eyes/eyes/hazel_128x128/lower.bmp

@@ -24,6 +24,8 @@ GLOBAL_VAR Adafruit_Arcada arcada;
 
 #define MAX_DISPLAY_SIZE 240
 GLOBAL_VAR int       DISPLAY_SIZE        GLOBAL_INIT(240);    // Start with assuming a 240x240 display
+GLOBAL_VAR int       DISPLAY_X_OFFSET    GLOBAL_INIT(0);      // Used with rectangular screens
+GLOBAL_VAR int       DISPLAY_Y_OFFSET    GLOBAL_INIT(0);      // Used with rectangular screens
 GLOBAL_VAR uint32_t  stackReserve        GLOBAL_INIT(5192);   // See image-loading code
 GLOBAL_VAR int       eyeRadius           GLOBAL_INIT(0);      // 0 = Use default in loadConfig()
 GLOBAL_VAR int       eyeDiameter;                             // Calculated from eyeRadius later
@@ -152,7 +154,7 @@ typedef struct {
   int8_t           winkPin;      // Manual eye wink control (-1 = none)
   // Remaining values are initialized in code:
   columnStruct     column[2];    // Alternating column structures A/B
-  Adafruit_ST7789 *display;      // Pointer to display object
+  Adafruit_SPITFT *display;      // Pointer to display object
   DMAbuddy         dma;          // DMA channel object with fix() function
   DmacDescriptor  *dptr;         // DMA channel descriptor pointer
   uint32_t         dmaStartTime; // For DMA timeout handler