Corrections to examples

Author: pschatzmann

examples-basic-api/base-i2s-a2dp/base-i2s-a2dp.ino

@@ -10,14 +10,19 @@
 
 #include "Arduino.h"
 #include "AudioTools.h"
-#include "BluetoothA2DPSource.h"
+#include "AudioA2DP.h"
 
 using namespace audio_tools;  
 
+/**
+ * @brief We use a ADS1015 I2S microphone as input and send the data to A2DP
+ * Unfortunatly the data type from the microphone (int32_t)  does not match with the required data type by A2DP (int16_t),
+ * so we need to convert.
+ */ 
 
 BluetoothA2DPSource a2dp_source;
 I2S<int32_t> i2s;
-CallbackConverter<int32_t,int16_t> converter(&convertFrom32To16);
+ChannelConverter<int32_t> converter(&convertFrom32To16);
 ConverterFillLeftAndRight<int32_t> bothChannels;
 const size_t max_buffer_len = 1024;
 int32_t buffer[max_buffer_len][2];
@@ -33,7 +38,7 @@ int32_t get_sound_data(Channels* data, int32_t len) {
    bothChannels.convert(buffer, result_len);
 
    // convert buffer to int16 for A2DP
-   converter.convert(buffer, (int16_t(*)[2]) data, result_len);
+   converter.convert(buffer, data, result_len);
    return result_len;
 }
 

examples-basic-api/base-i2s-serial/base-i2s-serial.ino

@@ -1,4 +1,4 @@
-
+/**
  * @file i2s-serial.ino
  * @author Phil Schatzmann
  * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/i2s-serial/README.md

examples/streams-generator-i2s/streams-generator-i2s.ino

@@ -1,7 +1,7 @@
 /**
- * @file streams-generator-a2dp.ino
+ * @file streams-generator-i2s.ino
  * @author Phil Schatzmann
- * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/streams-generator-a2dp/README.md 
+ * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/streams-generator-i2s/README.md 
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
@@ -25,7 +25,7 @@ void setup(void) {
   Serial.begin(115200);
 
   // start the bluetooth
-  Serial.println("starting A2DP...");
+  Serial.println("starting I2S...");
   I2SConfig config = out.defaultConfig(TX_MODE);
   config.sample_rate = sample_rate; 
   config.channels = 2;

src/AudioPWM/PWMforESP32.h

@@ -38,6 +38,11 @@ struct PWMConfigESP32 {
     int buffer_size = 1024 * 8;
     int bits_per_sample = 16;
     int resolution = 8;  // must be between 8 and 11 -> drives pwm frequency
+
+    int maxChannels() {
+        return 16;
+    }
+
 } default_config;
 
 typedef PWMConfigESP32 PWMConfig;

src/AudioPWM/PWMforPico.h

@@ -43,12 +43,17 @@ struct PWMConfigPico {
     int amplitude_out = 127; // amplitude of square wave (pwm values -amplitude to amplitude) for one byte
     int amplitude_in = 0; 
     int start_pin = 2; // channel 0 will be on gpio 2, channel 1 on 3 etc
+
+    int maxChannels() {
+        return 16;
+    }    
 } default_config;
 
 typedef PWMConfigPico PWMConfig;
 
 /**
- * @brief Audio output for the Rasperry Pico to PWM pins
+ * @brief Audio output for the Rasperry Pico to PWM pins.
+   The Raspberry Pi Pico has 8 PWM blocks/slices(1-8) and each PWM block provides up to two PWM outputs(A-B). 
  * @author Phil Schatzmann
  * @copyright GPLv3