Skip to content

Commit ecaa513

Browse files
michaelkamprathmichaelkamprath
authored
Merge pull request #1 from michaelkamprath/v1documentation
Documentation and Color Handling Improvement
2 parents e5805f0 + b97d028 commit ecaa513

File tree

24 files changed

+569
-239
lines changed

24 files changed

+569
-239
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ There are two ways to initialize a `Glyph` object: with a bit array and with a b
1919
#### RGBImage
2020
A RGBImage is a color image using one of two color modes: 6 bit and 12 bit. There are two types of RGBImage object, the immutable `RGBImage` object and the mutable `MutableRGBImage` object. The advantage of the immutable `RGBImage` object is that it can be initialized with a `PROGMEM` block, thus reducing the RAM footprint for statically constructed `RGBImage` objects.
2121

22-
Color for the image is represented by a `ColorType` value. When the preprocessor macro `TWELVE_BIT_COLOR` is defined to `1`, `ColorType` will be an `unsigned int` with the following bit layout:
22+
Color for the image is represented by a `RGBColorType` value. When the preprocessor macro `TWELVE_BIT_COLOR` is defined to `1`, `RGBColorType` will be an `unsigned int` with the following bit layout:
2323

2424
```
2525
Bits 0 4 8 12
@@ -34,7 +34,7 @@ Bits 0 4 8 12
3434
```
3535
Color can easily be set in hexadecimal format, as the 2nd byte is red, the third byte is green, and the fourth byte is blue. The left most bit of the first byte is used to indicate whether the color is transparent or not. For operations that support transparency, any other color bits are ignored when the transparency bit is set. Transparency is primarily used when drawing one `RGBImage` onto another. Transparent colors will not change the color of the underlying pixel the `RGBImage` is being drawn on top of.
3636

37-
When the preprocessor macro `TWELVE_BIT_COLOR` is defined to `0`, `ColorType` will be an `unsigned char` with the following bit layout:
37+
When the preprocessor macro `TWELVE_BIT_COLOR` is defined to `0`, `RGBColorType` will be an `unsigned char` with the following bit layout:
3838

3939
```
4040
Bits 0 4
@@ -48,15 +48,15 @@ Bits 0 4
4848
B = Blue
4949
```
5050

51-
An `RGBImage` can be initialized with an array of `ColorType` values sized to be the image's rows\*columns.
51+
An `RGBImage` can be initialized with an array of `RGBColorType` values sized to be the image's rows\*columns.
5252
### Matrix Driver
5353
The matrix driver is an object that manages rendering an image on an LED matrix. It does this using a double buffer approach. The first buffer is the image that is desired to be rendered on the LED matrix. The second buffer is the bit sequences that needs to be sent to the LED matrix's shift registers to render the image. The matrix drive object uses SPI to send the bits to the shift register. Since the rows on the matrix are multiplexed when rendering, the matrix driver object will use a system clock interrupt to ensure the multiplexing is consistently timed.
5454

5555
When constructing a matrix driver, you need to tell it a few details:
5656
* The matrix's size in rows and columns
5757
* Whether the shift registers used for controlling columns should be set to `HIGH` or `LOW` to turn on the column.
5858
* Whether the shift registers used for controlling rows should be set to `HIGH` or `LOW` to turn on the row
59-
* The pin which will be used to send the latch signle.
59+
* The pin which will be used to send the latch signal.
6060

6161
#### LEDMatrix
6262
The `LEDMatrix` driver is used for matrices of single color LEDs. This drive uses a `MutableGlyph` as its image buffer.

‎examples/color_gradient-10x10/color_gradient-10x10.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
#define LOOP_COUNTER_MAX 8000
1313

1414
const int ROW_COLOR_LIST_SIZE = 19;
15-
ColorType rowColors[ROW_COLOR_LIST_SIZE];
15+
RGBColorType rowColors[ROW_COLOR_LIST_SIZE];
1616

17-
ColorType currentColor = RED_COLOR;
17+
RGBColorType currentColor = RED_COLOR;
1818

19-
ColorType redIncrement = 1 << RED_BIT_SHIFT;
20-
ColorType greenIncrement = 1 << GREEN_BIT_SHIFT;
21-
ColorType blueIncrement = 1 << BLUE_BIT_SHIFT;
19+
RGBColorType redIncrement = 1 << RED_BIT_SHIFT;
20+
RGBColorType greenIncrement = 1 << GREEN_BIT_SHIFT;
21+
RGBColorType blueIncrement = 1 << BLUE_BIT_SHIFT;
2222

2323
const int SEQUENCE_LENGTH = 7;
2424

