Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

merge into: Crash_Override:master
Branches Tags
Crash_Override:master
Crash_Override:M17_AX25_FM
Crash_Override:extended
Crash_Override:EOF
Crash_Override:M17_Trace
Crash_Override:I2C
Crash_Override:M17
Crash_Override:SimpleDMR
Crash_Override:AX25_FM
Crash_Override:ipv6
Crash_Override:FM
Crash_Override:AX25
Crash_Override:FM_Ext
Crash_Override:msraya
Crash_Override:Kenwood
Crash_Override:TXHang
Crash_Override:dmr_beacons
Crash_Override:jitter_buffer
Crash_Override:DGID
Crash_Override:rptintr
Crash_Override:gpid
Crash_Override:fast_data
Crash_Override:remote_control
Crash_Override:P25Changes
Crash_Override:pocsag_test
Crash_Override:pocsag
Crash_Override:icom
Crash_Override:nxdn
Crash_Override:JitterBuffer
Crash_Override:revert-337-devel
Crash_Override:YSFRefactor
Crash_Override:dmr_failover
Crash_Override:level-testing
...
pull from: Crash_Override:DGID
Branches Tags
Crash_Override:master
Crash_Override:M17_AX25_FM
Crash_Override:extended
Crash_Override:EOF
Crash_Override:M17_Trace
Crash_Override:I2C
Crash_Override:M17
Crash_Override:SimpleDMR
Crash_Override:AX25_FM
Crash_Override:ipv6
Crash_Override:FM
Crash_Override:AX25
Crash_Override:FM_Ext
Crash_Override:msraya
Crash_Override:Kenwood
Crash_Override:TXHang
Crash_Override:dmr_beacons
Crash_Override:jitter_buffer
Crash_Override:DGID
Crash_Override:rptintr
Crash_Override:gpid
Crash_Override:fast_data
Crash_Override:remote_control
Crash_Override:P25Changes
Crash_Override:pocsag_test
Crash_Override:pocsag
Crash_Override:icom
Crash_Override:nxdn
Crash_Override:JitterBuffer
Crash_Override:revert-337-devel
Crash_Override:YSFRefactor
Crash_Override:dmr_failover
Crash_Override:level-testing

2 commits
master ... DGID

Author SHA1 Message Date
Jonathan Naylor
d43a057f7a
Merge pull request #517 from msraya/patch-1 
Keep DG-ID Information
 2019-09-24 10:04:43 +01:00
msraya
3c4f98a9a6
Keep DG-ID Information 
Remove setDGID to zero. 
Keep change DGID if selected in configuration file.
 2019-09-05 12:39:20 +02:00
1 changed files with 12 additions and 31 deletions
Show stats Expand all files Collapse all files

43
YSFControl.cpp
View file

@ -258,8 +258,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -273,7 +271,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -299,8 +297,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_EOT;
@ -314,7 +310,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -354,9 +350,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
m_display->writeFusionBER(float(errors) / 7.2F);
LogDebug("YSF, V Mode 3, seq %u, AMBE FEC %u/720 (%.1f%%)", m_rfFrames % 128, errors, float(errors) / 7.2F);
}
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -366,7 +360,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -435,8 +429,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -450,7 +442,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -476,8 +468,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_EOT;
@ -491,7 +481,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -552,8 +542,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -563,7 +551,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -642,7 +630,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
fich.setFI(YSF_FI_HEADER);
fich.setDGId(0U);
fich.encode(buffer + 2U);
unsigned char csd1[20U], csd2[20U];
@ -664,7 +651,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(buffer + 2U);
@ -682,8 +669,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -693,7 +678,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -759,8 +744,6 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -774,7 +757,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -852,8 +835,6 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
CYSFFICH fich = m_lastFICH;
// Remove any DG-ID information
fich.setDGId(0U);
fich.encode(data + 2U);
data[0U] = TAG_DATA;
@ -863,7 +844,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
if (m_duplex) {
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY);
fich.setDev(m_lowDeviation);
fich.encode(data + 2U);
@ -1005,7 +986,7 @@ void CYSFControl::writeNetwork()
}
// Add the DG-ID information.
fich.setDGId(m_dgIdEnabled ? m_dgIdValue : 0U);
if (m_dgIdEnabled) fich.setDGId(m_dgIdValue);
if (m_remoteGateway) {
fich.setVoIP(false);