Skip to content

Commit 3d6258f

Browse files
jeplerjepler
committed
Rename Protomatter -> RGBMatrix
This is a quick rename, it changes the user-facing names but not the internal names of things.
1 parent 64c3968 commit 3d6258f

File tree

18 files changed

+30
-30
lines changed

18 files changed

+30
-30
lines changed

ports/atmel-samd/common-hal/protomatter/Protomatter.c renamed to ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <stddef.h>
2828

29-
#include "common-hal/protomatter/Protomatter.h"
29+
#include "common-hal/rgbmatrix/RGBMatrix.h"
3030

3131
#include "samd/timers.h"
3232
#include "timer_handler.h"

ports/atmel-samd/common-hal/protomatter/Protomatter.h renamed to ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.h

File renamed without changes.

ports/atmel-samd/common-hal/protomatter/__init__.c renamed to ports/atmel-samd/common-hal/rgbmatrix/__init__.c

File renamed without changes.

ports/nrf/common-hal/protomatter/Protomatter.c renamed to ports/nrf/common-hal/rgbmatrix/RGBMatrix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <stddef.h>
2828

29-
#include "common-hal/protomatter/Protomatter.h"
29+
#include "common-hal/rgbmatrix/RGBMatrix.h"
3030

3131
#include "peripherals/nrf/timers.h"
3232

ports/nrf/common-hal/protomatter/Protomatter.h renamed to ports/nrf/common-hal/rgbmatrix/RGBMatrix.h

File renamed without changes.

ports/nrf/common-hal/protomatter/__init__.c renamed to ports/nrf/common-hal/rgbmatrix/__init__.c

File renamed without changes.

‎py/circuitpy_defns.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ ifeq ($(CIRCUITPY_PIXELBUF),1)
182182
SRC_PATTERNS += _pixelbuf/%
183183
endif
184184
ifeq ($(CIRCUITPY_PROTOMATTER),1)
185-
SRC_PATTERNS += protomatter/%
185+
SRC_PATTERNS += rgbmatrix/%
186186
endif
187187
ifeq ($(CIRCUITPY_PULSEIO),1)
188188
SRC_PATTERNS += pulseio/%
@@ -277,8 +277,8 @@ SRC_COMMON_HAL_ALL = \
277277
nvm/ByteArray.c \
278278
nvm/__init__.c \
279279
os/__init__.c \
280-
protomatter/Protomatter.c \
281-
protomatter/__init__.c \
280+
rgbmatrix/RGBMatrix.c \
281+
rgbmatrix/__init__.c \
282282
pulseio/PWMOut.c \
283283
pulseio/PulseIn.c \
284284
pulseio/PulseOut.c \
@@ -366,8 +366,8 @@ SRC_SHARED_MODULE_ALL = \
366366
random/__init__.c \
367367
socket/__init__.c \
368368
network/__init__.c \
369-
protomatter/Protomatter.c \
370-
protomatter/__init__.c \
369+
rgbmatrix/RGBMatrix.c \
370+
rgbmatrix/__init__.c \
371371
storage/__init__.c \
372372
struct/__init__.c \
373373
terminalio/Terminal.c \
@@ -417,7 +417,7 @@ ifeq ($(CIRCUITPY_PROTOMATTER),1)
417417
SRC_MOD += $(addprefix lib/protomatter/, \
418418
core.c \
419419
)
420-
$(BUILD)/lib/protomatter/core.o: CFLAGS += -include "shared-module/protomatter/allocator.h" -DCIRCUITPY -Wno-missing-braces
420+
$(BUILD)/lib/protomatter/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces
421421
endif
422422

423423
# All possible sources are listed here, and are filtered by SRC_PATTERNS.

‎py/circuitpy_mpconfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ extern const struct _mp_obj_module_t pixelbuf_module;
463463

