Make Mic a template param, improve I2S audio

Author: davepl

include/globals.h

@@ -917,7 +917,10 @@ constexpr std::array<T, N> to_array(const T (&arr)[N]) {
 
 #if USE_TFTSPI
     #define DISABLE_ALL_LIBRARY_WARNINGS 1
-    #if TTGO
+    // If the project provides its own TFT_eSPI setup via USER_SETUP_LOADED
+    // and build_flags, do not include the TTGO default user setup to avoid
+    // macro redefinition warnings.
+    #if TTGO && !defined(USER_SETUP_LOADED)
         #include <User_Setups/Setup25_TTGO_T_Display.h>
     #endif
     #include <TFT_eSPI.h>

include/soundanalyzer.h

@@ -518,7 +518,8 @@ build_flags     = -DM5DEMO=1
                   -DLED_PIN0=32
                   -DTOGGLE_BUTTON_1=37
                   -DTOGGLE_BUTTON_2=39
-                  -DNUM_BANDS=160
+                  -DDEFAULT_INFO_PAGE=1                  
+                  -DNUM_BANDS=80
                   ${dev_m5stack.build_flags}
 
 ; Now for the Heltec, with WiFi and webserver enabled
@@ -1047,6 +1048,7 @@ board_build.flash_freq = 40m
 build_flags     = -DTTGO=1
                   -DEFFECTS_TTGO=1
                   -DUSE_SCREEN=1
+                  -DDEFAULT_INFO_PAGE=1                  
                   -DUSE_TFTSPI=1
                   -DUSER_SETUP_LOADED=1
                   -DST7789_DRIVER
@@ -1062,8 +1064,6 @@ build_flags     = -DTTGO=1
                   -DTFT_MISO=-1
                   -DTFT_BL=4
                   -DTFT_BACKLIGHT_ON=HIGH
-                  -DLOAD_GLCD=1
-                  -DLOAD_GFXFF=1
                   -DSPI_FREQUENCY=40000000
                   -DSPI_READ_FREQUENCY=6000000
                   -DPROJECT_NAME="\"TTGO\""
@@ -1076,7 +1076,8 @@ build_flags     = -DTTGO=1
                   -DENABLE_OTA=0
                   -DENABLE_REMOTE=1
                   -DENABLE_AUDIO=1
-                  -DNUM_BANDS=120
+                  -DNUM_BANDS=48
+                  -DMAX_SAMPLES=512
                   -DUSE_I2S_AUDIO=1
                   -DINPUT_PIN=33
                   -DI2S_BCLK_PIN=26
@@ -1085,8 +1086,6 @@ build_flags     = -DTTGO=1
                   -DLED_PIN0=21
                   -DRING_SIZE_0=24
                   -DBONUS_PIXELS=0
-                  -DMATRIX_WIDTH=48
-                  -DMATRIX_HEIGHT=16
                   -DNUM_FANS=MATRIX_WIDTH
                   -DFAN_SIZE=MATRIX_HEIGHT
                   -DIR_REMOTE_PIN=22

platformio.ini

@@ -91,10 +91,10 @@ void IRAM_ATTR AudioSamplerTaskEntry(void *)
         debugV("VURatio: %f\n", g_Analyzer.VURatio());
         debugV("VURatioFade: %f\n", g_Analyzer.VURatioFade());
 
-        // Delay enough time to yield 45fps max
+        // Delay enough time to yield 60fps max
         // We wait a minimum even if busy so we don't Bogart the CPU
 
-        constexpr auto kMaxFPS = 45;
+        constexpr auto kMaxFPS = 60;
         const auto targetDelay = PERIOD_FROM_FREQ(kMaxFPS) * MILLIS_PER_SECOND / MICROS_PER_SECOND;
         delay(max(1.0, targetDelay - (millis() - lastFrame)));
 

src/audio.cpp

@@ -180,7 +180,6 @@ void onReceiveESPNOW(const uint8_t *macAddr, const uint8_t *data, int dataLen);
 
 std::unique_ptr<SystemContainer> g_ptrSystem;
 Values g_Values;
-SoundAnalyzer g_Analyzer;
 RemoteDebug Debug;                                                        // Instance of our telnet debug server
 std::mutex g_buffer_mutex;
 

src/main.cpp

@@ -109,7 +109,7 @@ void BasicInfoSummary(bool bRedraw)
     char chStatus = szStatus[c2];
     cStatus++;
 
-    if (display.width() > 240)
+    if (display.width() > 320)
         display.setTextSize(3);
     else if (display.width() >= 160)
         display.setTextSize(2);

src/screen.cpp

@@ -0,0 +1,25 @@
+//+--------------------------------------------------------------------------
+//
+// File:        SoundAnalyzer.cpp
+//
+// NightDriverStrip - (c) 2018 Plummer's Software LLC.  All Rights Reserved.
+//
+// Template instantiations for SoundAnalyzer class
+//
+//---------------------------------------------------------------------------
+
+#include "soundanalyzer.h"
+
+ProjectSoundAnalyzer g_Analyzer;
+
+#if ENABLE_AUDIO
+
+// Explicit template instantiations to ensure proper linkage
+template class SoundAnalyzer<kParamsMesmerizer>;
+template class SoundAnalyzer<kParamsPCRemote>;
+template class SoundAnalyzer<kParamsM5>;
+template class SoundAnalyzer<kParamsM5Plus2>;
+template class SoundAnalyzer<kParamsI2SExternal>;
+
+#endif
+