Rename Protomatter -> RGBMatrix

This is a quick rename, it changes the user-facing names but not the
internal names of things.
crypto-aes
Jeff Epler 2 years ago
parent 64c3968a2e
commit 3d6258f63d
  1. 2
      ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.c
  2. 0
      ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.h
  3. 0
      ports/atmel-samd/common-hal/rgbmatrix/__init__.c
  4. 2
      ports/nrf/common-hal/rgbmatrix/RGBMatrix.c
  5. 0
      ports/nrf/common-hal/rgbmatrix/RGBMatrix.h
  6. 0
      ports/nrf/common-hal/rgbmatrix/__init__.c
  7. 12
      py/circuitpy_defns.mk
  8. 2
      py/circuitpy_mpconfig.h
  9. 2
      shared-bindings/framebufferio/__init__.c
  10. 18
      shared-bindings/rgbmatrix/RGBMatrix.c
  11. 2
      shared-bindings/rgbmatrix/RGBMatrix.h
  12. 12
      shared-bindings/rgbmatrix/__init__.c
  13. 2
      shared-module/displayio/__init__.h
  14. 6
      shared-module/rgbmatrix/RGBMatrix.c
  15. 0
      shared-module/rgbmatrix/RGBMatrix.h
  16. 0
      shared-module/rgbmatrix/__init__.c
  17. 0
      shared-module/rgbmatrix/__init__.h
  18. 0
      shared-module/rgbmatrix/allocator.h

@ -26,7 +26,7 @@
#include <stddef.h>
#include "common-hal/protomatter/Protomatter.h"
#include "common-hal/rgbmatrix/RGBMatrix.h"
#include "samd/timers.h"
#include "timer_handler.h"

@ -26,7 +26,7 @@
#include <stddef.h>
#include "common-hal/protomatter/Protomatter.h"
#include "common-hal/rgbmatrix/RGBMatrix.h"
#include "peripherals/nrf/timers.h"

@ -182,7 +182,7 @@ ifeq ($(CIRCUITPY_PIXELBUF),1)
SRC_PATTERNS += _pixelbuf/%
endif
ifeq ($(CIRCUITPY_PROTOMATTER),1)
SRC_PATTERNS += protomatter/%
SRC_PATTERNS += rgbmatrix/%
endif
ifeq ($(CIRCUITPY_PULSEIO),1)
SRC_PATTERNS += pulseio/%
@ -277,8 +277,8 @@ SRC_COMMON_HAL_ALL = \
nvm/ByteArray.c \
nvm/__init__.c \
os/__init__.c \
protomatter/Protomatter.c \
protomatter/__init__.c \
rgbmatrix/RGBMatrix.c \
rgbmatrix/__init__.c \
pulseio/PWMOut.c \
pulseio/PulseIn.c \
pulseio/PulseOut.c \
@ -366,8 +366,8 @@ SRC_SHARED_MODULE_ALL = \
random/__init__.c \
socket/__init__.c \
network/__init__.c \
protomatter/Protomatter.c \
protomatter/__init__.c \
rgbmatrix/RGBMatrix.c \
rgbmatrix/__init__.c \
storage/__init__.c \
struct/__init__.c \
terminalio/Terminal.c \
@ -417,7 +417,7 @@ ifeq ($(CIRCUITPY_PROTOMATTER),1)
SRC_MOD += $(addprefix lib/protomatter/, \
core.c \
)
$(BUILD)/lib/protomatter/core.o: CFLAGS += -include "shared-module/protomatter/allocator.h" -DCIRCUITPY -Wno-missing-braces
$(BUILD)/lib/protomatter/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces
endif
# All possible sources are listed here, and are filtered by SRC_PATTERNS.

@ -463,7 +463,7 @@ extern const struct _mp_obj_module_t pixelbuf_module;
#if CIRCUITPY_PROTOMATTER
extern const struct _mp_obj_module_t protomatter_module;
#define PROTOMATTER_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_protomatter),(mp_obj_t)&protomatter_module },
#define PROTOMATTER_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rgbmatrix),(mp_obj_t)&protomatter_module },
#else
#define PROTOMATTER_MODULE
#endif

@ -38,7 +38,7 @@
//| The `framebufferio` module contains classes to manage display output
//| including synchronizing with refresh rates and partial updating.
//| It is used in conjunction with classes from `displayio` to actually
//| place items on the display; and classes like `Protomatter` to actually
//| place items on the display; and classes like `RGBMatrix` to actually
//| drive the display.
//|
//| Libraries

