Skip to content

Commit a323377

Browse files
committed
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.
1 parent d1ff23e commit a323377

File tree

17 files changed

+18
-18
lines changed

17 files changed

+18
-18
lines changed

ports/atmel-samd/common-hal/_protomatter/Protomatter.c renamed to ports/atmel-samd/common-hal/protomatter/Protomatter.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/protomatter/Protomatter.h"
3030

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

ports/nrf/common-hal/_protomatter/Protomatter.c renamed to ports/nrf/common-hal/protomatter/Protomatter.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/protomatter/Protomatter.h"
3030

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

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 += protomatter/%
186186
endif
187187
ifeq ($(CIRCUITPY_PULSEIO),1)
188188
SRC_PATTERNS += pulseio/%
@@ -248,8 +248,6 @@ SRC_COMMON_HAL_ALL = \
248248
_bleio/PacketBuffer.c \
249249
_bleio/Service.c \
250250
_bleio/UUID.c \
251-
_protomatter/Protomatter.c \
252-
_protomatter/__init__.c \
253251
analogio/AnalogIn.c \
254252
analogio/AnalogOut.c \
255253
analogio/__init__.c \
@@ -279,6 +277,8 @@ SRC_COMMON_HAL_ALL = \
279277
nvm/ByteArray.c \
280278
nvm/__init__.c \
281279
os/__init__.c \
280+
protomatter/Protomatter.c \
281+
protomatter/__init__.c \
282282
pulseio/PWMOut.c \
283283
pulseio/PulseIn.c \
284284
pulseio/PulseOut.c \
@@ -323,8 +323,6 @@ SRC_SHARED_MODULE_ALL = \
323323
_bleio/ScanResults.c \
324324
_pixelbuf/PixelBuf.c \
325325
_pixelbuf/__init__.c \
326-
_protomatter/Protomatter.c \
327-
_protomatter/__init__.c \
328326
_stage/Layer.c \
329327
_stage/Text.c \
330328
_stage/__init__.c \
@@ -368,6 +366,8 @@ SRC_SHARED_MODULE_ALL = \
368366
random/__init__.c \
369367
socket/__init__.c \
370368
network/__init__.c \
369+
protomatter/Protomatter.c \
370+
protomatter/__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/protomatter/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_protomatter),(mp_obj_t)&protomatter_module },
467467
#else
468468
#define PROTOMATTER_MODULE
469469
#endif

shared-bindings/_protomatter/Protomatter.c renamed to shared-bindings/protomatter/Protomatter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
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/protomatter/Protomatter.h"
33+
#include "shared-bindings/protomatter/Protomatter.h"
3434
#include "shared-bindings/microcontroller/Pin.h"
3535
#include "shared-bindings/microcontroller/__init__.h"
3636
#include "shared-bindings/util.h"

shared-bindings/_protomatter/Protomatter.h renamed to shared-bindings/protomatter/Protomatter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PROTOMATTER_PROTOMATTER_H
2828
#define MICROPY_INCLUDED_SHARED_BINDINGS_PROTOMATTER_PROTOMATTER_H
2929

30-
#include "shared-module/_protomatter/Protomatter.h"
30+
#include "shared-module/protomatter/Protomatter.h"
3131
#include "lib/protomatter/core.h"
3232

3333
extern const mp_obj_type_t protomatter_Protomatter_type;

0 commit comments

Comments
 (0)