Fixing compilation error

9 years ago · c30cdbb2be
parent eed3e4877a
commit c30cdbb2be
4 changed files with 12 additions and 4 deletions
--- 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;
--- 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)

--- 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;
--- 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;