2525
// This is the list of main colors we want to cycle through. Agradient will be calculated between them.
26-
ColorType colorSequence[SEQUENCE_LENGTH] = {
26+
RGBColorType colorSequence[SEQUENCE_LENGTH] = {
2727
RED_COLOR,
2828
RED_COLOR+GREEN_COLOR,
2929
GREEN_COLOR,
@@ -44,9 +44,9 @@ unsigned int colorIncrements[SEQUENCE_LENGTH] = {
4444
greenIncrement+blueIncrement
4545
};
4646

47-
// since ColorTYpe is an unsigned value, we need to keep track whether we are
47+
// since RGBColorType is an unsigned value, we need to keep track whether we are
4848
// adding or subtracting the increment.
49-
ColorType incrementType[SEQUENCE_LENGTH] = {
49+
RGBColorType incrementType[SEQUENCE_LENGTH] = {
5050
true,
5151
false,
5252
true,
@@ -72,7 +72,7 @@ int getNextIdx() {
7272
}
7373
}
7474

75-
ColorType getNextColor() {
75+
RGBColorType getNextColor() {
7676
if ( currentColor == colorSequence[getNextIdx()] ) {
7777
sequenceIdx++;
7878
if (sequenceIdx == SEQUENCE_LENGTH) {

‎examples/color_gradient-8x8/color_gradient-8x8.ino

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
RGBLEDMatrix leds(8,8);
1414

1515
const int ROW_COLOR_LIST_SIZE = 15;
16-
ColorType rowColors[ROW_COLOR_LIST_SIZE];
16+
RGBColorType rowColors[ROW_COLOR_LIST_SIZE];
1717

18-
ColorType currentColor = RED_COLOR;
18+
RGBColorType currentColor = RED_COLOR;
1919

20-
ColorType redIncrement = 1 << RED_BIT_SHIFT;
21-
ColorType greenIncrement = 1 << GREEN_BIT_SHIFT;
22-
ColorType blueIncrement = 1 << BLUE_BIT_SHIFT;
23-
ColorType greenAndBlueIncrement = greenIncrement|blueIncrement;
20+
RGBColorType redIncrement = 1 << RED_BIT_SHIFT;
21+
RGBColorType greenIncrement = 1 << GREEN_BIT_SHIFT;
22+
RGBColorType blueIncrement = 1 << BLUE_BIT_SHIFT;
23+
RGBColorType greenAndBlueIncrement = greenIncrement|blueIncrement;
2424
const int SEQUENCE_LENGTH = 7;
2525

2626
// This is the list of main colors we want to cycle through. Agradient will be calculated between them.
27-
ColorType colorSequence[SEQUENCE_LENGTH] = {
27+
RGBColorType colorSequence[SEQUENCE_LENGTH] = {
2828
RED_COLOR,
2929
RED_COLOR+GREEN_COLOR,
3030
GREEN_COLOR,
@@ -35,7 +35,7 @@ ColorType colorSequence[SEQUENCE_LENGTH] = {
3535
};
3636

3737
// This is the list of step values needed to transition to the next color.
38-
ColorType colorIncrements[SEQUENCE_LENGTH] = {
38+
RGBColorType colorIncrements[SEQUENCE_LENGTH] = {
3939
greenIncrement,
4040
redIncrement,
4141
blueIncrement,
@@ -45,7 +45,7 @@ ColorType colorIncrements[SEQUENCE_LENGTH] = {
4545
greenAndBlueIncrement
4646
};
4747

48-
// since ColorTYpe is an unsigned value, we need to keep track whether we are
48+
// since RGBColorType is an unsigned value, we need to keep track whether we are
4949
// adding or subtracting the increment.
5050
boolean incrementType[SEQUENCE_LENGTH] = {
5151
true,
@@ -73,7 +73,7 @@ int getNextIdx() {
7373
}
7474
}
7575

76-
ColorType getNextColor() {
76+
RGBColorType getNextColor() {
7777
if ( currentColor == colorSequence[getNextIdx()] ) {
7878
sequenceIdx++;
7979
if (sequenceIdx == SEQUENCE_LENGTH) {

‎examples/conway-game-of-life-10x10/conway-game-of-life-10x10.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private:
3737
LifeState* _cells;
3838
LifeState* _nextCells;
3939

40-
ColorType getColorForLifeState( LifeState state ) const;
40+
RGBColorType getColorForLifeState( LifeState state ) const;
4141

4242
protected:
4343
virtual void action();
@@ -143,7 +143,7 @@ void CellUniverse::action() {
143143
int idx = y*_leds.columns() + x;
144144
_nextCells[idx] = newState;
145145

146-
ColorType cellColor = this->getColorForLifeState(newState);
146+
RGBColorType cellColor = this->getColorForLifeState(newState);
147147
_leds.image().pixel(y, x) = cellColor;
148148
}
149149
}
@@ -157,15 +157,15 @@ void CellUniverse::drawToScreen() {
157157
for (int x = 0; x < _leds.columns(); x++) {
158158
for (int y = 0; y < _leds.rows(); y++ ) {
159159
LifeState currentState = this->getCellStatus(y, x);
160-
ColorType cellColor = this->getColorForLifeState(currentState);
160+
RGBColorType cellColor = this->getColorForLifeState(currentState);
161161
_leds.image().pixel(y, x) = cellColor;
162162
}
163163
}
164164
_leds.stopDrawing();
165165
}
166166

167-
ColorType CellUniverse::getColorForLifeState( LifeState state ) const {
168-
ColorType cellColor = BLACK_COLOR;
167+
RGBColorType CellUniverse::getColorForLifeState( LifeState state ) const {
168+
RGBColorType cellColor = BLACK_COLOR;
169169
switch (state) {
170170
case BORN:
171171
cellColor = GREEN_COLOR;

‎examples/conway-game-of-life-8x8/conway-game-of-life-8x8.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private:
3737
LifeState* _cells;
3838
LifeState* _nextCells;
3939

40-
ColorType getColorForLifeState( LifeState state ) const;
40+
RGBColorType getColorForLifeState( LifeState state ) const;
4141

4242
protected:
4343
virtual void action();
@@ -143,7 +143,7 @@ void CellUniverse::action() {
143143
int idx = y*_leds.columns() + x;
144144
_nextCells[idx] = newState;
145145

146-
ColorType cellColor = this->getColorForLifeState(newState);
146+
RGBColorType cellColor = this->getColorForLifeState(newState);
147147
_leds.image().pixel(y, x) = cellColor;
148148
}
149149
}
@@ -157,15 +157,15 @@ void CellUniverse::drawToScreen() {
157157
for (int x = 0; x < _leds.columns(); x++) {
158158
for (int y = 0; y < _leds.rows(); y++ ) {
159159
LifeState currentState = this->getCellStatus(y, x);
160-
ColorType cellColor = this->getColorForLifeState(currentState);
160+
RGBColorType cellColor = this->getColorForLifeState(currentState);
161161
_leds.image().pixel(y, x) = cellColor;
162162
}
163163
}
164164
_leds.stopDrawing();
165165
}
166166

167-
ColorType CellUniverse::getColorForLifeState( LifeState state ) const {
168-
ColorType cellColor = BLACK_COLOR;
167+
RGBColorType CellUniverse::getColorForLifeState( LifeState state ) const {
168+
RGBColorType cellColor = BLACK_COLOR;
169169
switch (state) {
170170
case BORN:
171171
cellColor = GREEN_COLOR;

‎examples/dot-chaser-10x10/dot-chaser-10x10.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected:
1717
_screen->startDrawing();
1818
for (int x = 0; x < _screen->rows(); ++x) {
1919
for (int y = 0; y < _screen->columns(); ++y ) {
20-
ColorType color = 0;
20+
RGBColorType color = 0;
2121
if ( x == _xStack[4] && y == _yStack[4] ) {
2222
color = DARK_BLUE_COLOR;
2323
}

‎examples/dot-chaser-8x8/dot-chaser-8x8.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected:
1717
_screen->startDrawing();
1818
for (int x = 0; x < _screen->rows(); ++x) {
1919
for (int y = 0; y < _screen->columns(); ++y ) {
20-
ColorType color = 0;
20+
RGBColorType color = 0;
2121
if ( x == _xStack[4] && y == _yStack[4] ) {
2222
color = DARK_BLUE_COLOR;
2323
}

‎examples/space-invaders-color-10x10/space-invaders-color-10x10.ino

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
RGBLEDMatrix leds(10,10);
99

10-
PROGMEM ColorType const invader1A[64] = {
10+
PROGMEM RGBColorType const invader1A[64] = {
1111
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
1212
TRANSPARENT_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
1313
TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,
@@ -18,7 +18,7 @@ PROGMEM ColorType const invader1A[64] = {
1818
DARK_GREEN_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR
1919
};
2020

21-
PROGMEM ColorType const invader1B[64] = {
21+
PROGMEM RGBColorType const invader1B[64] = {
2222
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
2323
TRANSPARENT_COLOR,TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
2424
TRANSPARENT_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,DARK_GREEN_COLOR,TRANSPARENT_COLOR,
@@ -30,7 +30,7 @@ PROGMEM ColorType const invader1B[64] = {
3030
};
3131

3232

33-
PROGMEM ColorType const invader2A[64] = {
33+
PROGMEM RGBColorType const invader2A[64] = {
3434
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
3535
TRANSPARENT_COLOR,TRANSPARENT_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
3636
TRANSPARENT_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,TRANSPARENT_COLOR,
@@ -41,7 +41,7 @@ PROGMEM ColorType const invader2A[64] = {
4141
RED_COLOR,RED_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,RED_COLOR,RED_COLOR
4242
};
4343

44-
PROGMEM ColorType const invader2B[64] = {
44+
PROGMEM RGBColorType const invader2B[64] = {
4545
TRANSPARENT_COLOR,TRANSPARENT_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
4646
TRANSPARENT_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,RED_COLOR,TRANSPARENT_COLOR,
4747
RED_COLOR,RED_COLOR,LIME_COLOR,RED_COLOR,RED_COLOR,LIME_COLOR,RED_COLOR,RED_COLOR,
@@ -52,7 +52,7 @@ PROGMEM ColorType const invader2B[64] = {
5252
TRANSPARENT_COLOR,TRANSPARENT_COLOR,RED_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,RED_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
5353
};
5454

55-
PROGMEM ColorType const invader3A[64] = {
55+
PROGMEM RGBColorType const invader3A[64] = {
5656
TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
5757
TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
5858
TRANSPARENT_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,
@@ -63,7 +63,7 @@ PROGMEM ColorType const invader3A[64] = {
6363
TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
6464
};
6565

66-
PROGMEM ColorType const invader3B[64] = {
66+
PROGMEM RGBColorType const invader3B[64] = {
6767
TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
6868
ORANGE_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,
6969
ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,ORANGE_COLOR,
@@ -74,7 +74,7 @@ PROGMEM ColorType const invader3B[64] = {
7474
TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,ORANGE_COLOR,TRANSPARENT_COLOR
7575
};
7676

77-
PROGMEM ColorType const invader4A[72] = {
77+
PROGMEM RGBColorType const invader4A[72] = {
7878
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
7979
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
8080
YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,
@@ -86,7 +86,7 @@ PROGMEM ColorType const invader4A[72] = {
8686
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
8787
};
8888

89-
PROGMEM ColorType const invader4B[72] = {
89+
PROGMEM RGBColorType const invader4B[72] = {
9090
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
9191
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
9292
BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,
@@ -98,7 +98,7 @@ PROGMEM ColorType const invader4B[72] = {
9898
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
9999
};
100100

101-
PROGMEM ColorType const invader4C[72] = {
101+
PROGMEM RGBColorType const invader4C[72] = {
102102
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
103103
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
104104
BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,
@@ -110,7 +110,7 @@ PROGMEM ColorType const invader4C[72] = {
110110
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,CORAL_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
111111
};
112112

113-
PROGMEM ColorType const invader4D[72] = {
113+
PROGMEM RGBColorType const invader4D[72] = {
114114
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
115115
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
116116
YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,
@@ -122,7 +122,7 @@ PROGMEM ColorType const invader4D[72] = {
122122
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,CORAL_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
123123
};
124124

125-
PROGMEM ColorType const invader4E[72] = {
125+
PROGMEM RGBColorType const invader4E[72] = {
126126
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
127127
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
128128
YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,
@@ -134,7 +134,7 @@ PROGMEM ColorType const invader4E[72] = {
134134
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,CORAL_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
135135
};
136136

137-
PROGMEM ColorType const invader4F[72] = {
137+
PROGMEM RGBColorType const invader4F[72] = {
138138
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
139139
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
140140
BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,
@@ -146,7 +146,7 @@ PROGMEM ColorType const invader4F[72] = {
146146
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
147147
};
148148

149-
PROGMEM ColorType const invader4G[72] = {
149+
PROGMEM RGBColorType const invader4G[72] = {
150150
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
151151
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
152152
BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,
@@ -158,7 +158,7 @@ PROGMEM ColorType const invader4G[72] = {
158158
TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR
159159
};
160160

161-
PROGMEM ColorType const invader4H[72] = {
161+
PROGMEM RGBColorType const invader4H[72] = {
162162
TRANSPARENT_COLOR,TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,TRANSPARENT_COLOR,
163163
TRANSPARENT_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,BLUE_COLOR,TRANSPARENT_COLOR,
164164
YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,YELLOW_COLOR,BLUE_COLOR,BLUE_COLOR,YELLOW_COLOR,

0 commit comments

Comments
 (0)