Skip to content

Commit

Permalink
Merge pull request #1077 from hathach/nrf52_sys_module
Browse files Browse the repository at this point in the history
try to address sys module #1070
  • Loading branch information
tannewt authored Aug 2, 2018
2 parents 65bd07b + 0bc3432 commit 24b4f28
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions ports/nrf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ SRC_C += \
lib/utils/pyexec.c \
lib/utils/interrupt_char.c \
lib/utils/stdout_helpers.c \
lib/utils/sys_stdio_mphal.c \
lib/libc/string0.c \
lib/mp-readline/readline.c \

Expand Down
13 changes: 7 additions & 6 deletions ports/nrf/mpconfigport.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@
#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
#define MICROPY_PY_SYS_EXIT (1)
#define MICROPY_PY_SYS_MAXSIZE (1)
#define MICROPY_PY_SYS_STDFILES (0)
#define MICROPY_PY_SYS_STDIO_BUFFER (0)
#define MICROPY_PY_SYS_STDFILES (1)
#define MICROPY_PY_SYS_STDIO_BUFFER (1)
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
#define MICROPY_PY_CMATH (0)
#define MICROPY_PY_IO (0)
#define MICROPY_PY_IO_FILEIO (0)
#define MICROPY_PY_IO (1)
#define MICROPY_PY_IO_FILEIO (1)
#define MICROPY_PY_UERRNO (0)
#define MICROPY_PY_UBINASCII (1)
#define MICROPY_PY_URANDOM (0)
Expand Down Expand Up @@ -161,6 +161,9 @@ typedef int mp_int_t; // must be pointer size
typedef unsigned int mp_uint_t; // must be pointer size
typedef long mp_off_t;

#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
#define mp_type_fileio mp_type_vfs_fat_fileio

// extra built in modules to add to the list of known ones

extern const struct _mp_obj_module_t microcontroller_module;
Expand Down Expand Up @@ -231,8 +234,6 @@ extern const struct _mp_obj_module_t mp_module_ubluepy;
const char *readline_hist[8]; \
mp_obj_t gamepad_singleton; \

#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)

// We need to provide a declaration/definition of alloca()
#include <alloca.h>

Expand Down

0 comments on commit 24b4f28

Please sign in to comment.