UDP

Author: pschatzmann

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

@@ -0,0 +1,54 @@
+/**
+ * @file example-udp-receive.ino
+ * @author Phil Schatzmann
+ * @brief Receiving audio via udp
+ * @version 0.1
+ * @date 2022-03-09
+ * 
+ * @copyright Copyright (c) 2022
+ * 
+ * ATTENTION: DRAFT - not tested yet
+ */
+
+#include "AudioTools.h"
+#include "AudioLibs/Communication.h"
+
+uint16_t sample_rate = 44100;
+uint8_t channels = 2;  // The stream will have 2 channels
+I2SStream out; 
+UDPStream udp; 
+const int udpPort = 7000;
+StreamCopy copier(out, udp);     
+const char* ssid="SSID";
+const char* password="password";
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+
+  // connect to WIFI
+  WiFi.begin(ssid, password);
+  while (WiFi.status() != WL_CONNECTED) {
+      delay(500);
+      Serial.print(".");
+  }
+  Serial.println();
+
+
+  udp.begin(port);
+
+  // 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/sandbox/communication/communication-udp-send/communication-udp-send.ino

@@ -0,0 +1,52 @@
+/**
+ * @file example-udp-send.ino
+ * @author Phil Schatzmann
+ * @brief Sending audio over udp
+ * @version 0.1
+ * @date 2022-03-09
+ *
+ * @copyright Copyright (c) 2022
+ *
+ * ATTENTION: DRAFT - not tested yet
+ */
+
+#include "AudioTools.h"
+#include "AudioLibs/Communication.h"
+
+uint16_t sample_rate = 44100;
+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; 
+IPAddress udpAddress(192, 168, 1, 255);
+const int udpPort = 7000;
+StreamCopy copier(udp, sound);  // copies sound into i2s
+const char *ssid = "ssid";
+const char *password = "password";
+
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // connect to WIFI
+  WiFi.begin(ssid, password);
+  while (WiFi.status() != WL_CONNECTED) {
+      delay(500);
+      Serial.print(".");
+  }
+  Serial.println();
+  Serial.println(WiFi.localIP());
+
+
+  // Define udp address and port
+  udp.begin(udpAddress, udpPort);
+
+  // Setup sine wave
+  sineWave.begin(channels, sample_rate, N_B4);
+  Serial.println("started...");
+}
+
+void loop() { 
+    copier.copy();
+}

src/AudioLibs/Communication.h

@@ -32,11 +32,11 @@ class ESPNowStream : public AudioStreamX {
   }
 
   /// Adds an array of
-  template<size_t size>
-  bool addPeers(const char*(&array)[size]) {
+  template <size_t size>
+  bool addPeers(const char *(&array)[size]) {
     bool result = true;
-    for (int j=0;j<size;j++){
-      if(!addPeer(array[j])){
+    for (int j = 0; j < size; j++) {
+      if (!addPeer(array[j])) {
         result = false;
       }
     }
@@ -150,10 +150,11 @@ class ESPNowStream : public AudioStreamX {
     // we use the first confirming mac_addr for further confirmations and ignore
     // others
     if (first_mac[0] == 0) {
-      strcpy((char*)first_mac,(char*) mac_addr);
+      strcpy((char *)first_mac, (char *)mac_addr);
     }
     LOGI("%s:%d", mac_addr, status);
-    if (strcmp((char*)first_mac, (char*)mac_addr) == 0 && status == ESP_NOW_SEND_SUCCESS) {
+    if (strcmp((char *)first_mac, (char *)mac_addr) == 0 &&
+        status == ESP_NOW_SEND_SUCCESS) {
       ESPNowStreamSelf->available_to_write = ESP_NOW_MAX_DATA_LEN;
     }
   }
@@ -181,15 +182,40 @@ class UDPStream : public WiFiUDP {
     return size;
   }
 
+  /// Starts to send data to the indicated address / port
+  uint8_t begin(IPAddress a, uint16_t port) {
+    remote_address_ext = a;
+    remote_port_ext = port;
+    return WiFiUDP::begin(port);
+  }
+
+  /// We use the same remote port as defined in begin for write
+  uint16_t remotePort() {
+    uint16_t result = WiFiUDP::remotePort();
+    return result != 0 ? result : remote_port_ext;
+  }
+
+  /// We use the same remote ip as defined in begin for write
+  IPAddress remoteIP() {
+    // IPAddress result = WiFiUDP::remoteIP();
+    // LOGI("ip: %u", result);
+    return remote_address_ext;
+  }
+
   /**
    *  Replys will be sent to the initial remote caller
    */
   size_t write(const uint8_t *buffer, size_t size) override {
+    LOGD(LOG_METHOD);
     beginPacket(remoteIP(), remotePort());
     size_t result = WiFiUDP::write(buffer, size);
     endPacket();
     return result;
   }
+
+ protected:
+  uint16_t remote_port_ext;
+  IPAddress remote_address_ext;
 };
 
 }  // namespace audio_tools