CODAL v0.3.0: Updates for the audio pipeline refactor. (#101)

* Updates for the audio pipeline refactor (WIP).

* SerialStreamer has been moved to codal-core.

And the version in codal-core includes a bug fix required in the
audio-refactor branch.

* Update tests to reflect new audio API

* Change back codal-microbit-v2 branch to main, v0.3.0 released with audio refactor.

---------

Co-authored-by: Joe Finney <[email protected]>

Author: microbit-carlos

source/samples/MicrophoneTest.cpp

@@ -76,7 +76,7 @@ mems_mic_test()
 void
 mems_mic_zero_offset_test()
 {
-    LevelDetectorSPL* levelSPL = new LevelDetectorSPL(uBit.audio.processor->output, 85.0, 65.0, 16.0, 0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR, false);
+    LevelDetectorSPL* levelSPL = new LevelDetectorSPL(uBit.audio.processor->output, 85.0, 65.0, 16.0, 0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR);
     uBit.audio.activateMic();
 
     char float_str[20];

source/samples/OOB_v3.cpp

@@ -212,7 +212,8 @@ static void onButtonLogo(MicroBitEvent) {
 
     int sampleRate = 11000;
     static SplitterChannel *splitterChannel = uBit.audio.splitter->createChannel();
-    splitterChannel->requestSampleRate( sampleRate );
+    // FIXME: Update this to use the new requestSampleRate
+    // splitterChannel->requestSampleRate( sampleRate );
 
     // Uncomment these two lines and comment out the *recording declaration after them to insert a low-pass-filter.
     // static LowPassFilter *lowPassFilter = new LowPassFilter(*splitterChannel, 0.812313f, false);

source/samples/SerialStreamer.cpp

@@ -21,126 +21,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
-
+#include "MicroBit.h"
 #include "SerialStreamer.h"
 #include "Tests.h"
 
-/**
- * Creates a simple component that logs a stream of signed 16 bit data as signed 8-bit data over serial.
- * @param source a DataSource to measure the level of.
- * @param mode the format of the serialised data. Valid options are SERIAL_STREAM_MODE_BINARY (default), SERIAL_STREAM_MODE_DECIMAL, SERIAL_STREAM_MODE_HEX.
- */
-SerialStreamer::SerialStreamer(DataSource &source, int mode) : upstream(source)
-{
-    this->mode = mode;
-
-    // Register with our upstream component
-    source.connect(*this);
-}
-
-/**
- * Callback provided when data is ready.
- */
-int SerialStreamer::pullRequest()
-{
-    static volatile int pr = 0;
-     
-    if(!pr)
-    {
-        pr++;
-        while(pr)
-        {
-            lastBuffer = upstream.pull();
-            streamBuffer(lastBuffer);
-            pr--;
-        }
-    }
-    else
-    {
-        pr++;
-    }
-    
-    return DEVICE_OK;
-}
-
-/**
-    * returns the last buffer processed by this component
-    */
-ManagedBuffer SerialStreamer::getLastBuffer()
-{
-    return lastBuffer;
-}
-
-/**
- * Callback provided when data is ready.
- */
-void SerialStreamer::streamBuffer(ManagedBuffer buffer)
-{
-    int CRLF = 0;
-    int bps = upstream.getFormat();
-
-    // If a BINARY mode is requested, simply output all the bytes to the serial port.
-    if( mode == SERIAL_STREAM_MODE_BINARY )
-    {
-        uint8_t *p = &buffer[0];
-        uint8_t *end = p + buffer.length();
-
-        while(p < end)
-            uBit.serial.putc(*p++);
-    }
-
-    // if a HEX mode is requested, format using printf, framed by sample size..
-    if( mode == SERIAL_STREAM_MODE_HEX || mode == SERIAL_STREAM_MODE_DECIMAL )
-    {
-        uint8_t *d = &buffer[0];
-        uint8_t *end = d+buffer.length();
-        uint32_t data;
-
-        while(d < end)
-        {
-            data = *d++;
-
-            if (bps > DATASTREAM_FORMAT_8BIT_SIGNED)
-                data |= (*d++) << 8;
-            if (bps > DATASTREAM_FORMAT_16BIT_SIGNED)
-                data |= (*d++) << 16;
-            if (bps > DATASTREAM_FORMAT_24BIT_SIGNED)
-                data |= (*d++) << 24;
-
-            if (mode == SERIAL_STREAM_MODE_HEX) {
-                uBit.serial.printf("%x ", data);
-            } else {
-                // SERIAL_STREAM_MODE_DECIMAL
-                if (bps == DATASTREAM_FORMAT_8BIT_SIGNED) {
-                    uBit.serial.printf("%d ", (int8_t)(data & 0xFF));
-                } else if (bps == DATASTREAM_FORMAT_16BIT_SIGNED) {
-                    uBit.serial.printf("%d ", (int16_t)(data & 0xFFFF));
-                } else if (bps == DATASTREAM_FORMAT_24BIT_SIGNED) {
-                    // Move the sign bit to the most significant bit
-                    int32_t signed_data = data & 0x7FFFFF;
-                    if (data & (1 << 23)) {
-                        signed_data |= 1 << 31;
-                    }
-                    uBit.serial.printf("%d ", signed_data);
-                } else {
-                    // Cannot print uint32_t correctly as serial.printf
-                    // does not support "%u"
-                    uBit.serial.printf("%d ", data);
-                }
-            }
-
-            CRLF++;
-
-            if (CRLF >= 16){
-                uBit.serial.putc('\r');
-                uBit.serial.putc('\n');
-                CRLF = 0;
-            }
-        }
+void streamer_serial_test() {
+    static SplitterChannel *splitterChannel = uBit.audio.splitter->createChannel();
+    SerialStreamer *streamer = new SerialStreamer(*splitterChannel, SERIAL_STREAM_MODE_DECIMAL);
 
-        if (CRLF > 0) {
-            uBit.serial.putc( '\r' );
-            uBit.serial.putc( '\n' );
-        }
+    while (true) {
+        uBit.sleep(1000);
     }
 }

source/samples/SerialStreamer.h

@@ -58,16 +58,18 @@ void stream_test_record() {
     static StreamRecording * recording = new StreamRecording( *input );
     static MixerChannel * output = uBit.audio.mixer.addChannel( *recording );
 
-    input->requestSampleRate( 11000 );
+    uBit.audio.mic->setSampleRate( 11000 );
     output->setSampleRate( 11000 );
-    output->setVolume( CONFIG_MIXER_INTERNAL_RANGE * 0.8 ); // 80% volume
+
+    output->setVolume( CONFIG_MIXER_INTERNAL_RANGE * 0.2 ); // 20% volume
 
     uBit.display.printChar( '3', 1000 );
     uBit.display.printChar( '2', 1000 );
     uBit.display.printChar( '1', 1000 );
 
     uBit.display.printChar( 'R' );
-    input->requestSampleRate( 11000 );
+    uBit.audio.mic->setSampleRate( 11000 );
+
     recording->recordAsync();
     while( recording->isRecording() ) {
         uBit.display.printChar( '~' );
@@ -99,13 +101,13 @@ static const int STRSR_SAMPLE_RATE = 11000;
 
 static void strsr_handle_buttonA(MicroBitEvent) {
     static SplitterChannel *splitterChannel = uBit.audio.splitter->createChannel();
-    splitterChannel->requestSampleRate(STRSR_SAMPLE_RATE);
+    uBit.audio.mic->setSampleRate( STRSR_SAMPLE_RATE );
     static StreamRecording *recording = new StreamRecording(*splitterChannel);
     static MixerChannel *channel = uBit.audio.mixer.addChannel(*recording, STRSR_SAMPLE_RATE);
 
     DMESG( "Actual sample rate: %d (requested %d)", (int)splitterChannel->getSampleRate(), STRSR_SAMPLE_RATE );
 
-    MicroBitAudio::requestActivation();
+    uBit.audio.requestActivation();
     channel->setVolume(75.0);
     uBit.audio.mixer.setVolume(512);
     uBit.audio.mixer.setSilenceLevel( 0 );
@@ -114,20 +116,20 @@ static void strsr_handle_buttonA(MicroBitEvent) {
     uBit.display.clear();
     uBit.audio.levelSPL->setUnit(LEVEL_DETECTOR_SPL_8BIT);
 
-    splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
+    uBit.audio.mic->setSampleRate( STRSR_SAMPLE_RATE );
 
     DMESG( "RECORDING" );
     recording->recordAsync();
     bool showR = true;
     while (uBit.buttonA.isPressed()) {
         if( uBit.logo.isPressed() ) {
-            splitterChannel->requestSampleRate( abs((uBit.accelerometer.getRoll()-90) * 100) );
+            uBit.audio.mic->setSampleRate( abs((uBit.accelerometer.getRoll()-90) * 100) );
             DMESG( "Sample Rate: %d (mic = %d)", (int)splitterChannel->getSampleRate(), (int)uBit.audio.mic->getSampleRate() );
         } else {
             if( uBit.buttonB.isPressed() )
-                splitterChannel->requestSampleRate( 5000 );
+                uBit.audio.mic->setSampleRate(5000);
             else
-                splitterChannel->requestSampleRate( STRSR_SAMPLE_RATE );
+                uBit.audio.mic->setSampleRate(STRSR_SAMPLE_RATE);
         }
 
         if (showR)

source/samples/StreamAPITest.cpp

@@ -105,5 +105,6 @@ void stream_test_getValue_interval();
 void stream_test_record();
 void stream_test_recording_sample_rates();
 void stream_test_all();
+void streamer_serial_test();
 
 #endif