electronics/sabik-cpu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sample rate and offset correction

Browse Source
This commit is contained in:
Markus Koch 2021-03-01 19:11:56 +01:00
parent cac80f1c65
commit 03abf17edc
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/adc.c
View File

@ -139,12 +139,13 @@ void DMA2_Stream0_IRQHandler()
{ {
int sample; int sample;
DMA_ClearFlag(ADC_RX_DMA_STREAM, DMA_FLAG_TCIF0); DMA_ClearFlag(ADC_RX_DMA_STREAM, DMA_FLAG_TCIF0);
//printf("[DMA-IRQ] %d, %d\r\n", adc_buffer[0], adc_buffer[1]);
sample = 2048 - ((adc_buffer[0] + adc_buffer[1]) / 2); sample = ((adc_buffer[0] + adc_buffer[1]) / 2) - 2048;
GotSample(sample); GotSample(sample);
} }
// Not used: // Only for debugging. Currently disabled.
void ADC_IRQHandler() void ADC_IRQHandler()
{ {
ADC_ClearFlag(ADC1, ADC_FLAG_EOC); ADC_ClearFlag(ADC1, ADC_FLAG_EOC);
@ -155,5 +156,6 @@ void TIM5_IRQHandler()
{ {
TIM_ClearFlag(TIM5, TIM_FLAG_CC1); TIM_ClearFlag(TIM5, TIM_FLAG_CC1);
// I would really like to this in HW via events, but somehow it's broken... // I would really like to this in HW via events, but somehow it's broken...
ADC_SoftwareStartConv(ADC1); ADC_SoftwareStartConv(ADC1);
} }

2
firmware/adc.h
View File

@ -2,7 +2,7 @@
#define _ADC_H #define _ADC_H
#define ADC_F_TIM 50000000 #define ADC_F_TIM 50000000
#define ADC_SAMPLE_RATE 44130 #define ADC_SAMPLE_RATE (40000)
#define ADC_RX_DMA_CHANNEL DMA_Channel_0 #define ADC_RX_DMA_CHANNEL DMA_Channel_0

2
firmware/ccconfig.h
View File

@ -4,7 +4,7 @@
#define CCEMBEDDED #define CCEMBEDDED
#define NUM_LIN_LEDS 60 #define NUM_LIN_LEDS 60
#define USE_NUM_LIN_LEDS 60 #define USE_NUM_LIN_LEDS 60
#define DFREQ 44130 #define DFREQ (40000)
#endif #endif

10
firmware/main.c
View File

@ -40,8 +40,8 @@ void NewFrame()
int i; int i;
HandleFrameInfo(); HandleFrameInfo();
// UpdateLinearLEDs(); UpdateLinearLEDs();
UpdateAllSameLEDs(); //UpdateAllSameLEDs();
SendSPI2812( ledOut, NUM_LIN_LEDS ); SendSPI2812( ledOut, NUM_LIN_LEDS );
} }
@ -116,14 +116,10 @@ int main(void)
SysTick_Config( RCC_Clocks.HCLK_Frequency / 100); SysTick_Config( RCC_Clocks.HCLK_Frequency / 100);
float fv = RCC_Clocks.HCLK_Frequency / 1000000.0f; float fv = RCC_Clocks.HCLK_Frequency / 1000000.0f;
// We can use printf to print back through the debugging interface, but that's slow and
// it also takes up a bunch of space. No printf = no space wasted in printf.
// printf( "Operating at %.3fMHz\n", fv );
ConfigureUART(); ConfigureUART();
InitColorChord(); InitColorChord();
Configure_PA0(); Configure_PA0();
//InitMP45DT02();
InitSPI2812(); InitSPI2812();
adc_init(); adc_init();
@ -158,7 +154,7 @@ int main(void)
{ {
LED_OFF; //Use led on the board to show us how much CPU we're using. (You can also probe PB15) LED_OFF; //Use led on the board to show us how much CPU we're using. (You can also probe PB15)
PushSample32( sampbuff[this_samp]/2 ); //Can't put in full volume. PushSample32( sampbuff[this_samp] ); //Can't put in full volume. (here was /2)
this_samp = (this_samp+1)%CIRCBUFSIZE; this_samp = (this_samp+1)%CIRCBUFSIZE;