diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-07-02 17:23:22 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-07-02 17:23:22 +0200 |
| commit | 5161239c9f671af2f8ad56ebda9aabb93ec2e5ab (patch) | |
| tree | a046e83106279058fa5ffa8fe962d0d1f7a469bf | |
| parent | 9a65fa304c151f796ecfd040b0744ed7cdc88537 (diff) | |
| download | micropython-5161239c9f671af2f8ad56ebda9aabb93ec2e5ab.tar.gz micropython-5161239c9f671af2f8ad56ebda9aabb93ec2e5ab.zip | |
cc3200: time.sleep() now receives seconds, like CPython.
| -rw-r--r-- | cc3200/mods/modutime.c | 8 | ||||
| -rw-r--r-- | docs/library/time.rst | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c index 210c8ce5ae..f828fca9ae 100644 --- a/cc3200/mods/modutime.c +++ b/cc3200/mods/modutime.c @@ -122,10 +122,10 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) { MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime); -/// \function sleep(milliseconds) -/// Sleep for the given number of milliseconds. -STATIC mp_obj_t time_sleep(mp_obj_t milliseconds_o) { - HAL_Delay(mp_obj_get_int(milliseconds_o)); +/// \function sleep(seconds) +/// Sleep for the given number of seconds. +STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) { + HAL_Delay(mp_obj_get_int(seconds_o) * 1000); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep); diff --git a/docs/library/time.rst b/docs/library/time.rst index 8595daa888..8af8e37ba8 100644 --- a/docs/library/time.rst +++ b/docs/library/time.rst @@ -38,18 +38,12 @@ Functions Sleep for the given number of seconds. Seconds can be a floating-point number to sleep for a fractional number of seconds. -.. only:: port_esp8266 +.. only:: port_esp8266 or port_wipy .. function:: sleep(seconds) Sleep for the given number of seconds. -.. only:: port_wipy - - .. function:: sleep(milliseconds) - - Sleep for the given number of milliseconds. - .. function:: time() Returns the number of seconds, as an integer, since 1/1/2000. |