ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-09-05 14:37:48 -04:00
Code Issues Projects Releases Wiki Activity

Small Fixes to DMR2YSF

Browse Source
This commit is contained in:
root 2020-06-05 19:14:20 +01:00
parent a6aa187a22
commit 81b4b93e50
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DMR2YSF/Conf.cpp
View File

@ -43,6 +43,17 @@ m_dstPort(0U),
m_localAddress(), m_localAddress(),
m_localPort(0U), m_localPort(0U),
m_fcsFile(), m_fcsFile(),
m_fichCallSign(2U),
m_fichCallMode(0U),
m_fichFrameTotal(7U),
m_fichMessageRoute(0U),
m_fichVOIP(0U),
m_fichDataType(2U),
m_fichSQLType(0U),
m_fichSQLCode(0U),
m_ysfDT1(),
m_ysfDT2(),
m_ysfRadioID(),
m_daemon(false), m_daemon(false),
m_debug(false), m_debug(false),
m_dmrId(0U), m_dmrId(0U),

4
DMR2YSF/DMR2YSF.cpp
View File

@ -920,9 +920,9 @@ unsigned int CDMR2YSF::findYSFID(std::string cs, bool showdst)
if (id == 0) { if (id == 0) {
id = m_defsrcid; id = m_defsrcid;
if (showdst) if (showdst)
LogMessage("Not DMR ID found, using default ID: %u, DstID: %s%u", id, dmrpc ? "" : "TG ", m_dstid); LogMessage("DMR ID not found, using default ID: %u, DstID: %s%u", id, dmrpc ? "" : "TG ", m_dstid);
else else
LogMessage("Not DMR ID found, using default ID: %u", id); LogMessage("DMR ID not found, using default ID: %u", id);
} }
else { else {
if (showdst) if (showdst)

17
DMR2YSF/DMR2YSF.ini
View File

@ -6,15 +6,14 @@ LocalAddress=127.0.0.1
LocalPort=3200 LocalPort=3200
FCSRooms=FCSRooms.txt FCSRooms=FCSRooms.txt
RadioID=***** RadioID=*****
FICHCallsign=2 # FICHCallsign=2
FICHCallMode=0 # FICHCallMode=0
FICHBlockTotal=0 # FICHFrameTotal=7
FICHFrameTotal=7 # FICHMessageRoute=0
FICHMessageRoute=0 # FICHVOIP=0
FICHVOIP=0 # FICHDataType=2
FICHDataType=2 # FICHSQLType=0
FICHSQLType=0 # FICHSQLCode=0
FICHSQLCode=0
DT1=49,34,98,95,41,0,0,0,0,0 DT1=49,34,98,95,41,0,0,0,0,0
DT2=0,0,0,0,108,32,28,32,3,8 DT2=0,0,0,0,108,32,28,32,3,8
Daemon=0 Daemon=0

4
DMR2YSF/YSFPayload.cpp
View File

@ -25,7 +25,7 @@
#include <cstdint> #include <cstdint>
const unsigned int INTERLEAVE_TABLE_9_20[] = { const unsigned int INTERLEAVE_TABLE_9_20[] = {
0U, 40U, 80U, 120U, 160U, 200U, 240U, 280U, 320U, 0U, 40U, 80U, 120U, 160U, 200U, 240U, 280U, 320U,
2U, 42U, 82U, 122U, 162U, 202U, 242U, 282U, 322U, 2U, 42U, 82U, 122U, 162U, 202U, 242U, 282U, 322U,
4U, 44U, 84U, 124U, 164U, 204U, 244U, 284U, 324U, 4U, 44U, 84U, 124U, 164U, 204U, 244U, 284U, 324U,
6U, 46U, 86U, 126U, 166U, 206U, 246U, 286U, 326U, 6U, 46U, 86U, 126U, 166U, 206U, 246U, 286U, 326U,
@ -609,7 +609,7 @@ std::string CYSFPayload::getDest()
std::string tmp; std::string tmp;
if (m_dest) if (m_dest)
tmp.assign((const char *)m_dest, YSF_CALLSIGN_LENGTH); tmp.assign((const char *)m_dest, 5);
else else
tmp = ""; tmp = "";