diff options
| author | Kevin Townsend <microbuilder@users.noreply.github.com> | 2018-02-08 00:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 00:56:31 +0100 |
| commit | 71128b575f04a218948ee9a402c5ac5d0682cacf (patch) | |
| tree | 0c0122d3f5ffb62d99ca272cd15adc1ba3785dad | |
| parent | 9d191f7f9f386bb62f32b3aa9c6534dc84f9a48a (diff) | |
| parent | d1b2f69771383e613ca530a171c54b6ea1ec7456 (diff) | |
Merge pull request #602 from arturo182/nrf_struct
nrf: Use the shared struct module
| -rw-r--r-- | ports/nrf/Makefile | 3 | ||||
| -rw-r--r-- | ports/nrf/mpconfigport.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 9049bdb64..1ff534777 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -231,6 +231,7 @@ SRC_SHARED_MODULE = \ os/__init__.c \ random/__init__.c \ storage/__init__.c \ + struct/__init__.c \ gamepad/__init__.c \ gamepad/GamePad.c @@ -239,11 +240,11 @@ SRC_SHARED_MODULE = \ bitbangio/OneWire.c \ bitbangio/SPI.c \ busio/OneWire.c \ - struct/__init__.c \ uheap/__init__.c \ ustack/__init__.c SRC_SHARED_BINDINGS = \ + struct/__init__.c \ gamepad/__init__.c \ gamepad/GamePad.c diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index 63fe5e3b4..483e20c65 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -124,6 +124,7 @@ #define MICROPY_PY_UHEAPQ (0) #define MICROPY_PY_UHASHLIB (0) #define MICROPY_PY_UTIME_MP_HAL (1) +#define MICROPY_PY_STRUCT (0) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (0) #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 random_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 supervisor_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_random ), (mp_obj_t)&random_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_gamepad ), (mp_obj_t)&gamepad_module }, \ { MP_OBJ_NEW_QSTR (MP_QSTR_time ), (mp_obj_t)&time_module }, \ |