Trainer UI (#7423)

Trainer UI
This commit is contained in:
3djc
2020-03-06 15:47:34 +01:00
committed by GitHub
parent 766211a6f3
commit 2fb3d977a9
29 changed files with 175 additions and 66 deletions
+2
View File
@@ -129,6 +129,7 @@ add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD -DHARDWARE_KEYS)
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
add_definitions(-DHARDWARE_TRAINER_JACK)
if(NOT UNEXPECTED_SHUTDOWN)
add_definitions(-DNO_UNEXPECTED_SHUTDOWN)
@@ -186,6 +187,7 @@ if(BLUETOOTH)
add_definitions(-DBLUETOOTH)
set(TARGET_SRC ${TARGET_SRC} ../common/arm/stm32/bluetooth_driver.cpp)
set(SRC ${SRC} bluetooth.cpp)
add_definitions(-DHARDWARE_TRAINER_BLUETOOTH)
endif()
if (AUX_SERIAL)
+1 -1
View File
@@ -407,7 +407,7 @@
#define AUX_SERIAL_DMA_Channel_RX DMA_Channel_5
#define AUX_SERIAL_PWR_GPIO GPIOB
#define AUX_SERIAL_PWR_GPIO_PIN GPIO_Pin_0 // PB.00
#define TRAINER_BATTERY_COMPARTMENT
#define HARDWARE_TRAINER_AUX_SERIAL
#define AUX2_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1)
#define AUX2_SERIAL_PWR_GPIO GPIOA
+1
View File
@@ -16,6 +16,7 @@ set(GUI_DIR colorlcd)
set(BITMAPS_DIR 480x272)
# set(NAVIGATION_TYPE touch)
set(TARGET_DIR nv14)
add_definitions(-DHARDWARE_TRAINER_JACK)
if(BOOTLOADER)
set(LINKER_SCRIPT targets/nv14/stm32f4_flash_bootloader.ld)
+3
View File
@@ -215,6 +215,9 @@ void calcConsumption();
#define TRAINER_CONNECTED() (PIOA->PIO_PDSR & PIO_PA8)
void init_trainer_capture();
void stop_trainer_capture();
#define TRAINER_DETECT_GPIO PIOA
#define TRAINER_DETECT_GPIO_PIN PIO_PA8
#define TRAINER_CONNECTED() (TRAINER_DETECT_GPIO->PIO_PDSR & TRAINER_DETECT_GPIO_PIN)
// Write Flash driver
#define FLASH_PAGESIZE 256
+8
View File
@@ -281,6 +281,10 @@ elseif(PCB STREQUAL XLITES)
set(INTERNAL_MODULE_SERIAL YES)
endif()
if(NOT PCB STREQUAL PCBXLITE)
add_definitions(-DHARDWARE_TRAINER_JACK)
endif()
if(GYRO)
add_definitions(-DGYRO)
set(TARGET_SRC
@@ -326,6 +330,10 @@ if(BLUETOOTH)
${SRC}
bluetooth.cpp
)
if(NOT PCB STREQUAL X9E)
# Bluetooth on X9E is compatible with almost nothing
add_definitions(-DHARDWARE_TRAINER_BLUETOOTH)
endif()
endif()
if(AUTOUPDATE)
+2 -1
View File
@@ -1233,6 +1233,7 @@
#endif
// Trainer Port
#define HARDWARE_TRAINER_EXTERNAL_MODULE
#if defined(PCBXLITES) || defined(PCBX9LITE)
// on these 2 radios the trainer port already uses DMA1_Stream6, we won't use the DMA
#define TRAINER_RCC_AHB1Periph RCC_AHB1Periph_GPIOD
@@ -1311,7 +1312,7 @@
#define AUX_SERIAL_RCC_APB1Periph 0
#define AUX_SERIAL_RCC_APB2Periph 0
#else
#define TRAINER_BATTERY_COMPARTMENT
#define HARDWARE_TRAINER_AUX_SERIAL
#define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1)
#define AUX_SERIAL_RCC_APB1Periph RCC_APB1Periph_USART3
#define AUX_SERIAL_RCC_APB2Periph 0