Merge pull request #46 from p-h-a-i-l/master

debug serial can use USART2 and USART3
This commit is contained in:
NiklasFauth 2018-09-06 01:16:48 +02:00 committed by GitHub
commit 2fce44cc98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ void setScopeChannel(uint8_t ch, int16_t val) {
}
void consoleScope() {
#if defined DEBUG_SERIAL_SERVOTERM && defined DEBUG_SERIAL_USART3
#if defined DEBUG_SERIAL_SERVOTERM && (defined DEBUG_SERIAL_USART2 || defined DEBUG_SERIAL_USART3)
uart_buf[0] = 0xff;
uart_buf[1] = CLAMP(ch_buf[0]+127, 0, 255);
uart_buf[2] = CLAMP(ch_buf[1]+127, 0, 255);
@ -45,7 +45,7 @@ void consoleScope() {
}
#endif
#if defined DEBUG_SERIAL_ASCII && defined DEBUG_SERIAL_USART3
#if defined DEBUG_SERIAL_ASCII && (defined DEBUG_SERIAL_USART2 || defined DEBUG_SERIAL_USART3)
memset(uart_buf, 0, sizeof(uart_buf));
sprintf(uart_buf, "1:%i 2:%i 3:%i 4:%i 5:%i 6:%i 7:%i 8:%i\r\n", ch_buf[0], ch_buf[1], ch_buf[2], ch_buf[3], ch_buf[4], ch_buf[5], ch_buf[6], ch_buf[7]);