Small changes

pull/14/head
Andy CA6JAU 9 years ago
parent a68946e0b2
commit 47a2dca8b0

@ -439,15 +439,13 @@ void CSerialPort::beginInt(uint8_t n, int speed)
usbserial.begin(); usbserial.begin();
#endif #endif
break; break;
#if defined(SERIAL_REPEATER)
case 3U: case 3U:
#if defined(SERIAL_REPEATER)
InitUSART2(speed); InitUSART2(speed);
break;
#elif defined(SERIAL_REPEATER_USART1) #elif defined(SERIAL_REPEATER_USART1)
case 3U:
InitUSART1(speed); InitUSART1(speed);
break;
#endif #endif
break;
default: default:
break; break;
} }
@ -462,11 +460,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)
case 3U: case 3U:
#if defined(SERIAL_REPEATER)
return AvailUSART2(); return AvailUSART2();
#elif defined(SERIAL_REPEATER_USART1) #elif defined(SERIAL_REPEATER_USART1)
case 3U:
return AvailUSART1(); return AvailUSART1();
#endif #endif
default: default:
@ -483,11 +480,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)
case 3U: case 3U:
#if defined(SERIAL_REPEATER)
return ReadUSART2(); return ReadUSART2();
#elif defined(SERIAL_REPEATER_USART1) #elif defined(SERIAL_REPEATER_USART1)
case 3U:
return ReadUSART1(); return ReadUSART1();
#endif #endif
default: default:
@ -509,19 +505,17 @@ 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)
case 3U: case 3U:
#if defined(SERIAL_REPEATER)
WriteUSART2(data, length); WriteUSART2(data, length);
if (flush) if (flush)
TXSerialFlush2(); TXSerialFlush2();
break;
#elif defined(SERIAL_REPEATER_USART1) #elif defined(SERIAL_REPEATER_USART1)
case 3U:
WriteUSART1(data, length); WriteUSART1(data, length);
if (flush) if (flush)
TXSerialFlush1(); TXSerialFlush1();
break;
#endif #endif
break;
default: default:
break; break;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.