retropilot
/
panda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

high baud rate works

master
George Hotz 2018-01-28 02:10:52 -08:00
parent fc81fc1118
commit 743d244513
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
board/drivers/uart.h
View File

@ -162,31 +162,45 @@ void uart_set_baud(USART_TypeDef *u, int baud) {
#define USART1_DMA_LEN 0x40
char usart1_dma[USART1_DMA_LEN];
void DMA2_Stream5_IRQHandler(void) {
set_led(LED_BLUE, 1);
void uart_dma_drain() {
if (DMA2_Stream5->NDTR == USART1_DMA_LEN) return;
DMA2_Stream5->CR &= DMA_SxCR_EN;
enter_critical_section();
uart_ring *q = &esp_ring;
// disable DMA
q->uart->CR3 &= ~USART_CR3_DMAR;
DMA2_Stream5->CR &= ~DMA_SxCR_EN;
//puth(DMA2_Stream5->NDTR); puts("\n");
int i;
for (i = 0; i < USART1_DMA_LEN; i++) {
for (i = 0; i < USART1_DMA_LEN - DMA2_Stream5->NDTR; i++) {
char c = usart1_dma[i];
uint8_t next_w_ptr = q->w_ptr_rx + 1;
if (next_w_ptr != q->r_ptr_rx) {
q->elems_rx[q->w_ptr_rx] = c;
q->w_ptr_rx = next_w_ptr;
if (q->callback) q->callback(q);
}
}
DMA2_Stream5->M0AR = (uint32_t)usart1_dma;
DMA2_Stream5->NDTR = USART1_DMA_LEN;
DMA2_Stream5->CR = DMA_SxCR_CHSEL_2 | DMA_SxCR_MINC | DMA_SxCR_EN;
DMA2_Stream5->CR |= DMA_SxCR_TCIE;
// clear interrupts
DMA2->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5;
DMA2->HIFCR = DMA_HIFCR_CTCIF5;
// enable DMA
DMA2_Stream5->CR |= DMA_SxCR_EN;
q->uart->CR3 |= USART_CR3_DMAR;
exit_critical_section();
}
void DMA2_Stream5_IRQHandler(void) {
//set_led(LED_BLUE, 1);
uart_dma_drain();
}
void uart_init(USART_TypeDef *u, int baud) {
@ -200,7 +214,9 @@ void uart_init(USART_TypeDef *u, int baud) {
// ** UART is ready to work **
// enable interrupts
u->CR1 |= USART_CR1_RXNEIE;
if (u != USART1) {
u->CR1 |= USART_CR1_RXNEIE;
}
if (u == USART1) {
// DMA2, stream 2, channel 3
@ -210,13 +226,13 @@ void uart_init(USART_TypeDef *u, int baud) {
// channel4, increment memory, periph -> memory, enable
DMA2_Stream5->CR = DMA_SxCR_CHSEL_2 | DMA_SxCR_MINC | DMA_SxCR_EN;
DMA2_Stream5->CR |= DMA_SxCR_TCIE;
DMA2_Stream5->CR |= DMA_SxCR_TCIE | DMA_SxCR_HTIE;
// this one uses DMA receiver
u->CR3 = USART_CR3_DMAR;
NVIC_EnableIRQ(DMA2_Stream5_IRQn);
//NVIC_EnableIRQ(USART1_IRQn);
NVIC_EnableIRQ(USART1_IRQn);
} else if (u == USART2) {
NVIC_EnableIRQ(USART2_IRQn);
} else if (u == USART3) {

1
board/main.c
View File

@ -311,6 +311,7 @@ int usb_cb_control_msg(USB_Setup_TypeDef *setup, uint8_t *resp, int hardwired) {
case 0xe0:
ur = get_ring_by_number(setup->b.wValue.w);
if (!ur) break;
if (ur == &esp_ring) uart_dma_drain();
// read
while ((resp_len < min(setup->b.wLength.w, MAX_RESP_LEN)) &&
getc(ur, (char*)&resp[resp_len])) {

3
tests/location_listener.py
View File

@ -27,8 +27,7 @@ if __name__ == "__main__":
print ser.read(1024)
# upping baud rate
# 460800 has issues
baudrate = 115200
baudrate = 460800
print "upping baud rate"
msg = add_nmea_checksum("$PUBX,41,1,0007,0003,%d,0" % baudrate)+"\r\n"