AudioKit 2957

Author: pschatzmann

examples/examples-communication/example-bt-receive/example-bt-receive.ino

@@ -0,0 +1,42 @@
+/**
+ * @file example-serial-receive.ino
+ * @author Phil Schatzmann
+ * @brief Receiving audio via serial bluetooth
+ * @version 0.1
+ * @date 2022-03-09
+ * 
+ * @copyright Copyright (c) 2022
+ * 
+ */
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+BluetoothSerial SerialBT;
+StreamCopy copier(out, SerialBT);     
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  SerialBT.begin("ESP32Receiver"); //Bluetooth device name
+  while(!SerialBT.connected()){
+    //SerialBT.connect("ESP32Receiver");
+    Serial.print(".");
+    delay(1000);
+  }
+  Serial.println();
+
+  // start I2S
+  Serial.println("starting I2S...");
+  auto config = out.defaultConfig(TX_MODE);
+  config.sample_rate = sample_rate; 
+  config.channels = channels;
+  config.bits_per_sample = 16;
+  out.begin(config);
+
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

examples/examples-communication/example-bt-send/example-bt-send.ino

@@ -0,0 +1,40 @@
+/**
+ * @file example-serial-send.ino
+ * @author Phil Schatzmann
+ * @brief Sending audio over serial bluetooth
+ * @version 0.1
+ * @date 2022-03-09
+ *
+ * @copyright Copyright (c) 2022
+ *
+ */
+
+#include "BluetoothSerial.h"
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+SineWaveGenerator<sound_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<sound_t> sound( sineWave);                      // Stream generated from sine wave
+BluetoothSerial SerialBT;
+StreamCopy copier(SerialBT, sound);  // copies sound into i2s
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  SerialBT.begin("ESP32Sender"); //Bluetooth device name
+  while(!SerialBT.connected()){
+    SerialBT.connect("ESP32Receiver");
+    Serial.print(".");
+    delay(1000);
+  }
+  Serial.println();
+
+  // Setup sine wave
+  sineWave.begin(channels, sample_rate, N_B4);
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

examples/examples-communication/example-espnow-send/example-serial-send.ino

@@ -0,0 +1,35 @@
+/**
+ * @file example-serial-send.ino
+ * @author Phil Schatzmann
+ * @brief Sending audio over ESPNow
+ * @version 0.1
+ * @date 2022-03-09
+ *
+ * @copyright Copyright (c) 2022
+ *
+ */
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+SineWaveGenerator<sound_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<sound_t> sound( sineWave); // Stream generated from sine wave
+ESPNowStream now;
+StreamCopy copier(now, sound);  // copies sound into i2s
+const char *ssd = "ssid";
+const char *password = "password";
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  now.add
+  now.begin(ssid, pasword);
+
+  // Setup sine wave
+  sineWave.begin(channels, sample_rate, N_B4);
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

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

@@ -0,0 +1,41 @@
+/**
+ * @file example-serial-receive.ino
+ * @author Phil Schatzmann
+ * @brief Receiving audio via serial
+ * @version 0.1
+ * @date 2022-03-09
+ * 
+ * @copyright Copyright (c) 2022
+ * 
+ */
+
+#define RXD2 16
+#define TXD2 17
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+I2SStream out; 
+StreamCopy copier(out, Serial2);     
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // Note the format for setting a serial port is as follows:
+  // Serial2.begin(baud-rate, protocol, RX pin, TX pin);
+  Serial2.begin(115200, SERIAL_8N1, RXD2, TXD2);
+
+  // start I2S
+  Serial.println("starting I2S...");
+  auto config = out.defaultConfig(TX_MODE);
+  config.sample_rate = sample_rate; 
+  config.channels = channels;
+  config.bits_per_sample = 16;
+  out.begin(config);
+
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

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

@@ -0,0 +1,36 @@
+/**
+ * @file example-serial-send.ino
+ * @author Phil Schatzmann
+ * @brief Sending audio over serial
+ * @version 0.1
+ * @date 2022-03-09
+ *
+ * @copyright Copyright (c) 2022
+ *
+ */
+
+#define RXD2 16
+#define TXD2 17
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+SineWaveGenerator<sound_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<sound_t> sound( sineWave);                      // Stream generated from sine wave
+StreamCopy copier(Serial2, sound);  // copies sound into i2s
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // Note the format for setting a serial port is as follows:
+  // Serial2.begin(baud-rate, protocol, RX pin, TX pin);
+  Serial2.begin(115200, SERIAL_8N1, RXD2, TXD2);
+
+  // Setup sine wave
+  sineWave.begin(channels, sample_rate, N_B4);
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

src/AudioLibs/AudioKit.h

@@ -543,14 +543,6 @@ class AudioKitStream : public AudioStreamX {
       SPI.end();
     }
 
-    // pin conflicts with AIThinker A101 and headphone detection
-    if (! (cfg.sd_active && AUDIOKIT_BOARD==6)) {  
-      LOGD("actionHeadphoneDetection pin:%d",kit.pinHeadphoneDetect())
-      actions.add(kit.pinHeadphoneDetect(), actionHeadphoneDetection, AudioActions::ActiveChange);
-    } else {
-      LOGW("Headphone detection ignored because of conflict: %d ",kit.pinHeadphoneDetect());
-    }
-
     // pin conflicts with the SD CS pin for AIThinker and buttons
     if (! (cfg.sd_active && (AUDIOKIT_BOARD==5 || AUDIOKIT_BOARD==6))){
       LOGD("actionStartStop")
@@ -559,8 +551,16 @@ class AudioKitStream : public AudioStreamX {
       LOGW("Mode Button ignored because of conflict: %d ",kit.pinInputMode());
     }
 
-    // pin conflicts with SD Lyrat SD CS Pin and buttons
-    if (! (cfg.sd_active && AUDIOKIT_BOARD==1)){
+    // pin conflicts with AIThinker A101 and headphone detection
+    if (! (cfg.sd_active && AUDIOKIT_BOARD==6)) {  
+      LOGD("actionHeadphoneDetection pin:%d",kit.pinHeadphoneDetect())
+      actions.add(kit.pinHeadphoneDetect(), actionHeadphoneDetection, AudioActions::ActiveChange);
+    } else {
+      LOGW("Headphone detection ignored because of conflict: %d ",kit.pinHeadphoneDetect());
+    }
+
+    // pin conflicts with SD Lyrat SD CS Pin and buttons / Conflict on Audiokit V. 2957
+    if (! (cfg.sd_active && AUDIOKIT_BOARD==1 || AUDIOKIT_BOARD==7)){
       LOGD("actionVolumeDown")
       addAction(kit.pinVolumeDown(), actionVolumeDown); 
       LOGD("actionVolumeUp")