Merge pull request #123 from W0CHP/master

This commit is contained in:
Jonathan Naylor 2023-02-17 18:04:52 +00:00 committed by GitHub
commit ac2f19c692
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -116,19 +116,19 @@ void CAPRSWriter::sendIdFrame()
char desc[200U];
if (m_txFrequency != 0U) {
float offset = float(int(m_rxFrequency) - int(m_txFrequency)) / 1000000.0F;
::sprintf(desc, "MMDVM Voice %.5LfMHz %c%.4lfMHz%s%s",
::sprintf(desc, "MMDVM Voice (DMR) %.5LfMHz %c%.4lfMHz%s%s",
(long double)(m_txFrequency) / 1000000.0F,
offset < 0.0F ? '-' : '+',
::fabs(offset), m_desc.empty() ? "" : ", ", m_desc.c_str());
} else {
::sprintf(desc, "MMDVM Voice%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str());
::sprintf(desc, "MMDVM Voice (DMR)%s%s", m_desc.empty() ? "" : ", ", m_desc.c_str());
}
const char* band = "4m";
if (m_txFrequency >= 1200000000U)
band = "1.2";
band = "23cm/1.2GHz";
else if (m_txFrequency >= 420000000U)
band = "440";
band = "70cm";
else if (m_txFrequency >= 144000000U)
band = "2m";
else if (m_txFrequency >= 50000000U)