esp-now codec example

Author: pschatzmann

examples/sandbox/esp-now-codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino renamed to examples/examples-communication/esp-now/codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino

@@ -12,12 +12,12 @@
 #include "AudioLibs/Communication.h"
 #include "AudioCodecs/CodecSBC.h"
 
-uint16_t sample_rate = 32000;
-uint8_t channels = 2;  // The stream will have 2 channels
+AudioInfo info(32000,1,16);
 SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
 ESPNowStream now;
-EncodedAudioStream encoder(&now, new SBCEncoder()); // encode and write to ESP-now
+SBCEncoder sbc;
+EncodedAudioStream encoder(now, sbc); // encode and write to ESP-now
 StreamCopy copier(encoder, sound);  // copies sound into i2s
 const char *peers[] = {"A8:48:FA:0B:93:01"};
 
@@ -31,14 +31,10 @@ void setup() {
   now.addPeers(peers);
 
   // Setup sine wave
-  auto cfgs = sineWave.defaultConfig();
-  cfgs.sample_rate = sample_rate;
-  cfgs.channels = channels;
-  cfgs.bits_per_sample = 16;
-  sineWave.begin(cfgs, N_B4);
+  sineWave.begin(info, N_B4);
 
   // start encoder
-  encoder.begin(cfgs);
+  encoder.begin(info);
 
   Serial.println("Sender started...");
 }

examples/sandbox/esp-now-codec/communication-codec-espnow-receive_measure/communication-codec-espnow-receive_measure.ino renamed to examples/examples-communication/esp-now/codec/communication-codec-espnow-receive_measure/communication-codec-espnow-receive_measure.ino

@@ -57,13 +57,11 @@ struct ESPNowStreamConfig {
   int write_retry_count = -1; // -1 endless
   void (*recveive_cb)(const uint8_t *mac_addr, const uint8_t *data,
                       int data_len) = nullptr;
-  // to encrypt set primary_master_key and local_master_key to 16 byte strings
+  /// to encrypt set primary_master_key and local_master_key to 16 byte strings
   const char *primary_master_key = nullptr;
   const char *local_master_key = nullptr;
-
-#ifdef FAST_ESP_NOW_HACK
+  /// esp-now bit rate
   wifi_phy_rate_t rate = WIFI_PHY_RATE_2M_S;
-#endif
 };
 
 /**
@@ -86,7 +84,10 @@ class ESPNowStream : public AudioStream {
   }
 
   /// Returns the mac address of the current ESP32
-  const char *macAddress() { return WiFi.macAddress().c_str(); }
+  const char *macAddress() { 
+    static const char* result = WiFi.macAddress().c_str(); 
+    return result; 
+  }
 
   /// Defines an alternative send callback
   void setSendCallback(esp_now_send_cb_t cb) { send = cb; }
@@ -128,13 +129,11 @@ class ESPNowStream : public AudioStream {
       }
     }
 
-#ifdef FAST_ESP_NOW_HACK
     LOGI("Setting ESP-NEW rate");
     if (esp_wifi_config_espnow_rate(getInterface(), cfg.rate) !=
         ESP_OK) {
       LOGW("Could not set rate");
     }
-#endif
 
     Serial.println();
     Serial.print("mac: ");