Switched to LL
This commit is contained in:
parent
4d63ceced3
commit
fe332dea5d
64 changed files with 15308 additions and 37631 deletions
67
App/App.cpp
67
App/App.cpp
|
@ -5,8 +5,9 @@
|
|||
* Author: abody
|
||||
*/
|
||||
|
||||
#include <stm32f1xx_ll_dma.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "stm32f1xx_hal.h"
|
||||
#include "dma.h"
|
||||
#include "spi.h"
|
||||
#include "gpio.h"
|
||||
|
@ -18,8 +19,10 @@
|
|||
#include "LedBuffers.h"
|
||||
#include "Sparkle.h"
|
||||
|
||||
Sparkle g_s[NUMSPARKLES];
|
||||
volatile uint8_t g_done = 0;
|
||||
Sparkle g_sparkles[NUMSPARKLES];
|
||||
volatile uint8_t g_spi_idle = 0;
|
||||
|
||||
volatile uint32_t g_tick = 0;
|
||||
|
||||
void convert(uint8_t *src, uint8_t *dst, uint16_t size)
|
||||
{
|
||||
|
@ -48,7 +51,7 @@ uint16_t ChoosePixel()
|
|||
do {
|
||||
chosen = rr(NUMPIXELS);
|
||||
for(spi=0; spi<NUMSPARKLES; ++spi) {
|
||||
if(static_cast<Pixel_t*>(g_s[spi]) && static_cast<Pixel_t*>(g_s[spi]) == &g_pixels[chosen])
|
||||
if(static_cast<Pixel_t*>(g_sparkles[spi]) && static_cast<Pixel_t*>(g_sparkles[spi]) == &g_pixels[chosen])
|
||||
break;
|
||||
}
|
||||
} while(spi < NUMSPARKLES);
|
||||
|
@ -63,11 +66,25 @@ void StartSparkle( Sparkle &s )
|
|||
s.Start(g_pixels+ChoosePixel(), Pixel(255,255,255), Pixel(rr(8)+3,rr(8)+3,rr(8)+3));
|
||||
}
|
||||
|
||||
extern "C" void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
|
||||
extern "C" void HandleSystick()
|
||||
{
|
||||
if(hspi == &hspi1) {
|
||||
g_done = true;
|
||||
}
|
||||
++ g_tick;
|
||||
}
|
||||
|
||||
extern "C" uint32_t GetTick()
|
||||
{
|
||||
return g_tick;
|
||||
}
|
||||
|
||||
extern "C" void HandleSpiDmaIrq()
|
||||
{
|
||||
if(LL_DMA_IsActiveFlag_TC3(DMA1)) {
|
||||
LL_DMA_ClearFlag_TC3(DMA1);
|
||||
g_spi_idle = true;
|
||||
LL_SPI_DisableDMAReq_TX(SPI1);
|
||||
LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_3);
|
||||
} else if(LL_DMA_IsActiveFlag_TE3(DMA1))
|
||||
LL_DMA_ClearFlag_TE3(DMA1);
|
||||
}
|
||||
|
||||
extern "C" void App()
|
||||
|
@ -77,28 +94,38 @@ extern "C" void App()
|
|||
for(uint16_t px = 0; px < NUMPIXELS; ++px)
|
||||
g_pixels[px] = Pixel( DEFAULT_COLOR );
|
||||
|
||||
uint32_t lastTick = HAL_GetTick();
|
||||
uint32_t lastTick = GetTick();
|
||||
|
||||
LL_SYSTICK_EnableIT();
|
||||
LL_SPI_Enable(SPI1);
|
||||
|
||||
while(1)
|
||||
{
|
||||
while(HAL_GetTick() - lastTick < FRAMETIME );
|
||||
while(GetTick() - lastTick < FRAMETIME );
|
||||
lastTick += FRAMETIME;
|
||||
HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
|
||||
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
|
||||
|
||||
for(int16_t spi = 0; spi < NUMSPARKLES; ++spi) {
|
||||
if(static_cast<Pixel_t*>(g_s[spi]))
|
||||
g_s[spi].Step();
|
||||
if(static_cast<Pixel_t*>(g_sparkles[spi]))
|
||||
g_sparkles[spi].Step();
|
||||
else
|
||||
StartSparkle(g_s[spi]);
|
||||
StartSparkle(g_sparkles[spi]);
|
||||
}
|
||||
HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
|
||||
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
|
||||
|
||||
convert((uint8_t*)g_pixels, g_spibuffer, sizeof(g_pixels));
|
||||
HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
|
||||
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
|
||||
|
||||
g_done = false;
|
||||
HAL_SPI_Transmit_DMA(&hspi1, g_spibuffer, sizeof(g_spibuffer));
|
||||
while(!g_done);
|
||||
HAL_GPIO_TogglePin(GPIOC, GPIO_PIN_13);
|
||||
g_spi_idle = false;
|
||||
// HAL_SPI_Transmit_DMA(&hspi1, g_ledBits, sizeof(g_ledBits));
|
||||
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_SPI_EnableDMAReq_TX(SPI1);
|
||||
LL_DMA_EnableIT_TC(DMA1, LL_DMA_CHANNEL_3);
|
||||
LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_3);
|
||||
|
||||
while(!g_spi_idle);
|
||||
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
|
||||
}
|
||||
}
|
||||
|
|
15
App/App.h
Normal file
15
App/App.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
#ifndef __APP_H_INCLUDED__
|
||||
#define __APP_H_INCLUDED__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern"C" {
|
||||
#endif
|
||||
|
||||
void HandleSystick();
|
||||
void HandleSpiDmaIrq();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __APP_H_INCLUDED__ */
|
Loading…
Add table
Add a link
Reference in a new issue