noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'geekylou-master'

This commit is contained in:
Roger Clark 2016-03-01 16:25:59 +11:00
parent ba5d4058f1 246a172250
commit e69af74e96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
STM32F1/cores/maple/libmaple/usb/stm32f1/usb.c
View File

@ -210,7 +210,7 @@ void __irq_usb_lp_can_rx0(void) {
#if (USB_ISR_MSK & USB_ISTR_WKUP)
if (istr & USB_ISTR_WKUP & USBLIB->irq_mask) {
USB_BASE->ISTR = ~USB_ISTR_WKUP;
USB_BASE->ISTR = ~(USB_ISTR_WKUP | USB_ISTR_SUSP);
usb_resume(RESUME_EXTERNAL);
}
#endif
@ -225,7 +225,7 @@ void __irq_usb_lp_can_rx0(void) {
usb_resume(RESUME_LATER);
}
/* clear of the ISTR bit must be done after setting of CNTR_FSUSP */
USB_BASE->ISTR = ~USB_ISTR_SUSP;
USB_BASE->ISTR = ~(USB_ISTR_WKUP | USB_ISTR_SUSP);
}
#endif

2
STM32F1/cores/maple/usb_serial.cpp
View File

@ -204,7 +204,7 @@ uint8 USBSerial::pending(void) {
}
uint8 USBSerial::isConnected(void) {
return usb_is_connected(USBLIB) && usb_is_configured(USBLIB);
return usb_is_connected(USBLIB) && usb_is_configured(USBLIB) && usb_cdcacm_get_dtr();
}
uint8 USBSerial::getDTR(void) {