Update SerialSTM.cpp

pull/13/head
Tony Corbett 9 years ago committed by GitHub
parent cc72d91f51
commit 0d39ef58cd

@ -44,7 +44,7 @@ USART2 - TXD PA2 - RXD PA3
#define TX_SERIAL_FIFO_SIZE 256U #define TX_SERIAL_FIFO_SIZE 256U
#define RX_SERIAL_FIFO_SIZE 256U #define RX_SERIAL_FIFO_SIZE 256U
#if defined(STM32_USART1_HOST) || defined(SERIAL_REPEATER) #if defined(STM32_USART1_HOST) || defined(SERIAL_REPEATER_USART1)
extern "C" { extern "C" {
void USART1_IRQHandler(); void USART1_IRQHandler();
@ -439,11 +439,11 @@ void CSerialPort::beginInt(uint8_t n, int speed)
usbserial.begin(); usbserial.begin();
#endif #endif
break; break;
#if defined(SERIAL_REPEATER) && (defined(STM32_USART1_HOST) || defined(ZUMSPOT_LIBRE)) #if defined(SERIAL_REPEATER)
case 3U: case 3U:
InitUSART2(speed); InitUSART2(speed);
break; break;
#elif defined(SERIAL_REPEATER) #elif defined(SERIAL_REPEATER_USART1)
case 3U: case 3U:
InitUSART1(speed); InitUSART1(speed);
break; break;
@ -462,10 +462,10 @@ int CSerialPort::availableInt(uint8_t n)
#elif defined(STM32_USB_HOST) #elif defined(STM32_USB_HOST)
return usbserial.available(); return usbserial.available();
#endif #endif
#if defined(SERIAL_REPEATER) && (defined(STM32_USART1_HOST) || defined(ZUMSPOT_LIBRE)) #if defined(SERIAL_REPEATER)
case 3U: case 3U:
return AvailUSART2(); return AvailUSART2();
#elif defined(SERIAL_REPEATER) #elif defined(SERIAL_REPEATER_USART1)
case 3U: case 3U:
return AvailUSART1(); return AvailUSART1();
#endif #endif
@ -483,10 +483,10 @@ uint8_t CSerialPort::readInt(uint8_t n)
#elif defined(STM32_USB_HOST) #elif defined(STM32_USB_HOST)
return usbserial.read(); return usbserial.read();
#endif #endif
#if defined(SERIAL_REPEATER) && (defined(STM32_USART1_HOST) || defined(ZUMSPOT_LIBRE)) #if defined(SERIAL_REPEATER)
case 3U: case 3U:
return ReadUSART2(); return ReadUSART2();
#elif defined(SERIAL_REPEATER) #elif defined(SERIAL_REPEATER_USART1)
case 3U: case 3U:
return ReadUSART1(); return ReadUSART1();
#endif #endif
@ -509,13 +509,13 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
usbserial.flush(); usbserial.flush();
#endif #endif
break; break;
#if defined(SERIAL_REPEATER) && (defined(STM32_USART1_HOST) || defined(ZUMSPOT_LIBRE)) #if defined(SERIAL_REPEATER)
case 3U: case 3U:
WriteUSART2(data, length); WriteUSART2(data, length);
if (flush) if (flush)
TXSerialFlush2(); TXSerialFlush2();
break; break;
#elif defined(SERIAL_REPEATER) #elif defined(SERIAL_REPEATER_USART1)
case 3U: case 3U:
WriteUSART1(data, length); WriteUSART1(data, length);
if (flush) if (flush)

Loading…
Cancel
Save

Powered by TurnKey Linux.