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

Incorporate stylistic changes suggested by @dhylands

Browse Source
This commit is contained in:
blmorris 2014-07-11 21:18:09 -04:00
parent e687fdbcbc
commit 847a6b30b1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stmhal/i2c.c
View File

@ -453,7 +453,7 @@ STATIC mp_obj_t pyb_i2c_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_arg
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv); STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
/// \method mem_read(data, addr, memaddr, timeout=5000, memaddr_use_16b=False) /// \method mem_read(data, addr, memaddr, timeout=5000, use_16bit_addr=False)
/// ///
/// Read from the memory of an I2C device: /// Read from the memory of an I2C device:
/// ///
@ -461,7 +461,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
/// - `addr` is the I2C device address /// - `addr` is the I2C device address
/// - `memaddr` is the memory location within the I2C device /// - `memaddr` is the memory location within the I2C device
/// - `timeout` is the timeout in milliseconds to wait for the read /// - `timeout` is the timeout in milliseconds to wait for the read
/// - `memaddr_use_16b` selects width of memaddr: 8 or 16 bits /// - `use_16bit_addr` selects width of memaddr: 8 or 16 bits
/// ///
/// Returns the read data. /// Returns the read data.
/// This is only valid in master mode. /// This is only valid in master mode.
@ -470,7 +470,7 @@ STATIC const mp_arg_t pyb_i2c_mem_read_args[] = {
{ MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_addr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
{ MP_QSTR_memaddr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, { MP_QSTR_memaddr, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
{ MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} }, { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
{ MP_QSTR_memaddr_use_16b, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, { MP_QSTR_use_16bit_addr, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
}; };
#define PYB_I2C_MEM_READ_NUM_ARGS MP_ARRAY_SIZE(pyb_i2c_mem_read_args) #define PYB_I2C_MEM_READ_NUM_ARGS MP_ARRAY_SIZE(pyb_i2c_mem_read_args)
@ -514,7 +514,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(uint n_args, const mp_obj_t *args, mp_map_t *kw
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read); STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
/// \method mem_write(data, addr, memaddr, timeout=5000, memaddr_use_16b=False) /// \method mem_write(data, addr, memaddr, timeout=5000, use_16bit_addr=False)
/// ///
/// Write to the memory of an I2C device: /// Write to the memory of an I2C device:
/// ///
@ -522,7 +522,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
/// - `addr` is the I2C device address /// - `addr` is the I2C device address
/// - `memaddr` is the memory location within the I2C device /// - `memaddr` is the memory location within the I2C device
/// - `timeout` is the timeout in milliseconds to wait for the write /// - `timeout` is the timeout in milliseconds to wait for the write
/// - `memaddr_use_16b` selects width of memaddr: 8 or 16 bits /// - `use_16bit_addr` selects width of memaddr: 8 or 16 bits
/// ///
/// Returns `None`. /// Returns `None`.
/// This is only valid in master mode. /// This is only valid in master mode.

2
stmhal/qstrdefsport.h
View File

@ -160,7 +160,7 @@ Q(baudrate)
Q(gencall) Q(gencall)
Q(data) Q(data)
Q(memaddr) Q(memaddr)
Q(memaddr_use_16b) Q(use_16bit_addr)
Q(timeout) Q(timeout)
Q(init) Q(init)
Q(deinit) Q(deinit)