ShaYmez/MMDVM_CM
1
0
Fork 0
mirror of https://github.com/ShaYmez/MMDVM_CM.git synced 2025-06-18 13:12:26 -04:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
root 2020-06-05 16:02:20 +01:00
parent 8d7854999b
commit 00606bb544
6 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DMR2YSF/Conf.h
View File

@ -110,8 +110,8 @@ 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]; unsigned char m_ysfDT1[10U];
unsigned char m_ysfDT2[10]; unsigned char m_ysfDT2[10U];
char m_ysfRadioID[5]; char m_ysfRadioID[5];
}; };

1
DMR2YSF/DMR2YSF.cpp
View File

@ -48,7 +48,6 @@ 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 by CA6JAU, G4KLX and others"; const char* HEADER4 = "Copyright(C) 2018 by CA6JAU, G4KLX and others";
const char ysf_radioid[] = {'H', '5', '0', '0', '0'};
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>

24
DMR2YSF/DMR2YSF.ini
View File

@ -5,18 +5,18 @@ GatewayPort=4200
LocalAddress=127.0.0.1 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 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
Debug=0 Debug=0

4
YSF2DMR/Conf.h
View File

@ -177,8 +177,8 @@ 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]; unsigned char m_ysfDT1[10U];
unsigned char m_ysfDT2[10]; unsigned char m_ysfDT2[10U];
char m_ysfRadioID[5]; char m_ysfRadioID[5];
}; };

1
YSF2DMR/YSF2DMR.cpp
View File

@ -50,7 +50,6 @@ 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, EA7EE, G4KLX and others"; const char* HEADER4 = "Copyright(C) 2018,2019 by CA6JAU, EA7EE, G4KLX and others";
const char ysf_radioid[] = {'H', '5', '0', '0', '0'};
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>

24
YSF2DMR/YSF2DMR.ini
View File

@ -21,18 +21,18 @@ EnableWiresX=1
RemoteGateway=0 RemoteGateway=0
HangTime=1000 HangTime=1000
WiresXMakeUpper=1 WiresXMakeUpper=1
#RadioID=***** RadioID=*****
#FICHCallsign=2 FICHCallsign=2
#FICHCallMode=0 FICHCallMode=0
#FICHBlockTotal=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
[DMR Network] [DMR Network]