diff --git a/.cproject b/.cproject index be429ab..4ae66d1 100644 --- a/.cproject +++ b/.cproject @@ -52,7 +52,6 @@ - @@ -65,7 +64,6 @@ - @@ -473,10 +469,9 @@ diff --git a/App/App.cpp b/App/App.cpp index f7511d1..83adf0f 100644 --- a/App/App.cpp +++ b/App/App.cpp @@ -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); diff --git a/App/Config.h b/App/Config.h index 378322c..5d3c629 100644 --- a/App/Config.h +++ b/App/Config.h @@ -15,11 +15,11 @@ # define NUMSPARKLES (NUMPIXELS/12+1) # define FRAMETIME 20 #else -# define NUMPIXELS 6 +# define NUMPIXELS 144 # define NUMSPARKLES 1 -# define FRAMETIME 1 +# define FRAMETIME 10 #endif -#define DEFAULT_COLOR 63,63,63 -#define SPIBUFFER_PIXELS 2 +#define DEFAULT_COLOR 15,15,15 +#define SPIBUFFER_PIXELS 4 #endif /* CONFIG_H_ */ diff --git a/App/LedBuffers.cpp b/App/LedBuffers.cpp index 65c88b9..45a7f83 100644 --- a/App/LedBuffers.cpp +++ b/App/LedBuffers.cpp @@ -6,13 +6,6 @@ */ #include "LedBuffers.h" -pixel_t g_pixels[NUMPIXELS] = { - {0xaa,0x55,0}, - {0x55,0xaa,0xff}, - {0xaa,0x55,0}, - {0x55,0xaa,0xff}, - {0xaa,0x55,0}, - {0x55,0xaa,0xff}, -}; +pixel_t g_pixels[NUMPIXELS]; uint8_t g_spibuffer[2][SPIBUFFER_SIZE]; diff --git a/App/LedBuffers.h b/App/LedBuffers.h index 6db399b..c0ad896 100644 --- a/App/LedBuffers.h +++ b/App/LedBuffers.h @@ -13,7 +13,8 @@ extern pixel_t g_pixels[NUMPIXELS]; -#define SPIBUFFER_SIZE (SPIBUFFER_PIXELS * sizeof(pixel_t) * 8 / 2) +#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]; diff --git a/NeoPixelF103MVP Debug.launch b/NeoPixelF103MVP Debug.launch index f7ecac3..6012781 100644 --- a/NeoPixelF103MVP Debug.launch +++ b/NeoPixelF103MVP Debug.launch @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -68,5 +68,6 @@ + diff --git a/NeoPixelF103MVP Release.launch b/NeoPixelF103MVP Release.launch index dc86ccb..f189e62 100644 --- a/NeoPixelF103MVP Release.launch +++ b/NeoPixelF103MVP Release.launch @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/NeoPixelF103MVP.ioc b/NeoPixelF103MVP.ioc index 423ae29..f1a7f2d 100644 --- a/NeoPixelF103MVP.ioc +++ b/NeoPixelF103MVP.ioc @@ -5,7 +5,7 @@ Dma.SPI1_TX.0.Direction=DMA_MEMORY_TO_PERIPH Dma.SPI1_TX.0.Instance=DMA1_Channel3 Dma.SPI1_TX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE Dma.SPI1_TX.0.MemInc=DMA_MINC_ENABLE -Dma.SPI1_TX.0.Mode=DMA_NORMAL +Dma.SPI1_TX.0.Mode=DMA_CIRCULAR Dma.SPI1_TX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE Dma.SPI1_TX.0.PeriphInc=DMA_PINC_DISABLE Dma.SPI1_TX.0.Priority=DMA_PRIORITY_HIGH diff --git a/Src/spi.c b/Src/spi.c index 6930971..e5b0ddb 100644 --- a/Src/spi.c +++ b/Src/spi.c @@ -52,7 +52,7 @@ void MX_SPI1_Init(void) LL_DMA_SetChannelPriorityLevel(DMA1, LL_DMA_CHANNEL_3, LL_DMA_PRIORITY_HIGH); - LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_NORMAL); + LL_DMA_SetMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_MODE_CIRCULAR); LL_DMA_SetPeriphIncMode(DMA1, LL_DMA_CHANNEL_3, LL_DMA_PERIPH_NOINCREMENT);