adafruit-mirror/Adafruit_Learning_System_Guides
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

center eyes, check files for press-on-boot

Browse source
This commit is contained in:
Adafruit Adabot 2019-09-25 00:23:44 -04:00
parent 394ef176fd
commit 4262fd385f
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
M4_Eyes/M4_Eyes.ino
View file

@ -145,6 +145,10 @@ void setup() {
arcada.displayBegin(); 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); Serial.begin(115200);
// while(!Serial) delay(10); // while(!Serial) delay(10);
@ -161,13 +165,13 @@ void setup() {
// of the nose booper when doing this...it self-calibrates on startup. // 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. // DO THIS BEFORE THE SPLASH SO IT DOESN'T REQUIRE A LENGTHY HOLD.
char *filename = "config.eye"; char *filename = "config.eye";
arcada.readButtons();
uint32_t buttonState = arcada.justPressedButtons(); uint32_t buttonState = arcada.readButtons();
if(buttonState & ARCADA_BUTTONMASK_UP) { if((buttonState & ARCADA_BUTTONMASK_UP) && arcada.exists("config1.eye")) {
filename = "config1.eye"; filename = "config1.eye";
} else if(buttonState & ARCADA_BUTTONMASK_A) { } else if((buttonState & ARCADA_BUTTONMASK_A) && arcada.exists("config2.eye")) {
filename = "config2.eye"; filename = "config2.eye";
} else if(buttonState & ARCADA_BUTTONMASK_DOWN) { } else if((buttonState & ARCADA_BUTTONMASK_DOWN) && arcada.exists("config3.eye")) {
filename = "config3.eye"; filename = "config3.eye";
} }
@ -204,7 +208,9 @@ void setup() {
yield(); yield();
uint8_t e; uint8_t e;
for(e=0; e<NUM_EYES; 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].spi->setClockSource(DISPLAY_CLKSRC);
#endif
eye[e].display->fillScreen(0); eye[e].display->fillScreen(0);
eye[e].dma.allocate(); eye[e].dma.allocate();
eye[e].dma.setTrigger(eye[e].spi->getDMAC_ID_TX()); eye[e].dma.setTrigger(eye[e].spi->getDMAC_ID_TX());
@ -837,7 +843,7 @@ void loop() {
// Initialize new SPI transaction & address window... // Initialize new SPI transaction & address window...
eye[eyeNum].spi->beginTransaction(settings); eye[eyeNum].spi->beginTransaction(settings);
digitalWrite(eye[eyeNum].cs, LOW); // Chip select 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); delayMicroseconds(1);
digitalWrite(eye[eyeNum].dc, HIGH); // Data mode digitalWrite(eye[eyeNum].dc, HIGH); // Data mode
if(eyeNum == (NUM_EYES-1)) { if(eyeNum == (NUM_EYES-1)) {

2
M4_Eyes/globals.h
View file

@ -24,6 +24,8 @@ GLOBAL_VAR Adafruit_Arcada arcada;
#define MAX_DISPLAY_SIZE 240 #define MAX_DISPLAY_SIZE 240
GLOBAL_VAR int DISPLAY_SIZE GLOBAL_INIT(240); // Start with assuming a 240x240 display 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 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 eyeRadius GLOBAL_INIT(0); // 0 = Use default in loadConfig()
GLOBAL_VAR int eyeDiameter; // Calculated from eyeRadius later GLOBAL_VAR int eyeDiameter; // Calculated from eyeRadius later