diff options
Diffstat (limited to 'stmhal')
| -rw-r--r-- | stmhal/Makefile | 1 | ||||
| -rw-r--r-- | stmhal/accel.c | 10 | ||||
| -rw-r--r-- | stmhal/bufhelper.c | 29 | ||||
| -rw-r--r-- | stmhal/bufhelper.h | 2 | ||||
| -rw-r--r-- | stmhal/i2c.c | 295 | ||||
| -rw-r--r-- | stmhal/i2c.h | 3 | ||||
| -rw-r--r-- | stmhal/qstrdefsport.h | 34 | ||||
| -rw-r--r-- | stmhal/spi.c | 173 | ||||
| -rw-r--r-- | stmhal/usart.c | 280 |
9 files changed, 621 insertions, 206 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index 3cd51c0166..c4c7f7bfc1 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -97,6 +97,7 @@ SRC_C = \ servo.c \ dac.c \ adc.c \ + bufhelper.c \ i2c.c \ spi.c \ diff --git a/stmhal/accel.c b/stmhal/accel.c index 47c7a1a494..9890aa3c7f 100644 --- a/stmhal/accel.c +++ b/stmhal/accel.c @@ -35,7 +35,15 @@ void accel_init(void) { } STATIC void accel_start(void) { - // start the I2C bus + // start the I2C bus in master mode + I2CHandle1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; + I2CHandle1.Init.ClockSpeed = 400000; + I2CHandle1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; + I2CHandle1.Init.DutyCycle = I2C_DUTYCYCLE_16_9; + I2CHandle1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; + I2CHandle1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; + I2CHandle1.Init.OwnAddress1 = PYB_I2C_MASTER_ADDRESS; + I2CHandle1.Init.OwnAddress2 = 0xfe; // unused i2c_init(&I2CHandle1); // turn off AVDD, wait 20ms, turn on AVDD, wait 20ms again diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c new file mode 100644 index 0000000000..5612a048dc --- /dev/null +++ b/stmhal/bufhelper.c @@ -0,0 +1,29 @@ +#include "misc.h" +#include "mpconfig.h" +#include "qstr.h" +#include "obj.h" +#include "bufhelper.h" + +void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, uint8_t *tmp_data) { + if (MP_OBJ_IS_INT(o)) { + tmp_data[0] = mp_obj_get_int(o); + bufinfo->buf = tmp_data; + bufinfo->len = 1; + bufinfo->typecode = 'B'; + } else { + mp_get_buffer_raise(o, bufinfo, MP_BUFFER_READ); + } +} + +mp_obj_t pyb_buf_get_for_recv(mp_obj_t o, mp_buffer_info_t *bufinfo) { + if (MP_OBJ_IS_INT(o)) { + // allocate a new bytearray of given length + bufinfo->len = mp_obj_get_int(o); + bufinfo->typecode = 'B'; + return mp_obj_str_builder_start(&mp_type_bytes, bufinfo->len, (byte**)&bufinfo->buf); + } else { + // get the existing buffer + mp_get_buffer_raise(o, bufinfo, MP_BUFFER_WRITE); + return MP_OBJ_NULL; + } +} diff --git a/stmhal/bufhelper.h b/stmhal/bufhelper.h new file mode 100644 index 0000000000..9b58e817c8 --- /dev/null +++ b/stmhal/bufhelper.h @@ -0,0 +1,2 @@ +void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, uint8_t *tmp_data); +mp_obj_t pyb_buf_get_for_recv(mp_obj_t o, mp_buffer_info_t *bufinfo); diff --git a/stmhal/i2c.c b/stmhal/i2c.c index e1dd83d2f8..d94a99ee9e 100644 --- a/stmhal/i2c.c +++ b/stmhal/i2c.c @@ -11,8 +11,12 @@ #include "runtime.h" #include "pin.h" #include "genhdr/pins.h" +#include "bufhelper.h" #include "i2c.h" +#define PYB_I2C_MASTER (0) +#define PYB_I2C_SLAVE (1) + #if MICROPY_HW_ENABLE_I2C1 I2C_HandleTypeDef I2CHandle1 = {.Instance = NULL}; #endif @@ -65,15 +69,6 @@ void i2c_init(I2C_HandleTypeDef *i2c) { } // init the I2C device - i2c->Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; - i2c->Init.ClockSpeed = 400000; - i2c->Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; - i2c->Init.DutyCycle = I2C_DUTYCYCLE_16_9; - i2c->Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; - i2c->Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; - i2c->Init.OwnAddress1 = 0xfe; // unused - i2c->Init.OwnAddress2 = 0xfe; // unused - if (HAL_I2C_Init(i2c) != HAL_OK) { // init error // TODO should raise an exception, but this function is not necessarily going to be @@ -83,6 +78,22 @@ void i2c_init(I2C_HandleTypeDef *i2c) { } } +void i2c_deinit(I2C_HandleTypeDef *i2c) { + HAL_I2C_DeInit(i2c); + if (0) { +#if MICROPY_HW_ENABLE_I2C1 + } else if (i2c->Instance == I2C1) { + __I2C1_FORCE_RESET(); + __I2C1_RELEASE_RESET(); + __I2C1_CLK_DISABLE(); +#endif + } else if (i2c->Instance == I2C2) { + __I2C2_FORCE_RESET(); + __I2C2_RELEASE_RESET(); + __I2C2_CLK_DISABLE(); + } +} + /******************************************************************************/ /* Micro Python bindings */ @@ -91,6 +102,8 @@ typedef struct _pyb_i2c_obj_t { I2C_HandleTypeDef *i2c; } pyb_i2c_obj_t; +STATIC inline bool in_master_mode(pyb_i2c_obj_t *self) { return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS; } + STATIC const pyb_i2c_obj_t pyb_i2c_obj[] = { #if MICROPY_HW_ENABLE_I2C1 {{&pyb_i2c_type}, &I2CHandle1}, @@ -101,9 +114,64 @@ STATIC const pyb_i2c_obj_t pyb_i2c_obj[] = { }; #define PYB_NUM_I2C (sizeof(pyb_i2c_obj) / sizeof(pyb_i2c_obj[0])) +STATIC void pyb_i2c_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { + pyb_i2c_obj_t *self = self_in; + + uint i2c_num; + if (self->i2c->Instance == I2C1) { i2c_num = 1; } + else { i2c_num = 2; } + + if (self->i2c->State == HAL_I2C_STATE_RESET) { + print(env, "I2C(%u)", i2c_num); + } else { + if (in_master_mode(self)) { + print(env, "I2C(%u, I2C.MASTER, baudrate=%u)", i2c_num, self->i2c->Init.ClockSpeed); + } else { + print(env, "I2C(%u, I2C.SLAVE, addr=0x%02x)", i2c_num, (self->i2c->Instance->OAR1 >> 1) & 0x7f); + } + } +} + +STATIC const mp_arg_parse_t pyb_i2c_init_accepted_args[] = { + { MP_QSTR_mode, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_INT, {.u_int = 0} }, + { MP_QSTR_addr, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 0x12} }, + { MP_QSTR_baudrate, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 400000} }, + { MP_QSTR_gencall, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_BOOL, {.u_bool = false} }, +}; +#define PYB_I2C_INIT_NUM_ARGS (sizeof(pyb_i2c_init_accepted_args) / sizeof(pyb_i2c_init_accepted_args[0])) + +STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + // parse args + mp_arg_parse_val_t vals[PYB_I2C_INIT_NUM_ARGS]; + mp_arg_parse_all(n_args, args, kw_args, PYB_I2C_INIT_NUM_ARGS, pyb_i2c_init_accepted_args, vals); + + // set the I2C configuration values + I2C_InitTypeDef *init = &self->i2c->Init; + + if (vals[0].u_int == PYB_I2C_MASTER) { + // use a special address to indicate we are a master + init->OwnAddress1 = PYB_I2C_MASTER_ADDRESS; + } else { + init->OwnAddress1 = (vals[1].u_int << 1) & 0xfe; + } + + init->AddressingMode = I2C_ADDRESSINGMODE_7BIT; + init->ClockSpeed = MIN(vals[2].u_int, 400000); + init->DualAddressMode = I2C_DUALADDRESS_DISABLED; + init->DutyCycle = I2C_DUTYCYCLE_16_9; + init->GeneralCallMode = vals[3].u_bool ? I2C_GENERALCALL_ENABLED : I2C_GENERALCALL_DISABLED; + init->NoStretchMode = I2C_NOSTRETCH_DISABLED; + init->OwnAddress2 = 0xfe; // unused + + // init the I2C bus + i2c_init(self->i2c); + + return mp_const_none; +} + STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { // check arguments - mp_arg_check_num(n_args, n_kw, 1, 1, false); + mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true); // get i2c number machine_int_t i2c_id = mp_obj_get_int(args[0]) - 1; @@ -113,18 +181,39 @@ STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "I2C bus %d does not exist", i2c_id + 1)); } - // get i2c object + // get I2C object const pyb_i2c_obj_t *i2c_obj = &pyb_i2c_obj[i2c_id]; - // start the peripheral - i2c_init(i2c_obj->i2c); + if (n_args > 1 || n_kw > 0) { + // start the peripheral + mp_map_t kw_args; + mp_map_init_fixed_table(&kw_args, n_kw, args + n_args); + pyb_i2c_init_helper(i2c_obj, n_args - 1, args + 1, &kw_args); + } return (mp_obj_t)i2c_obj; } +STATIC mp_obj_t pyb_i2c_init(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + return pyb_i2c_init_helper(args[0], n_args - 1, args + 1, kw_args); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init); + +STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) { + pyb_i2c_obj_t *self = self_in; + i2c_deinit(self->i2c); + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit); + // Check if an I2C device responds to the given address. STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) { pyb_i2c_obj_t *self = self_in; + + if (!in_master_mode(self)) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master")); + } + machine_uint_t i2c_addr = mp_obj_get_int(i2c_addr_o) << 1; for (int i = 0; i < 10; i++) { @@ -136,13 +225,16 @@ STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) { return mp_const_false; } - STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_i2c_is_ready_obj, pyb_i2c_is_ready); // Scan all I2C addresses from 0x01 to 0x7f and return a list of those that respond. STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) { pyb_i2c_obj_t *self = self_in; + if (!in_master_mode(self)) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master")); + } + mp_obj_t list = mp_obj_new_list(0, NULL); for (uint addr = 1; addr <= 127; addr++) { @@ -157,88 +249,156 @@ STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) { return list; } - STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan); -STATIC mp_obj_t pyb_i2c_read(mp_obj_t self_in, mp_obj_t i2c_addr_in, mp_obj_t n_in) { - pyb_i2c_obj_t *self = self_in; - machine_uint_t i2c_addr = mp_obj_get_int(i2c_addr_in) << 1; - machine_uint_t n = mp_obj_get_int(n_in); +STATIC const mp_arg_parse_t pyb_i2c_send_accepted_args[] = { + { MP_QSTR_send, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_addr, MP_ARG_PARSE_INT, {.u_int = PYB_I2C_MASTER_ADDRESS} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_I2C_SEND_NUM_ARGS (sizeof(pyb_i2c_send_accepted_args) / sizeof(pyb_i2c_send_accepted_args[0])) - byte *data; - mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, n, &data); - HAL_StatusTypeDef status = HAL_I2C_Master_Receive(self->i2c, i2c_addr, data, n, 500); +STATIC mp_obj_t pyb_i2c_send(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + pyb_i2c_obj_t *self = args[0]; + + // parse args + mp_arg_parse_val_t vals[PYB_I2C_SEND_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_SEND_NUM_ARGS, pyb_i2c_send_accepted_args, vals); + + // get the buffer to send from + mp_buffer_info_t bufinfo; + uint8_t data[1]; + pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data); + + // send the data + HAL_StatusTypeDef status; + if (in_master_mode(self)) { + if (vals[1].u_int == PYB_I2C_MASTER_ADDRESS) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "addr argument required")); + } + machine_uint_t i2c_addr = vals[1].u_int << 1; + status = HAL_I2C_Master_Transmit(self->i2c, i2c_addr, bufinfo.buf, bufinfo.len, vals[2].u_int); + } else { + status = HAL_I2C_Slave_Transmit(self->i2c, bufinfo.buf, bufinfo.len, vals[2].u_int); + } if (status != HAL_OK) { // TODO really need a HardwareError object, or something - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_I2C_Master_Receive failed with code %d", status)); + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_I2C_xxx_Transmit failed with code %d", status)); } - return mp_obj_str_builder_end(o); + return mp_const_none; } +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send); + +STATIC const mp_arg_parse_t pyb_i2c_recv_accepted_args[] = { + { MP_QSTR_recv, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_addr, MP_ARG_PARSE_INT, {.u_int = PYB_I2C_MASTER_ADDRESS} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_I2C_RECV_NUM_ARGS (sizeof(pyb_i2c_recv_accepted_args) / sizeof(pyb_i2c_recv_accepted_args[0])) -STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_i2c_read_obj, pyb_i2c_read); +STATIC mp_obj_t pyb_i2c_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + pyb_i2c_obj_t *self = args[0]; -STATIC mp_obj_t pyb_i2c_write(mp_obj_t self_in, mp_obj_t i2c_addr_in, mp_obj_t data_in) { - pyb_i2c_obj_t *self = self_in; - machine_uint_t i2c_addr = mp_obj_get_int(i2c_addr_in) << 1; + // parse args + mp_arg_parse_val_t vals[PYB_I2C_RECV_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_RECV_NUM_ARGS, pyb_i2c_recv_accepted_args, vals); + + // get the buffer to receive into + mp_buffer_info_t bufinfo; + mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &bufinfo); + + // receive the data HAL_StatusTypeDef status; - if (MP_OBJ_IS_INT(data_in)) { - uint8_t data[1] = {mp_obj_get_int(data_in)}; - status = HAL_I2C_Master_Transmit(self->i2c, i2c_addr, data, 1, 500); + if (in_master_mode(self)) { + if (vals[1].u_int == PYB_I2C_MASTER_ADDRESS) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "addr argument required")); + } + machine_uint_t i2c_addr = vals[1].u_int << 1; + status = HAL_I2C_Master_Receive(self->i2c, i2c_addr, bufinfo.buf, bufinfo.len, vals[2].u_int); } else { - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ); - status = HAL_I2C_Master_Transmit(self->i2c, i2c_addr, bufinfo.buf, bufinfo.len, 500); + status = HAL_I2C_Slave_Receive(self->i2c, bufinfo.buf, bufinfo.len, vals[2].u_int); } if (status != HAL_OK) { // TODO really need a HardwareError object, or something - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_I2C_Master_Transmit failed with code %d", status)); + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_I2C_xxx_Receive failed with code %d", status)); } - return mp_const_none; + // return the received data + if (o_ret == MP_OBJ_NULL) { + return vals[0].u_obj; + } else { + return mp_obj_str_builder_end(o_ret); + } } +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv); -STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_i2c_write_obj, pyb_i2c_write); +STATIC const mp_arg_parse_t pyb_i2c_mem_read_accepted_args[] = { + { MP_QSTR_data, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_addr, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_INT, {.u_int = 0} }, + { MP_QSTR_memaddr, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_INT, {.u_int = 0} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_I2C_MEM_READ_NUM_ARGS (sizeof(pyb_i2c_mem_read_accepted_args) / sizeof(pyb_i2c_mem_read_accepted_args[0])) -STATIC mp_obj_t pyb_i2c_mem_read(uint n_args, const mp_obj_t *args) { +STATIC mp_obj_t pyb_i2c_mem_read(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { pyb_i2c_obj_t *self = args[0]; - machine_uint_t i2c_addr = mp_obj_get_int(args[1]) << 1; - machine_uint_t mem_addr = mp_obj_get_int(args[2]); - machine_uint_t n = mp_obj_get_int(args[3]); - byte *data; - mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, n, &data); - HAL_StatusTypeDef status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, n, 200); + if (!in_master_mode(self)) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master")); + } + + // parse args + mp_arg_parse_val_t vals[PYB_I2C_MEM_READ_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_MEM_READ_NUM_ARGS, pyb_i2c_mem_read_accepted_args, vals); + + // get the buffer to read into + mp_buffer_info_t bufinfo; + mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &bufinfo); - //printf("Read got %d\n", status); + // get the addresses + machine_uint_t i2c_addr = vals[1].u_int << 1; + machine_uint_t mem_addr = vals[2].u_int; + + HAL_StatusTypeDef status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, bufinfo.buf, bufinfo.len, vals[3].u_int); if (status != HAL_OK) { // TODO really need a HardwareError object, or something nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_I2C_Mem_Read failed with code %d", status)); } - return mp_obj_str_builder_end(o); + // return the read data + if (o_ret == MP_OBJ_NULL) { + return vals[0].u_obj; + } else { + return mp_obj_str_builder_end(o_ret); + } } +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read); -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_i2c_mem_read_obj, 4, 4, pyb_i2c_mem_read); - -STATIC mp_obj_t pyb_i2c_mem_write(uint n_args, const mp_obj_t *args) { +STATIC mp_obj_t pyb_i2c_mem_write(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { pyb_i2c_obj_t *self = args[0]; - machine_uint_t i2c_addr = mp_obj_get_int(args[1]) << 1; - machine_uint_t mem_addr = mp_obj_get_int(args[2]); - HAL_StatusTypeDef status; - if (MP_OBJ_IS_INT(args[3])) { - uint8_t data[1] = {mp_obj_get_int(args[3])}; - status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, 1, 200); - } else { - mp_buffer_info_t bufinfo; - mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ); - status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, bufinfo.buf, bufinfo.len, 200); + + if (!in_master_mode(self)) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master")); } - //printf("Write got %d\n", status); + // parse args (same as mem_read) + mp_arg_parse_val_t vals[PYB_I2C_MEM_READ_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_MEM_READ_NUM_ARGS, pyb_i2c_mem_read_accepted_args, vals); + + // get the buffer to write from + mp_buffer_info_t bufinfo; + uint8_t data[1]; + pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data); + + // get the addresses + machine_uint_t i2c_addr = vals[1].u_int << 1; + machine_uint_t mem_addr = vals[2].u_int; + + HAL_StatusTypeDef status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, bufinfo.buf, bufinfo.len, vals[3].u_int); if (status != HAL_OK) { // TODO really need a HardwareError object, or something @@ -247,16 +407,22 @@ STATIC mp_obj_t pyb_i2c_mem_write(uint n_args, const mp_obj_t *args) { return mp_const_none; } - -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_i2c_mem_write_obj, 4, 4, pyb_i2c_mem_write); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_write_obj, 1, pyb_i2c_mem_write); STATIC const mp_map_elem_t pyb_i2c_locals_dict_table[] = { + // instance methods + { MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&pyb_i2c_init_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&pyb_i2c_deinit_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_is_ready), (mp_obj_t)&pyb_i2c_is_ready_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&pyb_i2c_scan_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&pyb_i2c_read_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&pyb_i2c_write_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&pyb_i2c_send_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&pyb_i2c_recv_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_mem_read), (mp_obj_t)&pyb_i2c_mem_read_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_mem_write), (mp_obj_t)&pyb_i2c_mem_write_obj }, + + // class constants + { MP_OBJ_NEW_QSTR(MP_QSTR_MASTER), MP_OBJ_NEW_SMALL_INT(PYB_I2C_MASTER) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_SLAVE), MP_OBJ_NEW_SMALL_INT(PYB_I2C_SLAVE) }, }; STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table); @@ -264,6 +430,7 @@ STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table); const mp_obj_type_t pyb_i2c_type = { { &mp_type_type }, .name = MP_QSTR_I2C, + .print = pyb_i2c_print, .make_new = pyb_i2c_make_new, .locals_dict = (mp_obj_t)&pyb_i2c_locals_dict, }; diff --git a/stmhal/i2c.h b/stmhal/i2c.h index 00bb744f0c..d4f08efb75 100644 --- a/stmhal/i2c.h +++ b/stmhal/i2c.h @@ -1,3 +1,6 @@ +// use this for OwnAddress1 to configure I2C in master mode +#define PYB_I2C_MASTER_ADDRESS (0xfe) + extern I2C_HandleTypeDef I2CHandle1; extern I2C_HandleTypeDef I2CHandle2; extern const mp_obj_type_t pyb_i2c_type; diff --git a/stmhal/qstrdefsport.h b/stmhal/qstrdefsport.h index f59f6131bc..b7102b7267 100644 --- a/stmhal/qstrdefsport.h +++ b/stmhal/qstrdefsport.h @@ -79,12 +79,17 @@ Q(off) Q(toggle) Q(intensity) -// for USART object +// for USART class Q(USART) -Q(status) -Q(recv_chr) -Q(send_chr) +Q(baudrate) +Q(bits) +Q(stop) +Q(parity) +Q(init) +Q(deinit) +Q(all) Q(send) +Q(recv) // for ExtInt class Q(ExtInt) @@ -106,8 +111,19 @@ Q(EVT_RISING_FALLING) // for I2C object Q(I2C) +Q(mode) +Q(addr) +Q(baudrate) +Q(gencall) +Q(data) +Q(memaddr) +Q(timeout) +Q(init) +Q(deinit) Q(is_ready) Q(scan) +Q(send) +Q(recv) Q(mem_read) Q(mem_write) @@ -120,16 +136,18 @@ Q(recv) Q(send_recv) Q(mode) Q(baudrate) -Q(clkpol) -Q(clkphase) +Q(polarity) +Q(phase) Q(dir) -Q(size) +Q(bits) Q(nss) Q(firstbit) Q(ti) -Q(crcpoly) +Q(crc) Q(MASTER) Q(SLAVE) +Q(MSB) +Q(LSB) // for Accel object Q(Accel) diff --git a/stmhal/spi.c b/stmhal/spi.c index b16cd83c8b..352c594c9e 100644 --- a/stmhal/spi.c +++ b/stmhal/spi.c @@ -11,6 +11,7 @@ #include "runtime.h" #include "pin.h" #include "genhdr/pins.h" +#include "bufhelper.h" #include "spi.h" #if MICROPY_HW_ENABLE_SPI1 @@ -41,7 +42,7 @@ void spi_init(SPI_HandleTypeDef *spi) { GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.Mode = GPIO_MODE_AF_PP; GPIO_InitStructure.Speed = GPIO_SPEED_FAST; - GPIO_InitStructure.Pull = GPIO_PULLUP; // ST examples use PULLUP + GPIO_InitStructure.Pull = spi->Init.CLKPolarity == SPI_POLARITY_LOW ? GPIO_PULLDOWN : GPIO_PULLUP; const pin_obj_t *pins[4]; if (0) { @@ -100,12 +101,18 @@ void spi_deinit(SPI_HandleTypeDef *spi) { if (0) { #if MICROPY_HW_ENABLE_SPI1 } else if (spi->Instance == SPI1) { + __SPI1_FORCE_RESET(); + __SPI1_RELEASE_RESET(); __SPI1_CLK_DISABLE(); #endif } else if (spi->Instance == SPI2) { + __SPI2_FORCE_RESET(); + __SPI2_RELEASE_RESET(); __SPI2_CLK_DISABLE(); #if MICROPY_HW_ENABLE_SPI3 } else if (spi->Instance == SPI3) { + __SPI3_FORCE_RESET(); + __SPI3_RELEASE_RESET(); __SPI3_CLK_DISABLE(); #endif } @@ -156,29 +163,34 @@ STATIC void pyb_spi_print(void (*print)(void *env, const char *fmt, ...), void * spi_clock = HAL_RCC_GetPCLK1Freq(); } uint baudrate = spi_clock >> ((self->spi->Init.BaudRatePrescaler >> 3) + 1); - print(env, "SPI(%u, SPI.MASTER, clock=%u, baudrate=%u)", spi_num, spi_clock, baudrate); + print(env, "SPI(%u, SPI.MASTER, baudrate=%u", spi_num, baudrate); } else { - print(env, "SPI(%u, SPI.SLAVE)", spi_num); + print(env, "SPI(%u, SPI.SLAVE", spi_num); } + print(env, ", polarity=%u, phase=%u, bits=%u", self->spi->Init.CLKPolarity == SPI_POLARITY_LOW ? 0 : 1, self->spi->Init.CLKPhase == SPI_PHASE_1EDGE ? 1 : 2, self->spi->Init.DataSize == SPI_DATASIZE_8BIT ? 8 : 16); + if (self->spi->Init.CRCCalculation == SPI_CRCCALCULATION_ENABLED) { + print(env, ", crc=0x%x", self->spi->Init.CRCPolynomial); + } + print(env, ")"); } } STATIC const mp_arg_parse_t pyb_spi_init_accepted_args[] = { { MP_QSTR_mode, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_INT, {.u_int = 0} }, - { MP_QSTR_baudrate, MP_ARG_PARSE_INT, {.u_int = 328125} }, - { MP_QSTR_clkpol, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = SPI_POLARITY_LOW} }, - { MP_QSTR_clkphase, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = SPI_PHASE_1EDGE} }, + { MP_QSTR_baudrate, MP_ARG_PARSE_INT, {.u_int = 328125} }, + { MP_QSTR_polarity, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 1} }, + { MP_QSTR_phase, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 1} }, { MP_QSTR_dir, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = SPI_DIRECTION_2LINES} }, - { MP_QSTR_size, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 8} }, + { MP_QSTR_bits, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 8} }, { MP_QSTR_nss, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = SPI_NSS_SOFT} }, { MP_QSTR_firstbit, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = SPI_FIRSTBIT_MSB} }, { MP_QSTR_ti, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_BOOL, {.u_bool = false} }, - { MP_QSTR_crcpoly, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_OBJ, {.u_obj = mp_const_none} }, + { MP_QSTR_crc, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_OBJ, {.u_obj = mp_const_none} }, }; #define PYB_SPI_INIT_NUM_ARGS (sizeof(pyb_spi_init_accepted_args) / sizeof(pyb_spi_init_accepted_args[0])) STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { - // parse keyword args + // parse args mp_arg_parse_val_t vals[PYB_SPI_INIT_NUM_ARGS]; mp_arg_parse_all(n_args, args, kw_args, PYB_SPI_INIT_NUM_ARGS, pyb_spi_init_accepted_args, vals); @@ -206,8 +218,8 @@ STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, uint n_args, cons else if (br_prescale <= 128) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_128; } else { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256; } - init->CLKPolarity = vals[2].u_int; - init->CLKPhase = vals[3].u_int; + init->CLKPolarity = vals[2].u_int == 0 ? SPI_POLARITY_LOW : SPI_POLARITY_HIGH; + init->CLKPhase = vals[3].u_int == 1 ? SPI_PHASE_1EDGE : SPI_PHASE_2EDGE; init->Direction = vals[4].u_int; init->DataSize = (vals[5].u_int == 16) ? SPI_DATASIZE_16BIT : SPI_DATASIZE_8BIT; init->NSS = vals[6].u_int; @@ -264,24 +276,28 @@ STATIC mp_obj_t pyb_spi_deinit(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_spi_deinit_obj, pyb_spi_deinit); -STATIC mp_obj_t pyb_spi_send(mp_obj_t self_in, mp_obj_t data_in) { +STATIC const mp_arg_parse_t pyb_spi_send_accepted_args[] = { + { MP_QSTR_send, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_SPI_SEND_NUM_ARGS (sizeof(pyb_spi_send_accepted_args) / sizeof(pyb_spi_send_accepted_args[0])) + +STATIC mp_obj_t pyb_spi_send(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { // TODO assumes transmission size is 8-bits wide - // TODO accept timeout as keyword argument - pyb_spi_obj_t *self = self_in; + pyb_spi_obj_t *self = args[0]; - uint8_t data[1]; + // parse args + mp_arg_parse_val_t vals[PYB_SPI_SEND_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_SPI_SEND_NUM_ARGS, pyb_spi_send_accepted_args, vals); + + // get the buffer to send from mp_buffer_info_t bufinfo; - if (MP_OBJ_IS_INT(data_in)) { - data[0] = mp_obj_get_int(data_in); - bufinfo.buf = data; - bufinfo.len = 1; - bufinfo.typecode = 'B'; - } else { - mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ); - } + uint8_t data[1]; + pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data); - HAL_StatusTypeDef status = HAL_SPI_Transmit(self->spi, bufinfo.buf, bufinfo.len, 1000); + // send the data + HAL_StatusTypeDef status = HAL_SPI_Transmit(self->spi, bufinfo.buf, bufinfo.len, vals[1].u_int); if (status != HAL_OK) { // TODO really need a HardwareError object, or something @@ -290,57 +306,104 @@ STATIC mp_obj_t pyb_spi_send(mp_obj_t self_in, mp_obj_t data_in) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_spi_send_obj, pyb_spi_send); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_obj, 1, pyb_spi_send); + +STATIC const mp_arg_parse_t pyb_spi_recv_accepted_args[] = { + { MP_QSTR_recv, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_SPI_RECV_NUM_ARGS (sizeof(pyb_spi_recv_accepted_args) / sizeof(pyb_spi_recv_accepted_args[0])) -STATIC mp_obj_t pyb_spi_recv(mp_obj_t self_in, mp_obj_t n_in) { +STATIC mp_obj_t pyb_spi_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { // TODO assumes transmission size is 8-bits wide - // TODO accept timeout as keyword argument - pyb_spi_obj_t *self = self_in; - machine_uint_t n = mp_obj_get_int(n_in); + pyb_spi_obj_t *self = args[0]; + + // parse args + mp_arg_parse_val_t vals[PYB_SPI_RECV_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_SPI_RECV_NUM_ARGS, pyb_spi_recv_accepted_args, vals); - byte *data; - mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, n, &data); - HAL_StatusTypeDef status = HAL_SPI_Receive(self->spi, data, n, 1000); + // get the buffer to receive into + mp_buffer_info_t bufinfo; + mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &bufinfo); + + // receive the data + HAL_StatusTypeDef status = HAL_SPI_Receive(self->spi, bufinfo.buf, bufinfo.len, vals[1].u_int); if (status != HAL_OK) { // TODO really need a HardwareError object, or something nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_SPI_Receive failed with code %d", status)); } - return mp_obj_str_builder_end(o); + // return the received data + if (o_ret == MP_OBJ_NULL) { + return vals[0].u_obj; + } else { + return mp_obj_str_builder_end(o_ret); + } } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_spi_recv_obj, pyb_spi_recv); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_recv_obj, 1, pyb_spi_recv); -STATIC mp_obj_t pyb_spi_send_recv(mp_obj_t self_in, mp_obj_t data_in) { +STATIC const mp_arg_parse_t pyb_spi_send_recv_accepted_args[] = { + { MP_QSTR_send, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_recv, MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_SPI_SEND_RECV_NUM_ARGS (sizeof(pyb_spi_send_recv_accepted_args) / sizeof(pyb_spi_send_recv_accepted_args[0])) + +STATIC mp_obj_t pyb_spi_send_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { // TODO assumes transmission size is 8-bits wide - // TODO accept timeout as keyword argument - pyb_spi_obj_t *self = self_in; + pyb_spi_obj_t *self = args[0]; + // parse args + mp_arg_parse_val_t vals[PYB_SPI_SEND_RECV_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_SPI_SEND_RECV_NUM_ARGS, pyb_spi_send_recv_accepted_args, vals); + + // get buffers to send from/receive to + mp_buffer_info_t bufinfo_send; uint8_t data_send[1]; - mp_buffer_info_t bufinfo; - if (MP_OBJ_IS_INT(data_in)) { - data_send[0] = mp_obj_get_int(data_in); - bufinfo.buf = data_send; - bufinfo.len = 1; - bufinfo.typecode = 'B'; + mp_buffer_info_t bufinfo_recv; + mp_obj_t o_ret; + + if (vals[0].u_obj == vals[1].u_obj) { + // same object for send and receive, it must be a r/w buffer + mp_get_buffer_raise(vals[0].u_obj, &bufinfo_send, MP_BUFFER_RW); + bufinfo_recv = bufinfo_send; + o_ret = MP_OBJ_NULL; } else { - mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ); + // get the buffer to send from + pyb_buf_get_for_send(vals[0].u_obj, &bufinfo_send, data_send); + + // get the buffer to receive into + if (vals[1].u_obj == MP_OBJ_NULL) { + // only send argument given, so create a fresh buffer of the send length + bufinfo_recv.len = bufinfo_send.len; + bufinfo_recv.typecode = 'B'; + o_ret = mp_obj_str_builder_start(&mp_type_bytes, bufinfo_recv.len, (byte**)&bufinfo_recv.buf); + } else { + // recv argument given + mp_get_buffer_raise(vals[1].u_obj, &bufinfo_recv, MP_BUFFER_WRITE); + o_ret = MP_OBJ_NULL; + } } - byte *data_recv; - mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, bufinfo.len, &data_recv); - HAL_StatusTypeDef status = HAL_SPI_TransmitReceive(self->spi, bufinfo.buf, data_recv, bufinfo.len, 1000); + // send and receive the data + HAL_StatusTypeDef status = HAL_SPI_TransmitReceive(self->spi, bufinfo_send.buf, bufinfo_recv.buf, bufinfo_send.len, vals[2].u_int); if (status != HAL_OK) { // TODO really need a HardwareError object, or something nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_SPI_TransmitReceive failed with code %d", status)); } - return mp_obj_str_builder_end(o); + // return the received data + if (o_ret == MP_OBJ_NULL) { + return vals[1].u_obj; + } else { + return mp_obj_str_builder_end(o_ret); + } } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_spi_send_recv_obj, pyb_spi_send_recv); +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_recv_obj, 1, pyb_spi_send_recv); STATIC const mp_map_elem_t pyb_spi_locals_dict_table[] = { // instance methods @@ -351,21 +414,17 @@ STATIC const mp_map_elem_t pyb_spi_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_send_recv), (mp_obj_t)&pyb_spi_send_recv_obj }, // class constants - { MP_OBJ_NEW_QSTR(MP_QSTR_MASTER), MP_OBJ_NEW_SMALL_INT(SPI_MODE_MASTER) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_SLAVE), MP_OBJ_NEW_SMALL_INT(SPI_MODE_SLAVE) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_MASTER), MP_OBJ_NEW_SMALL_INT(SPI_MODE_MASTER) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_SLAVE), MP_OBJ_NEW_SMALL_INT(SPI_MODE_SLAVE) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_MSB), MP_OBJ_NEW_SMALL_INT(SPI_FIRSTBIT_MSB) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_LSB), MP_OBJ_NEW_SMALL_INT(SPI_FIRSTBIT_LSB) }, /* TODO { MP_OBJ_NEW_QSTR(MP_QSTR_DIRECTION_2LINES ((uint32_t)0x00000000) { MP_OBJ_NEW_QSTR(MP_QSTR_DIRECTION_2LINES_RXONLY SPI_CR1_RXONLY { MP_OBJ_NEW_QSTR(MP_QSTR_DIRECTION_1LINE SPI_CR1_BIDIMODE - { MP_OBJ_NEW_QSTR(MP_QSTR_POLARITY_LOW ((uint32_t)0x00000000) - { MP_OBJ_NEW_QSTR(MP_QSTR_POLARITY_HIGH SPI_CR1_CPOL - { MP_OBJ_NEW_QSTR(MP_QSTR_PHASE_1EDGE ((uint32_t)0x00000000) - { MP_OBJ_NEW_QSTR(MP_QSTR_PHASE_2EDGE SPI_CR1_CPHA { MP_OBJ_NEW_QSTR(MP_QSTR_NSS_SOFT SPI_CR1_SSM { MP_OBJ_NEW_QSTR(MP_QSTR_NSS_HARD_INPUT ((uint32_t)0x00000000) { MP_OBJ_NEW_QSTR(MP_QSTR_NSS_HARD_OUTPUT ((uint32_t)0x00040000) - { MP_OBJ_NEW_QSTR(MP_QSTR_FIRSTBIT_MSB ((uint32_t)0x00000000) - { MP_OBJ_NEW_QSTR(MP_QSTR_FIRSTBIT_LSB SPI_CR1_LSBFIRST */ }; diff --git a/stmhal/usart.c b/stmhal/usart.c index 89770942be..c737955ac2 100644 --- a/stmhal/usart.c +++ b/stmhal/usart.c @@ -8,23 +8,26 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" +#include "runtime.h" +#include "bufhelper.h" #include "usart.h" struct _pyb_usart_obj_t { mp_obj_base_t base; pyb_usart_t usart_id; bool is_enabled; - UART_HandleTypeDef handle; + UART_HandleTypeDef uart; }; pyb_usart_obj_t *pyb_usart_global_debug = NULL; -bool usart_init(pyb_usart_obj_t *usart_obj, uint32_t baudrate) { - USART_TypeDef *USARTx=NULL; +// assumes Init parameters have been set up correctly +bool usart_init2(pyb_usart_obj_t *usart_obj) { + USART_TypeDef *USARTx = NULL; - uint32_t GPIO_Pin=0; - uint8_t GPIO_AF_USARTx=0; - GPIO_TypeDef* GPIO_Port=NULL; + uint32_t GPIO_Pin = 0; + uint8_t GPIO_AF_USARTx = 0; + GPIO_TypeDef* GPIO_Port = NULL; switch (usart_obj->usart_id) { // USART1 is on PA9/PA10, PB6/PB7 @@ -71,7 +74,7 @@ bool usart_init(pyb_usart_obj_t *usart_obj, uint32_t baudrate) { __USART3_CLK_ENABLE(); break; - // USART4 is on PA0/PA1, PC10/PC11 + // UART4 is on PA0/PA1, PC10/PC11 case PYB_USART_4: USARTx = UART4; GPIO_AF_USARTx = GPIO_AF8_UART4; @@ -97,8 +100,7 @@ bool usart_init(pyb_usart_obj_t *usart_obj, uint32_t baudrate) { return false; } - // Initialize USARTx - + // init GPIO GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.Pin = GPIO_Pin; GPIO_InitStructure.Speed = GPIO_SPEED_HIGH; @@ -107,28 +109,62 @@ bool usart_init(pyb_usart_obj_t *usart_obj, uint32_t baudrate) { GPIO_InitStructure.Alternate = GPIO_AF_USARTx; HAL_GPIO_Init(GPIO_Port, &GPIO_InitStructure); - UART_HandleTypeDef *uh = &usart_obj->handle; + // init USARTx + usart_obj->uart.Instance = USARTx; + HAL_UART_Init(&usart_obj->uart); + + usart_obj->is_enabled = true; + + return true; +} + +bool usart_init(pyb_usart_obj_t *usart_obj, uint32_t baudrate) { + UART_HandleTypeDef *uh = &usart_obj->uart; memset(uh, 0, sizeof(*uh)); - uh->Instance = USARTx; uh->Init.BaudRate = baudrate; - uh->Init.WordLength = USART_WORDLENGTH_8B; - uh->Init.StopBits = USART_STOPBITS_1; - uh->Init.Parity = USART_PARITY_NONE; - uh->Init.Mode = USART_MODE_TX_RX; + uh->Init.WordLength = UART_WORDLENGTH_8B; + uh->Init.StopBits = UART_STOPBITS_1; + uh->Init.Parity = UART_PARITY_NONE; + uh->Init.Mode = UART_MODE_TX_RX; uh->Init.HwFlowCtl = UART_HWCONTROL_NONE; uh->Init.OverSampling = UART_OVERSAMPLING_16; - HAL_UART_Init(uh); + return usart_init2(usart_obj); +} - return true; +void usart_deinit(pyb_usart_obj_t *usart_obj) { + usart_obj->is_enabled = false; + UART_HandleTypeDef *uart = &usart_obj->uart; + HAL_UART_DeInit(uart); + if (uart->Instance == USART1) { + __USART1_FORCE_RESET(); + __USART1_RELEASE_RESET(); + __USART1_CLK_DISABLE(); + } else if (uart->Instance == USART2) { + __USART2_FORCE_RESET(); + __USART2_RELEASE_RESET(); + __USART2_CLK_DISABLE(); + } else if (uart->Instance == USART3) { + __USART3_FORCE_RESET(); + __USART3_RELEASE_RESET(); + __USART3_CLK_DISABLE(); + } else if (uart->Instance == UART4) { + __UART4_FORCE_RESET(); + __UART4_RELEASE_RESET(); + __UART4_CLK_DISABLE(); + } else if (uart->Instance == USART6) { + __USART6_FORCE_RESET(); + __USART6_RELEASE_RESET(); + __USART6_CLK_DISABLE(); + } } bool usart_rx_any(pyb_usart_obj_t *usart_obj) { - return __HAL_UART_GET_FLAG(&usart_obj->handle, USART_FLAG_RXNE); + return __HAL_UART_GET_FLAG(&usart_obj->uart, UART_FLAG_RXNE); } int usart_rx_char(pyb_usart_obj_t *usart_obj) { uint8_t ch; - if (HAL_UART_Receive(&usart_obj->handle, &ch, 1, 0) != HAL_OK) { + if (HAL_UART_Receive(&usart_obj->uart, &ch, 1, 0) != HAL_OK) { ch = 0; } return ch; @@ -136,19 +172,15 @@ int usart_rx_char(pyb_usart_obj_t *usart_obj) { void usart_tx_char(pyb_usart_obj_t *usart_obj, int c) { uint8_t ch = c; - HAL_UART_Transmit(&usart_obj->handle, &ch, 1, 100000); + HAL_UART_Transmit(&usart_obj->uart, &ch, 1, 100000); } void usart_tx_str(pyb_usart_obj_t *usart_obj, const char *str) { - for (; *str; str++) { - usart_tx_char(usart_obj, *str); - } + HAL_UART_Transmit(&usart_obj->uart, (uint8_t*)str, strlen(str), 100000); } void usart_tx_strn(pyb_usart_obj_t *usart_obj, const char *str, uint len) { - for (; len > 0; str++, len--) { - usart_tx_char(usart_obj, *str); - } + HAL_UART_Transmit(&usart_obj->uart, (uint8_t*)str, len, 100000); } void usart_tx_strn_cooked(pyb_usart_obj_t *usart_obj, const char *str, uint len) { @@ -163,17 +195,67 @@ void usart_tx_strn_cooked(pyb_usart_obj_t *usart_obj, const char *str, uint len) /******************************************************************************/ /* Micro Python bindings */ -STATIC void usart_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { +STATIC void pyb_usart_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { pyb_usart_obj_t *self = self_in; - print(env, "<USART %lu>", self->usart_id); + if (!self->is_enabled) { + print(env, "USART(%lu)", self->usart_id); + } else { + print(env, "USART(%lu, baudrate=%u, bits=%u, stop=%u", + self->usart_id, self->uart.Init.BaudRate, + self->uart.Init.WordLength == UART_WORDLENGTH_8B ? 8 : 9, + self->uart.Init.StopBits == UART_STOPBITS_1 ? 1 : 2); + if (self->uart.Init.Parity == UART_PARITY_NONE) { + print(env, ", parity=None)"); + } else { + print(env, ", parity=%u)", self->uart.Init.Parity == UART_PARITY_EVEN ? 0 : 1); + } + } } -STATIC mp_obj_t usart_obj_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { - // check arguments - if (!(n_args == 2 && n_kw == 0)) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "USART accepts 2 arguments")); +STATIC const mp_arg_parse_t pyb_usart_init_accepted_args[] = { + { MP_QSTR_baudrate, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_INT, {.u_int = 9600} }, + { MP_QSTR_bits, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 8} }, + { MP_QSTR_stop, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 1} }, + { MP_QSTR_parity, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_OBJ, {.u_obj = mp_const_none} }, +}; +#define PYB_USART_INIT_NUM_ARGS (sizeof(pyb_usart_init_accepted_args) / sizeof(pyb_usart_init_accepted_args[0])) + +STATIC mp_obj_t pyb_usart_init_helper(pyb_usart_obj_t *self, uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + // parse args + mp_arg_parse_val_t vals[PYB_USART_INIT_NUM_ARGS]; + mp_arg_parse_all(n_args, args, kw_args, PYB_USART_INIT_NUM_ARGS, pyb_usart_init_accepted_args, vals); + + // set the USART configuration values + memset(&self->uart, 0, sizeof(self->uart)); + UART_InitTypeDef *init = &self->uart.Init; + init->BaudRate = vals[0].u_int; + init->WordLength = vals[1].u_int == 8 ? UART_WORDLENGTH_8B : UART_WORDLENGTH_9B; + switch (vals[2].u_int) { + case 1: init->StopBits = UART_STOPBITS_1; break; + default: init->StopBits = UART_STOPBITS_2; break; + } + if (vals[3].u_obj == mp_const_none) { + init->Parity = UART_PARITY_NONE; + } else { + machine_int_t parity = mp_obj_get_int(vals[3].u_obj); + init->Parity = (parity & 1) ? UART_PARITY_ODD : UART_PARITY_EVEN; + } + init->Mode = UART_MODE_TX_RX; + init->HwFlowCtl = UART_HWCONTROL_NONE; + init->OverSampling = UART_OVERSAMPLING_16; + + // init USART (if it fails, it's because the port doesn't exist) + if (!usart_init2(self)) { + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "USART port %d does not exist", self->usart_id)); } + return mp_const_none; +} + +STATIC mp_obj_t pyb_usart_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { + // check arguments + mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true); + // create object pyb_usart_obj_t *o = m_new_obj(pyb_usart_obj_t); o->base.type = &pyb_usart_type; @@ -200,17 +282,29 @@ STATIC mp_obj_t usart_obj_make_new(mp_obj_t type_in, uint n_args, uint n_kw, con o->usart_id = mp_obj_get_int(args[0]); } - // init USART (if it fails, it's because the port doesn't exist) - if (!usart_init(o, mp_obj_get_int(args[1]))) { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "USART port %d does not exist", o->usart_id)); + if (n_args > 1 || n_kw > 0) { + // start the peripheral + mp_map_t kw_args; + mp_map_init_fixed_table(&kw_args, n_kw, args + n_args); + pyb_usart_init_helper(o, n_args - 1, args + 1, &kw_args); } - o->is_enabled = true; - return o; } -STATIC mp_obj_t usart_obj_status(mp_obj_t self_in) { +STATIC mp_obj_t pyb_usart_init(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + return pyb_usart_init_helper(args[0], n_args - 1, args + 1, kw_args); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usart_init_obj, 1, pyb_usart_init); + +STATIC mp_obj_t pyb_usart_deinit(mp_obj_t self_in) { + pyb_usart_obj_t *self = self_in; + usart_deinit(self); + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usart_deinit_obj, pyb_usart_deinit); + +STATIC mp_obj_t pyb_usart_any(mp_obj_t self_in) { pyb_usart_obj_t *self = self_in; if (usart_rx_any(self)) { return mp_const_true; @@ -218,57 +312,91 @@ STATIC mp_obj_t usart_obj_status(mp_obj_t self_in) { return mp_const_false; } } +STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usart_any_obj, pyb_usart_any); -STATIC mp_obj_t usart_obj_rx_char(mp_obj_t self_in) { - mp_obj_t ret = mp_const_none; - pyb_usart_obj_t *self = self_in; +STATIC const mp_arg_parse_t pyb_usart_send_accepted_args[] = { + { MP_QSTR_send, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_USART_SEND_NUM_ARGS (sizeof(pyb_usart_send_accepted_args) / sizeof(pyb_usart_send_accepted_args[0])) - if (self->is_enabled) { - ret = mp_obj_new_int(usart_rx_char(self)); - } - return ret; -} +STATIC mp_obj_t pyb_usart_send(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + // TODO assumes transmission size is 8-bits wide -STATIC mp_obj_t usart_obj_tx_char(mp_obj_t self_in, mp_obj_t c) { - pyb_usart_obj_t *self = self_in; - uint len; - const char *str = mp_obj_str_get_data(c, &len); - if (len == 1 && self->is_enabled) { - usart_tx_char(self, str[0]); - } - return mp_const_none; -} + pyb_usart_obj_t *self = args[0]; -STATIC mp_obj_t usart_obj_tx_str(mp_obj_t self_in, mp_obj_t s) { - pyb_usart_obj_t *self = self_in; - if (self->is_enabled) { - if (MP_OBJ_IS_STR(s)) { - uint len; - const char *data = mp_obj_str_get_data(s, &len); - usart_tx_strn(self, data, len); - } + // parse args + mp_arg_parse_val_t vals[PYB_USART_SEND_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_USART_SEND_NUM_ARGS, pyb_usart_send_accepted_args, vals); + + // get the buffer to send from + mp_buffer_info_t bufinfo; + uint8_t data[1]; + pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data); + + // send the data + HAL_StatusTypeDef status = HAL_UART_Transmit(&self->uart, bufinfo.buf, bufinfo.len, vals[1].u_int); + + if (status != HAL_OK) { + // TODO really need a HardwareError object, or something + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_UART_Transmit failed with code %d", status)); } + return mp_const_none; } +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usart_send_obj, 1, pyb_usart_send); + +STATIC const mp_arg_parse_t pyb_usart_recv_accepted_args[] = { + { MP_QSTR_recv, MP_ARG_PARSE_REQUIRED | MP_ARG_PARSE_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_timeout, MP_ARG_PARSE_KW_ONLY | MP_ARG_PARSE_INT, {.u_int = 5000} }, +}; +#define PYB_USART_RECV_NUM_ARGS (sizeof(pyb_usart_recv_accepted_args) / sizeof(pyb_usart_recv_accepted_args[0])) + +STATIC mp_obj_t pyb_usart_recv(uint n_args, const mp_obj_t *args, mp_map_t *kw_args) { + // TODO assumes transmission size is 8-bits wide -STATIC MP_DEFINE_CONST_FUN_OBJ_1(usart_obj_status_obj, usart_obj_status); -STATIC MP_DEFINE_CONST_FUN_OBJ_1(usart_obj_rx_char_obj, usart_obj_rx_char); -STATIC MP_DEFINE_CONST_FUN_OBJ_2(usart_obj_tx_char_obj, usart_obj_tx_char); -STATIC MP_DEFINE_CONST_FUN_OBJ_2(usart_obj_tx_str_obj, usart_obj_tx_str); + pyb_usart_obj_t *self = args[0]; -STATIC const mp_map_elem_t usart_locals_dict_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR_status), (mp_obj_t)&usart_obj_status_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_recv_chr), (mp_obj_t)&usart_obj_rx_char_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_send_chr), (mp_obj_t)&usart_obj_tx_char_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&usart_obj_tx_str_obj }, + // parse args + mp_arg_parse_val_t vals[PYB_USART_RECV_NUM_ARGS]; + mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_USART_RECV_NUM_ARGS, pyb_usart_recv_accepted_args, vals); + + // get the buffer to receive into + mp_buffer_info_t bufinfo; + mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &bufinfo); + + // receive the data + HAL_StatusTypeDef status = HAL_UART_Receive(&self->uart, bufinfo.buf, bufinfo.len, vals[1].u_int); + + if (status != HAL_OK) { + // TODO really need a HardwareError object, or something + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "HAL_UART_Receive failed with code %d", status)); + } + + // return the received data + if (o_ret == MP_OBJ_NULL) { + return vals[0].u_obj; + } else { + return mp_obj_str_builder_end(o_ret); + } +} +STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usart_recv_obj, 1, pyb_usart_recv); + +STATIC const mp_map_elem_t pyb_usart_locals_dict_table[] = { + // instance methods + { MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&pyb_usart_init_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&pyb_usart_deinit_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_any), (mp_obj_t)&pyb_usart_any_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&pyb_usart_send_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&pyb_usart_recv_obj }, }; -STATIC MP_DEFINE_CONST_DICT(usart_locals_dict, usart_locals_dict_table); +STATIC MP_DEFINE_CONST_DICT(pyb_usart_locals_dict, pyb_usart_locals_dict_table); const mp_obj_type_t pyb_usart_type = { { &mp_type_type }, .name = MP_QSTR_USART, - .print = usart_obj_print, - .make_new = usart_obj_make_new, - .locals_dict = (mp_obj_t)&usart_locals_dict, + .print = pyb_usart_print, + .make_new = pyb_usart_make_new, + .locals_dict = (mp_obj_t)&pyb_usart_locals_dict, }; |