ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2024-12-22 09:10:57 -05:00
Code Issues Projects Releases Wiki Activity

Add fixes for P252DMR and YSF2P25

Browse Source
This commit is contained in:
Doug McLain 2021-02-13 14:48:12 -05:00
parent b8f4a63772
commit d684d0924c
8 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DMR2M17/DMR2M17
View File

Binary file not shown.

BIN
M172DMR/M172DMR
View File

Binary file not shown.

1
M172DMR/ModeConv.cpp
View File

@ -672,7 +672,6 @@ unsigned int CModeConv::getM17(unsigned char* data)
m_M17.getData(data, 8U); m_M17.getData(data, 8U);
m_M17.getData(tag+1, 1U); m_M17.getData(tag+1, 1U);
m_M17.getData(data+8, 8U); m_M17.getData(data+8, 8U);
fprintf(stderr, "getM17() m_m17N:tag1:tag2 == %d:%d:%d\n", m_m17N, tag[0U], tag[1U]);
m_m17N -= 2U; m_m17N -= 2U;
} }
return (tag[1U] == TAG_EOT) ? tag[1U] : tag[0]; return (tag[1U] == TAG_EOT) ? tag[1U] : tag[0];

2
P252DMR/P252DMR.cpp
View File

@ -799,7 +799,7 @@ int CP252DMR::run()
if (m_xlxReflectors != NULL) if (m_xlxReflectors != NULL)
m_xlxReflectors->clock(ms); m_xlxReflectors->clock(ms);
//if (ms < 5U) CThread::sleep(5U); if (ms < 5U) CThread::sleep(5U);
} }
m_p25Network->close(); m_p25Network->close();

2
YSF2P25/Conf.cpp
View File

@ -51,7 +51,7 @@ m_fichCallMode(0U),
m_fichFrameTotal(6U), m_fichFrameTotal(6U),
m_fichMessageRoute(0U), m_fichMessageRoute(0U),
m_fichVOIP(0U), m_fichVOIP(0U),
m_fichDataType(2U), m_fichDataType(3U),
m_fichSQLType(0U), m_fichSQLType(0U),
m_fichSQLCode(0U), m_fichSQLCode(0U),
m_ysfDT1(), m_ysfDT1(),

4
YSF2P25/ModeConv.cpp
View File

@ -247,6 +247,10 @@ unsigned int CModeConv::getYSF(unsigned char* data)
m_YSF.getData(tag, 1U); m_YSF.getData(tag, 1U);
m_YSF.getData(data, 11U); m_YSF.getData(data, 11U);
m_ysfN -= 1U; m_ysfN -= 1U;
if(tag[0U] == TAG_EOT) {
m_YSF.clear();
m_ysfN = 0;
}
return tag[0U]; return tag[0U];
} }
} }

1
YSF2P25/YSF2P25.cpp
View File

@ -721,7 +721,6 @@ int CYSF2P25::run()
// Send data to MMDVMHost // Send data to MMDVMHost
m_ysfNetwork->write(m_ysfFrame); m_ysfNetwork->write(m_ysfFrame);
ysf_cnt++; ysf_cnt++;
ysfWatch.start(); ysfWatch.start();
} }

2
YSF2P25/YSF2P25.ini
View File

@ -20,7 +20,7 @@ WiresXMakeUpper=1
# FICHFrameTotal=6 # FICHFrameTotal=6
# FICHMessageRoute=0 # FICHMessageRoute=0
# FICHVOIP=0 # FICHVOIP=0
# FICHDataType=2 # FICHDataType=3
# FICHSQLType=0 # FICHSQLType=0
# FICHSQLCode=0 # FICHSQLCode=0
DT1=1,34,97,95,43,3,17,0,0,0 DT1=1,34,97,95,43,3,17,0,0,0