Merge branch 'main' of https://github.com/pschatzmann/arduino-audio-tools

Author: pschatzmann

README.md

@@ -8,6 +8,7 @@ Some basic __header-only C++ classes__ that can be used for __Audio Processing__
 - Helps to [communicate](https://github.com/pschatzmann/arduino-audio-tools/wiki/Communication) audio over the wire or wirelessly
 - Different [Sound Generators](https://pschatzmann.github.io/arduino-audio-tools/group__generator.html) (e.g. to generate a sine tone) for [GeneratedSoundStream](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_generated_sound_stream.html)
 - Support for [Sound Effects](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_audio_effect_stream.html) with different [Effect Implementations](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_audio_effect.html) (e.g. Boost, Distortion, Echo, Reverb...) for [AudioEffectStream](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_audio_effect_stream_t.html)
+- Provides a [3 Band Equilizer](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_equilizer3_bands.html)
 - Different [Converters](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_base_converter.html) for [ConverterStream](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_converter_stream.html)
 - Different [Filters](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_filter.html) for [FilteredStream](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_filtered_stream.html)
 - [Musical Notes](https://pschatzmann.github.io/arduino-audio-tools/classaudio__tools_1_1_musical_notes.html) (with frequencies of notes)

src/AudioConfig.h

@@ -263,6 +263,7 @@ typedef WiFiClient WiFiClientSecure;
 #    define USE_PRINT_FLUSH false
 #  endif
 #  define USE_SD_SUPPORTS_SPI
+//#  define USE_ESP32_LOGGER true
 #endif
 
 // ----- Regular ESP32 -----
@@ -340,12 +341,13 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 //-------ESP32C3, ESP32S3, ESP32S2---------
 
 #if defined(ESP32)  && defined(ESP32X) 
-#include "esp32-hal-log.h"
-#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 0 , 0)
+# ifdef ARDUINO
+#  include "esp32-hal-log.h"
+# endif
+# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 0 , 0)
 #  define USE_INT24_FROM_INT
 #  define USE_ANALOG
-#endif
-
+# endif
 
 #define USE_PWM
 #define USE_URL_ARDUINO
@@ -831,6 +833,9 @@ using WiFiServerSecure = BearSSL::WiFiServerSecure;
 #  define USE_ALLOCATOR false
 #endif
 
+#ifndef USE_ESP32_LOGGER
+#  define USE_ESP32_LOGGER false
+#endif
 
 // Standard Arduino Print provides flush function
 #ifndef USE_PRINT_FLUSH

src/AudioTools/CoreAudio/AudioLogger.h

@@ -10,9 +10,13 @@
 #include "AudioTools/Concurrency/RP2040/MutexRP2040.h"
 #elif defined(ESP32)
 #include "AudioTools/Concurrency/RTOS/MutexRTOS.h"
+#include "esp_log.h"
 #endif
 
 // Logging Implementation
+#if defined(ESP32)
+#endif
+
 #if USE_AUDIO_LOGGING
 
 namespace audio_tools {
@@ -211,6 +215,14 @@ class CustomLogLevel {
   if (AudioLogger::instance().level() <= AudioLogger::Error) { \
     LOG_MIN(AudioLogger::Error);                               \
   }
+#elif USE_ESP32_LOGGER
+
+#define TAG_AUDIO "AUDIO"
+#define LOGD(...) ESP_LOGD(TAG_AUDIO,__VA_ARGS__);
+#define LOGI(...) ESP_LOGI(TAG_AUDIO,__VA_ARGS__);
+#define LOGW(...) ESP_LOGW(TAG_AUDIO,__VA_ARGS__);
+#define LOGE(...) ESP_LOGE(TAG_AUDIO,__VA_ARGS__);
+
 #else
 // Log statments which store the fmt string in Progmem
 #define LOGD(fmt, ...)                                         \
@@ -271,10 +283,10 @@ class CustomLogLevel {
 #else
 
 // Switch off logging
-#define LOGD(...)
-#define LOGI(...)
-#define LOGW(...)
-#define LOGE(...)
+#define LOGD(...) 
+#define LOGI(...) 
+#define LOGW(...) 
+#define LOGE(...) 
 #define TRACED()
 #define TRACEI()
 #define TRACEW()

src/AudioTools/CoreAudio/AudioMetaData/MetaDataFilter.h

@@ -80,7 +80,7 @@ class MetaDataFilter : public AudioOutput {
       size_t written = 0;
       if (p_out) written = p_out->write(tmp.data(), to_write);
       if (p_writer) written = p_writer->write(tmp.data(), to_write);
-      assert(to_write == to_write);
+      assert(to_write == written);
       metadata_range.clear();
     } else {
       LOGI("output ignored");