From 57d7f7f2adce8008690f6efd865d0994d4e52143 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 24 Nov 2022 09:07:08 -0600 Subject: [PATCH] move to _pixelmap --- py/circuitpy_defns.mk | 6 +++--- .../{adafruit_pixelmap => _pixelmap}/PixelMap.c | 4 ++-- .../{adafruit_pixelmap => _pixelmap}/PixelMap.h | 0 .../{adafruit_pixelmap => _pixelmap}/__init__.c | 10 +++++----- .../{adafruit_pixelmap => _pixelmap}/__init__.h | 0 .../{adafruit_pixelmap => _pixelmap}/PixelMap.c | 4 ++-- .../{adafruit_pixelmap => _pixelmap}/PixelMap.h | 0 .../{adafruit_pixelmap => _pixelmap}/__init__.c | 0 8 files changed, 12 insertions(+), 12 deletions(-) rename shared-bindings/{adafruit_pixelmap => _pixelmap}/PixelMap.c (98%) rename shared-bindings/{adafruit_pixelmap => _pixelmap}/PixelMap.h (100%) rename shared-bindings/{adafruit_pixelmap => _pixelmap}/__init__.c (85%) rename shared-bindings/{adafruit_pixelmap => _pixelmap}/__init__.h (100%) rename shared-module/{adafruit_pixelmap => _pixelmap}/PixelMap.c (98%) rename shared-module/{adafruit_pixelmap => _pixelmap}/PixelMap.h (100%) rename shared-module/{adafruit_pixelmap => _pixelmap}/__init__.c (100%) diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 0d70068e43..70310106f0 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -267,7 +267,7 @@ ifeq ($(CIRCUITPY_PIXELBUF),1) SRC_PATTERNS += adafruit_pixelbuf/% endif ifeq ($(CIRCUITPY_PIXELMAP),1) -SRC_PATTERNS += adafruit_pixelmap/% +SRC_PATTERNS += _pixelmap/% endif ifeq ($(CIRCUITPY_QRIO),1) SRC_PATTERNS += qrio/% @@ -546,8 +546,8 @@ SRC_SHARED_MODULE_ALL = \ _eve/__init__.c \ adafruit_pixelbuf/PixelBuf.c \ adafruit_pixelbuf/__init__.c \ - adafruit_pixelmap/PixelMap.c \ - adafruit_pixelmap/__init__.c \ + _pixelmap/PixelMap.c \ + _pixelmap/__init__.c \ _stage/Layer.c \ _stage/Text.c \ _stage/__init__.c \ diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.c b/shared-bindings/_pixelmap/PixelMap.c similarity index 98% rename from shared-bindings/adafruit_pixelmap/PixelMap.c rename to shared-bindings/_pixelmap/PixelMap.c index 3361534ca1..c5f7e0ddb5 100644 --- a/shared-bindings/adafruit_pixelmap/PixelMap.c +++ b/shared-bindings/_pixelmap/PixelMap.c @@ -29,9 +29,9 @@ #include "py/objtype.h" #include "py/runtime.h" -#include "shared-bindings/adafruit_pixelmap/PixelMap.h" +#include "shared-bindings/_pixelmap/PixelMap.h" #include "shared-bindings/adafruit_pixelbuf/PixelBuf.h" -#include "shared-module/adafruit_pixelmap/PixelMap.h" +#include "shared-module/_pixelmap/PixelMap.h" //| from adafruit_pixelbuf import PixelBuf, PixelReturnType, PixelSequence, PixelType //| diff --git a/shared-bindings/adafruit_pixelmap/PixelMap.h b/shared-bindings/_pixelmap/PixelMap.h similarity index 100% rename from shared-bindings/adafruit_pixelmap/PixelMap.h rename to shared-bindings/_pixelmap/PixelMap.h diff --git a/shared-bindings/adafruit_pixelmap/__init__.c b/shared-bindings/_pixelmap/__init__.c similarity index 85% rename from shared-bindings/adafruit_pixelmap/__init__.c rename to shared-bindings/_pixelmap/__init__.c index 7b10471c83..13a09d69d2 100644 --- a/shared-bindings/adafruit_pixelmap/__init__.c +++ b/shared-bindings/_pixelmap/__init__.c @@ -29,13 +29,13 @@ #include "py/runtime.h" #include "py/objproperty.h" -#include "shared-bindings/adafruit_pixelmap/__init__.h" -#include "shared-bindings/adafruit_pixelmap/PixelMap.h" +#include "shared-bindings/_pixelmap/__init__.h" +#include "shared-bindings/_pixelmap/PixelMap.h" //| """A fast pixel mapping library //| -//| The `adafruit_pixelmap` module provides the :py:class:`PixelMap` class to accelerate +//| The `_pixelmap` module provides the :py:class:`PixelMap` class to accelerate //| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel.""" //| //| # The types accepted when getting a pixel value @@ -48,7 +48,7 @@ //| PixelSequence = Union[Tuple[PixelType], List[PixelType]] STATIC const mp_rom_map_elem_t pixelmap_module_globals_table[] = { - { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_pixelmap) }, + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pixelmap) }, { MP_ROM_QSTR(MP_QSTR_PixelMap), MP_ROM_PTR(&pixelmap_pixelmap_type) }, }; @@ -59,4 +59,4 @@ const mp_obj_module_t pixelmap_module = { .globals = (mp_obj_dict_t *)&pixelmap_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_adafruit_pixelmap, pixelmap_module, CIRCUITPY_PIXELMAP); +MP_REGISTER_MODULE(MP_QSTR__pixelmap, pixelmap_module, CIRCUITPY_PIXELMAP); diff --git a/shared-bindings/adafruit_pixelmap/__init__.h b/shared-bindings/_pixelmap/__init__.h similarity index 100% rename from shared-bindings/adafruit_pixelmap/__init__.h rename to shared-bindings/_pixelmap/__init__.h diff --git a/shared-module/adafruit_pixelmap/PixelMap.c b/shared-module/_pixelmap/PixelMap.c similarity index 98% rename from shared-module/adafruit_pixelmap/PixelMap.c rename to shared-module/_pixelmap/PixelMap.c index f2c73c7a61..d20a6dd03c 100644 --- a/shared-module/adafruit_pixelmap/PixelMap.c +++ b/shared-module/_pixelmap/PixelMap.c @@ -28,9 +28,9 @@ #include "py/smallint.h" #include "py/runtime.h" -#include "shared-bindings/adafruit_pixelmap/PixelMap.h" +#include "shared-bindings/_pixelmap/PixelMap.h" #include "shared-bindings/adafruit_pixelbuf/PixelBuf.h" -#include "shared-module/adafruit_pixelmap/PixelMap.h" +#include "shared-module/_pixelmap/PixelMap.h" static void pixelmap_set_pixel_rgbw(pixelmap_pixelmap_obj_t *self, size_t i, color_u rgbw) { diff --git a/shared-module/adafruit_pixelmap/PixelMap.h b/shared-module/_pixelmap/PixelMap.h similarity index 100% rename from shared-module/adafruit_pixelmap/PixelMap.h rename to shared-module/_pixelmap/PixelMap.h diff --git a/shared-module/adafruit_pixelmap/__init__.c b/shared-module/_pixelmap/__init__.c similarity index 100% rename from shared-module/adafruit_pixelmap/__init__.c rename to shared-module/_pixelmap/__init__.c