From c30cdbb2be322f02db004b9a298f18d201e9a25e Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 22 Jul 2017 18:58:36 -0400 Subject: [PATCH] Fixing compilation error --- Globals.h | 3 ++- IOSTM.cpp | 7 ++++++- MMDVM_HS.cpp | 3 ++- MMDVM_HS.ino | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Globals.h b/Globals.h index bba702e..b23af82 100644 --- a/Globals.h +++ b/Globals.h @@ -82,8 +82,9 @@ extern CSerialPort serial; extern CDStarRX dstarRX; extern CDStarTX dstarTX; -#if defined(DUPLEX) extern uint8_t m_control; + +#if defined(DUPLEX) extern CDMRIdleRX dmrIdleRX; extern CDMRRX dmrRX; extern CDMRTX dmrTX; diff --git a/IOSTM.cpp b/IOSTM.cpp index c72e96e..6c3a156 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -281,8 +281,10 @@ void CIO::Init() NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4); EXTI_InitTypeDef EXTI_InitStructure; +#if defined(DUPLEX) EXTI_InitTypeDef EXTI_InitStructure2; - +#endif + GPIO_InitTypeDef GPIO_InitStruct; GPIO_StructInit(&GPIO_InitStruct); @@ -473,7 +475,10 @@ void CIO::Init() void CIO::startInt() { NVIC_InitTypeDef NVIC_InitStructure; + +#if defined(DUPLEX) NVIC_InitTypeDef NVIC_InitStructure2; +#endif #if defined(PI_HAT_7021_REV_02) diff --git a/MMDVM_HS.cpp b/MMDVM_HS.cpp index 58d2474..a8d243e 100644 --- a/MMDVM_HS.cpp +++ b/MMDVM_HS.cpp @@ -44,8 +44,9 @@ bool m_dcd = false; CDStarRX dstarRX; CDStarTX dstarTX; -#if defined(DUPLEX) uint8_t m_control; + +#if defined(DUPLEX) CDMRIdleRX dmrIdleRX; CDMRRX dmrRX; CDMRTX dmrTX; diff --git a/MMDVM_HS.ino b/MMDVM_HS.ino index 27c395b..c88c1ec 100644 --- a/MMDVM_HS.ino +++ b/MMDVM_HS.ino @@ -40,8 +40,9 @@ bool m_dcd = false; CDStarRX dstarRX; CDStarTX dstarTX; -#if defined(DUPLEX) uint8_t m_control; + +#if defined(DUPLEX) CDMRIdleRX dmrIdleRX; CDMRRX dmrRX; CDMRTX dmrTX;