playground-stm32/neopixel_f103_mvp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Circular DMA buffer

Browse source
This commit is contained in:
Attila Body 2020-12-01 21:54:43 +01:00
parent 731bba0f0e
commit 3f48d95efd
9 changed files with 72 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

103
App/App.cpp
View file

@ -21,21 +21,18 @@
Sparkle g_sparkles[NUMSPARKLES];
volatile uint8_t g_spi_idle = 0;
uint16_t g_pixels_transmitted;
volatile uint8_t g_buffer_in_transmit;
volatile bool g_need_refill;
uint32_t g_refills = 0;
uint16_t g_pixels_converted = 0;
volatile uint16_t g_pixels_converted = 0;
volatile uint32_t g_tick = 0;
#define MIN(a,b) ((a) < (b) ? (a) : (b))
void convert(uint8_t *src, uint8_t *dst, uint16_t size)
void convert(uint8_t *src, uint8_t *dst, uint16_t src_size)
{
static uint8_t const bits[4] = { 0b10001000, 0b10001110, 0b11101000, 0b11101110 };
while(size--) {
while(src_size--) {
uint8_t byte=*src++;
for(int8_t shift = 6; shift >= 0; shift -= 2) {
uint8_t mask = 3 << shift;
@ -70,7 +67,11 @@ uint16_t ChoosePixel()
void StartSparkle( Sparkle &s )
{
#ifndef DBG_CHOSEN_PIXEL
s.Start(g_pixels+ChoosePixel(), rr(32), Pixel(255,255,255), Pixel(rr(8)+3,rr(8)+3,rr(8)+3));
#else
s.Start(g_pixels+ChoosePixel(), 0, Pixel(255,255,255), Pixel(1, 1, 1));
#endif
}
extern "C" void HandleSystick()
@ -83,57 +84,60 @@ extern "C" uint32_t GetTick()
return g_tick;
}
extern "C" void HandleSpiDmaIrq()
{
static bool endframe;
static bool endframe = false;
static bool endprev = false;
if(LL_DMA_IsActiveFlag_TC3(DMA1))
if(LL_DMA_IsActiveFlag_TE3(DMA1)) {
LL_DMA_ClearFlag_TE3(DMA1);
}
else if(LL_DMA_IsActiveFlag_HT3(DMA1) || LL_DMA_IsActiveFlag_TC3(DMA1))
{
LL_DMA_ClearFlag_TC3(DMA1);
LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_3);
g_buffer_in_transmit ^= 1;
g_pixels_transmitted += SPIBUFFER_PIXELS;
if(g_pixels_transmitted < NUMPIXELS)
if(LL_DMA_IsActiveFlag_HT3(DMA1))
{
LL_DMA_SetMemoryAddress(DMA1, LL_DMA_CHANNEL_3, (uint32_t)g_spibuffer[g_buffer_in_transmit]);
LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, SPIBUFFER_SIZE);
LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_3);
if(g_pixels_converted < NUMPIXELS)
{
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
convert((uint8_t*)&g_pixels[g_pixels_converted],
g_spibuffer[g_buffer_in_transmit ^ 1],
MIN(SPIBUFFER_PIXELS, NUMPIXELS - g_pixels_converted) * sizeof(pixel_t));
g_pixels_converted += MIN(SPIBUFFER_PIXELS, NUMPIXELS - g_pixels_converted);
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
endframe = false;
}
else
{
memset(g_spibuffer[g_buffer_in_transmit ^1], 0, sizeof(g_spibuffer[g_buffer_in_transmit ^1]));
endframe = true;
}
LL_DMA_ClearFlag_HT3(DMA1);
g_buffer_in_transmit = 1;
if(endframe)
LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_NORMAL);
}
else if(endframe)
else if(LL_DMA_IsActiveFlag_TC3(DMA1))
{
LL_DMA_SetMemoryAddress(DMA1, LL_DMA_CHANNEL_3, (uint32_t)g_spibuffer[g_buffer_in_transmit]);
LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, SPIBUFFER_SIZE);
LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_3);
endframe = false;
LL_DMA_ClearFlag_TC3(DMA1);
g_buffer_in_transmit = 0;
if(endframe && endprev) {
LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_3);
LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_CIRCULAR);
g_spi_idle = true;
endframe = endprev = false;
return;
}
}
else {
g_spi_idle = true;
endprev = endframe;
uint8_t convert_now = MIN(NUMPIXELS - g_pixels_converted, SPIBUFFER_PIXELS);
if(convert_now)
{
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
convert((uint8_t*)&g_pixels[g_pixels_converted],
g_spibuffer[g_buffer_in_transmit ^ 1],
convert_now * sizeof(pixel_t));
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
g_pixels_converted += convert_now;
}
if(convert_now < SPIBUFFER_PIXELS) {
memset(g_spibuffer[g_buffer_in_transmit ^ 1] + convert_now * SPIBUFFER_PIXEL_SIZE,
0, SPIBUFFER_SIZE - convert_now * SPIBUFFER_PIXEL_SIZE);
endframe = true;
}
}
else if(LL_DMA_IsActiveFlag_TE3(DMA1))
LL_DMA_ClearFlag_TE3(DMA1);
}
extern "C" void App()
{
uint32_t lastTick = GetTick();
@ -158,8 +162,6 @@ extern "C" void App()
}
g_pixels_converted = 0;
g_pixels_transmitted = 0;
g_need_refill = true;
convert((uint8_t*)g_pixels, g_spibuffer[0], SPIBUFFER_PIXELS * sizeof(pixel_t));
g_pixels_converted += SPIBUFFER_PIXELS;
@ -167,13 +169,14 @@ extern "C" void App()
g_pixels_converted += SPIBUFFER_PIXELS;
g_buffer_in_transmit = 0;
g_spi_idle = false;
LL_DMA_ConfigAddresses(DMA1, LL_DMA_CHANNEL_3, (uint32_t)g_spibuffer[0], LL_SPI_DMA_GetRegAddr(SPI1), LL_DMA_DIRECTION_MEMORY_TO_PERIPH);
LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, SPIBUFFER_SIZE);
LL_DMA_ConfigAddresses(DMA1, LL_DMA_CHANNEL_3, (uint32_t)g_spibuffer, LL_SPI_DMA_GetRegAddr(SPI1), LL_DMA_DIRECTION_MEMORY_TO_PERIPH);
LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, sizeof(g_spibuffer));
LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_3);
LL_DMA_EnableIT_HT(DMA1, LL_DMA_CHANNEL_3);
LL_DMA_EnableIT_TC(DMA1, LL_DMA_CHANNEL_3);
LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_3);
g_spi_idle = false;
while(!g_spi_idle);