jaseg/olsndot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb-rs485: update to latest library master

Browse source
This commit is contained in:
Karl Palsson 2017-02-21 21:17:14 +00:00
parent 18df4064d3
commit 9e15416b0b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/usb-serial-rs485/main-stm32f103-generic.c
View file

@ -121,14 +121,13 @@ void usart2_isr(void)
void usb_cdcacm_setup_pre_arch(void)
{
// Hack to reenumerate
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
gpio_clear(GPIOA, GPIO12);
for (unsigned int i = 0; i < 800000; i++) {
__asm__("nop");
}
rcc_periph_clock_enable(RCC_OTGFS);
}
void usb_cdcacm_setup_post_arch(usbd_device *dev)

6
tests/usb-serial-rs485/main-stm32f4-disco.c
View file

@ -77,7 +77,7 @@ void usart2_isr(void)
gpio_really(GPIOA, GPIO5, 1);
// usbser-rxne()
/* Check if we were called because of RXNE. */
if (usart_get_interrupt_source(USART2, USART_SR_RXNE)) {
if (usart_get_flag(USART2, USART_SR_RXNE)) {
gpio_set(LED_RX_PORT, LED_RX_PIN);
uint8_t c = usart_recv(USART2);
if (ringb_put(&rx_ring, c)) {
@ -92,7 +92,7 @@ void usart2_isr(void)
gpio_clear(LED_RX_PORT, LED_RX_PIN);
}
// usbser-irq-txe()
if (usart_get_interrupt_source(USART2, USART_SR_TXE)) {
if (usart_get_flag(USART2, USART_SR_TXE)) {
if (ringb_depth(&tx_ring) == 0) {
// turn off tx empty interrupts, nothing left to send
usart_disable_tx_interrupt(USART2);
@ -105,7 +105,7 @@ void usart2_isr(void)
}
}
// usbser-irq-txc? rs485 is auto on some devices, but can be emulated anyway
// if (usart_get_interrupt_source(USART2, USART_SR_TC)) {
// if (usart_get_flag(USART2, USART_SR_TC)) {
// ER_DPRINTF("TC");
// // turn off the complete irqs, we're done now.
// USART_SR(USART2) &= ~USART_SR_TC;