fix more compiler complaints
@@ -105,7 +105,7 @@ SPISettings settings(DISPLAY_FREQ, MSBFIRST, SPI_MODE0);
// below, to allow for caching/scheduling fudge). If so, that's our signal
// that something is likely amiss and we take evasive maneuvers, resetting
// the affected DMA channel (DMAbuddy::fix()).
-#define DMA_TIMEOUT ((DISPLAY_SIZE * 16 * 4000) / (DISPLAY_FREQ / 1000))
+#define DMA_TIMEOUT (uint32_t)((DISPLAY_SIZE * 16 * 4000) / (DISPLAY_FREQ / 1000))
static inline uint16_t readBoop(void) {
uint16_t counter = 0;
@@ -167,11 +167,11 @@ void setup() {
uint32_t buttonState = arcada.readButtons();
if((buttonState & ARCADA_BUTTONMASK_UP) && arcada.exists("config1.eye")) {
- filename = "config1.eye";
+ filename = (char *)"config1.eye";
} else if((buttonState & ARCADA_BUTTONMASK_A) && arcada.exists("config2.eye")) {
- filename = "config2.eye";
+ filename = (char *)"config2.eye";
} else if((buttonState & ARCADA_BUTTONMASK_DOWN) && arcada.exists("config3.eye")) {
- filename = "config3.eye";
+ filename = (char *)"config3.eye";
}
yield();
@@ -184,11 +184,11 @@ void setup() {
#endif
yield();
- if (arcada.drawBMP("/splash.bmp", 0, 0, (eye[0].display)) == IMAGE_SUCCESS) {
+ if (arcada.drawBMP((char *)"/splash.bmp", 0, 0, (eye[0].display)) == IMAGE_SUCCESS) {
Serial.println("Splashing");
if (NUM_EYES > 1) { // other eye
yield();
- arcada.drawBMP("/splash.bmp", 0, 0, (eye[1].display));
+ arcada.drawBMP((char *)"/splash.bmp", 0, 0, (eye[1].display));
}
// backlight on for a bit
for (int bl=0; bl<=250; bl+=20) {
@@ -295,7 +295,6 @@ void setup() {
// leave some RAM for the stack to operate over the lifetime of this
// program and to handle small heap allocations.
- ImageReturnCode status;
uint32_t maxRam = availableRAM() - stackReserve;
// Load texture maps for eyes
@@ -356,6 +355,7 @@ void setup() {
// Load eyelid graphics.
yield();
+ ImageReturnCode status;
status = loadEyelid(upperEyelidFilename ?
upperEyelidFilename : (char *)"upper.bmp",
