1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00

Merge pull request #3756 from bnn1044/CLRACING

Clracing target maintain
This commit is contained in:
Martin Budden 2017-08-12 07:08:16 +01:00 committed by GitHub
commit e560c67e09
5 changed files with 15 additions and 6 deletions

View file

@ -325,7 +325,7 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
cameraControlKeyPress(CAMERA_CONTROL_KEY_DOWN, 0);
} else if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_CE) {
cameraControlKeyPress(CAMERA_CONTROL_KEY_UP, 2000);
}
}
#endif
}

View file

@ -27,7 +27,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM11, CH1, PB9, TIM_USE_PPM, TIMER_OUTPUT_NONE , 0), // PPM
DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, TIMER_OUTPUT_ENABLED , 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM1, CH2N, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_INVERTED, 0), // M1 - D2_ST6
DEF_TIM(TIM8, CH3N, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_INVERTED, 0), // M2_OUT D2_ST2

View file

@ -30,6 +30,8 @@
#define INVERTER_PIN_UART1 PC0 // PC0 used as inverter select GPIO
#define CAMERA_CONTROL_PIN PB9 // define dedicated camera_osd_control pin
#define USE_EXTI
#define MPU_INT_EXTI PC4
@ -104,7 +106,9 @@
#define UART4_RX_PIN PA1
#define UART4_TX_PIN PA0
#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART3,USART4, USART6,
#define USE_SOFTSERIAL1
#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3,USART4, USART6, SOFT_SERIAL1
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_PIN PB9 // (HARDARE=0,PPM)

View file

@ -28,7 +28,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM4, CH3, PB8, TIM_USE_PPM, TIMER_INPUT_ENABLED, 0), // PPM -DMA1_ST7
DEF_TIM(TIM10, CH1, PB8, TIM_USE_ANY, TIMER_OUTPUT_ENABLED, 0 ), // USE FOR CAMERA CONTROL
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1), // PWM1 - DMA1_ST6 D(1, 7, 3),D(1, 6, 3)
DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1), // PWM2 - DMA2_ST2 D(2, 4, 7),D(2, 2, 0)

View file

@ -24,6 +24,9 @@
#define BEEPER PB4
#define BEEPER_INVERTED
//define camera control
#define CAMERA_CONTROL_PIN PB8
#define USE_EXTI
#define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL
@ -100,7 +103,9 @@
#define UART6_RX_PIN PC7
#define UART6_TX_PIN PC6
#define SERIAL_PORT_COUNT 5
#define USE_SOFTSERIAL1
#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3,USART4, USART6, SOFT_SERIAL1
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0, PPM)
@ -151,5 +156,5 @@
#define TARGET_IO_PORTD (BIT(2))
#define USABLE_TIMER_CHANNEL_COUNT 9
#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) )
#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(10) )