sound working with audio-tools

Author: NoTreesSupport

include/main.h

@@ -5,6 +5,7 @@
 #include "rtos_tasks.h"
 #include "user_interface.h"
 #include "sound.h"
+#include "serial_helpers.h"
 
 lv_point_t g_touchCoordinate;
 

include/serial_helpers.h

@@ -0,0 +1,18 @@
+#ifndef SERIAL_HELPERS_H
+#define SERIAL_HELPERS_H
+
+#include <Arduino.h>
+#include <string>
+
+using std::string;
+
+#define DEFAULT_BAUD_RATE 115200
+
+
+namespace SerialHelpers
+{
+    void setupSerial();
+    void logHeapInfo(string context);
+}
+
+#endif

include/sound.h

@@ -1,16 +1,17 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "AudioGeneratorAAC.h"
-#include "AudioOutputI2S.h"
-#include "AudioFileSourcePROGMEM.h"
-
-#include "sounds/sampleaac.h"
+#include "AudioTools.h"
 
 #define I2S_DOUT 37
 #define I2S_BCLK 36
 #define I2S_LRC 35
 
+// How to create audio memory streams
+// https://github.com/pschatzmann/arduino-audio-tools/wiki/MemoryStream:-Converting-a-File-to-Flash-Memory
+// In Audacity:
+//      - export WAV, Mono, 22050 Hz, Signed 16-bit PCM
+
 namespace Sound
 {
     void setup();

platformio.ini

@@ -26,7 +26,7 @@ build_flags =
 lib_deps = 
 	lovyan03/LovyanGFX@^1.1.5
 	lvgl/lvgl@^8.3.7
-	earlephilhower/ESP8266Audio@^1.9.7
+	https://github.com/pschatzmann/arduino-audio-tools
 monitor_speed = 115200
 monitor_filters = 
 	esp32_exception_decoder

src/main.cpp

@@ -2,23 +2,27 @@
 
 void setup()
 {
-	Serial.begin(115200);
-	delay(1000); // allow serial to start
+	SerialHelpers::setupSerial();
 
 	ESP_LOGI("", "setup");
+	SerialHelpers::logHeapInfo("Startup");
 
-	// setting up hardware systems
+	// setting up graphics systems
 	Graphics::lovyanGFX_init();
 	Graphics::LVGL_init();
+	SerialHelpers::logHeapInfo("after Graphics::setup()");
 
 	// setup support libraries
 	UserInterface::setup();
+	SerialHelpers::logHeapInfo("after UserInterface::setup()");
 
 	// setup audio play
 	Sound::setup();
+	SerialHelpers::logHeapInfo("after Sound::setup()");
 
 	// setup scheduled tasks
 	RTOSTasks::setup();
+	SerialHelpers::logHeapInfo("after RTOSTasks::setup()");
 }
 
 void loop()

src/serial_helpers.cpp

@@ -0,0 +1,27 @@
+#include "serial_helpers.h"
+#include "user_interface.h"
+
+char *stack_start;
+
+bool isSerialAvailable = false;
+
+void SerialHelpers::setupSerial()
+{
+  Serial.begin(DEFAULT_BAUD_RATE);
+
+  while (!Serial)
+  {
+    ; // wait for serial port to connect. Needed for native USB, on LEONARDO, MICRO, YUN, and other 32u4 based boards.
+  }
+
+  delay(1000); // allow serial to start
+
+  ESP_LOGI("-----", "Program Start");
+
+  isSerialAvailable = true;
+}
+
+void SerialHelpers::logHeapInfo(string context)
+{
+  ESP_LOGI("HEAP/PSRAM", "%s: %d / %d", context.c_str(), ESP.getFreeHeap(), ESP.getFreePsram());
+}

src/sound.cpp

@@ -1,32 +1,53 @@
 #include "sound.h"
 
-AudioFileSourcePROGMEM *in;
-AudioGeneratorAAC *aac;
-AudioOutputI2S *out;
+#include "sounds/beep1.h"
+#include "sounds/beep2.h"
+
+uint8_t channels = 2;
+uint16_t sample_rate = 22050;
+
+I2SConfig config;
+MemoryStream sound1(beep1_wav, sizeof(beep1_wav));
+MemoryStream sound2(beep2_wav, sizeof(beep2_wav));
+I2SStream out; // Output to I2S
+StreamCopy copier;
+
+bool even = false;
 
 void Sound::setup()
 {
     ESP_LOGI("", "Sound::setup()");
 
-    aac = new AudioGeneratorAAC();
-    out = new AudioOutputI2S();
-    out->SetPinout(I2S_BCLK, I2S_LRC, I2S_DOUT);
+    AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+    config = out.defaultConfig(TX_MODE);
+    config.sample_rate = sample_rate;
+    config.channels = channels;
+    config.bits_per_sample = 16;
+    config.pin_bck = I2S_BCLK;
+    config.pin_data = I2S_DOUT;
+    config.pin_ws = I2S_LRC;
+    out.begin(config);
 }
 
 void Sound::play()
 {
     ESP_LOGI("", "Sound::play()");
 
-    in = new AudioFileSourcePROGMEM(sampleaac, sizeof(sampleaac));
-    aac->begin(in, out);
+    if (even)
+    {
+        sound1.begin();
+        copier.begin(out, sound1);
+    }
+    else
+    {
+        sound2.begin();
+        copier.begin(out, sound2);
+    }
+    even = !even;
 }
 
 void Sound::loop()
 {
-    // ESP_LOGW("IsPlaying", "%d", aac->isRunning());
-
-    if (aac->isRunning())
-    {
-        aac->loop();
-    }
+    copier.copy();
 }