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

Merge pull request #1351 from jepler/issue1307-ujson

Browse Source 
json: enable on nrf boards and "large flash" M4 samd boards
This commit is contained in:
Scott Shawcroft 2018-11-27 11:29:29 -08:00 committed by GitHub
commit 60480ff4ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/atmel-samd/mpconfigport.h
View File

@ -286,6 +286,14 @@ extern const struct _mp_obj_module_t wiznet_module;
#define WIZNET_MODULE #define WIZNET_MODULE
#endif #endif
// (u)json depends, perhaps erroneously, on MICROPY_PY_IO
#if MICROPY_PY_IO
#define JSON_MODULE { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) },
#define MICROPY_PY_UJSON (1)
#else
#define JSON_MODULE
#endif
#ifndef EXTRA_BUILTIN_MODULES #ifndef EXTRA_BUILTIN_MODULES
#define EXTRA_BUILTIN_MODULES \ #define EXTRA_BUILTIN_MODULES \
@ -297,6 +305,7 @@ extern const struct _mp_obj_module_t wiznet_module;
NETWORK_MODULE \ NETWORK_MODULE \
SOCKET_MODULE \ SOCKET_MODULE \
WIZNET_MODULE \ WIZNET_MODULE \
JSON_MODULE \
{ MP_OBJ_NEW_QSTR(MP_QSTR_rotaryio), (mp_obj_t)&rotaryio_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_rotaryio), (mp_obj_t)&rotaryio_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 }
#endif #endif

3
ports/nrf/mpconfigport.h
View File

@ -112,7 +112,7 @@
#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0) #define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
#define MICROPY_PY_UCTYPES (0) #define MICROPY_PY_UCTYPES (0)
#define MICROPY_PY_UZLIB (0) #define MICROPY_PY_UZLIB (0)
#define MICROPY_PY_UJSON (0) #define MICROPY_PY_UJSON (1)
#define MICROPY_PY_URE (0) #define MICROPY_PY_URE (0)
#define MICROPY_PY_UHEAPQ (0) #define MICROPY_PY_UHEAPQ (0)
#define MICROPY_PY_UHASHLIB (1) #define MICROPY_PY_UHASHLIB (1)
@ -204,6 +204,7 @@ extern const struct _mp_obj_module_t bleio_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 }, \
{ MP_OBJ_NEW_QSTR (MP_QSTR_json ), (mp_obj_t)&mp_module_ujson }, \
USBHID_MODULE \ USBHID_MODULE \
BLEIO_MODULE BLEIO_MODULE