shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'nfc' into nfc2

Browse Source
This commit is contained in:
Oleg Moiseenko
2019-02-07 14:49:47 +02:00
committed by GitHub
parent ca05385513 587c9aad14
commit 32400c8d09
43 changed files with 945 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
targets/stm32l432/src/redirect.c
View File

@ -37,7 +37,6 @@ void _putchar(char c)
LL_USART_TransmitData8(DEBUG_UART,c);
#endif
}
static int NFC = 0;
int _write (int fd, const void *buf, long int len)
@ -53,13 +52,10 @@ int _write (int fd, const void *buf, long int len)
memcpy(&logbuf[logbuflen], data, len);
logbuflen += len;
if (!NFC)
{
// Send out USB serial
uint8_t res = CDC_Transmit_FS(logbuf, logbuflen);
if (res == USBD_OK)
logbuflen = 0;
}
// Send out USB serial
uint8_t res = CDC_Transmit_FS(logbuf, logbuflen);
if (res == USBD_OK)
logbuflen = 0;
// Send out UART serial
while(len--)