dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request from W0CHP/master

Browse source
This commit is contained in:
Jonathan Naylor 2023-02-17 18:04:17 +00:00 • committed by GitHub
commit 3731800162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
DGIdGateway
APRSWriter.cpp
YSFGateway
APRSWriter.cpp

16
DGIdGateway/APRSWriter.cpp
View file

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

16
YSFGateway/APRSWriter.cpp
View file

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