Skip to content

Commit bba1a47

Browse files
authored
Merge pull request #676 from DevxMike/master
fixed nullptr dereference
2 parents 7929b97 + 268fd5e commit bba1a47

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

examples/1_SimpleTestShapes/1_SimpleTestShapes.ino

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@
1313
//MatrixPanel_I2S_DMA dma_display;
1414
MatrixPanel_I2S_DMA *dma_display = nullptr;
1515

16-
uint16_t myBLACK = dma_display->color565(0, 0, 0);
17-
uint16_t myWHITE = dma_display->color565(255, 255, 255);
18-
uint16_t myRED = dma_display->color565(255, 0, 0);
19-
uint16_t myGREEN = dma_display->color565(0, 255, 0);
20-
uint16_t myBLUE = dma_display->color565(0, 0, 255);
21-
22-
16+
uint16_t myBLACK, myWHITE, myRED, myGREEN, myBLUE;
2317

2418
// Input a value 0 to 255 to get a color value.
2519
// The colours are a transition r - g - b - back to r.
@@ -109,6 +103,14 @@ void setup() {
109103
dma_display->begin();
110104
dma_display->setBrightness8(90); //0-255
111105
dma_display->clearScreen();
106+
107+
myBLACK = dma_display->color565(0, 0, 0);
108+
myWHITE = dma_display->color565(255, 255, 255);
109+
myRED = dma_display->color565(255, 0, 0);
110+
myGREEN = dma_display->color565(0, 255, 0);
111+
myBLUE = dma_display->color565(0, 0, 255);
112+
113+
112114
dma_display->fillScreen(myWHITE);
113115

114116
// fix the screen with green

examples/3_DoubleBuffer/3_DoubleBuffer.ino

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
// Double buffering is not always required in reality.
66

77
#include <ESP32-HUB75-MatrixPanel-I2S-DMA.h>
8+
#include <array>
89

910
MatrixPanel_I2S_DMA *display = nullptr;
1011

11-
uint16_t myDARK = display->color565(64, 64, 64);
12-
uint16_t myWHITE = display->color565(192, 192, 192);
13-
uint16_t myRED = display->color565(255, 0, 0);
14-
uint16_t myGREEN = display->color565(0, 255, 0);
15-
uint16_t myBLUE = display->color565(0, 0, 255);
12+
constexpr std::size_t color_num = 5;
13+
using colour_arr_t = std::array<uint16_t, color_num>;
1614

17-
uint16_t colours[5] = { myDARK, myWHITE, myRED, myGREEN, myBLUE };
15+
uint16_t myDARK, myWHITE, myRED, myGREEN, myBLUE;
16+
colour_arr_t colours;
1817

1918
struct Square
2019
{
@@ -45,6 +44,14 @@ void setup()
4544
display = new MatrixPanel_I2S_DMA(mxconfig);
4645
display->begin(); // setup display with pins as pre-defined in the library
4746

47+
myDARK = display->color565(64, 64, 64);
48+
myWHITE = display->color565(192, 192, 192);
49+
myRED = display->color565(255, 0, 0);
50+
myGREEN = display->color565(0, 255, 0);
51+
myBLUE = display->color565(0, 0, 255);
52+
53+
colours = {{ myDARK, myWHITE, myRED, myGREEN, myBLUE }};
54+
4855
// Create some random squares
4956
for (int i = 0; i < numSquares; i++)
5057
{

0 commit comments

Comments
 (0)