diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-05-13 20:22:11 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-05-13 20:22:11 +0100 |
| commit | 1511dd4f84da036a738e217420d2b1685b5eb823 (patch) | |
| tree | eaa5ee45a576b0bafac0f702a9bb7d801dc9f8f8 | |
| parent | 1c132c8587c930b1e5d38fc2bd78f21a05f2e4fe (diff) | |
| download | micropython-1511dd4f84da036a738e217420d2b1685b5eb823.tar.gz micropython-1511dd4f84da036a738e217420d2b1685b5eb823.zip | |
stmhal: Add readinto and readlines methods to sys.stdin, pyb.USB_VCP().
Addresses issue #1255.
| -rw-r--r-- | stmhal/pybstdio.c | 2 | ||||
| -rw-r--r-- | stmhal/usb.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c index bf8b3717d3..baa3e77e4d 100644 --- a/stmhal/pybstdio.c +++ b/stmhal/pybstdio.c @@ -91,7 +91,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_o STATIC const mp_map_elem_t stdio_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_readall), (mp_obj_t)&mp_stream_readall_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), (mp_obj_t)&mp_stream_readinto_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj}, + { MP_OBJ_NEW_QSTR(MP_QSTR_readlines), (mp_obj_t)&mp_stream_unbuffered_readlines_obj}, { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj }, diff --git a/stmhal/usb.c b/stmhal/usb.c index cb08f9c5dd..1209ec5f12 100644 --- a/stmhal/usb.c +++ b/stmhal/usb.c @@ -430,15 +430,12 @@ STATIC const mp_map_elem_t pyb_usb_vcp_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_any), (mp_obj_t)&pyb_usb_vcp_any_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&pyb_usb_vcp_send_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&pyb_usb_vcp_recv_obj }, - /// \method read([nbytes]) { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj }, - /// \method readall() { MP_OBJ_NEW_QSTR(MP_QSTR_readall), (mp_obj_t)&mp_stream_readall_obj }, - /// \method readline() + { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), (mp_obj_t)&mp_stream_readinto_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj}, - /// \method write(buf) + { MP_OBJ_NEW_QSTR(MP_QSTR_readlines), (mp_obj_t)&mp_stream_unbuffered_readlines_obj}, { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj }, - /// \method close() { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj }, |