DRAFT AnalogAudioArduino

Author: pschatzmann

examples/examples-stream/streams-memory_mp3-pwm/README.md

@@ -26,4 +26,4 @@ The pins depend on the Processor:
 | Right      |  GPI3        | GPIO3         | GPI3         |
 | GND        |  GND         | GND           | GND          |
 
-To verify check the PWM_START_PIN in AudioConfig.h or you can set the pins by calling setPins() method on the PWMConfig object.
+To verify check the PIN_PWM_START in AudioConfig.h or you can set the pins by calling setPins() method on the PWMConfig object.

examples/tests/test-timercb_rx/test-timercb_rx.ino

@@ -2,8 +2,6 @@
 #include "AudioTools.h"
 
 
-
-
 TimerCallbackAudioStream timerStream;
 
 uint16_t IRAM_ATTR callback(uint8_t *data, uint16_t len){

src/AudioAnalog/AnalogAudio.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "AudioAnalog/AnalogAudioESP32.h"
+#include "AudioAnalog/AnalogAudioArduino.h"
 
 
 

src/AudioAnalog/AnalogAudioArduino.h

@@ -0,0 +1,120 @@
+#pragma once
+
+#include "AudioConfig.h"
+#ifdef USE_ADC_ARDUINO
+#include "AudioTimer/AudioTimer.h"
+#include "AudioTools/AudioStreams.h"
+#include "AudioTools/AudioTypes.h"
+#include "AudioTools/Buffers.h"
+
+namespace audio_tools {
+
+
+/**
+ * @brief Configuration for Analog Reader
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+class AnalogConfig : public AudioBaseInfo {
+ public:
+  AnalogConfig() {
+    channels = 1;
+    sample_rate = 10000;
+    bits_per_sample = 16;
+  }
+  int start_pin = PIN_ADC_START;
+  uint16_t buffer_size = ADC_BUFFER_SIZE;
+  uint8_t buffers = ADC_BUFFERS;
+};
+
+/**
+ * @brief Reading Analog Data using a timer and the Arduino analogRead() method
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ *
+ */
+class AnalogAudioStream : public AudioStreamX {
+ public:
+  AnalogAudioStream() = default;
+
+  AnalogConfig defaultConfig() {
+    AnalogConfig cfg;
+    return cfg;
+  }
+
+  void setAudioInfo(AudioBaseInfo info) { LOGW("setAudioInfo() not supported") }
+
+  bool begin(AnalogConfig cfg) {
+    LOGD("%s", __func__);
+    config = cfg;
+    if (buffer == nullptr) {
+      // allocate buffers
+      buffer = new NBuffer<int16_t>(cfg.buffer_size, cfg.buffers);
+      if (buffer==nullptr){
+        LOGE("Not enough memory for buffer");
+        return false;
+      } else {
+        LOGI("buffer: %d", (int) buffer);
+        LOGI("self: %d", (int) this);
+      }
+      // setup pins
+      setupPins();
+    } else {
+      timer.end();
+    }
+
+    // (re)start timer
+    uint32_t time = AudioUtils::toTimeUs(config.sample_rate);
+    LOGI("sample_rate: %d", cfg.sample_rate);
+    LOGI("time us: %u", time);
+    timer.setCallbackParameter(this);
+    return timer.begin(callback, time, TimeUnit::US);
+  }
+
+  virtual int available() { return buffer==nullptr ? 0 : buffer->available(); };
+
+  /// Provides the sampled audio data
+  size_t readBytes(uint8_t *values, size_t len) {
+    if (buffer==nullptr) return 0;
+    int samples = len / 2;
+    return buffer->readArray((int16_t *)values, samples);
+  }
+
+ protected:
+  AnalogConfig config;
+  TimerAlarmRepeating timer;
+  BaseBuffer<int16_t> *buffer = nullptr;
+
+  /// Sample data and write to buffer
+  static void callback(void *arg) {
+    int16_t value = 0;
+    AnalogAudioStream *self = (AnalogAudioStream *)arg;
+    if (self->buffer != nullptr) {
+      int channels = self->config.channels;
+      for (int j = 0; j < channels; j++) {
+        //Serial.print("+"); 
+        // provides value in range 0…4095
+        value = analogRead(self->config.start_pin + j);
+        //Serial.print("-");
+        value = (value-2048)*15;
+        self->buffer->write(value);
+      }
+    } 
+  }
+
+  /// pinmode input for defined analog pins
+  void setupPins() {
+    LOGD("%s", __func__);
+    LOGI("start_pin: %d", config.start_pin);
+    // setup pins for read
+    for (int j = 0; j < config.channels; j++) {
+      int pin = config.start_pin + j;
+      pinMode(pin, INPUT);
+      LOGD("pinMode(%d, INPUT)",pin);
+    }
+  }
+};
+
+}  // namespace audio_tools
+
+#endif

src/AudioConfig.h

@@ -148,7 +148,7 @@
 #define USE_URLSTREAM_TASK
 
 #define PWM_FREQENCY 30000
-#define PWM_START_PIN 12
+#define PIN_PWM_START 12
 #define PIN_I2S_BCK 14
 #define PIN_I2S_WS 15
 #define PIN_I2S_DATA_IN 32
@@ -196,7 +196,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_AUDIO_SERVER
 //#define USE_ESP8266_AUDIO
 
-#define PWM_START_PIN 12
+#define PIN_PWM_START 12
 #define PIN_I2S_BCK -1
 #define PIN_I2S_WS -1
 #define PIN_I2S_DATA_IN -1
@@ -212,7 +212,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_I2S
 #define USE_PWM
 
-#define PWM_START_PIN 6
+#define PIN_PWM_START 6
 #define PIN_I2S_BCK 2
 #define PIN_I2S_WS 1
 #define PIN_I2S_DATA_IN 3
@@ -226,8 +226,10 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #if defined(ARDUINO_ARCH_MBED_RP2040)
 //#define USE_I2S 1
 #define USE_PWM
+#define USE_ADC_ARDUINO
 
-#define PWM_START_PIN 6
+#define PIN_ADC_START 26
+#define PIN_PWM_START 6
 #define PIN_I2S_BCK 26
 #define PIN_I2S_WS PIN_I2S_BCK+1
 #define PIN_I2S_DATA_IN 28
@@ -239,14 +241,24 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 // fix missing __sync_synchronize symbol
 #define FIX_SYNC_SYNCHRONIZE
 #define IRAM_ATTR
+#ifndef ADC_BUFFER_SIZE 
+#define ADC_BUFFER_SIZE 1024
+#endif
+
+#ifndef ADC_BUFFERS 
+#define ADC_BUFFERS 50
+#endif
+
 //#define USE_ESP8266_AUDIO
 
 //----------------
 #elif defined(ARDUINO_ARCH_RP2040)
 #define USE_I2S 1
 #define USE_PWM
+#define USE_ADC_ARDUINO
 
-#define PWM_START_PIN 6
+#define PIN_ADC_START 26
+#define PIN_PWM_START 6
 #define PIN_I2S_BCK 26
 #define PIN_I2S_WS PIN_I2S_BCK+1
 #define PIN_I2S_DATA_IN 28
@@ -258,6 +270,15 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 // fix missing __sync_synchronize symbol
 #define FIX_SYNC_SYNCHRONIZE
 #define IRAM_ATTR
+
+#ifndef ADC_BUFFER_SIZE 
+#define ADC_BUFFER_SIZE 256
+#endif
+
+#ifndef ADC_BUFFERS 
+#define ADC_BUFFERS 100
+#endif
+
 //#define USE_ESP8266_AUDIO
 
 #endif
@@ -266,7 +287,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #ifdef __AVR__
 #define USE_PWM
 
-#define PWM_START_PIN 6
+#define PIN_PWM_START 6
 #define PIN_CS CS
 #endif
 
@@ -279,7 +300,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_I2S
 #define USE_PWM
 
-#define PWM_START_PIN 6
+#define PIN_PWM_START 6
 #define PIN_I2S_BCK 1
 #define PIN_I2S_WS PIN_I2S_BCK+1
 #define PIN_I2S_DATA_IN 3

src/AudioExperiments/AudioDAC.h

@@ -30,7 +30,7 @@ class DACInfo : public AudioBaseInfo {
         int oversample_factor = 1;
 
         /// Defines the pins: channel 0 is start_pin, channel 1 is start_pin+1 etc.
-        int start_pin = PWM_START_PIN;
+        int start_pin = PIN_PWM_START;
 
         /// Max number of bits used to output signal 
         int output_bits = 64;

src/AudioPWM/PWMAudioBase.h

@@ -46,7 +46,7 @@ struct PWMConfig : public AudioBaseInfo {
     uint8_t timer_id = 0;       // Only used by ESP32 must be between 0 and 3
 
 #ifndef __AVR__
-    uint16_t start_pin = PWM_START_PIN; 
+    uint16_t start_pin = PIN_PWM_START; 
 
     // define all pins by passing an array and updates the channels by the number of pins
     template<size_t N> 
@@ -59,7 +59,7 @@ struct PWMConfig : public AudioBaseInfo {
         }
         pins = array;
         start_pin = -1; // mark start pin as invalid
-        LOGI("start_pin: %d", PWM_START_PIN);
+        LOGI("start_pin: %d", PIN_PWM_START);
     }
 
 #endif

src/AudioPWM/PWMAudioMBED.h

@@ -29,7 +29,7 @@ class PWMAudioStreamMBED : public PWMAudioStreamBase {
 
         // Ends the output
         virtual void end(){
-             LOGD(LOG_METHOD);
+            LOGD(LOG_METHOD);
             ticker.detach(); // it does not hurt to call this even if it has not been started
             is_timer_started = false;
 

src/AudioTimer/AudioTimerDef.h

@@ -13,6 +13,7 @@ enum TimerFunction {DirectTimerCallback, TimerCallbackInThread, SimpleThreadLoop
  */
 class TimerAlarmRepeatingDef {
     public:
+        TimerAlarmRepeatingDef() = default;
         virtual  ~TimerAlarmRepeatingDef() = default;
         virtual bool begin(repeating_timer_callback_t callback_f, uint32_t time, TimeUnit unit = MS) = 0;
         virtual bool end() = 0;
@@ -26,7 +27,7 @@ class TimerAlarmRepeatingDef {
         }
 
     protected:
-        void* object;
+        void* object=nullptr;
 
 };
 
@@ -39,6 +40,9 @@ class AudioUtils {
         /// converts sampling rate to delay in microseconds (μs)
         static uint32_t toTimeUs(uint32_t samplingRate, uint8_t limit=10){
             uint32_t result = 1000000l / samplingRate;
+            if (1000000l % samplingRate!=0){
+                result++;
+            }
             if (result <= limit){
                 LOGW("Time for samplingRate %u -> %lu is < %u μs - we rounded up", (unsigned int)samplingRate, result, limit);
                 result = limit;
@@ -48,6 +52,9 @@ class AudioUtils {
 
         static uint32_t toTimeMs(uint32_t samplingRate, uint8_t limit=1){
             uint32_t result = 1000l / samplingRate;
+            if (1000000l % samplingRate!=0){
+                result++;
+            }
             if (result <= limit){
                 LOGW("Time for samplingRate %u -> %lu is < %u μs - we rounded up", (unsigned int)samplingRate, result, limit);
                 result = limit;

src/AudioTimer/AudioTimerMBED.h

@@ -19,16 +19,15 @@ TimerAlarmRepeatingMBED *timerAlarmRepeating = nullptr;
  */
 class TimerAlarmRepeatingMBED : public TimerAlarmRepeatingDef {
     public:
-    
-        TimerAlarmRepeatingMBED(TimerFunction function=DirectTimerCallback, int id=0){
+
+        TimerAlarmRepeatingMBED(TimerFunction function=DirectTimerCallback, int id=0) :  TimerAlarmRepeatingDef(){
             timerAlarmRepeating = this;
         }
 
         ~TimerAlarmRepeatingMBED(){
             end();
         }
 
-
         /**
          * Starts the alarm timer
          */
@@ -38,10 +37,10 @@ class TimerAlarmRepeatingMBED : public TimerAlarmRepeatingDef {
             // we determine the time in microseconds
             switch(unit){
                 case MS:
-                    ticker.attach(tickerCallback, time * 1000);
+                    ticker.attach_us(tickerCallback, (us_timestamp_t) time * 1000);
                     break;
                 case US:
-                    ticker.attach(tickerCallback, time);
+                    ticker.attach_us(tickerCallback,(us_timestamp_t) time);
                     break;
             }
             return true;
@@ -57,8 +56,8 @@ class TimerAlarmRepeatingMBED : public TimerAlarmRepeatingDef {
         mbed::Ticker ticker;
         repeating_timer_callback_t callback;
 
-        static void tickerCallback(){
-            timerAlarmRepeating->callback(timerAlarmRepeating);
+        inline static void tickerCallback(){
+            timerAlarmRepeating->callback(timerAlarmRepeating->object);
         }
 
 };