From 987ae9b433685afbb9e9ec64398ad6be67de7610 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Mon, 8 Feb 2021 20:52:25 +0000 Subject: [PATCH 1/4] Update Conf.cpp --- YSF2P25/Conf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSF2P25/Conf.cpp b/YSF2P25/Conf.cpp index d0f53d4..bd51a21 100644 --- a/YSF2P25/Conf.cpp +++ b/YSF2P25/Conf.cpp @@ -51,7 +51,7 @@ m_fichCallMode(0U), m_fichFrameTotal(6U), m_fichMessageRoute(0U), m_fichVOIP(0U), -m_fichDataType(2U), +m_fichDataType(3U), m_fichSQLType(0U), m_fichSQLCode(0U), m_ysfDT1(), From 6269cc32664626cb944580966eb465773ebbd736 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Mon, 8 Feb 2021 20:52:43 +0000 Subject: [PATCH 2/4] Update Version.h --- YSF2P25/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSF2P25/Version.h b/YSF2P25/Version.h index 36efd6b..e5b0ceb 100644 --- a/YSF2P25/Version.h +++ b/YSF2P25/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20200605"; +const char* VERSION = "20210208"; #endif From 9f2b462fb7922cf0c0884cf0dc2e58d6cce70e64 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Mon, 8 Feb 2021 21:15:50 +0000 Subject: [PATCH 3/4] Update YSF2P25.ini --- YSF2P25/YSF2P25.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSF2P25/YSF2P25.ini b/YSF2P25/YSF2P25.ini index d333430..2b5418c 100644 --- a/YSF2P25/YSF2P25.ini +++ b/YSF2P25/YSF2P25.ini @@ -20,7 +20,7 @@ WiresXMakeUpper=1 # FICHFrameTotal=6 # FICHMessageRoute=0 # FICHVOIP=0 -# FICHDataType=2 +# FICHDataType=3 # FICHSQLType=0 # FICHSQLCode=0 DT1=1,34,97,95,43,3,17,0,0,0 From 41c16857a17234fca8ce36b9e0a3ce1d591d6017 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Wed, 10 Feb 2021 08:56:51 +0000 Subject: [PATCH 4/4] Update ModeConv.cpp Clean the buffer at EOT (clearing the last IMBE data). Patch against https://github.com/juribeparada/MMDVM_CM/issues/55 --- YSF2P25/ModeConv.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/YSF2P25/ModeConv.cpp b/YSF2P25/ModeConv.cpp index 3926108..8553cd0 100644 --- a/YSF2P25/ModeConv.cpp +++ b/YSF2P25/ModeConv.cpp @@ -247,6 +247,10 @@ unsigned int CModeConv::getYSF(unsigned char* data) m_YSF.getData(tag, 1U); m_YSF.getData(data, 11U); m_ysfN -= 1U; + if(tag[0U] == TAG_EOT) { + m_YSF.clear(); + m_ysfN = 0; + } return tag[0U]; } }