Led strip handling moved to a separate class

This commit is contained in:
Attila Body 2020-12-02 22:48:13 +01:00
parent a7a7443d0a
commit e7fdc831a4
10 changed files with 195 additions and 493 deletions

View file

@ -6,6 +6,7 @@
*/
#include <stm32f1xx_ll_dma.h>
#include <stm32f1xx_ll_gpio.h>
#include "main.h"
#include "dma.h"
@ -15,35 +16,11 @@
#include <string.h>
#include <stdlib.h>
#include "Config.h"
#include "Pixel.h"
#include "LedBuffers.h"
#include "WS28xxStrip.h"
#include "Sparkle.h"
WS28xxStrip<NUMPIXELS, SPIBUFFER_PIXELS> g_strip( { DEFAULT_COLOR } );
Sparkle g_sparkles[NUMSPARKLES];
volatile uint8_t g_spi_idle = 0;
volatile uint8_t g_buffer_in_transmit;
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 src_size)
{
static uint16_t const bits[16] = { // due to LE-ness the bit order is 1 0 3 2
0b1000100010001000, 0b1000111010001000, 0b1110100010001000, 0b1110111010001000,
0b1000100010001110, 0b1000111010001110, 0b1110100010001110, 0b1110111010001110,
0b1000100011101000, 0b1000111011101000, 0b1110100011101000, 0b1110111011101000,
0b1000100011101110, 0b1000111011101110, 0b1110100011101110, 0b1110111011101110
};
uint16_t *dstptr = (uint16_t*)dst;
while(src_size--) {
uint8_t tmp =*src++;
*dstptr++ = bits[tmp >> 4];
*dstptr++ = bits[tmp & 0x0f];
}
}
inline uint16_t rr(uint16_t top)
{
@ -59,7 +36,7 @@ uint16_t ChoosePixel()
do {
chosen = rr(NUMPIXELS);
for(spi=0; spi<NUMSPARKLES; ++spi) {
if(static_cast<pixel_t*>(g_sparkles[spi]) && static_cast<pixel_t*>(g_sparkles[spi]) == &g_pixels[chosen])
if(static_cast<pixel_t*>(g_sparkles[spi]) && static_cast<pixel_t*>(g_sparkles[spi]) == &g_strip[chosen])
break;
}
} while(spi < NUMSPARKLES);
@ -72,92 +49,39 @@ 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));
s.Start(&g_strip[ChoosePixel()], rr(32), { 255,255,255 },
{ static_cast<uint8_t>(rr(8)+3), static_cast<uint8_t>(rr(8)+3), static_cast<uint8_t>(rr(8)+3) });
#else
s.Start(g_pixels+ChoosePixel(), 0, Pixel(255,255,255), Pixel(1, 1, 1));
s.Start(g_pixels+ChoosePixel(), 0, { 255,255,255 }, { 1, 1, 1 });
#endif
}
extern "C" void HandleSystick()
{
++ g_tick;
}
extern "C" uint32_t GetTick()
{
return g_tick;
}
extern "C" void HandleSpiDmaIrq()
{
static bool endframe = false;
static bool endprev = false;
if(LL_DMA_IsActiveFlag_TE3(DMA1)) {
LL_DMA_ClearFlag_TE3(DMA1);
}
else if(LL_DMA_IsActiveFlag_HT3(DMA1) || LL_DMA_IsActiveFlag_TC3(DMA1))
{
if(LL_DMA_IsActiveFlag_HT3(DMA1))
{
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(LL_DMA_IsActiveFlag_TC3(DMA1))
{
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;
}
}
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;
}
}
g_strip.SpiDmaIsr();
}
extern "C" void App()
{
uint32_t lastTick = GetTick();
for(uint16_t px = 0; px < NUMPIXELS; ++px)
g_pixels[px] = Pixel(DEFAULT_COLOR);
LL_SYSTICK_EnableIT();
LL_SPI_Enable(SPI1);
LL_SPI_EnableDMAReq_TX(SPI1);
while(1)
{
while(GetTick() - lastTick < FRAMETIME );
while(GetTick() - lastTick < FRAMETIME )
DoNothing();
lastTick += FRAMETIME;
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
for(int16_t spi = 0; spi < NUMSPARKLES; ++spi) {
if(static_cast<pixel_t*>(g_sparkles[spi]))
g_sparkles[spi].Step();
@ -165,24 +89,6 @@ extern "C" void App()
StartSparkle(g_sparkles[spi]);
}
g_pixels_converted = 0;
convert((uint8_t*)g_pixels, g_spibuffer[0], SPIBUFFER_PIXELS * sizeof(pixel_t));
g_pixels_converted += SPIBUFFER_PIXELS;
convert((uint8_t*)&g_pixels[g_pixels_converted], g_spibuffer[1], SPIBUFFER_PIXELS * sizeof(pixel_t));
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, 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);
while(!g_spi_idle);
g_strip.Update();
}
}

