diff --git a/components/bl00mbox/CMakeLists.txt b/components/bl00mbox/CMakeLists.txt index 905d3ea30169cb18449fd1c314c981e5442fa98a..9688b0e0fc0f85a8fa1c7bdc867c19bcaabd9a4f 100644 --- a/components/bl00mbox/CMakeLists.txt +++ b/components/bl00mbox/CMakeLists.txt @@ -30,6 +30,4 @@ idf_component_register( plugins/bl00mbox radspa extern - REQUIRES - st3m ) diff --git a/components/bl00mbox/README.md b/components/bl00mbox/README.md new file mode 100644 index 0000000000000000000000000000000000000000..4467c1e138e71bc312d063b59bf32a7a5967c7f4 --- /dev/null +++ b/components/bl00mbox/README.md @@ -0,0 +1 @@ +Hi! bl00mbox/radspa is an external project. To find out more or contribute check out https://gitlab.com/moon2embeddedaudio diff --git a/components/bl00mbox/bl00mbox.c b/components/bl00mbox/bl00mbox.c index a31700e299c7c67e0d8bf84f79a81c81e13f3801..ad55b04417ee9621750a6f7853f447d0a8b2e5e2 100644 --- a/components/bl00mbox/bl00mbox.c +++ b/components/bl00mbox/bl00mbox.c @@ -2,10 +2,8 @@ #include "bl00mbox.h" #include "bl00mbox_plugin_registry.h" #include "bl00mbox_audio.h" -#include "st3m_audio.h" void bl00mbox_init(){ bl00mbox_plugin_registry_init(); - st3m_audio_set_player_function(bl00mbox_audio_render); bl00mbox_channels_init(); } diff --git a/components/bl00mbox/bl00mbox_audio.c b/components/bl00mbox/bl00mbox_audio.c index 4b8ff07fec64acb62bad863f94b62a6c0253d643..d41e67880d293295cb5c607367e59b251f3d94b6 100644 --- a/components/bl00mbox/bl00mbox_audio.c +++ b/components/bl00mbox/bl00mbox_audio.c @@ -246,14 +246,7 @@ void bl00mbox_audio_render(int16_t * rx, int16_t * tx, uint16_t len){ #endif for(uint16_t i = 0; i < mono_len; i++){ - st3m_scope_write((acc[i])>>4); - tx[2*i] = acc[i]; tx[2*i+1] = acc[i]; } } - -// TEMP -void bl00mbox_player_function(int16_t * rx, int16_t * tx, uint16_t len){ - bl00mbox_audio_render(rx, tx, len); -} diff --git a/components/bl00mbox/include/bl00mbox_audio.h b/components/bl00mbox/include/bl00mbox_audio.h index a28eb9bc5bef2dadafdde584bb745186e7207954..8eead50f2278a630cbf2d82cd55a0c844f5c1587 100644 --- a/components/bl00mbox/include/bl00mbox_audio.h +++ b/components/bl00mbox/include/bl00mbox_audio.h @@ -1,16 +1,12 @@ //SPDX-License-Identifier: CC0-1.0 #pragma once -//TODO: move this to kconfig someday -#define BL00MBOX_MAX_BUFFER_LEN 256 -#define BL00MBOX_DEFAULT_CHANNEL_VOLUME 3000 +//TODO: move this to kconfig someday? +#define BL00MBOX_MAX_BUFFER_LEN 128 +#define BL00MBOX_DEFAULT_CHANNEL_VOLUME 8000 #define BL00MBOX_CHANNELS 32 #define BL00MBOX_BACKGROUND_MUTE_OVERRIDE_ENABLE -//TODO: remove st3m scope dependency -#include "st3m_audio.h" -#include "st3m_scope.h" - #include <stdio.h> #include <math.h> #include <string.h> diff --git a/components/st3m/st3m_audio.c b/components/st3m/st3m_audio.c index 1bb87f0b09099e3b09502f6d5131cc775d5f8c79..1ea7111aec8ce395f6806495e7130ae884c11068 100644 --- a/components/st3m/st3m_audio.c +++ b/components/st3m/st3m_audio.c @@ -1,4 +1,5 @@ #include "st3m_audio.h" +#include "st3m_scope.h" #include <math.h> #include <stdio.h> @@ -320,6 +321,9 @@ static void _audio_player_task(void *data) { UNLOCK; (*function)(buffer_rx, buffer_tx, FLOW3R_BSP_AUDIO_DMA_BUFFER_SIZE * 2); + for (uint16_t i = 0; i < FLOW3R_BSP_AUDIO_DMA_BUFFER_SIZE; i++) { + st3m_scope_write(buffer_tx[2 * i] >> 2); + } if (!hwmute && software_mute) { // Software muting needed. Only used on P1. diff --git a/main/main.c b/main/main.c index 5824bff716fe57065de8f8dc853fddd0d02f5e18..ade4f7c08f18225f1ec090b03cbf5f5f515e9ca7 100644 --- a/main/main.c +++ b/main/main.c @@ -131,6 +131,7 @@ void flow3r_startup(void) { st3m_scope_init(); st3m_audio_init(); bl00mbox_init(); + st3m_audio_set_player_function(bl00mbox_audio_render); st3m_badgenet_init(); st3m_mode_set(st3m_mode_kind_starting, "micropython");