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

fix build for non-displayio & non-protomatter targets

This commit is contained in:
Jeff Epler 2020-04-01 16:10:19 -05:00
parent 3a94412cd3
commit 1f3821220e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared-module/displayio/__init__.c
View File

@ -21,6 +21,7 @@
primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT]; primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
#if CIRCUITPY_PROTOMATTER
STATIC bool any_display_uses_this_protomatter(protomatter_protomatter_obj_t* pm) { STATIC bool any_display_uses_this_protomatter(protomatter_protomatter_obj_t* pm) {
for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) { for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
if (displays[i].framebuffer_display.base.type == &framebufferio_framebufferdisplay_type) { if (displays[i].framebuffer_display.base.type == &framebufferio_framebufferdisplay_type) {
@ -32,6 +33,7 @@ STATIC bool any_display_uses_this_protomatter(protomatter_protomatter_obj_t* pm)
} }
return false; return false;
} }
#endif
// Check for recursive calls to displayio_background. // Check for recursive calls to displayio_background.
bool displayio_background_in_progress = false; bool displayio_background_in_progress = false;

5
supervisor/shared/display.c
View File

@ -29,12 +29,15 @@
#include <string.h> #include <string.h>
#include "py/mpstate.h" #include "py/mpstate.h"
#include "shared-module/displayio/__init__.h"
#include "shared-bindings/displayio/Group.h" #include "shared-bindings/displayio/Group.h"
#include "shared-bindings/displayio/Palette.h" #include "shared-bindings/displayio/Palette.h"
#include "shared-bindings/displayio/TileGrid.h" #include "shared-bindings/displayio/TileGrid.h"
#include "supervisor/memory.h" #include "supervisor/memory.h"
#if CIRCUITPY_PROTOMATTER
#include "shared-module/displayio/__init__.h"
#endif
extern size_t blinka_bitmap_data[]; extern size_t blinka_bitmap_data[];
extern displayio_bitmap_t blinka_bitmap; extern displayio_bitmap_t blinka_bitmap;
extern displayio_group_t circuitpython_splash; extern displayio_group_t circuitpython_splash;