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

stmhal: Fix uart off by 1 circular buffer size.

Browse Source
This commit is contained in:
Ryan Shaw 2015-11-28 05:30:46 +11:00 committed by Damien George
parent 54a1d9ecb7
commit c03dd3b2f9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stmhal/uart.c
View File

@ -429,7 +429,8 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
} }
mp_printf(print, ", stop=%u, timeout=%u, timeout_char=%u, read_buf_len=%u)", mp_printf(print, ", stop=%u, timeout=%u, timeout_char=%u, read_buf_len=%u)",
self->uart.Init.StopBits == UART_STOPBITS_1 ? 1 : 2, self->uart.Init.StopBits == UART_STOPBITS_1 ? 1 : 2,
self->timeout, self->timeout_char, self->read_buf_len); self->timeout, self->timeout_char,
self->read_buf_len == 0 ? 0 : self->read_buf_len - 1); // -1 to adjust for usable length of buffer
} }
} }
@ -538,8 +539,8 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, mp_uint_t n_args, con
__HAL_UART_DISABLE_IT(&self->uart, UART_IT_RXNE); __HAL_UART_DISABLE_IT(&self->uart, UART_IT_RXNE);
} else { } else {
// read buffer using interrupts // read buffer using interrupts
self->read_buf_len = args[7].u_int; self->read_buf_len = args[7].u_int + 1; // +1 to adjust for usable length of buffer
self->read_buf = m_new(byte, args[7].u_int << self->char_width); self->read_buf = m_new(byte, self->read_buf_len << self->char_width);
__HAL_UART_ENABLE_IT(&self->uart, UART_IT_RXNE); __HAL_UART_ENABLE_IT(&self->uart, UART_IT_RXNE);
HAL_NVIC_SetPriority(self->irqn, IRQ_PRI_UART, IRQ_SUBPRI_UART); HAL_NVIC_SetPriority(self->irqn, IRQ_PRI_UART, IRQ_SUBPRI_UART);
HAL_NVIC_EnableIRQ(self->irqn); HAL_NVIC_EnableIRQ(self->irqn);