RGBMatrix: finish renaming from Protomatter

jepler · jepler · commit 5fcc6d628693 · 2020-04-17T18:44:07.000-05:00
This gets all the purely internal references.  Some uses of
protomatter/Protomatter/PROTOMATTER remain, as they are references
to symbols in the Protomatter C library itself.
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -14,7 +14,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_NETWORK = 0
-CIRCUITPY_PROTOMATTER = 0
+CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_AUDIOMP3 = 0
 
diff --git a/ports/atmel-samd/boards/pycubed/mpconfigboard.mk b/ports/atmel-samd/boards/pycubed/mpconfigboard.mk
@@ -17,7 +17,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_PROTOMATTER = 0
+CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
diff --git a/ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk b/ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk
@@ -19,7 +19,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_PROTOMATTER = 0
+CIRCUITPY_RGBMATRIX = 0
 
 # Include these Python libraries in firmware.
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -28,7 +28,7 @@ CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_PROTOMATTER = 0
+CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -26,7 +26,7 @@ CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_PROTOMATTER = 0
+CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_USB_HID = 0
 
diff --git a/ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.c b/ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.c
@@ -31,7 +31,7 @@
 #include "samd/timers.h"
 #include "timer_handler.h"
 
-void *common_hal_protomatter_timer_allocate() {
+void *common_hal_rgbmatrix_timer_allocate() {
     uint8_t timer_index = find_free_timer();
     if (timer_index == 0xff) {
         return NULL;
@@ -49,16 +49,16 @@ static uint8_t tc_index_from_ptr(void* ptr) {
     return 0xff;
 }
 
-void common_hal_protomatter_timer_enable(void* ptr) {
+void common_hal_rgbmatrix_timer_enable(void* ptr) {
     uint8_t timer_index = tc_index_from_ptr(ptr);
     if (timer_index == 0xff) {
         return;
     }
-    set_timer_handler(true, timer_index, TC_HANDLER_PROTOMATTER);
+    set_timer_handler(true, timer_index, TC_HANDLER_RGBMATRIX);
     turn_on_clocks(true, timer_index, 1);
 }
 
-void common_hal_protomatter_timer_disable(void* ptr) {
+void common_hal_rgbmatrix_timer_disable(void* ptr) {
     uint8_t timer_index = tc_index_from_ptr(ptr);
     if (timer_index == 0xff) {
         return;
@@ -67,7 +67,7 @@ void common_hal_protomatter_timer_disable(void* ptr) {
     tc_set_enable(ptr, false);
 }
 
-void common_hal_protomatter_timer_free(void* ptr) {
+void common_hal_rgbmatrix_timer_free(void* ptr) {
     uint8_t timer_index = tc_index_from_ptr(ptr);
     if (timer_index == 0xff) {
         return;
diff --git a/ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.h b/ports/atmel-samd/common-hal/rgbmatrix/RGBMatrix.h
@@ -24,12 +24,12 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PROTOMATTER_PROTOMATTER_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PROTOMATTER_PROTOMATTER_H
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H
 
-void *common_hal_protomatter_timer_allocate(void);
-void common_hal_protomatter_timer_enable(void*);
-void common_hal_protomatter_timer_disable(void*);
-void common_hal_protomatter_timer_free(void*);
+void *common_hal_rgbmatrix_timer_allocate(void);
+void common_hal_rgbmatrix_timer_enable(void*);
+void common_hal_rgbmatrix_timer_disable(void*);
+void common_hal_rgbmatrix_timer_free(void*);
 
 #endif
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
@@ -70,9 +70,9 @@ CIRCUITPY_ULAB = 1
 endif
 endif
 
-ifndef CIRCUITPY_PROTOMATTER
+ifndef CIRCUITPY_RGBMATRIX
 ifneq ($(CIRCUITPY_SMALL_BUILD),1)
-CIRCUITPY_PROTOMATTER = 1
+CIRCUITPY_RGBMATRIX = 1
 endif
 endif
 
diff --git a/ports/atmel-samd/timer_handler.c b/ports/atmel-samd/timer_handler.c
@@ -64,8 +64,8 @@ void shared_timer_handler(bool is_tc, uint8_t index) {
                 frequencyin_interrupt_handler(index);
             #endif
                 break;
-            case TC_HANDLER_PROTOMATTER:
-            #if CIRCUITPY_PROTOMATTER
+            case TC_HANDLER_RGBMATRIX:
+            #if CIRCUITPY_RGBMATRIX
                 _PM_IRQ_HANDLER();
             #endif
                 break;
diff --git a/ports/atmel-samd/timer_handler.h b/ports/atmel-samd/timer_handler.h
@@ -30,7 +30,7 @@
 #define TC_HANDLER_PULSEOUT 0x1
 #define TC_HANDLER_PEW 0x2
 #define TC_HANDLER_FREQUENCYIN 0x3
-#define TC_HANDLER_PROTOMATTER 0x4
+#define TC_HANDLER_RGBMATRIX 0x4
 
 void set_timer_handler(bool is_tc, uint8_t index, uint8_t timer_handler);
 void shared_timer_handler(bool is_tc, uint8_t index);
diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.c b/ports/nrf/common-hal/rgbmatrix/RGBMatrix.c
@@ -32,18 +32,18 @@
 
 extern void _PM_IRQ_HANDLER(void);
 
-void *common_hal_protomatter_timer_allocate() {
+void *common_hal_rgbmatrix_timer_allocate() {
     nrfx_timer_t *timer = nrf_peripherals_allocate_timer_or_throw();
     nrf_peripherals_timer_never_reset(timer);
     return timer->p_reg;
 }
 
 
-static void protomatter_event_handler(nrf_timer_event_t event_type, void *p_context) {
+static void rgbmatrix_event_handler(nrf_timer_event_t event_type, void *p_context) {
     _PM_IRQ_HANDLER();
 }
 
-void common_hal_protomatter_timer_enable(void* ptr) {
+void common_hal_rgbmatrix_timer_enable(void* ptr) {
     nrfx_timer_t *timer = nrf_peripherals_timer_from_reg(ptr);
     static const nrfx_timer_config_t timer_config = {
         .frequency = NRF_TIMER_FREQ_16MHz,
@@ -52,15 +52,15 @@ void common_hal_protomatter_timer_enable(void* ptr) {
         .interrupt_priority = NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY,
         .p_context = NULL,
     };
-    nrfx_timer_init(timer, &timer_config, &protomatter_event_handler);
+    nrfx_timer_init(timer, &timer_config, &rgbmatrix_event_handler);
 }
 
-void common_hal_protomatter_timer_disable(void* ptr) {
+void common_hal_rgbmatrix_timer_disable(void* ptr) {
     nrfx_timer_t *timer = nrf_peripherals_timer_from_reg(ptr);
     nrfx_timer_uninit(timer);
 }
 
-void common_hal_protomatter_timer_free(void* ptr) {
+void common_hal_rgbmatrix_timer_free(void* ptr) {
     nrfx_timer_t *timer = nrf_peripherals_timer_from_reg(ptr);
     nrf_peripherals_free_timer(timer);
 }
diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h b/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h
@@ -24,12 +24,12 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PROTOMATTER_PROTOMATTER_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PROTOMATTER_PROTOMATTER_H
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H
 
-void *common_hal_protomatter_timer_allocate(void);
-void common_hal_protomatter_timer_enable(void*);
-void common_hal_protomatter_timer_disable(void*);
-void common_hal_protomatter_timer_free(void*);
+void *common_hal_rgbmatrix_timer_allocate(void);
+void common_hal_rgbmatrix_timer_enable(void*);
+void common_hal_rgbmatrix_timer_disable(void*);
+void common_hal_rgbmatrix_timer_free(void*);
 
 #endif
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
@@ -51,7 +51,7 @@ endif
 # frequencyio not yet implemented
 CIRCUITPY_FREQUENCYIO = 0
 
-CIRCUITPY_PROTOMATTER = 1
+CIRCUITPY_RGBMATRIX = 1
 CIRCUITPY_FRAMEBUFFERIO = 1
 
 # nRF52840-specific
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
@@ -181,7 +181,7 @@ endif
 ifeq ($(CIRCUITPY_PIXELBUF),1)
 SRC_PATTERNS += _pixelbuf/%
 endif
-ifeq ($(CIRCUITPY_PROTOMATTER),1)
+ifeq ($(CIRCUITPY_RGBMATRIX),1)
 SRC_PATTERNS += rgbmatrix/%
 endif
 ifeq ($(CIRCUITPY_PULSEIO),1)
@@ -413,7 +413,7 @@ SRC_MOD += $(addprefix lib/mp3/src/, \
 )
 $(BUILD)/lib/mp3/src/buffers.o: CFLAGS += -include "py/misc.h" -D'MPDEC_ALLOCATOR(x)=m_malloc(x,0)' -D'MPDEC_FREE(x)=m_free(x)'
 endif
-ifeq ($(CIRCUITPY_PROTOMATTER),1)
+ifeq ($(CIRCUITPY_RGBMATRIX),1)
 SRC_MOD += $(addprefix lib/protomatter/, \
 	core.c \
 )
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -461,11 +461,11 @@ extern const struct _mp_obj_module_t pixelbuf_module;
 #define PIXELBUF_MODULE
 #endif
 
-#if CIRCUITPY_PROTOMATTER
-extern const struct _mp_obj_module_t protomatter_module;
-#define PROTOMATTER_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_rgbmatrix),(mp_obj_t)&protomatter_module },
+#if CIRCUITPY_RGBMATRIX
+extern const struct _mp_obj_module_t rgbmatrix_module;
+#define RGBMATRIX_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_rgbmatrix),(mp_obj_t)&rgbmatrix_module },
 #else
-#define PROTOMATTER_MODULE
+#define RGBMATRIX_MODULE
 #endif
 
 #if CIRCUITPY_PULSEIO
@@ -658,10 +658,10 @@ extern const struct _mp_obj_module_t ustack_module;
     PEW_MODULE \
     PIXELBUF_MODULE \
     PS2IO_MODULE \
-    PROTOMATTER_MODULE \
     PULSEIO_MODULE \
     RANDOM_MODULE \
     RE_MODULE \
+    RGBMATRIX_MODULE \
     ROTARYIO_MODULE \
     RTC_MODULE \
     SAMD_MODULE \
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -216,10 +216,10 @@ endif
 CFLAGS += -DCIRCUITPY_PIXELBUF=$(CIRCUITPY_PIXELBUF)
 
 # Only for SAMD boards for the moment
-ifndef CIRCUITPY_PROTOMATTER
-CIRCUITPY_PROTOMATTER = 0
+ifndef CIRCUITPY_RGBMATRIX
+CIRCUITPY_RGBMATRIX = 0
 endif
-CFLAGS += -DCIRCUITPY_PROTOMATTER=$(CIRCUITPY_PROTOMATTER)
+CFLAGS += -DCIRCUITPY_RGBMATRIX=$(CIRCUITPY_RGBMATRIX)
 
 ifndef CIRCUITPY_PULSEIO
 CIRCUITPY_PULSEIO = $(CIRCUITPY_DEFAULT_BUILD)
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.h b/shared-bindings/rgbmatrix/RGBMatrix.h
diff --git a/shared-bindings/rgbmatrix/__init__.c b/shared-bindings/rgbmatrix/__init__.c
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
diff --git a/shared-module/displayio/__init__.h b/shared-module/displayio/__init__.h
diff --git a/shared-module/rgbmatrix/RGBMatrix.c b/shared-module/rgbmatrix/RGBMatrix.c
diff --git a/shared-module/rgbmatrix/allocator.h b/shared-module/rgbmatrix/allocator.h
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
