Fixing compilation error

This commit is contained in:
Andy CA6JAU 2017-07-22 18:58:36 -04:00
parent eed3e4877a
commit c30cdbb2be
4 changed files with 12 additions and 4 deletions

View file

@ -82,8 +82,9 @@ extern CSerialPort serial;
extern CDStarRX dstarRX; extern CDStarRX dstarRX;
extern CDStarTX dstarTX; extern CDStarTX dstarTX;
#if defined(DUPLEX)
extern uint8_t m_control; extern uint8_t m_control;
#if defined(DUPLEX)
extern CDMRIdleRX dmrIdleRX; extern CDMRIdleRX dmrIdleRX;
extern CDMRRX dmrRX; extern CDMRRX dmrRX;
extern CDMRTX dmrTX; extern CDMRTX dmrTX;

View file

@ -281,7 +281,9 @@ void CIO::Init()
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4); NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);
EXTI_InitTypeDef EXTI_InitStructure; EXTI_InitTypeDef EXTI_InitStructure;
#if defined(DUPLEX)
EXTI_InitTypeDef EXTI_InitStructure2; EXTI_InitTypeDef EXTI_InitStructure2;
#endif
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_StructInit(&GPIO_InitStruct); GPIO_StructInit(&GPIO_InitStruct);
@ -473,7 +475,10 @@ void CIO::Init()
void CIO::startInt() void CIO::startInt()
{ {
NVIC_InitTypeDef NVIC_InitStructure; NVIC_InitTypeDef NVIC_InitStructure;
#if defined(DUPLEX)
NVIC_InitTypeDef NVIC_InitStructure2; NVIC_InitTypeDef NVIC_InitStructure2;
#endif
#if defined(PI_HAT_7021_REV_02) #if defined(PI_HAT_7021_REV_02)

View file

@ -44,8 +44,9 @@ bool m_dcd = false;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;
#if defined(DUPLEX)
uint8_t m_control; uint8_t m_control;
#if defined(DUPLEX)
CDMRIdleRX dmrIdleRX; CDMRIdleRX dmrIdleRX;
CDMRRX dmrRX; CDMRRX dmrRX;
CDMRTX dmrTX; CDMRTX dmrTX;

View file

@ -40,8 +40,9 @@ bool m_dcd = false;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;
#if defined(DUPLEX)
uint8_t m_control; uint8_t m_control;
#if defined(DUPLEX)
CDMRIdleRX dmrIdleRX; CDMRIdleRX dmrIdleRX;
CDMRRX dmrRX; CDMRRX dmrRX;
CDMRTX dmrTX; CDMRTX dmrTX;