View file

@ -1,11 +0,0 @@
/*
* LedBuffers.c
*
* Created on: Dec 16, 2018
* Author: abody
*/
#include "LedBuffers.h"
pixel_t g_pixels[NUMPIXELS];
uint8_t g_spibuffer[2][SPIBUFFER_SIZE];

View file

@ -1,21 +0,0 @@
/*
* LedBuffers.h
*
* Created on: Dec 16, 2018
* Author: abody
*/
#ifndef LEDBUFFERS_H_
#define LEDBUFFERS_H_
#include "Config.h"
#include "Pixel.h"
extern pixel_t g_pixels[NUMPIXELS];
#define SPIBUFFER_PIXEL_SIZE ( sizeof(pixel_t) * 4) // each raw pixel bit represented by 4 bits in SPI transfer
#define SPIBUFFER_SIZE (SPIBUFFER_PIXELS * SPIBUFFER_PIXEL_SIZE)
extern uint8_t g_spibuffer[2][SPIBUFFER_SIZE];
#endif /* LEDBUFFERS_H_ */

View file

@ -1,37 +0,0 @@
/*
* Pixel.h
*
* Created on: Dec 16, 2018
* Author: abody
*/
#ifndef PIXEL_H_
#define PIXEL_H_
#include <inttypes.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
uint8_t g;
uint8_t r;
uint8_t b;
} pixel_t;
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
struct Pixel : public pixel_t {
Pixel(uint8_t _r, uint8_t _g, uint8_t _b) {
g =_g;
r = _r;
b = _b;
}
};
#endif
#endif /* PIXEL_H_ */

View file

