Rename _protomatter -> protomatter

I originally believed that there would be a wrapper library around it,
like with _pixelbuf; but this proves not to be the case, as there's
too little for the library to do.
crypto-aes
Jeff Epler 2 years ago
parent d1ff23e004
commit a32337718d
  1. 2
      ports/atmel-samd/common-hal/protomatter/Protomatter.c
  2. 0
      ports/atmel-samd/common-hal/protomatter/Protomatter.h
  3. 0
      ports/atmel-samd/common-hal/protomatter/__init__.c
  4. 2
      ports/nrf/common-hal/protomatter/Protomatter.c
  5. 0
      ports/nrf/common-hal/protomatter/Protomatter.h
  6. 0
      ports/nrf/common-hal/protomatter/__init__.c
  7. 12
      py/circuitpy_defns.mk
  8. 2
      py/circuitpy_mpconfig.h
  9. 4
      shared-bindings/protomatter/Protomatter.c
  10. 2
      shared-bindings/protomatter/Protomatter.h
  11. 4
      shared-bindings/protomatter/__init__.c
  12. 2
      shared-module/displayio/__init__.h
  13. 6
      shared-module/protomatter/Protomatter.c
  14. 0
      shared-module/protomatter/Protomatter.h
  15. 0
      shared-module/protomatter/__init__.c
  16. 0
      shared-module/protomatter/__init__.h
  17. 0
      shared-module/protomatter/allocator.h

@ -26,7 +26,7 @@
#include <stddef.h>
#include "common-hal/_protomatter/Protomatter.h"
#include "common-hal/protomatter/Protomatter.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/protomatter/Protomatter.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 += protomatter/%
endif
ifeq ($(CIRCUITPY_PULSEIO),1)
SRC_PATTERNS += pulseio/%
@ -248,8 +248,6 @@ SRC_COMMON_HAL_ALL = \
_bleio/PacketBuffer.c \
_bleio/Service.c \
_bleio/UUID.c \
_protomatter/Protomatter.c \
_protomatter/__init__.c \
analogio/AnalogIn.c \
analogio/AnalogOut.c \
analogio/__init__.c \
@ -279,6 +277,8 @@ SRC_COMMON_HAL_ALL = \
nvm/ByteArray.c \
nvm/__init__.c \
os/__init__.c \
protomatter/Protomatter.c \
protomatter/__init__.c \
pulseio/PWMOut.c \
pulseio/PulseIn.c \
pulseio/PulseOut.c \
@ -323,8 +323,6 @@ SRC_SHARED_MODULE_ALL = \
_bleio/ScanResults.c \
_pixelbuf/PixelBuf.c \
_pixelbuf/__init__.c \
_protomatter/Protomatter.c \
_protomatter/__init__.c \
_stage/Layer.c \
_stage/Text.c \
_stage/__init__.c \
@ -368,6 +366,8 @@ SRC_SHARED_MODULE_ALL = \
random/__init__.c \
socket/__init__.c \
network/__init__.c \
protomatter/Protomatter.c \
protomatter/__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/protomatter/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_protomatter),(mp_obj_t)&protomatter_module },
#else
#define PROTOMATTER_MODULE
#endif

@ -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/protomatter/Protomatter.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/util.h"

@ -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/protomatter/Protomatter.h"
#include "lib/protomatter/core.h"
extern const mp_obj_type_t protomatter_Protomatter_type;

@ -29,7 +29,7 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "shared-bindings/_protomatter/Protomatter.h"
#include "shared-bindings/protomatter/Protomatter.h"
//| :mod:`_protomatter` --- Low-level routines for bitbanged LED matrices
//| =====================================================================
@ -43,7 +43,7 @@
//| Protomatter
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___name__), MP_ROM_QSTR(MP_QSTR_protomatter) },
{ MP_ROM_QSTR(MP_QSTR_Protomatter), MP_ROM_PTR(&protomatter_Protomatter_type) },
};

@ -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/protomatter/Protomatter.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/protomatter/Protomatter.h"
#include "shared-module/protomatter/allocator.h"
#include "shared-bindings/protomatter/Protomatter.h"
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/util.h"
Loading…
Cancel
Save