@ -29,8 +29,8 @@
#include "py/runtime.h"
#include "py/objarray.h"
#include "common-hal/protomatter/Protomatter.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "common-hal/rgbmatrix/RGBMatrix.h"
#include "shared-bindings/rgbmatrix/RGBMatrix.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/util.h"
@ -38,9 +38,9 @@
#include "shared-module/framebufferio/__init__.h"
#include "shared-module/framebufferio/FramebufferDisplay.h"
//| .. currentmodule:: protomatter
//| .. currentmodule:: rgbmatrix
//|
//| :class:`Protomatter` -- Driver for HUB75-style RGB LED matrices
//| :class:`RGBMatrix` -- Driver for HUB75-style RGB LED matrices
//| ================================================================
//|
@ -133,11 +133,11 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
}
}
//| :class:`~protomatter.Protomatter` displays an in-memory framebuffer to an LED matrix.
//| :class:`~rgbmatrix.RGBMatrix` displays an in-memory framebuffer to an LED matrix.
//|
//| .. class:: Protomatter(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, output_enable_pin, *, doublebuffer=True, framebuffer=None)
//| .. class:: RGBMatrix(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, output_enable_pin, *, doublebuffer=True, framebuffer=None)
//|
//| Create a Protomatter object with the given attributes. The height of
//| Create a RGBMatrix object with the given attributes. The height of
//| the display is determined by the number of rgb and address pins:
//| len(rgb_pins) // 3 * 2 ** len(address_pins). With 6 RGB pins and 4
//| 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_
//| If a framebuffer is not passed in, one is allocated internally. To
//| retrieve it, pass the protomatter object to memoryview().
//|
//| A Protomatter framebuffer is often used in conjunction with a
//| A RGBMatrix is often used in conjunction with a
//| `framebufferio.FramebufferDisplay`.
//|
@ -464,7 +464,7 @@ STATIC mp_int_t protomatter_protomatter_get_buffer(mp_obj_t self_in, mp_buffer_i
const mp_obj_type_t protomatter_Protomatter_type = {
{ &mp_type_type },
.name = MP_QSTR_Protomatter,
.name = MP_QSTR_RGBMatrix,
.buffer_p = { .get_buffer = protomatter_protomatter_get_buffer, },
.make_new = protomatter_protomatter_make_new,
.protocol = &protomatter_protomatter_proto,

@ -27,7 +27,7 @@
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PROTOMATTER_PROTOMATTER_H
#define MICROPY_INCLUDED_SHARED_BINDINGS_PROTOMATTER_PROTOMATTER_H
#include "shared-module/protomatter/Protomatter.h"
#include "shared-module/rgbmatrix/RGBMatrix.h"
#include "lib/protomatter/core.h"
extern const mp_obj_type_t protomatter_Protomatter_type;

@ -29,22 +29,22 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "shared-bindings/rgbmatrix/RGBMatrix.h"
//| :mod:`protomatter` --- Low-level routines for bitbanged LED matrices
//| :mod:`rgbmatrix` --- Low-level routines for bitbanged LED matrices
//| =====================================================================
//|
//| .. module:: protomatter
//| .. module:: rgbmatrix
//| :synopsis: Low-level routines for bitbanged LED matrices
//|
//| .. toctree::
//| :maxdepth: 3
//|
//| Protomatter
//| RGBMatrix
STATIC const mp_rom_map_elem_t protomatter_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_protomatter) },
{ MP_ROM_QSTR(MP_QSTR_Protomatter), MP_ROM_PTR(&protomatter_Protomatter_type) },
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rgbmatrix) },
{ MP_ROM_QSTR(MP_QSTR_RGBMatrix), MP_ROM_PTR(&protomatter_Protomatter_type) },
};
STATIC MP_DEFINE_CONST_DICT(protomatter_module_globals, protomatter_module_globals_table);

@ -36,7 +36,7 @@
#include "shared-bindings/displayio/Group.h"
#include "shared-bindings/displayio/I2CDisplay.h"
#include "shared-bindings/displayio/ParallelBus.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "shared-bindings/rgbmatrix/RGBMatrix.h"
typedef struct {
union {

@ -32,9 +32,9 @@
#include "py/objproperty.h"
#include "py/runtime.h"
#include "common-hal/protomatter/Protomatter.h"
#include "shared-module/protomatter/allocator.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "common-hal/rgbmatrix/RGBMatrix.h"
#include "shared-module/rgbmatrix/allocator.h"
#include "shared-bindings/rgbmatrix/RGBMatrix.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/util.h"
Loading…
Cancel
Save