ScStw/ESP32-HUB75-MatrixPanel-DMA
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #408 from Lukaswnd/master

Browse source 
fix: _dmadesc_ loopc
This commit is contained in:
mrfaptastic 2023-03-09 11:31:32 +00:00 committed by GitHub
commit d345aaf8c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ESP32-HUB75-MatrixPanel-I2S-DMA.cpp
View file

@ -831,9 +831,12 @@ void MatrixPanel_I2S_DMA::hlineDMA(int16_t x_coord, int16_t y_coord, int16_t l,
if ( !initialized ) if ( !initialized )
return; return;
if ( x_coord < 0 || y_coord < 0 || l < 1 || x_coord >= PIXELS_PER_ROW || y_coord >= m_cfg.mx_height) if ( (x_coord + l) < 1 || y_coord < 0 || l < 1 || x_coord >= PIXELS_PER_ROW || y_coord >= m_cfg.mx_height)
return; return;
l = x_coord < 0 ? l+x_coord : l;
x_coord = x_coord < 0 ? 0 : x_coord;
l = ( (x_coord + l) >= PIXELS_PER_ROW ) ? (PIXELS_PER_ROW - x_coord):l; l = ( (x_coord + l) >= PIXELS_PER_ROW ) ? (PIXELS_PER_ROW - x_coord):l;
@ -923,9 +926,12 @@ void MatrixPanel_I2S_DMA::vlineDMA(int16_t x_coord, int16_t y_coord, int16_t l,
if ( !initialized ) if ( !initialized )
return; return;
if ( x_coord < 0 || y_coord < 0 || l < 1 || x_coord >= PIXELS_PER_ROW || y_coord >= m_cfg.mx_height) if ( x_coord < 0 || (y_coord + l) < 1 || l < 1 || x_coord >= PIXELS_PER_ROW || y_coord >= m_cfg.mx_height)
return; return;
l = y_coord < 0 ? l+y_coord : l;
y_coord = y_coord < 0 ? 0 : y_coord;
// check for a length that goes beyond the height of the screen! Array out of bounds dma memory changes = screwed output #163 // check for a length that goes beyond the height of the screen! Array out of bounds dma memory changes = screwed output #163
l = ( (y_coord + l) >= m_cfg.mx_height ) ? (m_cfg.mx_height - y_coord):l; l = ( (y_coord + l) >= m_cfg.mx_height ) ? (m_cfg.mx_height - y_coord):l;
//if (y_coord + l > m_cfg.mx_height) //if (y_coord + l > m_cfg.mx_height)

4
src/ESP32-HUB75-MatrixPanel-I2S-DMA.h
View file

@ -274,7 +274,7 @@ struct HUB75_I2S_CFG {
bool clkphase; bool clkphase;
// Minimum refresh / scan rate needs to be configured on start due to LSBMSB_TRANSITION_BIT calculation in allocateDMAmemory() // Minimum refresh / scan rate needs to be configured on start due to LSBMSB_TRANSITION_BIT calculation in allocateDMAmemory()
uint8_t min_refresh_rate; uint16_t min_refresh_rate;
// struct constructor // struct constructor
HUB75_I2S_CFG ( HUB75_I2S_CFG (
@ -290,7 +290,7 @@ struct HUB75_I2S_CFG {
clk_speed _i2sspeed = HZ_15M, clk_speed _i2sspeed = HZ_15M,
uint8_t _latblk = DEFAULT_LAT_BLANKING, // Anything > 1 seems to cause artefacts on ICS panels uint8_t _latblk = DEFAULT_LAT_BLANKING, // Anything > 1 seems to cause artefacts on ICS panels
bool _clockphase = true, bool _clockphase = true,
uint8_t _min_refresh_rate = 60 uint16_t _min_refresh_rate = 60
) : mx_width(_w), ) : mx_width(_w),
mx_height(_h), mx_height(_h),
chain_length(_chain), chain_length(_chain),

29
src/platforms/esp32/esp32_i2s_parallel_dma.cpp
View file

@ -61,7 +61,7 @@ static void IRAM_ATTR irq_hndlr(void* arg) { // if we use I2S1 (default)
void IRAM_ATTR irq_hndlr(void* arg) { void IRAM_ATTR irq_hndlr(void* arg) {
// Clear flag so we can get retriggered // Clear flag so we can get retriggered
//SET_PERI_REG_BITS(I2S_INT_CLR_REG(ESP32_I2S_DEVICE), I2S_OUT_EOF_INT_CLR_V, 1, I2S_OUT_EOF_INT_CLR_S); SET_PERI_REG_BITS(I2S_INT_CLR_REG(ESP32_I2S_DEVICE), I2S_OUT_EOF_INT_CLR_V, 1, I2S_OUT_EOF_INT_CLR_S);
active_dma_buffer_output_count++; active_dma_buffer_output_count++;
@ -636,40 +636,29 @@ static void IRAM_ATTR irq_hndlr(void* arg) { // if we use I2S1 (default)
if ( current_back_buffer_id == 1) { if ( current_back_buffer_id == 1) {
// _dmadesc_b is not visable, make it visible. Currently looping around _dmadesc_a // _dmadesc_b is not visable, make it visible. Currently looping around _dmadesc_a
// GFX library is changing pixels of back buffer '1' // GFX library is changing pixels of back buffer '1'
_dev->int_clr.out_eof = 1; // clear interrupt
active_dma_buffer_output_count = 0;
while (!active_dma_buffer_output_count) {}
_dmadesc_a[_dmadesc_last].qe.stqe_next = &_dmadesc_b[0]; // Start sending out _dmadesc_b (or buffer 1) _dmadesc_a[_dmadesc_last].qe.stqe_next = &_dmadesc_b[0]; // Start sending out _dmadesc_b (or buffer 1)
current_back_buffer_id = 0; // quickly update the library so it stops writing dirrectly to buffer 1!
_dev->int_clr.out_eof = 1; // clear interrupt
active_dma_buffer_output_count = 0; active_dma_buffer_output_count = 0;
while (!active_dma_buffer_output_count) {} while (!active_dma_buffer_output_count) {}
_dmadesc_a[_dmadesc_last].qe.stqe_next = &_dmadesc_a[0]; // get this preped for the next flip buffer //fix _dmadesc_ loop issue #407
//need to connect the up comming _dmadesc_ not the old one
_dmadesc_b[_dmadesc_last].qe.stqe_next = &_dmadesc_b[0];
} else { } else {
// current_back_buffer_id == 0 // current_back_buffer_id == 0
// we are currently active on _dmadesc_a. we want to flip across and loop _dmadesc_ // we are currently active on _dmadesc_a. we want to flip across and loop _dmadesc_
_dev->int_clr.out_eof = 1; // clear interrupt
active_dma_buffer_output_count = 0;
while (!active_dma_buffer_output_count) {}
_dmadesc_b[_dmadesc_last].qe.stqe_next = &_dmadesc_a[0]; _dmadesc_b[_dmadesc_last].qe.stqe_next = &_dmadesc_a[0];
current_back_buffer_id = 1;
_dev->int_clr.out_eof = 1; // clear interrupt
active_dma_buffer_output_count = 0; active_dma_buffer_output_count = 0;
while (!active_dma_buffer_output_count) {} while (!active_dma_buffer_output_count) {}
_dmadesc_b[_dmadesc_last].qe.stqe_next = &_dmadesc_b[0]; _dmadesc_a[_dmadesc_last].qe.stqe_next = &_dmadesc_a[0];
} }
// current_back_buffer_id ^= 1; current_back_buffer_id ^= 1;
// Disable intterupt // Disable intterupt
_dev->int_ena.out_eof = 0; _dev->int_ena.out_eof = 0;