ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-05-29 12:22:33 -04:00
Code Issues Projects Releases Wiki Activity

Patched YSF2NXDN to improve support on new radios

Browse Source
This commit is contained in:
root 2020-05-03 19:05:37 +01:00
parent 57f406e49f
commit 4cd34fab58
3 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
YSF2NXDN/YSF2NXDN.cpp
View File

@ -33,6 +33,7 @@
// DT1 and DT2, suggested by Manuel EA7EE // DT1 and DT2, suggested by Manuel EA7EE
const unsigned char dt1_temp[] = {0x31, 0x22, 0x62, 0x5F, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00}; const unsigned char dt1_temp[] = {0x31, 0x22, 0x62, 0x5F, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00};
const unsigned char dt2_temp[] = {0x00, 0x00, 0x00, 0x00, 0x6C, 0x20, 0x1C, 0x20, 0x03, 0x08}; const unsigned char dt2_temp[] = {0x00, 0x00, 0x00, 0x00, 0x6C, 0x20, 0x1C, 0x20, 0x03, 0x08};
const uint8_t dt1[10] = {0x01, 0x22, 0x61, 0x5f, 0x2b, 0x03, 0x11, 0x00, 0x00, 0x00};
#define NXDN_FRAME_PER 75U #define NXDN_FRAME_PER 75U
#define YSF_FRAME_PER 90U #define YSF_FRAME_PER 90U
@ -47,6 +48,7 @@ const char* HEADER1 = "This software is for use on amateur radio networks only,"
const char* HEADER2 = "it is to be used for educational purposes only. Its use on"; const char* HEADER2 = "it is to be used for educational purposes only. Its use on";
const char* HEADER3 = "commercial networks is strictly prohibited."; const char* HEADER3 = "commercial networks is strictly prohibited.";
const char* HEADER4 = "Copyright(C) 2018,2019 by CA6JAU, G4KLX and others"; const char* HEADER4 = "Copyright(C) 2018,2019 by CA6JAU, G4KLX and others";
const char ysf_radioid[] = {'H', '5', '0', '0', '0'};
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
@ -605,17 +607,23 @@ int CYSF2NXDN::run()
CYSFFICH fich; CYSFFICH fich;
fich.setFI(YSF_FI_HEADER); fich.setFI(YSF_FI_HEADER);
fich.setCS(2U); fich.setCS(2U);
fich.setCM(1U);
fich.setBN(0U);
fich.setBT(0U);
fich.setFN(0U); fich.setFN(0U);
fich.setFT(7U); fich.setFT(6U);
fich.setDev(0U); fich.setDev(0U);
fich.setMR(2U); fich.setMR(0U);
fich.setVoIP(false);
fich.setDT(YSF_DT_VD_MODE2); fich.setDT(YSF_DT_VD_MODE2);
fich.setSQL(0U); fich.setSQL(0U);
fich.setSQ(0U); fich.setSQ(0U);
fich.encode(m_ysfFrame + 35U); fich.encode(m_ysfFrame + 35U);
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
memset(csd1, '*', YSF_CALLSIGN_LENGTH); memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, ysf_radioid, YSF_CALLSIGN_LENGTH/2);
//memset(csd1, '*', YSF_CALLSIGN_LENGTH);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_netSrc.c_str(), YSF_CALLSIGN_LENGTH); memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_netSrc.c_str(), YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH); memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
@ -623,7 +631,7 @@ int CYSF2NXDN::run()
payload.writeHeader(m_ysfFrame + 35U, csd1, csd2); payload.writeHeader(m_ysfFrame + 35U, csd1, csd2);
m_ysfNetwork->write(m_ysfFrame); m_ysfNetwork->write(m_ysfFrame);
ysf_cnt++; ysf_cnt++;
ysfWatch.start(); ysfWatch.start();
} }
@ -640,17 +648,23 @@ int CYSF2NXDN::run()
CYSFFICH fich; CYSFFICH fich;
fich.setFI(YSF_FI_TERMINATOR); fich.setFI(YSF_FI_TERMINATOR);
fich.setCS(2U); fich.setCS(2U);
fich.setCM(1U);
fich.setBN(0U);
fich.setBT(0U);
fich.setFN(0U); fich.setFN(0U);
fich.setFT(7U); fich.setFT(6U);
fich.setDev(0U); fich.setDev(0U);
fich.setMR(2U); fich.setMR(0U);
fich.setVoIP(false);
fich.setDT(YSF_DT_VD_MODE2); fich.setDT(YSF_DT_VD_MODE2);
fich.setSQL(0U); fich.setSQL(0U);
fich.setSQ(0U); fich.setSQ(0U);
fich.encode(m_ysfFrame + 35U); fich.encode(m_ysfFrame + 35U);
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
memset(csd1, '*', YSF_CALLSIGN_LENGTH); memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, ysf_radioid, YSF_CALLSIGN_LENGTH/2);
//memset(csd1, '*', YSF_CALLSIGN_LENGTH);
memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_netSrc.c_str(), YSF_CALLSIGN_LENGTH); memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_netSrc.c_str(), YSF_CALLSIGN_LENGTH);
memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH); memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
@ -662,8 +676,9 @@ int CYSF2NXDN::run()
else if (ysfFrameType == TAG_DATA) { else if (ysfFrameType == TAG_DATA) {
CYSFFICH fich; CYSFFICH fich;
CYSFPayload ysfPayload; CYSFPayload ysfPayload;
unsigned char dch[10U];
unsigned int fn = (ysf_cnt - 1U) % 8U; unsigned int fn = (ysf_cnt - 1U) % 7U;
::memcpy(m_ysfFrame + 0U, "YSFD", 4U); ::memcpy(m_ysfFrame + 0U, "YSFD", 4U);
::memcpy(m_ysfFrame + 4U, m_ysfNetwork->getCallsign().c_str(), YSF_CALLSIGN_LENGTH); ::memcpy(m_ysfFrame + 4U, m_ysfNetwork->getCallsign().c_str(), YSF_CALLSIGN_LENGTH);
@ -675,7 +690,10 @@ int CYSF2NXDN::run()
switch (fn) { switch (fn) {
case 0: case 0:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)"**********"); memset(dch, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(dch + YSF_CALLSIGN_LENGTH/2, ysf_radioid, YSF_CALLSIGN_LENGTH/2);
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, dch);
//ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)"**********");
break; break;
case 1: case 1:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)m_netSrc.c_str()); ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)m_netSrc.c_str());
@ -683,11 +701,16 @@ int CYSF2NXDN::run()
case 2: case 2:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)m_netDst.c_str()); ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)m_netDst.c_str());
break; break;
case 5:
memset(dch, ' ', YSF_CALLSIGN_LENGTH/2);
memcpy(dch + YSF_CALLSIGN_LENGTH/2, ysf_radioid, YSF_CALLSIGN_LENGTH/2);
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, dch); // Rem3/4
break;
case 6: case 6:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, gps_buffer); ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, dt1);
break; break;
case 7: case 7:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, gps_buffer + 10U); ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, dt2_temp);
break; break;
default: default:
ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)" "); ysfPayload.writeVDMode2Data(m_ysfFrame + 35U, (const unsigned char*)" ");
@ -696,10 +719,14 @@ int CYSF2NXDN::run()
// Set the FICH // Set the FICH
fich.setFI(YSF_FI_COMMUNICATIONS); fich.setFI(YSF_FI_COMMUNICATIONS);
fich.setCS(2U); fich.setCS(2U);
fich.setCM(1U);
fich.setBN(0U);
fich.setBT(0U);
fich.setFN(fn); fich.setFN(fn);
fich.setFT(7U); fich.setFT(6U);
fich.setDev(0U); fich.setDev(0U);
fich.setMR(YSF_MR_BUSY); fich.setMR(0U);
fich.setVoIP(false);
fich.setDT(YSF_DT_VD_MODE2); fich.setDT(YSF_DT_VD_MODE2);
fich.setSQL(0U); fich.setSQL(0U);
fich.setSQ(0U); fich.setSQ(0U);

6
YSF2NXDN/YSFFICH.cpp
View File

@ -232,6 +232,12 @@ void CYSFFICH::setCS(unsigned char cs)
m_fich[0U] |= (cs << 4) & 0x30U; m_fich[0U] |= (cs << 4) & 0x30U;
} }
void CYSFFICH::setCM(unsigned char cm)
{
m_fich[0U] &= 0xF3U;
m_fich[0U] |= (cm << 2) & 0x0CU;
}
void CYSFFICH::setFN(unsigned char fn) void CYSFFICH::setFN(unsigned char fn)
{ {
m_fich[1U] &= 0xC7U; m_fich[1U] &= 0xC7U;

1
YSF2NXDN/YSFFICH.h
View File

@ -44,6 +44,7 @@ public:
void setFI(unsigned char fi); void setFI(unsigned char fi);
void setCS(unsigned char cs); void setCS(unsigned char cs);
void setCM(unsigned char cm);
void setFN(unsigned char fn); void setFN(unsigned char fn);
void setFT(unsigned char ft); void setFT(unsigned char ft);
void setBN(unsigned char bn); void setBN(unsigned char bn);