From 725c5724bf5b94a1110b6cc942b26ceb89625939 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 22 Jul 2018 19:00:24 -0400 Subject: [PATCH] Add setCM() support for FICH in YSF2DMR --- YSF2DMR/YSFDefines.h | 4 +++- YSF2DMR/YSFFICH.cpp | 6 ++++++ YSF2DMR/YSFFICH.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/YSF2DMR/YSFDefines.h b/YSF2DMR/YSFDefines.h index 348d1bc..f97985d 100644 --- a/YSF2DMR/YSFDefines.h +++ b/YSF2DMR/YSFDefines.h @@ -40,9 +40,11 @@ const unsigned char YSF_DT_DATA_FR_MODE = 0x01U; const unsigned char YSF_DT_VD_MODE2 = 0x02U; const unsigned char YSF_DT_VOICE_FR_MODE = 0x03U; -const unsigned char YSF_CM_GROUP = 0x00U; +const unsigned char YSF_CM_GROUP1 = 0x00U; +const unsigned char YSF_CM_GROUP2 = 0x01U; const unsigned char YSF_CM_INDIVIDUAL = 0x03U; +const unsigned char YSF_MR_DIRECT = 0x00U; const unsigned char YSF_MR_NOT_BUSY = 0x01U; const unsigned char YSF_MR_BUSY = 0x02U; diff --git a/YSF2DMR/YSFFICH.cpp b/YSF2DMR/YSFFICH.cpp index d1c7468..07b07da 100644 --- a/YSF2DMR/YSFFICH.cpp +++ b/YSF2DMR/YSFFICH.cpp @@ -232,6 +232,12 @@ void CYSFFICH::setCS(unsigned char cs) m_fich[0U] |= (cs << 4) & 0x30U; } +void CYSFFICH::setCM(unsigned char cm) +{ + m_fich[0U] &= 0xF3U; + m_fich[0U] |= (cm << 2) & 0x0CU; +} + void CYSFFICH::setFN(unsigned char fn) { m_fich[1U] &= 0xC7U; diff --git a/YSF2DMR/YSFFICH.h b/YSF2DMR/YSFFICH.h index 3b49a68..d349886 100644 --- a/YSF2DMR/YSFFICH.h +++ b/YSF2DMR/YSFFICH.h @@ -44,6 +44,7 @@ public: void setFI(unsigned char fi); void setCS(unsigned char cs); + void setCM(unsigned char cm); void setFN(unsigned char fn); void setFT(unsigned char ft); void setBN(unsigned char bn);