djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3537 from jepler/update-protomatter-2

Browse Source 
rgbmatrix: update protomatter to 1.0.5 tag
This commit is contained in:
Scott Shawcroft 2020-10-12 15:45:51 -07:00 committed by GitHub
commit 1eb1434fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/protomatter

@ -1 +1 @@
Subproject commit 5f07ec6188852794a94138763e612844842f13e4 Subproject commit de6b7704c530d886ad8dfa0fa1864764d86117ee

4
py/circuitpy_defns.mk
View File

@ -525,10 +525,10 @@ 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)' $(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 endif
ifeq ($(CIRCUITPY_RGBMATRIX),1) ifeq ($(CIRCUITPY_RGBMATRIX),1)
SRC_MOD += $(addprefix lib/protomatter/, \ SRC_MOD += $(addprefix lib/protomatter/src/, \
core.c \ core.c \
) )
$(BUILD)/lib/protomatter/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces
endif endif
# All possible sources are listed here, and are filtered by SRC_PATTERNS. # All possible sources are listed here, and are filtered by SRC_PATTERNS.

2
shared-bindings/rgbmatrix/RGBMatrix.h
View File

@ -27,7 +27,7 @@
#pragma once #pragma once
#include "shared-module/rgbmatrix/RGBMatrix.h" #include "shared-module/rgbmatrix/RGBMatrix.h"
#include "lib/protomatter/core.h" #include "lib/protomatter/src/core.h"
extern const mp_obj_type_t rgbmatrix_RGBMatrix_type; extern const mp_obj_type_t rgbmatrix_RGBMatrix_type;

12
shared-module/rgbmatrix/RGBMatrix.c
View File

@ -78,10 +78,10 @@ void common_hal_rgbmatrix_rgbmatrix_reconstruct(rgbmatrix_rgbmatrix_obj_t* self,
// verify that the matrix is big enough // verify that the matrix is big enough
mp_get_index(mp_obj_get_type(self->framebuffer), self->bufinfo.len, MP_OBJ_NEW_SMALL_INT(self->bufsize-1), false); mp_get_index(mp_obj_get_type(self->framebuffer), self->bufinfo.len, MP_OBJ_NEW_SMALL_INT(self->bufsize-1), false);
} else { } else {
_PM_FREE(self->bufinfo.buf); _PM_free(self->bufinfo.buf);
_PM_FREE(self->protomatter.rgbPins); _PM_free(self->protomatter.rgbPins);
_PM_FREE(self->protomatter.addr); _PM_free(self->protomatter.addr);
_PM_FREE(self->protomatter.screenData); _PM_free(self->protomatter.screenData);
self->framebuffer = NULL; self->framebuffer = NULL;
self->bufinfo.buf = common_hal_rgbmatrix_allocator_impl(self->bufsize); self->bufinfo.buf = common_hal_rgbmatrix_allocator_impl(self->bufsize);
@ -164,13 +164,13 @@ void common_hal_rgbmatrix_rgbmatrix_deinit(rgbmatrix_rgbmatrix_obj_t* self) {
free_pin(&self->oe_pin); free_pin(&self->oe_pin);
if (self->protomatter.rgbPins) { if (self->protomatter.rgbPins) {
_PM_free(&self->protomatter); _PM_deallocate(&self->protomatter);
} }
memset(&self->protomatter, 0, sizeof(self->protomatter)); memset(&self->protomatter, 0, sizeof(self->protomatter));
// If it was supervisor-allocated, it is supervisor-freed and the pointer // If it was supervisor-allocated, it is supervisor-freed and the pointer
// is zeroed, otherwise the pointer is just zeroed // is zeroed, otherwise the pointer is just zeroed
_PM_FREE(self->bufinfo.buf); _PM_free(self->bufinfo.buf);
self->base.type = NULL; self->base.type = NULL;
// If a framebuffer was passed in to the constructor, NULL the reference // If a framebuffer was passed in to the constructor, NULL the reference

2
shared-module/rgbmatrix/RGBMatrix.h
View File

@ -26,7 +26,7 @@
#pragma once #pragma once
#include "lib/protomatter/core.h" #include "lib/protomatter/src/core.h"
extern const mp_obj_type_t rgbmatrix_RGBMatrix_type; extern const mp_obj_type_t rgbmatrix_RGBMatrix_type;
typedef struct { typedef struct {

4
shared-module/rgbmatrix/allocator.h
View File

@ -31,7 +31,7 @@
#include "py/misc.h" #include "py/misc.h"
#include "supervisor/memory.h" #include "supervisor/memory.h"
#define _PM_ALLOCATOR common_hal_rgbmatrix_allocator_impl #define _PM_allocate common_hal_rgbmatrix_allocator_impl
#define _PM_FREE(x) (common_hal_rgbmatrix_free_impl((x)), (x)=NULL, (void)0) #define _PM_free(x) (common_hal_rgbmatrix_free_impl((x)), (x)=NULL, (void)0)
extern void *common_hal_rgbmatrix_allocator_impl(size_t sz); extern void *common_hal_rgbmatrix_allocator_impl(size_t sz);
extern void common_hal_rgbmatrix_free_impl(void *); extern void common_hal_rgbmatrix_free_impl(void *);