g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2025-12-06 05:32:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mode type to APRS string. Make APRS band/offset string a bit more consistent.

Browse source
This commit is contained in:
Chipster 2023-02-17 06:27:51 -06:00
parent 371cc58202
commit 960ca7dc15
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Common/APRSWriter.cpp
View file

@ -344,24 +344,24 @@ void CAPRSWriter::sendIdFramesFixed()
wxString desc; wxString desc;
if (entry->getBand().Len() > 1U) { if (entry->getBand().Len() > 1U) {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc.Printf(wxT("Data %.5lfMHz"), entry->getFrequency()); desc.Printf(wxT("Data (D-Star) %.5lfMHz"), entry->getFrequency());
else else
desc = wxT("Data"); desc = wxT("Data (D-Star)");
} else { } else {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc.Printf(wxT("Voice %.5lfMHz %c%.4lfMHz"), desc.Printf(wxT("Voice (D-Star) %.5lfMHz %c%.4lfMHz"),
entry->getFrequency(), entry->getFrequency(),
entry->getOffset() < 0.0 ? wxT('-') : wxT('+'), entry->getOffset() < 0.0 ? wxT('-') : wxT('+'),
::fabs(entry->getOffset())); ::fabs(entry->getOffset()));
else else
desc = wxT("Voice"); desc = wxT("Voice (D-Star)");
} }
wxString band; wxString band;
if (entry->getFrequency() >= 1200.0) if (entry->getFrequency() >= 1200.0)
band = wxT("1.2"); band = wxT("23cm/1.2GHz");
else if (entry->getFrequency() >= 420.0) else if (entry->getFrequency() >= 420.0)
band = wxT("440"); band = wxT("70cm");
else if (entry->getFrequency() >= 144.0) else if (entry->getFrequency() >= 144.0)
band = wxT("2m"); band = wxT("2m");
else if (entry->getFrequency() >= 50.0) else if (entry->getFrequency() >= 50.0)
@ -489,24 +489,24 @@ void CAPRSWriter::sendIdFramesMobile()
wxString desc; wxString desc;
if (entry->getBand().Len() > 1U) { if (entry->getBand().Len() > 1U) {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc.Printf(wxT("Data %.5lfMHz"), entry->getFrequency()); desc.Printf(wxT("Data (D-Star) %.5lfMHz"), entry->getFrequency());
else else
desc = wxT("Data"); desc = wxT("Data (D-Star)");
} else { } else {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc.Printf(wxT("Voice %.5lfMHz %c%.4lfMHz"), desc.Printf(wxT("Voice (D-Star) %.5lfMHz %c%.4lfMHz"),
entry->getFrequency(), entry->getFrequency(),
entry->getOffset() < 0.0 ? wxT('-') : wxT('+'), entry->getOffset() < 0.0 ? wxT('-') : wxT('+'),
::fabs(entry->getOffset())); ::fabs(entry->getOffset()));
else else
desc = wxT("Voice"); desc = wxT("Voice (D-Star)");
} }
wxString band; wxString band;
if (entry->getFrequency() >= 1200.0) if (entry->getFrequency() >= 1200.0)
band = wxT("1.2"); band = wxT("23cm/1.2GHz");
else if (entry->getFrequency() >= 420.0) else if (entry->getFrequency() >= 420.0)
band = wxT("440"); band = wxT("70cm");
else if (entry->getFrequency() >= 144.0) else if (entry->getFrequency() >= 144.0)
band = wxT("2m"); band = wxT("2m");
else if (entry->getFrequency() >= 50.0) else if (entry->getFrequency() >= 50.0)