Merge branch 'tests/audio'

Author: JohnVidler

model/MicroBit.cpp

@@ -331,7 +331,9 @@ void MicroBit::onListenerRegisteredEvent(Event evt)
         case DEVICE_ID_SYSTEM_LEVEL_DETECTOR:
             // A listener has been registered for the level detector.
             // The level detector uses lazy instantiation, we just need to read the data once to start it running.
-            audio.level->getValue();
+            //audio.level->getValue();
+            // The level detector requires that we enable constant listening, otherwise no events will be emitted.
+            audio.level->activateForEvents( true );
             break;
 
         case DEVICE_ID_MICROPHONE:

source/MicroBitAudio.cpp

@@ -60,10 +60,10 @@ MicroBitAudio::MicroBitAudio(NRF52Pin &pin, NRF52Pin &speaker, NRF52ADC &adc, NR
     synth.allowEmptyBuffers(true);
 
     mic = adc.getChannel(microphone, false);
-    adc.setSamplePeriod( 1e6 / 22000 );
-    mic->setGain(7,0);
+    adc.setSamplePeriod( 1e6 / 11000 );
+    mic->setGain(7, 0);
 
-    // Implementers note: The order that the pipeline comes up here is quite senitive. If we connect up to splitters after starting to
+    // Implementers note: The order that the pipeline comes up here is quite sensitive. If we connect up to splitters after starting to
     // listen for events from them, we'll see channel startup events (which are valid!) that we don't want. So roughly always follow
     // the following schema:
     //
@@ -74,14 +74,18 @@ MicroBitAudio::MicroBitAudio(NRF52Pin &pin, NRF52Pin &speaker, NRF52ADC &adc, NR
     // This prevents any cases where the pipeline stages cause a connect() message to be emitted, which then auto-activates the mic.
 
     //Initialialise the microphone filter
-    micFilter = new LowPassFilter(mic->output, 0.1f, true);
+    //micFilter = new LowPassFilter(mic->output, 0.35f, true);
 
     //Initilise input splitter
-    rawSplitter = new StreamSplitter(*micFilter);
+    //rawSplitter = new StreamSplitter(*micFilter);
+    rawSplitter = new StreamSplitter(mic->output);
 
     //Initilise stream normalizer
     processor = new StreamNormalizer(*rawSplitter->createChannel(), 0.08f, true, DATASTREAM_FORMAT_8BIT_SIGNED, 10);
 
+    //Initilise level detector SPL and attach to splitter
+    levelSPL = new LevelDetectorSPL(*rawSplitter->createChannel(), 85.0, 65.0, 16.0, 0, DEVICE_ID_MICROPHONE, false);
+
     // Connect to the rawSplitter. This must come AFTER the processor, to prevent the processor's channel activation starting the microphone
     if(EventModel::defaultEventBus)
         EventModel::defaultEventBus->listen(rawSplitter->id, DEVICE_EVT_ANY, this, &MicroBitAudio::onSplitterEvent, MESSAGE_BUS_LISTENER_IMMEDIATE);
@@ -92,26 +96,30 @@ MicroBitAudio::MicroBitAudio(NRF52Pin &pin, NRF52Pin &speaker, NRF52ADC &adc, NR
     //Initilise level detector and attach to splitter
     level = new LevelDetector(*splitter->createChannel(), 150, 75, DEVICE_ID_SYSTEM_LEVEL_DETECTOR, false);
 
-    //Initilise level detector SPL and attach to splitter
-    levelSPL = new LevelDetectorSPL(*rawSplitter->createChannel(), 85.0, 65.0, 16.0, 0, DEVICE_ID_MICROPHONE, false);
-
     // Connect to the splitter - this COULD come after we create it, before we add any stages, as these are dynamic and will only connect on-demand, but just in case
     // we're going to follow the schema set out above, to be 100% sure.
     if(EventModel::defaultEventBus)
         EventModel::defaultEventBus->listen(DEVICE_ID_SPLITTER, DEVICE_EVT_ANY, this, &MicroBitAudio::onSplitterEvent, MESSAGE_BUS_LISTENER_IMMEDIATE);
+    
+    //activateMic();
 }
 
 /**
  * Handle events from splitter
  */
 void MicroBitAudio::onSplitterEvent(MicroBitEvent e){
-    if( e.value == SPLITTER_CHANNEL_CONNECT )
+
+    DMESGF( "Event! (%d -> %d)", e.source, e.value );
+
+    if( e.value == SPLITTER_ACTIVATE || e.value == SPLITTER_CHANNEL_CONNECT )
         activateMic();
 
     // Note: The processor will always be present on the rawSplitter, hence the <= 1.
-    else if( e.value == SPLITTER_CHANNEL_DISCONNECT )
-        if( splitter->numberActiveChannels <= 0 && rawSplitter->numberActiveChannels <= 1 )
+    else if( e.value == SPLITTER_DEACTIVATE || e.value == SPLITTER_CHANNEL_DISCONNECT )
+    {
+        if( splitter->activeChannels < 1 )
             deactivateMic();
+    }
 }
 
 /**
@@ -138,14 +146,14 @@ void MicroBitAudio::deactivateMic(){
  */
 void MicroBitAudio::deactivateLevelSPL(){
     //levelSPL->disable();
+    levelSPL->activateForEvents( false );
 }
 
 /**
   * Set normaliser gain
   */
 void MicroBitAudio::setMicrophoneGain(int gain){
     processor->setGain(gain/100);
-
 }
 
 /**