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

Merge pull request #602 from arturo182/nrf_struct

Browse Source 
nrf: Use the shared struct module
This commit is contained in:
Kevin Townsend 2018-02-08 00:56:31 +01:00 committed by GitHub
commit 71128b575f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/nrf/Makefile
View File

@ -231,6 +231,7 @@ SRC_SHARED_MODULE = \
os/__init__.c \ os/__init__.c \
random/__init__.c \ random/__init__.c \
storage/__init__.c \ storage/__init__.c \
struct/__init__.c \
gamepad/__init__.c \ gamepad/__init__.c \
gamepad/GamePad.c gamepad/GamePad.c
@ -239,11 +240,11 @@ SRC_SHARED_MODULE = \
bitbangio/OneWire.c \ bitbangio/OneWire.c \
bitbangio/SPI.c \ bitbangio/SPI.c \
busio/OneWire.c \ busio/OneWire.c \
struct/__init__.c \
uheap/__init__.c \ uheap/__init__.c \
ustack/__init__.c ustack/__init__.c
SRC_SHARED_BINDINGS = \ SRC_SHARED_BINDINGS = \
struct/__init__.c \
gamepad/__init__.c \ gamepad/__init__.c \
gamepad/GamePad.c gamepad/GamePad.c

3
ports/nrf/mpconfigport.h
View File

@ -124,6 +124,7 @@
#define MICROPY_PY_UHEAPQ (0) #define MICROPY_PY_UHEAPQ (0)
#define MICROPY_PY_UHASHLIB (0) #define MICROPY_PY_UHASHLIB (0)
#define MICROPY_PY_UTIME_MP_HAL (1) #define MICROPY_PY_UTIME_MP_HAL (1)
#define MICROPY_PY_STRUCT (0)
#define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE (1)
#define MICROPY_PY_MACHINE_PULSE (0) #define MICROPY_PY_MACHINE_PULSE (0)
#define MICROPY_PY_MACHINE_I2C_MAKE_NEW machine_hard_i2c_make_new #define MICROPY_PY_MACHINE_I2C_MAKE_NEW machine_hard_i2c_make_new
@ -224,6 +225,7 @@ extern const struct _mp_obj_module_t board_module;
extern const struct _mp_obj_module_t os_module; extern const struct _mp_obj_module_t os_module;
extern const struct _mp_obj_module_t random_module; extern const struct _mp_obj_module_t random_module;
extern const struct _mp_obj_module_t storage_module; extern const struct _mp_obj_module_t storage_module;
extern const struct _mp_obj_module_t struct_module;
extern const struct _mp_obj_module_t time_module; extern const struct _mp_obj_module_t time_module;
extern const struct _mp_obj_module_t supervisor_module; extern const struct _mp_obj_module_t supervisor_module;
extern const struct _mp_obj_module_t gamepad_module; extern const struct _mp_obj_module_t gamepad_module;
@ -272,6 +274,7 @@ extern const struct _mp_obj_module_t ble_module;
{ MP_OBJ_NEW_QSTR (MP_QSTR_os ), (mp_obj_t)&os_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_os ), (mp_obj_t)&os_module }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_random ), (mp_obj_t)&random_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_random ), (mp_obj_t)&random_module }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_storage ), (mp_obj_t)&storage_module },\ { MP_OBJ_NEW_QSTR (MP_QSTR_storage ), (mp_obj_t)&storage_module },\
{ MP_OBJ_NEW_QSTR (MP_QSTR_struct ), (mp_obj_t)&struct_module }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_supervisor ), (mp_obj_t)&supervisor_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_supervisor ), (mp_obj_t)&supervisor_module }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_gamepad ), (mp_obj_t)&gamepad_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_gamepad ), (mp_obj_t)&gamepad_module }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_time ), (mp_obj_t)&time_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_time ), (mp_obj_t)&time_module }, \