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 output of information about incoming reflector

Browse Source
This commit is contained in:
phl0
2016-04-16 21:45:49 +02:00
parent 103950d27f
commit bf128e76f3
10 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DStarControl.cpp
View File

@@ -203,7 +203,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfState = RS_RF_AUDIO;
if (m_netState == RS_NET_IDLE)
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R");
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R", "");
LogMessage("D-Star, received RF header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else if (type == TAG_EOT) {
@@ -374,7 +374,7 @@ bool CDStarControl::writeModem(unsigned char *data)
m_rfN = (m_rfN + 1U) % 21U;
if (m_netState == RS_NET_IDLE)
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R");
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "R", "");
LogMessage("D-Star, received RF late entry from %8.8s/%4.4s to %8.8s", my1, my2, your);
}
@@ -491,9 +491,18 @@ void CDStarControl::writeNetwork()
#endif
m_netState = RS_NET_AUDIO;
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N");
LINK_STATUS status = LS_NONE;
unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH];
if (m_network != NULL)
m_network->getStatus(status, reflector);
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector);
if (strcmp(reflector, " ") == 0) {
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your);
} else {
LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s via %8.8s", my1, my2, your, reflector);
}
} else if (type == TAG_EOT) {
if (m_netState != RS_NET_AUDIO)
return;