summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal/i2c.c
diff options
context:
space:
mode:
authorblmorris <bryan.morrissey@gmail.com>2014-07-11 21:18:09 -0400
committerblmorris <bryan.morrissey@gmail.com>2014-07-11 21:18:09 -0400
commit847a6b30b17493853322532a40f48afb1d975d2e (patch)
treea792f0f43d2765482985d3302ddf5b3c7e9f7b29 /stmhal/i2c.c
parente687fdbcbcd2c01e2617e2c519d0bc1183371cad (diff)
downloadmicropython-847a6b30b17493853322532a40f48afb1d975d2e.tar.gz
micropython-847a6b30b17493853322532a40f48afb1d975d2e.zip
Incorporate stylistic changes suggested by @dhylands
Diffstat (limited to 'stmhal/i2c.c')
-rw-r--r--stmhal/i2c.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index 604572c0f4..25180e512f 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -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);
-/// \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:
///
@@ -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
/// - `memaddr` is the memory location within the I2C device
/// - `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.
/// 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_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_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)
@@ -494,8 +494,8 @@ STATIC mp_obj_t pyb_i2c_mem_read(uint n_args, const mp_obj_t *args, mp_map_t *kw
mp_uint_t mem_addr = vals[2].u_int;
// determine width of mem_addr
mp_uint_t mem_addr_size = I2C_MEMADD_SIZE_8BIT;
- if( vals[4].u_bool ) {
- mem_addr_size = I2C_MEMADD_SIZE_16BIT;
+ if (vals[4].u_bool) {
+ mem_addr_size = I2C_MEMADD_SIZE_16BIT;
}
HAL_StatusTypeDef status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, mem_addr_size, bufinfo.buf, bufinfo.len, vals[3].u_int);
@@ -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);
-/// \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:
///
@@ -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
/// - `memaddr` is the memory location within the I2C device
/// - `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`.
/// This is only valid in master mode.
@@ -547,8 +547,8 @@ STATIC mp_obj_t pyb_i2c_mem_write(uint n_args, const mp_obj_t *args, mp_map_t *k
mp_uint_t mem_addr = vals[2].u_int;
// determine width of mem_addr
mp_uint_t mem_addr_size = I2C_MEMADD_SIZE_8BIT;
- if( vals[4].u_bool ) {
- mem_addr_size = I2C_MEMADD_SIZE_16BIT;
+ if (vals[4].u_bool) {
+ mem_addr_size = I2C_MEMADD_SIZE_16BIT;
}
HAL_StatusTypeDef status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, mem_addr_size, bufinfo.buf, bufinfo.len, vals[3].u_int);