fix sad alloc

Author: Adafruit Adabot

M4_Eyes/M4_Eyes.ino

@@ -140,12 +140,11 @@ void setup() {
   arcada.displayBegin();
   // MUST set up flash filesystem before Serial.begin() or seesaw.begin()
   if (!arcada.filesysBeginMSD()) {
-    arcada.setBacklight(255);
-    arcada.haltBox("No filesystem found, please load CircuitPython on in order to create one!");
+    fatal("No filesystem found!", 100);
   }
 
   Serial.begin(115200);
-  while(!Serial) delay(10);
+  //while(!Serial) delay(10);
 
   Serial.printf("Available RAM at start: %d\n", availableRAM());
   Serial.printf("Available flash at start: %d\n", availableNVM());
@@ -246,10 +245,7 @@ void setup() {
     eye[e].blinkFactor = 0.0;
   }
 
-  analogWrite(BACKLIGHT_PIN, 255);
-#if defined(SEESAW_BACKLIGHT_PIN)
-  arcada.ss.analogWrite(SEESAW_BACKLIGHT_PIN, 255);
-#endif
+  arcada.setBacklight(255);
 
   // LOAD CONFIGURATION FILE -----------------------------------------------
 

M4_Eyes/file.cpp

@@ -335,9 +335,11 @@ ImageReturnCode loadEyelid(char *filename,
   // This is the "booster seat" described in m4eyes.ino
   if(reader->bmpDimensions(filename, &w, &h) == IMAGE_SUCCESS) {
     tempBytes = ((w + 7) / 8) * h; // Bitmap size in bytes
-    if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
-      // Make SOME tempPtr reference, or optimizer removes the alloc!
-      tempPtr[0] = 0;
+    if (maxRam > tempBytes) {
+      if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
+        // Make SOME tempPtr reference, or optimizer removes the alloc!
+        tempPtr[0] = 0;
+      }
     }
     // DON'T nest the image-reading case in here. If the fragmentation
     // culprit can be found, this block of code (and the free() block
@@ -416,9 +418,11 @@ ImageReturnCode loadTexture(char *filename, uint16_t **data,
   // This is the "booster seat" described in m4eyes.ino
   if(reader->bmpDimensions(filename, &w, &h) == IMAGE_SUCCESS) {
     tempBytes = w * h * 2; // Image size in bytes (converted to 16bpp)
-    if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
-      // Make SOME tempPtr reference, or optimizer removes the alloc!
-      tempPtr[0] = 0;
+    if (maxRam > tempBytes) {
+      if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
+        // Make SOME tempPtr reference, or optimizer removes the alloc!
+        tempPtr[0] = 0;
+      }
     }
     // DON'T nest the image-reading case in here. If the fragmentation
     // culprit can be found, this block of code (and the free() block

M4_Eyes/globals.h

@@ -24,7 +24,7 @@
 
 // GLOBAL VARIABLES --------------------------------------------------------
 
-GLOBAL_VAR uint32_t  stackReserve        GLOBAL_INIT(8192);   // 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       eyeDiameter;                             // Calculated from eyeRadius later
 GLOBAL_VAR int       irisRadius          GLOBAL_INIT(60);     // Approx size in screen pixels