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

Merge branch 'FM' into FM_Ext

Browse Source
This commit is contained in:
Jonathan Naylor
2020-05-13 12:06:35 +01:00
parent 8ac6a1b208 dc5438e3aa
commit 9e52db3ef3
6 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modem.cpp
View File

@@ -107,6 +107,8 @@ m_port(port),
m_dmrColorCode(0U),
m_ysfLoDev(false),
m_ysfTXHang(4U),
m_p25TXHang(5U),
m_nxdnTXHang(5U),
m_duplex(duplex),
m_rxInvert(rxInvert),
m_txInvert(txInvert),
@@ -274,6 +276,16 @@ void CModem::setYSFParams(bool loDev, unsigned int txHang)
m_ysfTXHang = txHang;
}
void CModem::setP25Params(unsigned int txHang)
{
m_p25TXHang = txHang;
}
void CModem::setNXDNParams(unsigned int txHang)
{
m_nxdnTXHang = txHang;
}
void CModem::setTransparentDataParams(unsigned int sendFrameType)
{
m_sendTransparentDataFrameType = sendFrameType;
@@ -1615,7 +1627,7 @@ bool CModem::setConfig()
buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = 22U;
buffer[1U] = 24U;
buffer[2U] = MMDVM_SET_CONFIG;
@@ -1679,10 +1691,14 @@ bool CModem::setConfig()
buffer[21U] = (unsigned char)(m_fmTXLevel * 2.55F + 0.5F);
// CUtils::dump(1U, "Written", buffer, 22U);
buffer[22U] = (unsigned char)m_p25TXHang;
int ret = m_serial->write(buffer, 22U);
if (ret != 22)
buffer[23U] = (unsigned char)m_nxdnTXHang;
// CUtils::dump(1U, "Written", buffer, 24U);
int ret = m_serial->write(buffer, 24U);
if (ret != 24)
return false;
unsigned int count = 0U;