ShaYmez
/
MMDVM_CM
mirror of https://github.com/ShaYmez/MMDVM_CM.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patching YSF2P25 matching G4KLX code

This commit is contained in:
root 2020-06-06 19:53:00 +01:00
parent 0570756044
commit 258a2cd564
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
YSF2P25/Conf.cpp
View File

@ -126,7 +126,6 @@ bool CConf::read()
// Remove quotes from the value // Remove quotes from the value
size_t len = ::strlen(value); size_t len = ::strlen(value);
char *t; char *t;
unsigned char tokencnt = 0;
if (len > 1U && *value == '"' && value[len - 1U] == '"') { if (len > 1U && *value == '"' && value[len - 1U] == '"') {
value[len - 1U] = '\0'; value[len - 1U] = '\0';
value++; value++;
@ -163,7 +162,7 @@ bool CConf::read()
else if (::strcmp(key, "WiresXMakeUpper") == 0) else if (::strcmp(key, "WiresXMakeUpper") == 0)
m_wiresXMakeUpper = ::atoi(value) == 1; m_wiresXMakeUpper = ::atoi(value) == 1;
else if (::strcmp(key, "RadioID") == 0) else if (::strcmp(key, "RadioID") == 0)
::memcpy(m_ysfRadioID, value, 5); m_ysfRadioID = value;
else if (::strcmp(key, "FICHCallsign") == 0) else if (::strcmp(key, "FICHCallsign") == 0)
m_fichCallSign = ::atoi(value); m_fichCallSign = ::atoi(value);
else if (::strcmp(key, "FICHCallMode") == 0) else if (::strcmp(key, "FICHCallMode") == 0)
@ -180,22 +179,13 @@ bool CConf::read()
m_fichSQLType = ::atoi(value); m_fichSQLType = ::atoi(value);
else if (::strcmp(key, "FICHSQLCode") == 0) else if (::strcmp(key, "FICHSQLCode") == 0)
m_fichSQLCode = ::atoi(value); m_fichSQLCode = ::atoi(value);
else if (::strcmp(key, "DT1") == 0){ else if (::strcmp(key, "DT1") == 0){
tokencnt = 0; while ((t = strtok_r(value, ",", &value)) != NULL)
while((t = strtok_r(value, ",", &value)) != NULL){ m_ysfDT1.push_back(::atoi(t));
if(tokencnt < 10){ } else if (::strcmp(key, "DT2") == 0){
m_ysfDT1[tokencnt++] = atoi(t); while ((t = strtok_r(value, ",", &value)) != NULL)
} m_ysfDT2.push_back(::atoi(t));
} }
}
else if (::strcmp(key, "DT2") == 0){
tokencnt = 0;
while((t = strtok_r(value, ",", &value)) != NULL){
if(tokencnt < 10){
m_ysfDT2[tokencnt++] = atoi(t);
}
}
}
else if (::strcmp(key, "Daemon") == 0) else if (::strcmp(key, "Daemon") == 0)
m_daemon = ::atoi(value) == 1; m_daemon = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0) else if (::strcmp(key, "Debug") == 0)
@ -334,17 +324,17 @@ unsigned char CConf::getFICHSQLCode() const
return m_fichSQLCode; return m_fichSQLCode;
} }
unsigned char* CConf::getYsfDT1() std::vector<unsigned char> CConf::getYsfDT1()
{ {
return m_ysfDT1; return m_ysfDT1;
} }
unsigned char* CConf::getYsfDT2() std::vector<unsigned char> CConf::getYsfDT2()
{ {
return m_ysfDT2; return m_ysfDT2;
} }
char* CConf::getYsfRadioID() std::string CConf::getYsfRadioID()
{ {
return m_ysfRadioID; return m_ysfRadioID;
} }

12
YSF2P25/Conf.h
View File

@ -53,9 +53,9 @@ public:
unsigned char getFICHDataType() const; unsigned char getFICHDataType() const;
unsigned char getFICHSQLType() const; unsigned char getFICHSQLType() const;
unsigned char getFICHSQLCode() const; unsigned char getFICHSQLCode() const;
unsigned char* getYsfDT1(); std::vector<unsigned char> getYsfDT1();
unsigned char* getYsfDT2(); std::vector<unsigned char> getYsfDT2();
char* getYsfRadioID(); std::string getYsfRadioID();
bool getDaemon() const; bool getDaemon() const;
bool getNetworkDebug() const; bool getNetworkDebug() const;
@ -97,9 +97,9 @@ private:
unsigned char m_fichDataType; unsigned char m_fichDataType;
unsigned char m_fichSQLType; unsigned char m_fichSQLType;
unsigned char m_fichSQLCode; unsigned char m_fichSQLCode;
unsigned char m_ysfDT1[10]; std::vector<unsigned char> m_ysfDT1;
unsigned char m_ysfDT2[10]; std::vector<unsigned char> m_ysfDT2;
char m_ysfRadioID[5]; std::string m_ysfRadioID;
bool m_daemon; bool m_daemon;
bool m_networkDebug; bool m_networkDebug;

4
YSF2P25/YSF2P25.cpp
View File

@ -636,7 +636,7 @@ int CYSF2P25::run()
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
memset(csd1, '*', YSF_CALLSIGN_LENGTH/2); memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID(), YSF_CALLSIGN_LENGTH/2); memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID().c_str(), YSF_CALLSIGN_LENGTH/2);
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);
@ -676,7 +676,7 @@ int CYSF2P25::run()
unsigned char csd1[20U], csd2[20U]; unsigned char csd1[20U], csd2[20U];
memset(csd1, '*', YSF_CALLSIGN_LENGTH/2); memset(csd1, '*', YSF_CALLSIGN_LENGTH/2);
memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID(), YSF_CALLSIGN_LENGTH/2); memcpy(csd1 + YSF_CALLSIGN_LENGTH/2, m_conf.getYsfRadioID().c_str(), YSF_CALLSIGN_LENGTH/2);
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);