Skip to content

Commit e97b0cf

Browse files
tannewttannewt
authored
Merge pull request adafruit#2581 from jamesbowman/master
First draft of eveL, the low-level module of the Gameduino bindings
2 parents a076020 + b02937d commit e97b0cf

9 files changed

Lines changed: 1566 additions & 1 deletion

File tree

‎ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICE_COUNT = 3
1111
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
1212
LONGINT_IMPL = MPZ
13+
14+
CIRCUITPY__EVE = 1

‎ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ MCU_CHIP = nrf52840
88
QSPI_FLASH_FILESYSTEM = 1
99
EXTERNAL_FLASH_DEVICE_COUNT = 1
1010
EXTERNAL_FLASH_DEVICES = "GD25Q16C"
11+
12+
CIRCUITPY__EVE = 1

‎py/circuitpy_defns.mk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ endif
157157
ifeq ($(CIRCUITPY_MATH),1)
158158
SRC_PATTERNS += math/%
159159
endif
160+
ifeq ($(CIRCUITPY__EVE),1)
161+
SRC_PATTERNS += _eve/%
162+
endif
160163
ifeq ($(CIRCUITPY_MICROCONTROLLER),1)
161164
SRC_PATTERNS += microcontroller/%
162165
endif
@@ -298,6 +301,7 @@ $(filter $(SRC_PATTERNS), \
298301
fontio/Glyph.c \
299302
microcontroller/RunMode.c \
300303
math/__init__.c \
304+
_eve/__init__.c \
301305
)
302306

303307
SRC_BINDINGS_ENUMS += \
@@ -359,7 +363,8 @@ SRC_SHARED_MODULE_ALL = \
359363
uheap/__init__.c \
360364
ustack/__init__.c \
361365
_pew/__init__.c \
362-
_pew/PewPew.c
366+
_pew/PewPew.c \
367+
_eve/__init__.c
363368

364369
# All possible sources are listed here, and are filtered by SRC_PATTERNS.
365370
SRC_SHARED_MODULE = $(filter $(SRC_PATTERNS), $(SRC_SHARED_MODULE_ALL))

‎py/circuitpy_mpconfig.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,13 @@ extern const struct _mp_obj_module_t math_module;
384384
#define MATH_MODULE
385385
#endif
386386

387+
#if CIRCUITPY__EVE
388+
extern const struct _mp_obj_module_t _eve_module;
389+
#define _EVE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__eve), (mp_obj_t)&_eve_module },
390+
#else
391+
#define _EVE_MODULE
392+
#endif
393+
387394
#if CIRCUITPY_MICROCONTROLLER
388395
extern const struct _mp_obj_module_t microcontroller_module;
389396
#define MICROCONTROLLER_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_microcontroller), (mp_obj_t)&microcontroller_module },
@@ -617,6 +624,7 @@ extern const struct _mp_obj_module_t ustack_module;
617624
I2CSLAVE_MODULE \
618625
JSON_MODULE \
619626
MATH_MODULE \
627+
_EVE_MODULE \
620628
MICROCONTROLLER_MODULE \
621629
NEOPIXEL_WRITE_MODULE \
622630
NETWORK_MODULE \

‎py/circuitpy_mpconfig.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ CIRCUITPY_MATH = $(CIRCUITPY_ALWAYS_BUILD)
174174
endif
175175
CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
176176

177+
ifndef CIRCUITPY__EVE
178+
CIRCUITPY__EVE = 0
179+
endif
180+
CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
181+
177182
ifndef CIRCUITPY_MICROCONTROLLER
178183
CIRCUITPY_MICROCONTROLLER = $(CIRCUITPY_DEFAULT_BUILD)
179184
endif

0 commit comments

Comments
 (0)