Skip to content

Commit 0c95e6a

Browse files
committed
Moving to gifio module
1 parent 953c989 commit 0c95e6a

File tree

9 files changed

+242
-243
lines changed

9 files changed

+242
-243
lines changed

py/circuitpy_defns.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ SRC_SHARED_MODULE_ALL = \
579579
displayio/Group.c \
580580
displayio/I2CDisplay.c \
581581
displayio/OnDiskBitmap.c \
582-
displayio/OnDiskGif.c \
583582
displayio/Palette.c \
584583
displayio/Shape.c \
585584
displayio/TileGrid.c \
@@ -593,6 +592,7 @@ SRC_SHARED_MODULE_ALL = \
593592
getpass/__init__.c \
594593
gifio/__init__.c \
595594
gifio/GifWriter.c \
595+
gifio/OnDiskGif.c \
596596
imagecapture/ParallelImageCapture.c \
597597
ipaddress/IPv4Address.c \
598598
ipaddress/__init__.c \
@@ -698,10 +698,12 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \
698698
$(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes
699699
endif
700700

701+
ifeq ($(CIRCUITPY_GIFIO),1)
701702
SRC_MOD += $(addprefix lib/AnimatedGIF/, \
702703
gif.c \
703704
)
704705
$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -DCIRCUITPY
706+
endif
705707

706708
ifeq ($(CIRCUITPY_ZLIB),1)
707709
SRC_MOD += $(addprefix lib/uzlib/, \

py/circuitpy_mpconfig.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD)
249249
CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS)
250250

251251
ifeq ($(CIRCUITPY_DISPLAYIO),1)
252-
CIRCUITPY_GIFIO ?= $(CIRCUITPY_CAMERA)
252+
#CIRCUITPY_GIFIO ?= $(CIRCUITPY_CAMERA)
253+
CIRCUITPY_GIFIO ?= 1
253254
else
254255
CIRCUITPY_GIFIO ?= 0
255256
endif

shared-bindings/displayio/OnDiskGif.c

Lines changed: 0 additions & 210 deletions
This file was deleted.

shared-bindings/displayio/__init__.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "shared-bindings/displayio/Group.h"
4040
#include "shared-bindings/displayio/I2CDisplay.h"
4141
#include "shared-bindings/displayio/OnDiskBitmap.h"
42-
#include "shared-bindings/displayio/OnDiskGif.h"
4342
#include "shared-bindings/displayio/Palette.h"
4443
#if CIRCUITPY_PARALLELDISPLAY
4544
#include "shared-bindings/paralleldisplay/ParallelBus.h"
@@ -86,7 +85,6 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
8685
{ MP_ROM_QSTR(MP_QSTR_EPaperDisplay), MP_ROM_PTR(&displayio_epaperdisplay_type) },
8786
{ MP_ROM_QSTR(MP_QSTR_Group), MP_ROM_PTR(&displayio_group_type) },
8887
{ MP_ROM_QSTR(MP_QSTR_OnDiskBitmap), MP_ROM_PTR(&displayio_ondiskbitmap_type) },
89-
{ MP_ROM_QSTR(MP_QSTR_OnDiskGif), MP_ROM_PTR(&displayio_ondiskgif_type) },
9088
{ MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) },
9189
{ MP_ROM_QSTR(MP_QSTR_Shape), MP_ROM_PTR(&displayio_shape_type) },
9290
{ MP_ROM_QSTR(MP_QSTR_TileGrid), MP_ROM_PTR(&displayio_tilegrid_type) },

0 commit comments

Comments
 (0)