j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

quick fix to prevent two ws2812_update that follow each other

Browse source
This commit is contained in:
lilian 2017-12-02 19:46:38 +01:00
parent f67495f4f0
commit 9317995eb1
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
extras/ws2812_i2s/ws2812_i2s.c
View file

@ -24,6 +24,7 @@
#include "ws2812_i2s.h" #include "ws2812_i2s.h"
#include "i2s_dma/i2s_dma.h" #include "i2s_dma/i2s_dma.h"
#include <espressif/esp_common.h>
#include <string.h> #include <string.h>
#include <malloc.h> #include <malloc.h>
@ -156,10 +157,25 @@ const IRAM_DATA int16_t bitpatterns[16] =
0b1110111010001000, 0b1110111010001110, 0b1110111011101000, 0b1110111011101110, 0b1110111010001000, 0b1110111010001110, 0b1110111011101000, 0b1110111011101110,
}; };
void ws2812_i2s_update(ws2812_pixel_t *pixels, pixeltype_t type) #define WAIT_SAMPLE (280UL + 3UL * dma_buffer_size)
int ws2812_i2s_update(ws2812_pixel_t *pixels, pixeltype_t type)
{ {
while (i2s_dma_processing) {}; while (i2s_dma_processing) {};
if (i2s_dma_processing)
{
return -1; //Busy
}
//TODO: Found a better way to prevent this. i2s_dma_processing work like intended ??
//This is to set minimum time between two i2s_update when executed following
static uint32_t time = 0;
if (sdk_system_get_time() < (time + WAIT_SAMPLE))
{
return -1; //Busy
}
time = sdk_system_get_time();
uint16_t *p_dma_buf = dma_buffer; uint16_t *p_dma_buf = dma_buffer;
for (uint32_t i = 0; i < (dma_buffer_size / type); i++) { for (uint32_t i = 0; i < (dma_buffer_size / type); i++) {
@ -184,4 +200,5 @@ void ws2812_i2s_update(ws2812_pixel_t *pixels, pixeltype_t type)
i2s_dma_processing = true; i2s_dma_processing = true;
i2s_dma_start(dma_block_list); i2s_dma_start(dma_block_list);
return 0;
} }

3
extras/ws2812_i2s/ws2812_i2s.h
View file

@ -60,8 +60,9 @@ void ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type);
* *
* @param pixels Array of 'pixels_number' pixels. The array must contain all * @param pixels Array of 'pixels_number' pixels. The array must contain all
* the pixels. * the pixels.
* @return Non-zero if busy
*/ */
void ws2812_i2s_update(ws2812_pixel_t *pixels, pixeltype_t type); int ws2812_i2s_update(ws2812_pixel_t *pixels, pixeltype_t type);
#ifdef __cplusplus #ifdef __cplusplus
} }