doxygen

Author: pschatzmann

examples/sandbox/communication/communication-serial-receive/communication-serial-receive.ino

@@ -15,7 +15,7 @@
 #define RXD2 16
 #define TXD2 17
 
-uint16_t sample_rate = 44100;
+uint16_t sample_rate = 28800;
 uint8_t channels = 2;  // The stream will have 2 channels
 I2SStream out; 
 StreamCopy copier(out, Serial2);     

examples/sandbox/communication/communication-serial-send/communication-serial-send.ino

@@ -15,7 +15,7 @@
 #define RXD2 16
 #define TXD2 17
 
-uint16_t sample_rate = 44100;
+uint16_t sample_rate = 28800;
 uint8_t channels = 2;  // The stream will have 2 channels
 SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound( sineWave);                      // Stream generated from sine wave

examples/sandbox/communication/communication-udp-receive/communication-udp-receive.ino

@@ -26,7 +26,6 @@ void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
-
   // connect to WIFI
   WiFi.begin(ssid, password);
   while (WiFi.status() != WL_CONNECTED) {

examples/sandbox/communication/communication-udp-send/communication-udp-send.ino

@@ -18,6 +18,7 @@ uint8_t channels = 2;  // The stream will have 2 channels
 SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound( sineWave);  // Stream generated from sine wave
 UDPStream udp; 
+Throttle throttle;
 IPAddress udpAddress(192, 168, 1, 255);
 const int udpPort = 7000;
 StreamCopy copier(udp, sound);  // copies sound into i2s
@@ -41,12 +42,18 @@ void setup() {
 
   // Define udp address and port
   udp.begin(udpAddress, udpPort);
+  auto cfg = throttle.defaultConfig();
+  cfg.channels = channels;
+  cfg.sample_rate = sample_rate;
+  throttle.begin(cfg);
 
   // Setup sine wave
   sineWave.begin(channels, sample_rate, N_B4);
   Serial.println("started...");
 }
 
 void loop() { 
-    copier.copy();
+    throttle.startDelay();
+    int bytes = copier.copy();
+    throttle.delayBytes(bytes);
 }

src/AudioAnalog/AnalogAudioESP32.h

@@ -264,6 +264,8 @@ class AnalogAudioStream  : public AudioStreamX {
             if (i2s_set_pin(port_no, nullptr) != ESP_OK) LOGE("i2s_set_pin");
             if (i2s_set_dac_mode( I2S_DAC_CHANNEL_BOTH_EN) != ESP_OK) LOGE("i2s_set_dac_mode");
             if (i2s_set_sample_rates(port_no, cfg.sample_rate)  != ESP_OK) LOGE("i2s_set_sample_rates");
+            //if (i2s_set_clk(port_no, cfg.sample_rate, cfg.bits_per_sample, I2S_CHANNEL_STEREO)) LOGE("i2s_set_clk");
+
             break;
 
           default:

src/AudioLibs/Communication.h

@@ -241,13 +241,13 @@ class Throttle {
   }
 
   // starts the timing
-  void start() { start_time = millis(); }
+  void startDelay() { start_time = millis(); }
 
   // delay
-  void throttle(size_t bytes) { throttleSamples(bytes / bytesPerSample); }
+  void delayBytes(size_t bytes) { throttleSamples(bytes / bytesPerSample); }
 
   // delay
-  void throttleSamples(size_t samples) {
+  void delaySamples(size_t samples) {
     int durationMsEff = millis() - start_time;
     int durationToBe = (samples * 1000) / info.sample_rate;
     int waitMs = durationToBe - durationMsEff + correction_ms;

src/AudioTools/AudioStreams.h

@@ -633,15 +633,17 @@ class VolumeStream : public AudioStreamX {
         /// Default Constructor
         VolumeStream() = default;
 
+        /// Destructor
         ~VolumeStream() {
-          cleanup();
+            cleanup();
         };
 
+        /// Constructor which assigns Print output
         VolumeStream(Print &out) {
             setTarget(out);
         }
 
-        /// Constructor which automatically calls begin(Print out)!
+        /// Constructor which assigns Stream input or output
         VolumeStream(Stream &in) {
             setTarget(in);
         }