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

Merge remote-tracking branch 'adafruit/master' into bleio-rev

Browse Source
This commit is contained in:
Dan Halbert 2018-11-20 14:47:05 -05:00
commit c424ad844b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shared-bindings/time/__init__.c
View File

@ -206,10 +206,9 @@ STATIC mp_obj_t time_time(void) {
} }
MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time); MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
//| .. method:: monotonic_ns(clk_id) //| .. method:: monotonic_ns()
//| //|
//| Return the time of the specified clock clk_id in nanoseconds. Refer to //| Return the time of the specified clock clk_id in nanoseconds.
//| Clock ID Constants for a list of accepted values for clk_id.
//| //|
//| :return: the current time //| :return: the current time
//| :rtype: int //| :rtype: int