Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Audio refactor #457

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Audio refactor #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea1d2e1
Remove legacy code relater to runtime reconfiguration of audio pipeline
finneyj Nov 1, 2024
8345d46
Chnages ito support audio-refactor.
finneyj Nov 26, 2024
cdb033a
Bugfix minor errors in pipeline
finneyj Nov 28, 2024
8b28130
bugfix
finneyj Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions inc/MicroBitAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace codal
public:
static MicroBitAudio *instance; // Primary instance of MicroBitAudio, on demand activated.
Mixer2 mixer; // Multi channel audio mixer
NRF52ADCChannel *mic; // Microphone ADC Channel from uBit.IO
NRF52ADCChannel *mic; // Microphone ADC Channel from uBit.IO
StreamNormalizer *processor; // Stream Normaliser instance
StreamSplitter *splitter; // Stream Splitter instance (8bit normalized output)
StreamSplitter *rawSplitter; // Stream Splitter instance (raw input)
Expand Down Expand Up @@ -97,12 +97,6 @@ namespace codal
*/
static void requestActivation();

/**
* Catch events from the splitter
* @param MicroBitEvent
*/
void onSplitterEvent(MicroBitEvent);

/**
* Activate Mic
*/
Expand Down Expand Up @@ -190,6 +184,8 @@ namespace codal
* Puts the component in (or out of) sleep (low power) mode.
*/
virtual int setSleep(bool doSleep) override;

virtual void periodicCallback();
};
}

Expand Down
3 changes: 1 addition & 2 deletions model/MicroBit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ int MicroBit::init()
// before any user code begins running.

sleep(10);

return DEVICE_OK;
}

Expand Down Expand Up @@ -365,7 +364,7 @@ void MicroBit::onListenerRegisteredEvent(Event evt)
// The level detector uses lazy instantiation, we just need to read the data once to start it running.
//audio.level->getValue();
// The level detector requires that we enable constant listening, otherwise no events will be emitted.
audio.levelSPL->activateForEvents( true );
audio.levelSPL->listenerAdded();
break;

case DEVICE_ID_MICROPHONE:
Expand Down
33 changes: 17 additions & 16 deletions source/MicroBitAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,17 @@ MicroBitAudio::MicroBitAudio(NRF52Pin &pin, NRF52Pin &speaker, NRF52ADC &adc, NR
if (MicroBitAudio::instance == NULL)
MicroBitAudio::instance = this;

// Request a periodic callback
status |= DEVICE_COMPONENT_STATUS_SYSTEM_TICK;

synth.allowEmptyBuffers(true);

mic = adc.getChannel(microphone, false);
adc.setSamplePeriod( 1e6 / CONFIG_MIXER_DEFAULT_CHANNEL_SAMPLERATE );
mic->setGain(7, 0);

activateMic();

// 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:
Expand All @@ -79,28 +84,25 @@ MicroBitAudio::MicroBitAudio(NRF52Pin &pin, NRF52Pin &speaker, NRF52ADC &adc, NR

//Initilise level detector SPL and attach to splitter
//levelSPL = new LevelDetectorSPL(*rawSplitter->createChannel(), 85.0, 65.0, 16.0, 0, DEVICE_ID_MICROPHONE, false);
levelSPL = new LevelDetectorSPL(*rawSplitter->createChannel(), 85.0, 65.0, 16.0, 52.0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR, 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);
levelSPL = new LevelDetectorSPL(*rawSplitter->createChannel(), 85.0, 65.0, 16.0, 52.0, DEVICE_ID_SYSTEM_LEVEL_DETECTOR);

//Initilise stream splitter
splitter = new StreamSplitter(processor->output, DEVICE_ID_SPLITTER);

// 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);
EventModel::defaultEventBus->listen(DEVICE_ID_NOTIFY, mic->output.emitFlowEvents(), this, &MicroBitAudio::onSplitterEvent, MESSAGE_BUS_LISTENER_IMMEDIATE);
}
}

void MicroBitAudio::onSplitterEvent(MicroBitEvent e){
if( mic->output.isFlowing() || (e.value == SPLITTER_ACTIVATE || e.value == SPLITTER_CHANNEL_CONNECT) )
void MicroBitAudio::periodicCallback()
{
if (mic->isEnabled() && !micEnabled)
{
DMESG("MicroBitAudio::periodicCallback: activateMic()...");
activateMic();
else
}

if (!mic->isEnabled() && micEnabled)
{
DMESG("MicroBitAudio::periodicCallback: deactivateMic()...");
deactivateMic();
}
}

void MicroBitAudio::activateMic(){
Expand All @@ -112,7 +114,6 @@ void MicroBitAudio::activateMic(){

void MicroBitAudio::deactivateMic(){
this->micEnabled = false;
//mic->disable();
runmic.setDigitalValue(0);
runmic.setHighDrive(false);
}
Expand Down
Loading