Fixed Mic Spectrum and Recorder and Orange LED

#1271

Author: bmorcelli

src/core/led_control.cpp

@@ -159,7 +159,8 @@ void setLedColorConfig() {
     else if (bruceConfig.ledColor == CRGB::Red) idx = 3;
     else if (bruceConfig.ledColor == CRGB::Green) idx = 4;
     else if (bruceConfig.ledColor == CRGB::Blue) idx = 5;
-    else if (bruceConfig.ledColor == LED_COLOR_WHEEL) idx = 6; // colorwheel
+    else if (bruceConfig.ledColor == CRGB::Orange) idx = 6;
+    else if (bruceConfig.ledColor == LED_COLOR_WHEEL) idx = 7; // colorwheel
     else idx = 7;                                              // custom color
 
     options = {
@@ -169,12 +170,13 @@ void setLedColorConfig() {
         {"Red",         [=]() { bruceConfig.setLedColor(CRGB::Red); },    bruceConfig.ledColor == CRGB::Red   },
         {"Green",       [=]() { bruceConfig.setLedColor(CRGB::Green); },  bruceConfig.ledColor == CRGB::Green },
         {"Blue",        [=]() { bruceConfig.setLedColor(CRGB::Blue); },   bruceConfig.ledColor == CRGB::Blue  },
+        {"Orange",      [=]() { bruceConfig.setLedColor(CRGB::Orange); }, bruceConfig.ledColor == CRGB::Orange},
         {"Color Wheel",
          [=]() { bruceConfig.setLedColor(LED_COLOR_WHEEL); },
          bruceConfig.ledColor == LED_COLOR_WHEEL                                                              },
     };
 
-    if (idx == 7) options.emplace_back("Custom Color", [=]() { backToMenu(); }, true);
+    if (idx == 8) options.emplace_back("Custom Color", [=]() { backToMenu(); }, true);
     addOptionToMainMenu();
 
     loopOptions(options, idx);

src/modules/others/mic.cpp

@@ -206,14 +206,16 @@ void mic_test() {
     }
     Serial.println("Mic Spectrum start");
     InitI2SMicroPhone();
-
     // Alloc buffers in PSRAM if available
-    i2s_buffer = (int8_t *)heap_caps_malloc(FFT_SIZE * sizeof(int16_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-    fftHistory =
-        (uint8_t *)heap_caps_malloc(HISTORY_LEN * SPECTRUM_HEIGHT, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-
+    if (psramFound()) {
+        i2s_buffer = (int8_t *)ps_malloc(FFT_SIZE * sizeof(int16_t));
+        fftHistory = (uint8_t *)ps_malloc(HISTORY_LEN * SPECTRUM_HEIGHT);
+    } else {
+        i2s_buffer = (int8_t *)malloc(FFT_SIZE * sizeof(int16_t));
+        fftHistory = (uint8_t *)malloc(HISTORY_LEN * SPECTRUM_HEIGHT);
+    }
     if (!i2s_buffer || !fftHistory) {
-        Serial.println("Fail to alloc buffers, exiting");
+        displayError("Fail to alloc buffers, exiting", true);
         return;
     }
 
@@ -297,7 +299,13 @@ void mic_record() {
     }
     InitI2SMicroPhone();
 
-    i2s_buffer = (int8_t *)heap_caps_malloc(FFT_SIZE * sizeof(int16_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
+    // Alloc buffers in PSRAM if available
+    if (psramFound()) i2s_buffer = (int8_t *)ps_malloc(FFT_SIZE * sizeof(int16_t));
+    else i2s_buffer = (int8_t *)malloc(FFT_SIZE * sizeof(int16_t));
+    if (!i2s_buffer) {
+        displayError("Fail to alloc buffers, exiting", true);
+        return;
+    }
 
     FS *fs = nullptr;
     if (!getFsStorage(fs) || fs == nullptr) {