@ -8,7 +8,7 @@
#ifndef SPARKLE_H_
#define SPARKLE_H_
#include <inttypes.h>
#include "Pixel.h"
#include "WS28xxStrip.h"
class Sparkle {
public:

167
App/WS28xxStrip.h Normal file
View file

@ -0,0 +1,167 @@
/*
* WS28xxStrip.h
*
* Created on: Dec 2, 2020
* Author: compi
*/
#ifndef WS28XXSTRIP_H_
#define WS28XXSTRIP_H_
#include <stdint.h>
#include <stm32f1xx_ll_dma.h>
#include <stm32f1xx_ll_gpio.h>
#include <stm32f1xx_ll_spi.h>
struct pixel_t {
uint8_t g;
uint8_t r;
uint8_t b;
};
extern "C" void HandleSpiDmaIrq();
template <uint16_t pixels, uint8_t spi_pixels> class WS28xxStrip {
public:
WS28xxStrip(pixel_t defcolor);
pixel_t& operator[](int16_t index);
friend void HandleSpiDmaIrq();
void Update();
private:
void SpiDmaIsr();
void Refill();
void Convert(uint8_t *src, uint8_t *dst, uint16_t src_size);
template<typename T> T Min(T a, T b) { return a < b ? a : b; }
static constexpr const unsigned int SPI_PIXEL_SIZE = sizeof(pixel_t) * 4;
static constexpr const unsigned int SPI_BUFFER_SIZE = spi_pixels * SPI_PIXEL_SIZE;
pixel_t m_pixels[pixels];
uint8_t m_spi_buffer[2][SPI_BUFFER_SIZE];
volatile uint8_t m_spi_idle = 0;
volatile uint8_t m_buffer_in_transmit;
volatile uint16_t m_pixels_converted = 0;
volatile bool m_endframe = false;
volatile bool m_endprev = false;
volatile bool m_need_refill = false;
};
template <uint16_t pixels, uint8_t spi_pixels> WS28xxStrip<pixels, spi_pixels>::WS28xxStrip(pixel_t defcolor)
{
for(uint16_t p=0; p < pixels; ++p)
m_pixels[p] = defcolor;
}
template <uint16_t pixels, uint8_t spi_pixels> pixel_t& WS28xxStrip<pixels, spi_pixels>::operator[](int16_t index)
{
return m_pixels[index];
}
template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixels>::SpiDmaIsr()
{
if(LL_DMA_IsActiveFlag_TE3(DMA1)) {
LL_DMA_ClearFlag_TE3(DMA1);
}
else if(LL_DMA_IsActiveFlag_HT3(DMA1) || LL_DMA_IsActiveFlag_TC3(DMA1))
{
if(LL_DMA_IsActiveFlag_HT3(DMA1))
{
LL_DMA_ClearFlag_HT3(DMA1);
m_buffer_in_transmit = 1;
if(m_endframe)
LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_NORMAL);
}
else if(LL_DMA_IsActiveFlag_TC3(DMA1))
{
LL_DMA_ClearFlag_TC3(DMA1);
m_buffer_in_transmit = 0;
if(m_endframe && m_endprev) {
LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_3);
LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_CIRCULAR);
m_spi_idle = true;
m_endframe = m_endprev = false;
return;
}
}
m_need_refill = true;
}
}
template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixels>::Refill()
{
m_need_refill = false;
m_endprev = m_endframe;
uint8_t convert_now = Min((uint8_t)(pixels - m_pixels_converted), spi_pixels);
if(convert_now)
{
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
Convert((uint8_t*)&m_pixels[m_pixels_converted],
m_spi_buffer[m_buffer_in_transmit ^ 1],
convert_now * sizeof(pixel_t));
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
m_pixels_converted += convert_now;
}
if(convert_now < spi_pixels) {
memset(m_spi_buffer[m_buffer_in_transmit ^ 1] + convert_now * SPI_PIXEL_SIZE,
0, SPI_BUFFER_SIZE - convert_now * SPI_PIXEL_SIZE);
m_endframe = true;
}
}
template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixels>::Update()
{
m_pixels_converted = 0;
Convert((uint8_t*)m_pixels, m_spi_buffer[0], spi_pixels * sizeof(pixel_t));
m_pixels_converted += spi_pixels;
Convert((uint8_t*)&m_pixels[m_pixels_converted], m_spi_buffer[1], spi_pixels * sizeof(pixel_t));
m_pixels_converted += spi_pixels;
m_buffer_in_transmit = 0;
m_spi_idle = false;
LL_DMA_ConfigAddresses(DMA1, LL_DMA_CHANNEL_3, (uint32_t)m_spi_buffer, LL_SPI_DMA_GetRegAddr(SPI1), LL_DMA_DIRECTION_MEMORY_TO_PERIPH);
LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, sizeof(m_spi_buffer));
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);
while(!m_spi_idle) {
while(!m_spi_idle && !m_need_refill);
if(m_need_refill)
Refill();
}
}
template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixels>::Convert(uint8_t *src, uint8_t *dst, uint16_t src_size)
{
static uint16_t const bits[16] = { // due to LE-ness the bit order is 1 0 3 2
0b1000100010001000, 0b1000111010001000, 0b1110100010001000, 0b1110111010001000,
0b1000100010001110, 0b1000111010001110, 0b1110100010001110, 0b1110111010001110,
0b1000100011101000, 0b1000111011101000, 0b1110100011101000, 0b1110111011101000,
0b1000100011101110, 0b1000111011101110, 0b1110100011101110, 0b1110111011101110
};
uint16_t *dstptr = (uint16_t*)dst;
while(src_size--) {
uint8_t tmp =*src++;
*dstptr++ = bits[tmp >> 4];
*dstptr++ = bits[tmp & 0x0f];
}
}
#endif /* WS28XXSTRIP_H_ */