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

rename setBrightness to setPanelBrightness

Browse source 
For some strange reason it causes a panic. Some other arduino function must be conflicting.
This commit is contained in:
mrfaptastic 2019-07-29 12:57:53 +01:00
parent 1ce9f70e4b
commit da358dcb1f
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ESP32-RGB64x32MatrixPanel-I2S-DMA.cpp
View file

@ -61,7 +61,7 @@ void RGB64x32MatrixPanel_I2S_DMA::configureDMA(int r1_pin, int g1_pin, int b1_
Serial.printf("lsbMsbTransitionBit of %d gives %d Hz refresh: \r\n", lsbMsbTransitionBit, actualRefreshRate); Serial.printf("lsbMsbTransitionBit of %d gives %d Hz refresh: \r\n", lsbMsbTransitionBit, actualRefreshRate);
if (actualRefreshRate > 150) // HACK Hard Coded: Minimum frame rate of 150 if (actualRefreshRate > 100) // HACK Hard Coded: Minimum frame rate of 150
break; break;

35
ESP32-RGB64x32MatrixPanel-I2S-DMA.h
View file

@ -180,9 +180,9 @@ class RGB64x32MatrixPanel_I2S_DMA : public Adafruit_GFX {
backbuf_id = 0; backbuf_id = 0;
brightness = 60; // If you get ghosting... reduce brightness level. 60 seems to be the limit before ghosting on a 64 pixel wide physical panel for some panels brightness = 60; // If you get ghosting... reduce brightness level. 60 seems to be the limit before ghosting on a 64 pixel wide physical panel for some panels
} }
// Painfully propagate the DMA pin configuration, or use compiler defaults // Painfully propagate the DMA pin configuration, or use compiler defaults
void begin(int dma_r1_pin = R1_PIN_DEFAULT , int dma_g1_pin = G1_PIN_DEFAULT, int dma_b1_pin = B1_PIN_DEFAULT , int dma_r2_pin = R2_PIN_DEFAULT , int dma_g2_pin = G2_PIN_DEFAULT , int dma_b2_pin = B2_PIN_DEFAULT , int dma_a_pin = A_PIN_DEFAULT , int dma_b_pin = B_PIN_DEFAULT , int dma_c_pin = C_PIN_DEFAULT , int dma_d_pin = D_PIN_DEFAULT , int dma_e_pin = E_PIN_DEFAULT , int dma_lat_pin = LAT_PIN_DEFAULT, int dma_oe_pin = OE_PIN_DEFAULT , int dma_clk_pin = CLK_PIN_DEFAULT) void begin(int dma_r1_pin = R1_PIN_DEFAULT , int dma_g1_pin = G1_PIN_DEFAULT, int dma_b1_pin = B1_PIN_DEFAULT , int dma_r2_pin = R2_PIN_DEFAULT , int dma_g2_pin = G2_PIN_DEFAULT , int dma_b2_pin = B2_PIN_DEFAULT , int dma_a_pin = A_PIN_DEFAULT , int dma_b_pin = B_PIN_DEFAULT , int dma_c_pin = C_PIN_DEFAULT , int dma_d_pin = D_PIN_DEFAULT , int dma_e_pin = E_PIN_DEFAULT , int dma_lat_pin = LAT_PIN_DEFAULT, int dma_oe_pin = OE_PIN_DEFAULT , int dma_clk_pin = CLK_PIN_DEFAULT)
{ {
@ -226,8 +226,7 @@ class RGB64x32MatrixPanel_I2S_DMA : public Adafruit_GFX {
} }
// TODO: Disable/Enable auto buffer flipping (useful for lots of drawPixel usage)... // TODO: Disable/Enable auto buffer flipping (useful for lots of drawPixel usage)...
// Draw pixels // Draw pixels
virtual void drawPixel(int16_t x, int16_t y, uint16_t color); // overwrite adafruit implementation virtual void drawPixel(int16_t x, int16_t y, uint16_t color); // overwrite adafruit implementation
virtual void fillScreen(uint16_t color); // overwrite adafruit implementation virtual void fillScreen(uint16_t color); // overwrite adafruit implementation
@ -235,14 +234,14 @@ class RGB64x32MatrixPanel_I2S_DMA : public Adafruit_GFX {
void drawPixelRGB565(int16_t x, int16_t y, uint16_t color); void drawPixelRGB565(int16_t x, int16_t y, uint16_t color);
void drawPixelRGB888(int16_t x, int16_t y, uint8_t r, uint8_t g, uint8_t b); void drawPixelRGB888(int16_t x, int16_t y, uint8_t r, uint8_t g, uint8_t b);
void drawPixelRGB24(int16_t x, int16_t y, rgb_24 color); void drawPixelRGB24(int16_t x, int16_t y, rgb_24 color);
// Color 444 is a 4 bit scale, so 0 to 15, color 565 takes a 0-255 bit value, so scale up by 255/15 (i.e. 17)! // Color 444 is a 4 bit scale, so 0 to 15, color 565 takes a 0-255 bit value, so scale up by 255/15 (i.e. 17)!
uint16_t color444(uint8_t r, uint8_t g, uint8_t b) { return color565(r*17,g*17,b*17); } uint16_t color444(uint8_t r, uint8_t g, uint8_t b) { return color565(r*17,g*17,b*17); }
// Converts RGB888 to RGB565 // Converts RGB888 to RGB565
uint16_t color565(uint8_t r, uint8_t g, uint8_t b); // This is what is used by Adafruit GFX! uint16_t color565(uint8_t r, uint8_t g, uint8_t b); // This is what is used by Adafruit GFX!
void flipDMABuffer() inline void flipDMABuffer()
{ {
// Step 1. Bring backbuffer to the foreground (i.e. show it) // Step 1. Bring backbuffer to the foreground (i.e. show it)
//showDMABuffer(); //showDMABuffer();
@ -258,18 +257,19 @@ class RGB64x32MatrixPanel_I2S_DMA : public Adafruit_GFX {
#endif #endif
} }
void showDMABuffer() inline void showDMABuffer()
{ {
i2s_parallel_flip_to_buffer(&I2S1, backbuf_id); i2s_parallel_flip_to_buffer(&I2S1, backbuf_id);
} }
void setBrightness(int _brightness)
{ inline void setPanelBrightness(int b)
// Change to set the brightness of the display, range of 1 to matrixWidth (i.e. 1 - 64) {
brightness = _brightness; // Change to set the brightness of the display, range of 1 to matrixWidth (i.e. 1 - 64)
} brightness = b;
}
// ------- PRIVATE ------- // ------- PRIVATE -------
private: private:
@ -300,8 +300,9 @@ class RGB64x32MatrixPanel_I2S_DMA : public Adafruit_GFX {
int backbuf_id; // If using double buffer, which one is NOT active (ie. being displayed) to write too? int backbuf_id; // If using double buffer, which one is NOT active (ie. being displayed) to write too?
int lsbMsbTransitionBit; int lsbMsbTransitionBit;
int refreshRate; int refreshRate;
int brightness; int brightness;
}; // end Class header }; // end Class header
@ -357,7 +358,5 @@ inline uint16_t RGB64x32MatrixPanel_I2S_DMA::color565(uint8_t r, uint8_t g, uint
} }
#endif #endif