USB non working DRAFT

Author: pschatzmann

examples/examples-communication/usb/adafruit/adafruit.ino

@@ -0,0 +1,69 @@
+#include "AudioTools.h"
+#include "AudioTools/Sandbox/USB/USBDeviceAudioAdafruit.h"
+
+size_t sample_count_mic = 0;
+size_t sample_count_spk = 0;
+
+// Microphone: generate data for USB
+size_t readCB(uint8_t* data, size_t len, USBDeviceAudio& ref) {
+  int16_t* data16 = (int16_t*)data;
+  size_t samples = len / sizeof(int16_t);
+  size_t result = 0;
+  // generate random stereo data
+  for (int j = 0; j < samples; j+=2) {
+    data16[j] = random(-32000, 32000);
+    data16[j+1] = random(-32000, 32000);;
+    result += sizeof(int16_t)*2;
+    sample_count_mic += 2;
+  }
+  return result;
+}
+
+// Speaker: receive data from USB and write them to the final destination
+size_t writeCB(const uint8_t* data, size_t len, USBDeviceAudio & ref) {
+  int16_t* data16 = (int16_t*)data;
+  size_t samples = len / sizeof(int16_t);
+  sample_count_spk += samples;
+  return len;
+}
+
+auto config() {
+  USBAudioConfig result;
+  result.p_read_callback = readCB;
+  result.p_write_callback = writeCB;
+  return result;
+}
+
+USBDeviceAudioAdafruit usb{config()};
+
+void setup() {
+    // Manual begin() is required on core without built-in support e.g. mbed rp2040
+  if (!TinyUSBDevice.isInitialized()) {
+    TinyUSBDevice.begin(0);
+  }
+
+  Serial.begin(115200);
+
+  // If already enumerated, additional class driver begin() e.g msc, hid, midi won't take effect until re-enumeration
+  if (TinyUSBDevice.mounted()) {
+    TinyUSBDevice.detach();
+    delay(10);
+    TinyUSBDevice.attach();
+  }
+}
+
+void loop() {
+  #ifdef TINYUSB_NEED_POLLING_TASK
+  // Manual call tud_task since it isn't called by Core's background
+  TinyUSBDevice.task();
+  #endif
+  // use LED do display status
+  if (usb.updateLED(LED_BUILTIN)){
+    Serial.print("Total Microphone samples: ");
+    Serial.print(sample_count_mic);
+    Serial.print(" / Speaker samples: ");
+    Serial.print(sample_count_spk);
+    Serial.print(" / Sample rate: ");
+    Serial.println(usb.rate());
+  }
+}

src/AudioTools/CoreAudio/AudioI2S/I2SESP32V1.h

@@ -151,6 +151,11 @@ class I2SDriverESP32V1 {
                                   i2s_chan_handle_t &rx_chan) {
       return false;
     }
+
+    protected:
+    /// 24 bits are stored in a 32 bit integer
+    int get_bits_eff(int bits) { return ( bits == 24 )? 32 : bits; }
+
   };
 
   struct DriverI2S : public DriverCommon {
@@ -251,7 +256,7 @@ class I2SDriverESP32V1 {
           cfg.is_master ? I2S_ROLE_MASTER : I2S_ROLE_SLAVE);
       // use the legicy size parameters for frame num
       int size = cfg.buffer_size * cfg.buffer_count;
-      int frame_size = cfg.bits_per_sample * cfg.channels / 8;
+      int frame_size = get_bits_eff(cfg.bits_per_sample) * cfg.channels / 8;
       if (size > 0) result.dma_frame_num = size / frame_size;
       LOGI("dma_frame_num: %d", (int)result.dma_frame_num);
       result.auto_clear = cfg.auto_clear;