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

Clean up the new EOF handling.

Browse Source
This commit is contained in:
Jonathan Naylor
2021-08-20 07:08:18 +01:00
parent 55f4c6ce1a
commit fbb835812d
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
M17Control.cpp
View File

@@ -307,6 +307,7 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
// Copy the FN and payload from the frame // Copy the FN and payload from the frame
::memcpy(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES, frame, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES); ::memcpy(netData + M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES, frame, M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES);
netData[M17_LSF_LENGTH_BYTES - M17_CRC_LENGTH_BYTES + 0U] |= 0x80U;
// The CRC is added in the networking code // The CRC is added in the networking code
@@ -326,10 +327,6 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
#if defined(DUMP_M17) #if defined(DUMP_M17)
writeFile(data + 2U); writeFile(data + 2U);
#endif #endif
std::string source = m_rfLSF.getSource();
std::string dest = m_rfLSF.getDest();
if (m_duplex) { if (m_duplex) {
unsigned char rfData[M17_FRAME_LENGTH_BYTES + 2U]; unsigned char rfData[M17_FRAME_LENGTH_BYTES + 2U];
@@ -340,17 +337,10 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
// Generate the sync // Generate the sync
CSync::addM17LinkSetupSync(rfData + 2U); CSync::addM17LinkSetupSync(rfData + 2U);
CM17LSF lsf; m_rfLSF.setDataType(M17_DATA_TYPE_END);
lsf.setSource(source);
lsf.setDest(dest);
lsf.setPacketStream(M17_STREAM_TYPE);
lsf.setDataType(M17_DATA_TYPE_END);
lsf.setEncryptionType(M17_ENCRYPTION_TYPE_NONE);
lsf.setEncryptionSubType(M17_ENCRYPTION_SUB_TYPE_TEXT);
lsf.setMeta(M17_NULL_NONCE);
unsigned char setup[M17_LSF_LENGTH_BYTES]; unsigned char setup[M17_LSF_LENGTH_BYTES];
lsf.getLinkSetup(setup); m_rfLSF.getLinkSetup(setup);
// Add the convolution FEC // Add the convolution FEC
CM17Convolution conv; CM17Convolution conv;
@@ -385,6 +375,9 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
m_network->write(netData); m_network->write(netData);
} }
std::string source = m_rfLSF.getSource();
std::string dest = m_rfLSF.getDest();
if (m_rssi != 0U) if (m_rssi != 0U)
LogMessage("M17, received RF end of transmission from %s to %s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", source.c_str(), dest.c_str(), float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); LogMessage("M17, received RF end of transmission from %s to %s, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", source.c_str(), dest.c_str(), float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
else else
@@ -594,17 +587,10 @@ void CM17Control::writeNetwork()
// Generate the sync // Generate the sync
CSync::addM17LinkSetupSync(rfData + 2U); CSync::addM17LinkSetupSync(rfData + 2U);
CM17LSF lsf; m_netLSF.setDataType(M17_DATA_TYPE_END);
lsf.setSource(source);
lsf.setDest(dest);
lsf.setPacketStream(M17_STREAM_TYPE);
lsf.setDataType(M17_DATA_TYPE_END);
lsf.setEncryptionType(M17_ENCRYPTION_TYPE_NONE);
lsf.setEncryptionSubType(M17_ENCRYPTION_SUB_TYPE_TEXT);
lsf.setMeta(M17_NULL_NONCE);
unsigned char setup[M17_LSF_LENGTH_BYTES]; unsigned char setup[M17_LSF_LENGTH_BYTES];
lsf.getLinkSetup(setup); m_netLSF.getLinkSetup(setup);
// Add the convolution FEC // Add the convolution FEC
CM17Convolution conv; CM17Convolution conv;
@@ -667,9 +653,7 @@ bool CM17Control::processRFHeader(bool lateEntry)
m_rfState = RS_RF_DATA_AUDIO; m_rfState = RS_RF_DATA_AUDIO;
break; break;
default: default:
LogMessage("M17, received RF%sunknown transmission from %s to %s", lateEntry ? " late entry " : " ", source.c_str(), dest.c_str()); return false;
m_rfState = RS_RF_DATA;
break;
} }
m_display->writeM17(source.c_str(), dest.c_str(), "R"); m_display->writeM17(source.c_str(), dest.c_str(), "R");

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20210819"; const char* VERSION = "20210820";
#endif #endif