kopia lustrzana https://github.com/skuep/AIOC
Improvements in USB audio reliability
rodzic
a8c1b99865
commit
d5b44a96a1
|
@ -122,9 +122,9 @@
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX 1
|
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX 1
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX 1
|
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX 1
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX CFG_TUD_AUDIO_EP_SZ_OUT + CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE
|
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX CFG_TUD_AUDIO_EP_SZ_OUT + CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ 256 /* FIFO not being power of 2 seem to result in all kinds of BusFaults? */
|
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ 1024 /* FIFO not being power of 2 seem to result in all kinds of BusFaults? */
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX CFG_TUD_AUDIO_EP_SZ_IN + CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE
|
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX CFG_TUD_AUDIO_EP_SZ_IN + CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE
|
||||||
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ 256
|
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ 1024
|
||||||
|
|
||||||
#define CFG_TUD_AUDIO_EP_SZ_IN (48) * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX // 48 Samples (48 kHz) x 2 Bytes/Sample x 1 Channel
|
#define CFG_TUD_AUDIO_EP_SZ_IN (48) * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX // 48 Samples (48 kHz) x 2 Bytes/Sample x 1 Channel
|
||||||
#define CFG_TUD_AUDIO_EP_SZ_OUT (48) * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX // 48 Samples (48 kHz) x 2 Bytes/Sample x 1 Channel
|
#define CFG_TUD_AUDIO_EP_SZ_OUT (48) * CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE * CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX // 48 Samples (48 kHz) x 2 Bytes/Sample x 1 Channel
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit b9dea4173f50b1c3165bc7c721498607c21dc929
|
Subproject commit fa0d1f6c31e8c7ea0b022f8afff96353d64a867a
|
|
@ -38,6 +38,12 @@ uint8_t tu_stm32_edpt_number_cb(uint8_t addr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tu_stm32_sof_cb(void)
|
||||||
|
{
|
||||||
|
/* Capture timer value */
|
||||||
|
TIM2->EGR = TIM_EGR_CC1G;
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME: Do all three need to be handled, or just the LP one?
|
// FIXME: Do all three need to be handled, or just the LP one?
|
||||||
// USB high-priority interrupt (Channel 74): Triggered only by a correct
|
// USB high-priority interrupt (Channel 74): Triggered only by a correct
|
||||||
// transfer event for isochronous and double-buffer bulk transfer to reach
|
// transfer event for isochronous and double-buffer bulk transfer to reach
|
||||||
|
@ -87,10 +93,22 @@ void tud_resume_cb(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void USB_Init(void)
|
void Timer_Init(void)
|
||||||
{
|
{
|
||||||
__HAL_REMAPINTERRUPT_USB_ENABLE();
|
__HAL_RCC_TIM2_CLK_ENABLE();
|
||||||
|
|
||||||
|
/* TIM2 generates a timebase for USB OUT feedback endpoint */
|
||||||
|
TIM2->CR1 = TIM_CLOCKDIVISION_DIV1 | TIM_COUNTERMODE_UP | TIM_AUTORELOAD_PRELOAD_ENABLE;
|
||||||
|
TIM2->PSC = 0;
|
||||||
|
TIM2->ARR = 0xFFFFFFFFUL;
|
||||||
|
TIM2->CCMR1 = (0x1 << TIM_CCMR1_CC1S_Pos);
|
||||||
|
TIM2->EGR = TIM_EGR_UG;
|
||||||
|
TIM2->CR1 |= TIM_CR1_CEN;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void GPIO_Init(void)
|
||||||
|
{
|
||||||
/* Configure USB DM and DP pins */
|
/* Configure USB DM and DP pins */
|
||||||
__HAL_RCC_GPIOA_CLK_ENABLE();
|
__HAL_RCC_GPIOA_CLK_ENABLE();
|
||||||
GPIO_InitTypeDef GPIO_InitStruct;
|
GPIO_InitTypeDef GPIO_InitStruct;
|
||||||
|
@ -100,10 +118,16 @@ void USB_Init(void)
|
||||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
|
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
|
||||||
GPIO_InitStruct.Alternate = GPIO_AF14_USB;
|
GPIO_InitStruct.Alternate = GPIO_AF14_USB;
|
||||||
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
|
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
|
||||||
|
}
|
||||||
|
|
||||||
// Enable USB clock
|
void USB_Init(void)
|
||||||
|
{
|
||||||
|
__HAL_REMAPINTERRUPT_USB_ENABLE();
|
||||||
__HAL_RCC_USB_CLK_ENABLE();
|
__HAL_RCC_USB_CLK_ENABLE();
|
||||||
|
|
||||||
|
GPIO_Init();
|
||||||
|
Timer_Init();
|
||||||
|
|
||||||
// Init classes
|
// Init classes
|
||||||
USB_SerialInit();
|
USB_SerialInit();
|
||||||
USB_AudioInit();
|
USB_AudioInit();
|
||||||
|
|
|
@ -6,27 +6,26 @@
|
||||||
#ifndef AUDIO_SAMPLE_RATE
|
#ifndef AUDIO_SAMPLE_RATE
|
||||||
#define AUDIO_SAMPLE_RATE 48000
|
#define AUDIO_SAMPLE_RATE 48000
|
||||||
#endif
|
#endif
|
||||||
// Audio controls
|
|
||||||
// Current states
|
|
||||||
bool mute[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1]; // +1 for master channel 0
|
|
||||||
uint16_t volume[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1]; // +1 for master channel 0
|
|
||||||
uint32_t sampFreq;
|
|
||||||
uint8_t clkValid;
|
|
||||||
|
|
||||||
// Range states
|
static bool mute[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1]; // +1 for master channel 0
|
||||||
audio_control_range_2_n_t(1) volumeRng[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX+1]; // Volume range state
|
static uint16_t volume[CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX + 1]; // +1 for master channel 0
|
||||||
audio_control_range_4_n_t(1) sampleFreqRng; // Sample frequency range state
|
static uint32_t sampFreq = AUDIO_SAMPLE_RATE;
|
||||||
|
static uint8_t clkValid = 1;
|
||||||
|
|
||||||
// Audio test data
|
static audio_control_range_4_n_t(1) sampleFreqRng = {
|
||||||
uint16_t test_buffer_audio[CFG_TUD_AUDIO_EP_SZ_IN/2];
|
.wNumSubRanges = 1,
|
||||||
uint16_t startVal = 0;
|
.subrange[0] = {
|
||||||
|
.bMin = AUDIO_SAMPLE_RATE,
|
||||||
|
.bMax = AUDIO_SAMPLE_RATE,
|
||||||
|
.bRes = 0
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
#define FLAG_IN_START 0x00000010UL
|
#define FLAG_IN_START 0x00000010UL
|
||||||
#define FLAG_OUT_START 0x00000100UL
|
#define FLAG_OUT_START 0x00000100UL
|
||||||
|
|
||||||
static volatile uint32_t flags;
|
static volatile uint32_t flags;
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// Application Callback API Implementations
|
// Application Callback API Implementations
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
@ -295,8 +294,8 @@ bool tud_audio_rx_done_post_read_cb(uint8_t rhport, uint16_t n_bytes_received, u
|
||||||
if (flags & FLAG_OUT_START) {
|
if (flags & FLAG_OUT_START) {
|
||||||
uint16_t count = tud_audio_available();
|
uint16_t count = tud_audio_available();
|
||||||
|
|
||||||
if (count >= (2 * CFG_TUD_AUDIO_EP_SZ_OUT)) {
|
if (count >= (6 * CFG_TUD_AUDIO_EP_SZ_OUT)) {
|
||||||
/* Wait until at least two frames are in buffer, then start DAC */
|
/* Wait until at least n frames are in buffer, then start DAC output */
|
||||||
flags &= (uint32_t) ~FLAG_OUT_START;
|
flags &= (uint32_t) ~FLAG_OUT_START;
|
||||||
NVIC_EnableIRQ(TIM3_IRQn);
|
NVIC_EnableIRQ(TIM3_IRQn);
|
||||||
}
|
}
|
||||||
|
@ -305,6 +304,7 @@ bool tud_audio_rx_done_post_read_cb(uint8_t rhport, uint16_t n_bytes_received, u
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const * p_request)
|
bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const * p_request)
|
||||||
{
|
{
|
||||||
(void) rhport;
|
(void) rhport;
|
||||||
|
@ -318,7 +318,6 @@ bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const * p_reque
|
||||||
if (alt == 1) {
|
if (alt == 1) {
|
||||||
/* Microphone channel has been activated */
|
/* Microphone channel has been activated */
|
||||||
flags |= FLAG_IN_START;
|
flags |= FLAG_IN_START;
|
||||||
printf("IN opened\n");
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -326,7 +325,6 @@ bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const * p_reque
|
||||||
if (alt == 1) {
|
if (alt == 1) {
|
||||||
/* Speaker channel has been activated */
|
/* Speaker channel has been activated */
|
||||||
flags |= FLAG_OUT_START;
|
flags |= FLAG_OUT_START;
|
||||||
printf("OUT opened\n");
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -368,19 +366,20 @@ void tud_audio_feedback_params_cb(uint8_t func_id, uint8_t alt_itf, audio_feedba
|
||||||
/* Configure parameters for feedback endpoint */
|
/* Configure parameters for feedback endpoint */
|
||||||
feedback_param->frequency.mclk_freq = 2 * HAL_RCC_GetPCLK1Freq();
|
feedback_param->frequency.mclk_freq = 2 * HAL_RCC_GetPCLK1Freq();
|
||||||
feedback_param->sample_freq = AUDIO_SAMPLE_RATE;
|
feedback_param->sample_freq = AUDIO_SAMPLE_RATE;
|
||||||
feedback_param->method = AUDIO_FEEDBACK_METHOD_FREQUENCY_FLOAT;
|
feedback_param->method = AUDIO_FEEDBACK_METHOD_FREQUENCY_FIXED;
|
||||||
}
|
}
|
||||||
|
|
||||||
TU_ATTR_FAST_FUNC void tud_audio_feedback_interval_isr(uint8_t func_id, uint32_t frame_number, uint8_t interval_shift)
|
TU_ATTR_FAST_FUNC void tud_audio_feedback_interval_isr(uint8_t func_id, uint32_t frame_number, uint8_t interval_shift)
|
||||||
{
|
{
|
||||||
static uint32_t prev_cycles = 0;
|
static uint32_t prev_cycles = 0;
|
||||||
uint32_t this_cycles = TIM2->CNT;
|
uint32_t this_cycles = TIM2->CCR1; /* Load from capture register, which is set in tu_stm32_sof_cb */
|
||||||
|
|
||||||
/* Calculate number of master clock cycles between now and last call */
|
/* Calculate number of master clock cycles between now and last call */
|
||||||
uint32_t cycles = (uint32_t) (((uint64_t) this_cycles - prev_cycles) & 0xFFFFFFFFUL);
|
uint32_t cycles = (uint32_t) (((uint64_t) this_cycles - prev_cycles) & 0xFFFFFFFFUL);
|
||||||
|
TU_ASSERT(cycles != 0, /**/);
|
||||||
|
|
||||||
/* Notify the USB audio feedback endpoint */
|
/* Notify the USB audio feedback endpoint */
|
||||||
tud_audio_feedback_update(0, cycles);
|
tud_audio_feedback_update(func_id, cycles);
|
||||||
|
|
||||||
/* Prepare for next time */
|
/* Prepare for next time */
|
||||||
prev_cycles = this_cycles;
|
prev_cycles = this_cycles;
|
||||||
|
@ -390,9 +389,8 @@ void ADC1_2_IRQHandler (void)
|
||||||
{
|
{
|
||||||
if (ADC2->ISR & ADC_ISR_EOS) {
|
if (ADC2->ISR & ADC_ISR_EOS) {
|
||||||
ADC2->ISR = ADC_ISR_EOS;
|
ADC2->ISR = ADC_ISR_EOS;
|
||||||
uint16_t value = ADC2->DR;
|
uint16_t value = ((int32_t) ADC2->DR - 32768) & 0xFFFFU;
|
||||||
int16_t a = ((int32_t) value - 32768) & 0xFFFFU;
|
tud_audio_write (&value, sizeof(value));
|
||||||
tud_audio_write (&a, sizeof(value));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -459,19 +457,7 @@ static void Timer_Init(void)
|
||||||
TIM3->DIER = TIM_DIER_UIE;
|
TIM3->DIER = TIM_DIER_UIE;
|
||||||
TIM3->CR1 |= TIM_CR1_CEN;
|
TIM3->CR1 |= TIM_CR1_CEN;
|
||||||
|
|
||||||
|
NVIC_SetPriority(TIM3_IRQn, AIOC_IRQ_PRIO_AUDIO);
|
||||||
|
|
||||||
__HAL_RCC_TIM2_CLK_ENABLE();
|
|
||||||
|
|
||||||
/* TIM2 generates a timebase for USB OUT feedback endpoint */
|
|
||||||
TIM2->CR1 = TIM_CLOCKDIVISION_DIV1 | TIM_COUNTERMODE_UP | TIM_AUTORELOAD_PRELOAD_ENABLE;
|
|
||||||
TIM2->PSC = 0;
|
|
||||||
TIM2->ARR = 0xFFFFFFFFUL;
|
|
||||||
TIM2->EGR = TIM_EGR_UG;
|
|
||||||
TIM2->CR1 |= TIM_CR1_CEN;
|
|
||||||
|
|
||||||
NVIC_SetPriority(TIM2_IRQn, 2);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ADC_Init(void)
|
static void ADC_Init(void)
|
||||||
|
@ -529,14 +515,6 @@ void DAC_Init(void)
|
||||||
|
|
||||||
void USB_AudioInit(void)
|
void USB_AudioInit(void)
|
||||||
{
|
{
|
||||||
sampFreq = AUDIO_SAMPLE_RATE;
|
|
||||||
clkValid = 1;
|
|
||||||
|
|
||||||
sampleFreqRng.wNumSubRanges = 1;
|
|
||||||
sampleFreqRng.subrange[0].bMin = AUDIO_SAMPLE_RATE;
|
|
||||||
sampleFreqRng.subrange[0].bMax = AUDIO_SAMPLE_RATE;
|
|
||||||
sampleFreqRng.subrange[0].bRes = 0;
|
|
||||||
|
|
||||||
GPIO_Init();
|
GPIO_Init();
|
||||||
Timer_Init();
|
Timer_Init();
|
||||||
ADC_Init();
|
ADC_Init();
|
||||||
|
|
Ładowanie…
Reference in New Issue