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

Removed one function call from ISR chain

Browse source
This commit is contained in:
Attila Body 2020-12-05 01:00:21 +01:00
parent c187a62bfd
commit 09263346a5
5 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
App/App.cpp
View file

@ -65,9 +65,11 @@ void StartSparkle( Sparkle &s )
#endif
}
extern "C" void HandleSpiDmaIrq()
extern "C" void DMA1_Channel3_IRQHandler(void)
{
LL_GPIO_TogglePin(GPIOA, LL_GPIO_PIN_0);
g_strip.SpiDmaIsr();
LL_GPIO_TogglePin(GPIOA, LL_GPIO_PIN_0);
}
void TimerCallback(TimerHandle_t th)

11
App/WS28xxStrip.h
View file

@ -23,7 +23,7 @@ struct pixel_t {
uint8_t b;
};
extern "C" void HandleSpiDmaIrq();
extern "C" void DMA1_Channel3_IRQHandler(void);
template <uint16_t pixels, uint8_t spi_pixels> class WS28xxStrip {
public:
@ -31,7 +31,7 @@ public:
pixel_t& operator[](int16_t index);
friend void HandleSpiDmaIrq();
friend void DMA1_Channel3_IRQHandler(void);
void Update();
static void RefillTaskEntry(void *param) { reinterpret_cast<WS28xxStrip<pixels, spi_pixels>*>(param)->RefillTask(); }
@ -80,6 +80,8 @@ template <uint16_t pixels, uint8_t spi_pixels> pixel_t& WS28xxStrip<pixels, spi_
//////////////////////////////////////////////////////////////////////////////
template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixels>::SpiDmaIsr()
{
LL_GPIO_TogglePin(GPIOA, LL_GPIO_PIN_0);
BaseType_t woken;
if(LL_DMA_IsActiveFlag_TE3(DMA1)) {
@ -112,6 +114,7 @@ template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixe
woken = pdFALSE;
if(m_task_handle) {
LL_GPIO_TogglePin(GPIOA, LL_GPIO_PIN_0);
vTaskNotifyGiveFromISR(m_task_handle, &woken);
portYIELD_FROM_ISR(woken);
}
@ -127,17 +130,16 @@ template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixe
{
if( ulTaskNotifyTake(pdFALSE, pdMS_TO_TICKS(1000)) > 0)
{
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
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;
}
@ -146,6 +148,7 @@ template <uint16_t pixels, uint8_t spi_pixels> void WS28xxStrip<pixels, spi_pixe
0, SPI_BUFFER_SIZE - convert_now * SPI_PIXEL_SIZE);
m_endframe = true;
}
LL_GPIO_TogglePin(GPIOC, LL_GPIO_PIN_13);
}
}
}

1
Inc/stm32f1xx_it.h
View file

@ -54,7 +54,6 @@ void BusFault_Handler(void);
void UsageFault_Handler(void);
void DebugMon_Handler(void);
void SysTick_Handler(void);
void DMA1_Channel3_IRQHandler(void);
/* USER CODE BEGIN EFP */
/* USER CODE END EFP */

2
NeoPixelF103MVP.ioc
View file

@ -49,7 +49,7 @@ Mcu.UserName=STM32F103C8Tx
MxCube.Version=6.0.1
MxDb.Version=DB.6.0.0
NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.DMA1_Channel3_IRQn=true\:1\:0\:true\:false\:true\:false\:false\:true
NVIC.DMA1_Channel3_IRQn=true\:1\:0\:true\:false\:false\:false\:false\:false
NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.ForceEnableDMAVector=true
NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false

16
Src/stm32f1xx_it.c
View file

@ -182,22 +182,6 @@ void SysTick_Handler(void)
/* please refer to the startup file (startup_stm32f1xx.s). */
/******************************************************************************/
/**
* @brief This function handles DMA1 channel3 global interrupt.
*/
void DMA1_Channel3_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel3_IRQn 0 */
/* SPI1 TX DMA interrupt */
HandleSpiDmaIrq();
/* USER CODE END DMA1_Channel3_IRQn 0 */
/* USER CODE BEGIN DMA1_Channel3_IRQn 1 */
/* USER CODE END DMA1_Channel3_IRQn 1 */
}
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */