Merge branch 'master' into duplex

This commit is contained in:
Andy CA6JAU 2017-07-15 16:33:35 -04:00
commit ce36c8a63c
2 changed files with 11 additions and 3 deletions

View file

@ -389,7 +389,7 @@ void CSerialPort::start()
{
beginInt(1U, 115200);
#if defined(SERIAL_REPEATER)
#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1)
beginInt(3U, 9600);
#endif
}
@ -627,7 +627,7 @@ void CSerialPort::process()
}
break;
#if defined(SERIAL_REPEATER)
#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1)
case MMDVM_SERIAL:
writeInt(3U, m_buffer + 3U, m_len - 3U);
break;
@ -645,7 +645,7 @@ void CSerialPort::process()
}
}
#if defined(SERIAL_REPEATER)
#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1)
// Drain any incoming serial data
while (availableInt(3U))
readInt(3U);