Skip to content

Commit

Permalink
Correct the order of the YSF display argumemts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@g4klx
g4klx committed May 20, 2016
1 parent 14f36a1 commit 202437f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ MMDVMHost
*.zip
*.exe
*.user
*.VC.db
.vs
*.ambe
18 changes: 9 additions & 9 deletions YSFControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ bool CYSFControl::writeModem(unsigned char *data)
}

if (m_rfSource != NULL && m_rfDest != NULL) {
m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, " ", "R");
m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", " ");
LogMessage("YSF, received RF header from %10.10s to %10.10s", m_rfSource, m_rfDest);
} else if (m_rfSource == NULL && m_rfDest != NULL) {
m_display->writeFusion("??????????", (char*)m_rfDest, " ", "R");
m_display->writeFusion("??????????", (char*)m_rfDest, "R", " ");
LogMessage("YSF, received RF header from ?????????? to %10.10s", m_rfDest);
} else if (m_rfSource != NULL && m_rfDest == NULL) {
m_display->writeFusion((char*)m_rfSource, "??????????", " ", "R");
m_display->writeFusion((char*)m_rfSource, "??????????", "R", " ");
LogMessage("YSF, received RF header from %10.10s to ??????????", m_rfSource);
} else {
m_display->writeFusion("??????????", "??????????", " ", "R");
m_display->writeFusion("??????????", "??????????", "R", " ");
LogMessage("YSF, received RF header from ?????????? to ??????????");
}

Expand Down Expand Up @@ -235,15 +235,15 @@ bool CYSFControl::writeModem(unsigned char *data)

if (change) {
if (m_rfSource != NULL && m_rfDest != NULL) {
m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, " ", "R");
m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", " ");
LogMessage("YSF, received RF data from %10.10s to %10.10s", m_rfSource, m_rfDest);
}
if (m_rfSource != NULL && m_rfDest == NULL) {
m_display->writeFusion((char*)m_rfSource, "??????????", " ", "R");
m_display->writeFusion((char*)m_rfSource, "??????????", "R", " ");
LogMessage("YSF, received RF data from %10.10s to ??????????", m_rfSource);
}
if (m_rfSource == NULL && m_rfDest != NULL) {
m_display->writeFusion("??????????", (char*)m_rfDest, " ", "R");
m_display->writeFusion("??????????", (char*)m_rfDest, "R", " ");
LogMessage("YSF, received RF data from ?????????? to %10.10s", m_rfDest);
}
}
Expand Down Expand Up @@ -361,7 +361,7 @@ void CYSFControl::writeNetwork()
else
::memcpy(m_netDest, "??????????", YSF_CALLSIGN_LENGTH);

m_display->writeFusion((char*)m_netSource, (char*)m_netDest, (char*)(data + 4U), "N");
m_display->writeFusion((char*)m_netSource, (char*)m_netDest, "N", (char*)(data + 4U));
LogMessage("YSF, received network data from %10.10s to %10.10s at %10.10s", m_netSource, m_netDest, data + 4U);

m_netTimeoutTimer.start();
Expand All @@ -382,7 +382,7 @@ void CYSFControl::writeNetwork()
}

if (changed) {
m_display->writeFusion((char*)m_netSource, (char*)m_netDest, (char*)(data + 4U), "N");
m_display->writeFusion((char*)m_netSource, (char*)m_netDest, "N", (char*)(data + 4U));
LogMessage("YSF, received network data from %10.10s to %10.10s from %10.10s", m_netSource, m_netDest, data + 4U);
}
}
Expand Down

0 comments on commit 202437f

Please sign in to comment.