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

Fix #163

Browse source 
Array out of bounds DMA change.
This commit is contained in:
mrfaptastic 2021-08-16 14:18:36 +01:00
parent fd7629e52c
commit 1fa0b42480
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ESP32-HUB75-MatrixPanel-I2S-DMA.cpp
View file

@ -754,6 +754,7 @@ void MatrixPanel_I2S_DMA::brtCtrlOE(int brt, const bool _buff_id){
/* /*
* overload for compatibility * overload for compatibility
*/ */
/*
bool MatrixPanel_I2S_DMA::begin(int r1, int g1, int b1, int r2, int g2, int b2, int a, int b, int c, int d, int e, int lat, int oe, int clk) { bool MatrixPanel_I2S_DMA::begin(int r1, int g1, int b1, int r2, int g2, int b2, int a, int b, int c, int d, int e, int lat, int oe, int clk) {
// RGB // RGB
@ -769,6 +770,7 @@ bool MatrixPanel_I2S_DMA::begin(int r1, int g1, int b1, int r2, int g2, int b2,
return begin(); return begin();
} }
*/
/** /**
* @brief - Sets how many clock cycles to blank OE before/after LAT signal change * @brief - Sets how many clock cycles to blank OE before/after LAT signal change
@ -879,8 +881,10 @@ void MatrixPanel_I2S_DMA::vlineDMA(int16_t x_coord, int16_t y_coord, int16_t l,
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 < 0 || l < 1 || x_coord >= PIXELS_PER_ROW || y_coord >= m_cfg.mx_height)
return; return;
if (y_coord + l > m_cfg.mx_height) // check for a length that goes beyond the height of the screen! Array out of bounds dma memory changes = screwed output #163
l = m_cfg.mx_height - y_coord + 1; // reset width to end of col l = ( (y_coord + l) >= m_cfg.mx_height ) ? (m_cfg.mx_height - y_coord):l;
//if (y_coord + l > m_cfg.mx_height)
/// l = m_cfg.mx_height - y_coord + 1; // reset width to end of col
/* LED Brightness Compensation */ /* LED Brightness Compensation */
#ifndef NO_CIE1931 #ifndef NO_CIE1931

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

@ -351,7 +351,7 @@ class MatrixPanel_I2S_DMA {
/* Propagate the DMA pin configuration, allocate DMA buffs and start data ouput, initialy blank */ /* Propagate the DMA pin configuration, allocate DMA buffs and start data ouput, initialy blank */
bool begin(){ bool begin(){
if (initialized) return; // we don't do this twice or more! if (initialized) return true; // we don't do this twice or more!
// Change 'if' to '1' to enable, 0 to not include this Serial output in compiled program // Change 'if' to '1' to enable, 0 to not include this Serial output in compiled program
#if SERIAL_DEBUG #if SERIAL_DEBUG
@ -402,7 +402,9 @@ class MatrixPanel_I2S_DMA {
/* /*
* overload for compatibility * overload for compatibility
*/ */
/*
bool begin(int r1, int g1 = G1_PIN_DEFAULT, int b1 = B1_PIN_DEFAULT, int r2 = R2_PIN_DEFAULT, int g2 = G2_PIN_DEFAULT, int b2 = B2_PIN_DEFAULT, int a = A_PIN_DEFAULT, int b = B_PIN_DEFAULT, int c = C_PIN_DEFAULT, int d = D_PIN_DEFAULT, int e = E_PIN_DEFAULT, int lat = LAT_PIN_DEFAULT, int oe = OE_PIN_DEFAULT, int clk = CLK_PIN_DEFAULT); bool begin(int r1, int g1 = G1_PIN_DEFAULT, int b1 = B1_PIN_DEFAULT, int r2 = R2_PIN_DEFAULT, int g2 = G2_PIN_DEFAULT, int b2 = B2_PIN_DEFAULT, int a = A_PIN_DEFAULT, int b = B_PIN_DEFAULT, int c = C_PIN_DEFAULT, int d = D_PIN_DEFAULT, int e = E_PIN_DEFAULT, int lat = LAT_PIN_DEFAULT, int oe = OE_PIN_DEFAULT, int clk = CLK_PIN_DEFAULT);
*/
// TODO: Disable/Enable auto buffer flipping (useful for lots of drawPixel usage)... // TODO: Disable/Enable auto buffer flipping (useful for lots of drawPixel usage)...