From 00606bb544a8f160f37d1afa54de5adda971a0d2 Mon Sep 17 00:00:00 2001
From: root <root@pi-star>
Date: Fri, 5 Jun 2020 16:02:20 +0100
Subject: [PATCH] Minor fixes

---
 DMR2YSF/Conf.h      |  4 ++--
 DMR2YSF/DMR2YSF.cpp |  1 -
 DMR2YSF/DMR2YSF.ini | 24 ++++++++++++------------
 YSF2DMR/Conf.h      |  4 ++--
 YSF2DMR/YSF2DMR.cpp |  1 -
 YSF2DMR/YSF2DMR.ini | 24 ++++++++++++------------
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/DMR2YSF/Conf.h b/DMR2YSF/Conf.h
index c816fff..d6a7f4e 100644
--- a/DMR2YSF/Conf.h
+++ b/DMR2YSF/Conf.h
@@ -110,8 +110,8 @@ private:
   unsigned char m_fichDataType;
   unsigned char m_fichSQLType;
   unsigned char m_fichSQLCode;
-  unsigned char m_ysfDT1[10];
-  unsigned char m_ysfDT2[10];
+  unsigned char m_ysfDT1[10U];
+  unsigned char m_ysfDT2[10U];
   char m_ysfRadioID[5];
 };
 
diff --git a/DMR2YSF/DMR2YSF.cpp b/DMR2YSF/DMR2YSF.cpp
index 8b5814e..a292bac 100644
--- a/DMR2YSF/DMR2YSF.cpp
+++ b/DMR2YSF/DMR2YSF.cpp
@@ -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* HEADER3 = "commercial networks is strictly prohibited.";
 const char* HEADER4 = "Copyright(C) 2018 by CA6JAU, G4KLX and others";
-const char ysf_radioid[] = {'H', '5', '0', '0', '0'};
 
 #include <functional>
 #include <algorithm>
diff --git a/DMR2YSF/DMR2YSF.ini b/DMR2YSF/DMR2YSF.ini
index d81fdfa..ed24d34 100644
--- a/DMR2YSF/DMR2YSF.ini
+++ b/DMR2YSF/DMR2YSF.ini
@@ -5,18 +5,18 @@ GatewayPort=4200
 LocalAddress=127.0.0.1
 LocalPort=3200
 FCSRooms=FCSRooms.txt
-#RadioID=*****
-#FICHCallsign=2
-#FICHCallMode=0
-#FICHBlockTotal=0
-#FICHFrameTotal=7
-#FICHMessageRoute=0
-#FICHVOIP=0
-#FICHDataType=2
-#FICHSQLType=0
-#FICHSQLCode=0
-#DT1=49,34,98,95,41,0,0,0,0,0
-#DT2=0,0,0,0,108,32,28,32,3,8
+RadioID=*****
+FICHCallsign=2
+FICHCallMode=0
+FICHBlockTotal=0
+FICHFrameTotal=7
+FICHMessageRoute=0
+FICHVOIP=0
+FICHDataType=2
+FICHSQLType=0
+FICHSQLCode=0
+DT1=49,34,98,95,41,0,0,0,0,0
+DT2=0,0,0,0,108,32,28,32,3,8
 Daemon=0
 Debug=0
 
diff --git a/YSF2DMR/Conf.h b/YSF2DMR/Conf.h
index a8b17ff..472141e 100644
--- a/YSF2DMR/Conf.h
+++ b/YSF2DMR/Conf.h
@@ -177,8 +177,8 @@ private:
   unsigned char m_fichDataType;
   unsigned char m_fichSQLType;
   unsigned char m_fichSQLCode;
-  unsigned char m_ysfDT1[10];
-  unsigned char m_ysfDT2[10];
+  unsigned char m_ysfDT1[10U];
+  unsigned char m_ysfDT2[10U];
   char m_ysfRadioID[5];
 };
 
diff --git a/YSF2DMR/YSF2DMR.cpp b/YSF2DMR/YSF2DMR.cpp
index fe95747..f21018a 100644
--- a/YSF2DMR/YSF2DMR.cpp
+++ b/YSF2DMR/YSF2DMR.cpp
@@ -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* HEADER3 = "commercial networks is strictly prohibited.";
 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 <algorithm>
diff --git a/YSF2DMR/YSF2DMR.ini b/YSF2DMR/YSF2DMR.ini
index 38f0ca7..f8341a5 100644
--- a/YSF2DMR/YSF2DMR.ini
+++ b/YSF2DMR/YSF2DMR.ini
@@ -21,18 +21,18 @@ EnableWiresX=1
 RemoteGateway=0
 HangTime=1000
 WiresXMakeUpper=1
-#RadioID=*****
-#FICHCallsign=2
-#FICHCallMode=0
-#FICHBlockTotal=0
-#FICHFrameTotal=7
-#FICHMessageRoute=0
-#FICHVOIP=0
-#FICHDataType=2
-#FICHSQLType=0
-#FICHSQLCode=0
-#DT1=49,34,98,95,41,0,0,0,0,0
-#DT2=0,0,0,0,108,32,28,32,3,8
+RadioID=*****
+FICHCallsign=2
+FICHCallMode=0
+FICHBlockTotal=0
+FICHFrameTotal=7
+FICHMessageRoute=0
+FICHVOIP=0
+FICHDataType=2
+FICHSQLType=0
+FICHSQLCode=0
+DT1=49,34,98,95,41,0,0,0,0,0
+DT2=0,0,0,0,108,32,28,32,3,8
 Daemon=0
 
 [DMR Network]