464464
#if CIRCUITPY_PROTOMATTER
465465
extern const struct _mp_obj_module_t protomatter_module;
466-
#define PROTOMATTER_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_protomatter),(mp_obj_t)&protomatter_module },
466+
#define PROTOMATTER_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rgbmatrix),(mp_obj_t)&protomatter_module },
467467
#else
468468
#define PROTOMATTER_MODULE
469469
#endif

‎shared-bindings/framebufferio/__init__.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
//| The `framebufferio` module contains classes to manage display output
3939
//| including synchronizing with refresh rates and partial updating.
4040
//| It is used in conjunction with classes from `displayio` to actually
41-
//| place items on the display; and classes like `Protomatter` to actually
41+
//| place items on the display; and classes like `RGBMatrix` to actually
4242
//| drive the display.
4343
//|
4444
//| Libraries

shared-bindings/protomatter/Protomatter.c renamed to shared-bindings/rgbmatrix/RGBMatrix.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
#include "py/runtime.h"
3030
#include "py/objarray.h"
3131

32-
#include "common-hal/protomatter/Protomatter.h"
33-
#include "shared-bindings/protomatter/Protomatter.h"
32+
#include "common-hal/rgbmatrix/RGBMatrix.h"
33+
#include "shared-bindings/rgbmatrix/RGBMatrix.h"
3434
#include "shared-bindings/microcontroller/Pin.h"
3535
#include "shared-bindings/microcontroller/__init__.h"
3636
#include "shared-bindings/util.h"
3737
#include "shared-module/displayio/__init__.h"
3838
#include "shared-module/framebufferio/__init__.h"
3939
#include "shared-module/framebufferio/FramebufferDisplay.h"
4040

41-
//| .. currentmodule:: protomatter
41+
//| .. currentmodule:: rgbmatrix
4242
//|
43-
//| :class:`Protomatter` -- Driver for HUB75-style RGB LED matrices
43+
//| :class:`RGBMatrix` -- Driver for HUB75-style RGB LED matrices
4444
//| ================================================================
4545
//|
4646

@@ -133,11 +133,11 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
133133
}
134134
}
135135

136-
//| :class:`~protomatter.Protomatter` displays an in-memory framebuffer to an LED matrix.
136+
//| :class:`~rgbmatrix.RGBMatrix` displays an in-memory framebuffer to an LED matrix.
137137
//|
138-
//| .. class:: Protomatter(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, output_enable_pin, *, doublebuffer=True, framebuffer=None)
138+
//| .. class:: RGBMatrix(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, output_enable_pin, *, doublebuffer=True, framebuffer=None)
139139
//|
140-
//| Create a Protomatter object with the given attributes. The height of
140+
//| Create a RGBMatrix object with the given attributes. The height of
141141
//| the display is determined by the number of rgb and address pins:
142142
//| len(rgb_pins) // 3 * 2 ** len(address_pins). With 6 RGB pins and 4
143143
//| address lines, the display will be 32 pixels tall.
@@ -171,7 +171,7 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
171171
//| If a framebuffer is not passed in, one is allocated internally. To
172172
//| retrieve it, pass the protomatter object to memoryview().
173173
//|
174-
//| A Protomatter framebuffer is often used in conjunction with a
174+
//| A RGBMatrix is often used in conjunction with a
175175
//| `framebufferio.FramebufferDisplay`.
176176
//|
177177

@@ -464,7 +464,7 @@ STATIC mp_int_t protomatter_protomatter_get_buffer(mp_obj_t self_in, mp_buffer_i
464464

465465
const mp_obj_type_t protomatter_Protomatter_type = {
466466
{ &mp_type_type },
467-
.name = MP_QSTR_Protomatter,
467+
.name = MP_QSTR_RGBMatrix,
468468
.buffer_p = { .get_buffer = protomatter_protomatter_get_buffer, },
469469
.make_new = protomatter_protomatter_make_new,
470470
.protocol = &protomatter_protomatter_proto,

0 commit comments

Comments
 (0)