Fix horus X10 AUX_SERIAL definitions
This commit is contained in:
@@ -78,6 +78,7 @@ if (PCB STREQUAL X10)
|
|||||||
set(FLAVOUR x10express)
|
set(FLAVOUR x10express)
|
||||||
set(DEFAULT_INTERNAL_MODULE ISRM_PXX2 CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE ISRM_PXX2 CACHE STRING "Default internal module")
|
||||||
set(BLUETOOTH ON)
|
set(BLUETOOTH ON)
|
||||||
|
set(AUX_SERIAL OFF)
|
||||||
add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT)
|
add_definitions(-DHARDWARE_POWER_MANAGEMENT_UNIT)
|
||||||
add_definitions(-DRADIO_X10E)
|
add_definitions(-DRADIO_X10E)
|
||||||
add_definitions(-DMANUFACTURER_FRSKY)
|
add_definitions(-DMANUFACTURER_FRSKY)
|
||||||
|
|||||||
@@ -324,6 +324,7 @@ bool isBacklightEnabled()
|
|||||||
return boardBacklightOn;
|
return boardBacklightOn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(AUX_SERIAL_PWR_GPIO) || defined(AUX2_SERIAL_PWR_GPIO)
|
||||||
static void _aux_pwr(GPIO_TypeDef *GPIOx, uint32_t pin, uint8_t on)
|
static void _aux_pwr(GPIO_TypeDef *GPIOx, uint32_t pin, uint8_t on)
|
||||||
{
|
{
|
||||||
LL_GPIO_InitTypeDef pinInit;
|
LL_GPIO_InitTypeDef pinInit;
|
||||||
@@ -339,6 +340,7 @@ static void _aux_pwr(GPIO_TypeDef *GPIOx, uint32_t pin, uint8_t on)
|
|||||||
LL_GPIO_ResetOutputPin(GPIOx, pin);
|
LL_GPIO_ResetOutputPin(GPIOx, pin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(AUX_SERIAL)
|
#if defined(AUX_SERIAL)
|
||||||
void set_aux_pwr(uint8_t on)
|
void set_aux_pwr(uint8_t on)
|
||||||
|
|||||||
@@ -412,7 +412,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Serial Port (DEBUG)
|
// Serial Port (DEBUG)
|
||||||
#if (defined(PCBX12S) || (defined(RADIO_FAMILY_T16)) && !defined(HARDWARE_EXTERNAL_ACCESS_MOD)) && !defined(IMU_LSM6DS33)
|
#if defined(AUX_SERIAL)
|
||||||
#define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1)
|
#define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1)
|
||||||
#define AUX_SERIAL_RCC_APB1Periph RCC_APB1Periph_USART3
|
#define AUX_SERIAL_RCC_APB1Periph RCC_APB1Periph_USART3
|
||||||
#define AUX_SERIAL_RCC_APB2Periph 0
|
#define AUX_SERIAL_RCC_APB2Periph 0
|
||||||
@@ -430,10 +430,10 @@
|
|||||||
#define AUX_SERIAL_DMA_Stream_RX DMA1_Stream1
|
#define AUX_SERIAL_DMA_Stream_RX DMA1_Stream1
|
||||||
#define AUX_SERIAL_DMA_Stream_RX_LL LL_DMA_STREAM_1
|
#define AUX_SERIAL_DMA_Stream_RX_LL LL_DMA_STREAM_1
|
||||||
#define AUX_SERIAL_DMA_Channel_RX DMA_Channel_4
|
#define AUX_SERIAL_DMA_Channel_RX DMA_Channel_4
|
||||||
#if defined(RADIO_TX16S)
|
#if defined(RADIO_TX16S)
|
||||||
#define AUX_SERIAL_PWR_GPIO GPIOA
|
#define AUX_SERIAL_PWR_GPIO GPIOA
|
||||||
#define AUX_SERIAL_PWR_GPIO_PIN GPIO_Pin_15 // PA.15
|
#define AUX_SERIAL_PWR_GPIO_PIN GPIO_Pin_15 // PA.15
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#define AUX_SERIAL_RCC_AHB1Periph 0
|
#define AUX_SERIAL_RCC_AHB1Periph 0
|
||||||
#define AUX_SERIAL_RCC_APB1Periph 0
|
#define AUX_SERIAL_RCC_APB1Periph 0
|
||||||
|
|||||||
Reference in New Issue
Block a user