juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into duplex

Browse source
This commit is contained in:
Andy CA6JAU 2017-07-15 16:33:35 -04:00
parent 9db9535146 3ea4d243d6
commit ce36c8a63c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SerialArduino.cpp
View file

@ -37,6 +37,8 @@ void CSerialPort::beginInt(uint8_t n, int speed)
case 3U: case 3U:
#if defined(SERIAL_REPEATER) && defined(__STM32F1__) #if defined(SERIAL_REPEATER) && defined(__STM32F1__)
Serial2.begin(speed); Serial2.begin(speed);
#elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__)
Serial1.begin(speed);
#elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__))
Serial1.begin(speed); Serial1.begin(speed);
#endif #endif
@ -58,6 +60,8 @@ int CSerialPort::availableInt(uint8_t n)
case 3U: case 3U:
#if defined(SERIAL_REPEATER) && defined(__STM32F1__) #if defined(SERIAL_REPEATER) && defined(__STM32F1__)
return Serial2.available(); return Serial2.available();
#elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__)
return Serial1.available();
#elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__))
return Serial1.available(); return Serial1.available();
#endif #endif
@ -78,6 +82,8 @@ uint8_t CSerialPort::readInt(uint8_t n)
case 3U: case 3U:
#if defined(SERIAL_REPEATER) && defined(__STM32F1__) #if defined(SERIAL_REPEATER) && defined(__STM32F1__)
return Serial2.read(); return Serial2.read();
#elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__)
return Serial1.read();
#elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__))
return Serial1.read(); return Serial1.read();
#endif #endif
@ -101,6 +107,8 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
case 3U: case 3U:
#if defined(SERIAL_REPEATER) && defined(__STM32F1__) #if defined(SERIAL_REPEATER) && defined(__STM32F1__)
Serial2.write(data, length); Serial2.write(data, length);
#elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__)
Serial1.write(data, length);
#elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__))
Serial1.write(data, length); Serial1.write(data, length);
#endif #endif

6
SerialPort.cpp
View file

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