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

This commit is contained in:
Chipster 2023-02-17 06:27:51 -06:00
parent 371cc58202
commit 960ca7dc15

View file

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