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

correct file formatting to be tabs and not spaces;

Browse Source
This commit is contained in:
Bryan Biedenkapp
2018-11-12 13:25:24 -05:00
parent a06dbf9d55
commit 1c1462e71e
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
P25Control.cpp
View File

@@ -126,7 +126,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
else else
LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits));
if (m_netState == RS_NET_IDLE) if (m_netState == RS_NET_IDLE)
m_display->clearP25(); m_display->clearP25();
@@ -213,23 +213,23 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_rssiCount++; m_rssiCount++;
} }
if (duid == P25_DUID_HEADER) { if (duid == P25_DUID_HEADER) {
if (m_rfState == RS_RF_LISTENING) { if (m_rfState == RS_RF_LISTENING) {
m_rfData.reset(); m_rfData.reset();
bool ret = m_rfData.decodeHeader(data + 2U); bool ret = m_rfData.decodeHeader(data + 2U);
if (!ret) { if (!ret) {
m_lastDUID = duid; m_lastDUID = duid;
return false; return false;
} }
LogMessage("P25, received RF header"); LogMessage("P25, received RF header");
m_lastDUID = duid; m_lastDUID = duid;
return true; return true;
} }
} }
else if (duid == P25_DUID_LDU1) { else if (duid == P25_DUID_LDU1) {
if (m_rfState == RS_RF_LISTENING) { if (m_rfState == RS_RF_LISTENING) {
m_rfData.reset(); m_rfData.reset();
bool ret = m_rfData.decodeLDU1(data + 2U); bool ret = m_rfData.decodeLDU1(data + 2U);
if (!ret) { if (!ret) {
@@ -283,14 +283,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
if (m_rfState == RS_RF_AUDIO) { if (m_rfState == RS_RF_AUDIO) {
bool ret = m_rfData.decodeLDU1(data + 2U); bool ret = m_rfData.decodeLDU1(data + 2U);
if (!ret) { if (!ret) {
LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC");
m_rfData = m_rfLastLDU1; m_rfData = m_rfLastLDU1;
m_rfUndecodableLC++; m_rfUndecodableLC++;
} }
else { else {
m_rfLastLDU1 = m_rfData; m_rfLastLDU1 = m_rfData;
} }
// Regenerate Sync // Regenerate Sync
CSync::addP25Sync(data + 2U); CSync::addP25Sync(data + 2U);
@@ -337,14 +337,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
} else if (duid == P25_DUID_LDU2) { } else if (duid == P25_DUID_LDU2) {
if (m_rfState == RS_RF_AUDIO) { if (m_rfState == RS_RF_AUDIO) {
bool ret = m_rfData.decodeLDU2(data + 2U); bool ret = m_rfData.decodeLDU2(data + 2U);
if (!ret) { if (!ret) {
LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC"); LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC");
m_rfData = m_rfLastLDU2; m_rfData = m_rfLastLDU2;
m_rfUndecodableLC++; m_rfUndecodableLC++;
} }
else { else {
m_rfLastLDU2 = m_rfData; m_rfLastLDU2 = m_rfData;
} }
writeNetwork(m_rfLDU, m_lastDUID, false); writeNetwork(m_rfLDU, m_lastDUID, false);
@@ -494,7 +494,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
else else
LogMessage("P25, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits));
m_display->clearP25(); m_display->clearP25();
@@ -953,9 +953,9 @@ void CP25Control::createRFHeader()
m_rfFrames = 0U; m_rfFrames = 0U;
m_rfErrs = 0U; m_rfErrs = 0U;
m_rfUndecodableLC = 0U; m_rfUndecodableLC = 0U;
m_rfLastLDU1.reset(); m_rfLastLDU1.reset();
m_rfLastLDU2.reset(); m_rfLastLDU2.reset();
m_rfBits = 1U; m_rfBits = 1U;
m_rfTimeout.start(); m_rfTimeout.start();
m_lastDUID = P25_DUID_HEADER; m_lastDUID = P25_DUID_HEADER;

8
P25Control.h
View File

@@ -65,7 +65,7 @@ private:
unsigned int m_rfFrames; unsigned int m_rfFrames;
unsigned int m_rfBits; unsigned int m_rfBits;
unsigned int m_rfErrs; unsigned int m_rfErrs;
unsigned int m_rfUndecodableLC; unsigned int m_rfUndecodableLC;
unsigned int m_netFrames; unsigned int m_netFrames;
unsigned int m_netLost; unsigned int m_netLost;
unsigned int m_rfDataFrames; unsigned int m_rfDataFrames;
@@ -73,9 +73,9 @@ private:
unsigned char m_lastDUID; unsigned char m_lastDUID;
CP25Audio m_audio; CP25Audio m_audio;
CP25Data m_rfData; CP25Data m_rfData;
CP25Data m_rfLastLDU1; CP25Data m_rfLastLDU1;
CP25Data m_rfLastLDU2; CP25Data m_rfLastLDU2;
CP25Data m_netData; CP25Data m_netData;
CP25LowSpeedData m_rfLSD; CP25LowSpeedData m_rfLSD;
CP25LowSpeedData m_netLSD; CP25LowSpeedData m_netLSD;
unsigned char* m_netLDU1; unsigned char* m_netLDU1;