MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for passthrough of serial data from MQTT to the spare serial port on an MMDVM modem/hotspot.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-20 16:33:33 +01:00
parent 1afe34f514
commit 3c48b8f61b
11 changed files with 59 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Modem.cpp
View File

@@ -898,10 +898,15 @@ void CModem::clock(unsigned int ms)
printDebug();
break;
case MMDVM_SERIAL_DATA:
if (m_trace)
CUtils::dump(1U, "RX Serial Data", m_buffer, m_length);
m_rxSerialData.addData(m_buffer + m_offset, m_length - m_offset);
case MMDVM_SERIAL_DATA: {
if (m_trace)
CUtils::dump(1U, "RX Serial Data", m_buffer, m_length);
unsigned char data = m_length - m_offset;
m_rxSerialData.addData(&data, 1U);
m_rxSerialData.addData(m_buffer + m_offset, m_length - m_offset);
}
break;
default:
@@ -1301,18 +1306,18 @@ unsigned int CModem::readTransparentData(unsigned char* data)
return len;
}
unsigned int CModem::readSerial(unsigned char* data, unsigned int length)
unsigned int CModem::readSerialData(unsigned char* data)
{
assert(data != NULL);
assert(length > 0U);
unsigned int n = 0U;
while (!m_rxSerialData.isEmpty() && n < length) {
m_rxSerialData.getData(data + n, 1U);
n++;
}
if (m_rxSerialData.isEmpty())
return 0U;
return n;
unsigned char len = 0U;
m_rxSerialData.getData(&len, 1U);
m_rxSerialData.getData(data, len);
return len;
}
bool CModem::hasDStarSpace() const
@@ -1879,7 +1884,7 @@ bool CModem::writeIPInfo(const std::string& address)
return ret != int(length + 4U);
}
bool CModem::writeSerial(const unsigned char* data, unsigned int length)
bool CModem::writeSerialData(const unsigned char* data, unsigned int length)
{
assert(m_port != NULL);
assert(data != NULL);