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

Author: pschatzmann

examples/build-arch-log.txt

@@ -13,3 +13,6 @@ arduino:samd:arduino_zero_native ./examples-stream/streams-generator-serial -> r
 arduino:renesas_uno:unor4wifi ./examples-stream/streams-generator-serial -> rc=0
 arduino:mbed_nano:nano33ble ./examples-stream/streams-generator-serial -> rc=0
 arduino:mbed_rp2040:pico ./examples-stream/streams-generator-serial -> rc=0
+arduino:mbed_giga:giga ./examples-stream/streams-generator-serial -> rc=0
+arduino:zephyr:nano33ble ./examples-stream/streams-generator-serial -> rc=0
+STMicroelectronics:stm32:GenF4 ./examples-stream/streams-generator-serial -> rc=0

examples/build-arch.sh

@@ -33,8 +33,9 @@ compile_example "arduino:samd:arduino_zero_native"
 compile_example "arduino:renesas_uno:unor4wifi"
 compile_example "arduino:mbed_nano:nano33ble"
 compile_example "arduino:mbed_rp2040:pico" 
-#compile_example "arduino:zephyr:nano33ble"
-#compile_example "STMicroelectronics:stm32:GenF4" 
+compile_example "arduino:mbed_giga:giga"
+compile_example "arduino:zephyr:nano33ble"
+compile_example "STMicroelectronics:stm32:GenF4" 
 
 ./cleanup.sh
 

src/AudioTools/AudioCodecs/CodecChain.h

@@ -60,6 +60,12 @@ class CodecChain : public AudioDecoder, AudioEncoder {
     }
   }
 
+  void addNotifyAudioChange(AudioInfoSupport &bi) override {
+    for (auto &stream : streams) {
+      stream.addNotifyAudioChange(bi);
+    }
+  }
+
   size_t write(const uint8_t *data, size_t len) override {
     if (streams.size() == 0) return 0;
     return streams[0].write(data, len);

src/AudioTools/CoreAudio/AudioAnalog/AnalogDriverMBED.h

@@ -14,7 +14,7 @@ namespace audio_tools {
  */
 
 class AnalogDriverMBED : public AnalogDriverBase {
-public:
+ public:
   /// Default constructor
   AnalogDriverMBED() = default;
 
@@ -37,20 +37,20 @@ class AnalogDriverMBED : public AnalogDriverBase {
       return false;
     }
     info = cfg;
-    auto_center.begin(config.channels, config.bits_per.sample);
+    auto_center.begin(cfg.channels, cfg.bits_per_sample);
     int n_samples = cfg.buffer_size / (cfg.bits_per_sample / 8);
     ring_buffer.resize(n_samples);
     switch (info.channels) {
-    case 1:
-      dac1.begin(AN_RESOLUTION_12, info.sample_rate, n_samples,
-                 cfg.buffer_count);
-      break;
-    case 2:
-      dac1.begin(AN_RESOLUTION_12, info.sample_rate, n_samples / 2,
-                 cfg.buffer_count);
-      dac2.begin(AN_RESOLUTION_12, info.sample_rate, n_samples / 2,
-                 cfg.buffer_count);
-      break;
+      case 1:
+        dac1.begin(AN_RESOLUTION_12, info.sample_rate, n_samples,
+                   cfg.buffer_count);
+        break;
+      case 2:
+        dac1.begin(AN_RESOLUTION_12, info.sample_rate, n_samples / 2,
+                   cfg.buffer_count);
+        dac2.begin(AN_RESOLUTION_12, info.sample_rate, n_samples / 2,
+                   cfg.buffer_count);
+        break;
     }
     return true;
   }
@@ -64,15 +64,12 @@ class AnalogDriverMBED : public AnalogDriverBase {
     adc2.stop();
   }
 
-  int availableForWrite() {
-    return dac1.available() ? info.buffer_size : 0;
-  }
+  int availableForWrite() { return dac1.available() ? info.buffer_size : 0; }
 
   /// writes the data to the I2S interface
   size_t write(const uint8_t *src, size_t size_bytes) override {
     TRACED();
-    if (!dac1.available())
-      return 0;
+    if (!dac1.available()) return 0;
 
     // collect data in ringbuffer
     size_t result = 0;
@@ -101,32 +98,32 @@ class AnalogDriverMBED : public AnalogDriverBase {
     int16_t *data = (int16_t *)dest;
     size_t samples = size_bytes / 2;
     switch (info.channels) {
-    case 1:
-      for (int j = 0; j < samples; j++) {
-        data[j] = adc1.read();
-        result += 2;
-      }
-      break;
-    case 2:
-      for (int j = 0; j < samples; j += 2) {
-        data[j] = adc1.read();
-        data[j + 1] = adc2.read();
-        result += 4;
-      }
-      break;
+      case 1:
+        for (int j = 0; j < samples; j++) {
+          data[j] = adc1.read();
+          result += 2;
+        }
+        break;
+      case 2:
+        for (int j = 0; j < samples; j += 2) {
+          data[j] = adc1.read();
+          data[j + 1] =adc2.read();
+          result += 4;
+        }
+        break;
     }
 
     // make sure that the center is at 0
-    if (adc_config.is_auto_center_read){
-        auto_center.convert(dest, result);
+    if (info.is_auto_center_read) {
+      auto_center.convert(dest, result);
     }
 
     return result;
   }
 
   virtual int available() override { return info.buffer_size; }
 
-protected:
+ protected:
   audio_tools::RingBuffer<Sample> ring_buffer{0};
   AnalogConfig info;
   ConverterAutoCenter auto_center;
@@ -140,25 +137,25 @@ class AnalogDriverMBED : public AnalogDriverBase {
   size_t writeBuffer() {
     size_t result = 0;
     switch (info.channels) {
-    case 1: {
-      SampleBuffer buf = dac1.dequeue();
-      for (size_t i = 0; i < buf.size(); i++) {
-        buf[i] = ring_buffer.read();
-        result += 2;
-      }
-      dac1.write(buf);
-    } break;
-    case 2: {
-      SampleBuffer buf1 = dac1.dequeue();
-      SampleBuffer buf2 = dac2.dequeue();
-      for (size_t i = 0; i < buf1.size(); i += 2) {
-        buf1[i] = ring_buffer.read();
-        buf2[i] = ring_buffer.read();
-        result += 4;
-      }
-      dac1.write(buf1);
-      dac2.write(buf2);
-    } break;
+      case 1: {
+        SampleBuffer buf = dac1.dequeue();
+        for (size_t i = 0; i < buf.size(); i++) {
+          ring_buffer.read(buf[i]);
+          result += 2;
+        }
+        dac1.write(buf);
+      } break;
+      case 2: {
+        SampleBuffer buf1 = dac1.dequeue();
+        SampleBuffer buf2 = dac2.dequeue();
+        for (size_t i = 0; i < buf1.size(); i += 2) {
+          ring_buffer.read(buf1[i]);
+          ring_buffer.read(buf2[i] );
+          result += 4;
+        }
+        dac1.write(buf1);
+        dac2.write(buf2);
+      } break;
     }
     assert(ring_buffer.isEmpty());
     return result;
@@ -168,6 +165,6 @@ class AnalogDriverMBED : public AnalogDriverBase {
 /// @brief AnalogAudioStream
 using AnalogDriver = AnalogDriverMBED;
 
-} // namespace audio_tools
+}  // namespace audio_tools
 
-#endif // USE_ANALOG
+#endif  // USE_ANALOG

src/AudioTools/CoreAudio/GoerzelStream.h

@@ -1,8 +1,12 @@
 #pragma once
-#include <math.h>
 
+#include <math.h>
 #include "AudioStreams.h"
 
+#ifndef M_PI
+#  define M_PI (3.14159265358979323846f)
+#endif
+
 /**
  * @defgroup dsp DSP
  * @ingroup main

src/AudioTools/PlatformConfig/giga.h

@@ -10,7 +10,9 @@
 #define USE_TYPETRAITS
 #define USE_ANALOG
 #define USE_STREAM_WRITE_OVERRIDE
-#define ANALOG_BUFFER_SIZE 1024
+#ifndef ANALOG_BUFFER_SIZE
+#  define ANALOG_BUFFER_SIZE 1024
+#endif
 #define ANALOG_BUFFERS 10
 #define USE_URL_ARDUINO
 #define USE_AUDIO_SERVER

src/AudioTools/PlatformConfig/portenta.h

@@ -12,7 +12,9 @@
 #define USE_TIMER
 #define USE_PWM
 #define USE_STREAM_WRITE_OVERRIDE
-#define ANALOG_BUFFER_SIZE 1024
+#ifndef ANALOG_BUFFER_SIZE
+#  define ANALOG_BUFFER_SIZE 1024
+#endif
 #define ANALOG_BUFFERS 10
 #define USE_URL_ARDUINO
 #define USE_AUDIO_SERVER

src/AudioTools/PlatformConfig/stm32.h

@@ -25,7 +25,8 @@
 #define SOFT_MUTE_VALUE 0
 #define PIN_CS -1
 
-#define USE_ETHERNET
-#define USE_URL_ARDUINO
-#define USE_AUDIO_SERVER
+// Uncomment to activate networking
+//#define USE_ETHERNET
+//#define USE_URL_ARDUINO
+//#define USE_AUDIO_SERVER