Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Converted camera control pin definition to timer flag.

Browse source
This commit is contained in:
mikeller 2018-07-27 00:49:03 +12:00
parent eefd3e62a2
commit 430379016e
33 changed files with 123 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/drivers/camera_control.c
View file

@ -55,24 +55,21 @@
#define CAMERA_CONTROL_HARDWARE_PWM_AVAILABLE
#include "timer.h"
#ifndef CAMERA_CONTROL_PIN
#define CAMERA_CONTROL_PIN NONE
#endif
#ifdef USE_OSD
#include "io/osd.h"
#endif
PG_REGISTER_WITH_RESET_TEMPLATE(cameraControlConfig_t, cameraControlConfig, PG_CAMERA_CONTROL_CONFIG, 0);
PG_REGISTER_WITH_RESET_FN(cameraControlConfig_t, cameraControlConfig, PG_CAMERA_CONTROL_CONFIG, 0);
PG_RESET_TEMPLATE(cameraControlConfig_t, cameraControlConfig,
.mode = CAMERA_CONTROL_MODE_HARDWARE_PWM,
.refVoltage = 330,
.keyDelayMs = 180,
.internalResistance = 470,
.ioTag = IO_TAG(CAMERA_CONTROL_PIN),
.inverted = 0, // Output is inverted externally
);
void pgResetFn_cameraControlConfig(cameraControlConfig_t *cameraControlConfig)
{
cameraControlConfig->mode = CAMERA_CONTROL_MODE_HARDWARE_PWM;
cameraControlConfig->refVoltage = 330;
cameraControlConfig->keyDelayMs = 180;
cameraControlConfig->internalResistance = 470;
cameraControlConfig->ioTag = timerioTagGetByUsage(TIM_USE_CAMERA_CONTROL, 0);
cameraControlConfig->inverted = 0; // Output is inverted externally
}
static struct {
bool enabled;

3
src/main/drivers/timer.h
View file

@ -71,7 +71,8 @@ typedef enum {
TIM_USE_SERVO = 0x8,
TIM_USE_LED = 0x10,
TIM_USE_TRANSPONDER = 0x20,
TIM_USE_BEEPER = 0x40
TIM_USE_BEEPER = 0x40,
TIM_USE_CAMERA_CONTROL = 0x40,
} timerUsageFlag_e;
// use different types from capture and overflow - multiple overflow handlers are implemented as linked list

2
src/main/target/AG3X/target.c
View file

@ -55,7 +55,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
// UART2
DEF_TIM(TIM5, CH3, PA2, TIM_USE_LED, 0, 0), // TX2 D(1,0) ; SA port ---> LED
DEF_TIM(TIM9, CH2, PA3, TIM_USE_NONE, 0, 0), // RX2 ; CAMC port
DEF_TIM(TIM9, CH2, PA3, TIM_USE_CAMERA_CONTROL, 0, 0), // RX2 ; CAMC port
// I2C2
DEF_TIM(TIM2, CH3, PB10, TIM_USE_NONE, 0, 0), // SCL2 D(1,1)

2
src/main/target/AG3X/target.h
View file

@ -155,8 +155,6 @@
#define USE_RANGEFINDER_HCSR04
//#define USE_RANGEFINDER_TF
#define CAMERA_CONTROL_PIN PA3
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS

2
src/main/target/AIKONF4/target.c
View file

@ -28,7 +28,7 @@
#include "drivers/timer_def.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM2, CH2, PB3, TIM_USE_ANY, 0, 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM2, CH2, PB3, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL_PIN
// TIM8_UP (DMA2_ST1_CH7)
DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M1

2
src/main/target/AIKONF4/target.h
View file

@ -32,8 +32,6 @@
#define INVERTER_PIN_UART1 PC0
#define CAMERA_CONTROL_PIN PB3
#define USE_EXTI
#define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL

2
src/main/target/CLRACINGF4/target.c
View file

@ -30,7 +30,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, 0, 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM1, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // M1 - D2_ST6
DEF_TIM(TIM8, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M2_OUT D2_ST2

2
src/main/target/CLRACINGF4/target.h
View file

@ -38,8 +38,6 @@
#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

2
src/main/target/CLRACINGF7/target.c
View file

@ -28,7 +28,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM2, CH2, PB3, TIM_USE_ANY, 0, 0), // USE FOR CAMERA CONTROL
DEF_TIM(TIM2, CH2, PB3, TIM_USE_CAMERA_CONTROL, 0, 0), // USE FOR CAMERA CONTROL
DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // D1-ST6
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // D1-ST6

3
src/main/target/CLRACINGF7/target.h
View file

@ -29,9 +29,6 @@
#define BEEPER_PIN PB4
#define BEEPER_INVERTED
//define camera control
#define CAMERA_CONTROL_PIN PB3
#define USE_EXTI
#define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL

2
src/main/target/DALRCF405/target.c
View file

@ -42,6 +42,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // LED STRIP(1,0)
DEF_TIM(TIM2, CH1, PA5, TIM_USE_PWM, 0, 0), // FC CAM
DEF_TIM(TIM2, CH1, PA5, TIM_USE_CAMERA_CONTROL, 0, 0), // FC CAM
};

3
src/main/target/DALRCF405/target.h
View file

@ -31,9 +31,6 @@
#define BEEPER_PIN PC13
#define BEEPER_INVERTED
//define camera control
#define CAMERA_CONTROL_PIN PA5
//Gyro & ACC-------------------------------
#define USE_SPI
#define USE_SPI_DEVICE_1

4
src/main/target/FF_FORTINIF4/target.c
View file

@ -39,9 +39,9 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#endif
DEF_TIM(TIM4, CH4, PB9, TIM_USE_PPM, 0, 0 ), // PPM IN
#if defined(FF_FORTINIF4_REV03)
DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // FC CAM - DMA1_ST3
DEF_TIM(TIM4, CH2, PB7, TIM_USE_CAM, 0, 0 ), // FC CAM - DMA1_ST3
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0 ), // LED - DMA1_ST0
#else
DEF_TIM(TIM4, CH2, PB7, TIM_USE_LED, 0, 0 ), // LED - DMA1_ST3
DEF_TIM(TIM4, CH2, PB7, TIM_USE_LED | TIM_USE_CAMERA_CONTROL, 0, 0 ), // LED - DMA1_ST3
#endif
};

4
src/main/target/FF_FORTINIF4/target.h
View file

@ -49,10 +49,6 @@
#define BEEPER_INVERTED
/*---------------------------------*/
/*----------CAMERA CONTROL---------*/
#define CAMERA_CONTROL_PIN PB7
/*---------------------------------*/
/*------------SENSORS--------------*/
// MPU interrupt
#define USE_EXTI

4
src/main/target/FF_PIKOF4/target.h
View file

@ -43,10 +43,6 @@
#define BEEPER_INVERTED
/*---------------------------------*/
/*----------CAMERA CONTROL---------*/
// #define CAMERA_CONTROL_PIN PB7
/*---------------------------------*/
/*------------SENSORS--------------*/
// MPU interrupt
#define USE_EXTI

2
src/main/target/FOXEERF405/target.c
View file

@ -40,6 +40,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM1, CH3, PA10, TIM_USE_LED, 0, 0), // LED STRIP(2,6)
DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM, 0, 0), // FC CAM
DEF_TIM(TIM2, CH2, PB3, TIM_USE_CAMERA_CONTROL, 0, 0), // FC CAM
};

3
src/main/target/FOXEERF405/target.h
View file

@ -31,9 +31,6 @@
#define BEEPER_PIN PA4
#define BEEPER_INVERTED
//define camera control
#define CAMERA_CONTROL_PIN PB3
//Gyro & ACC-------------------------------
#define USE_SPI
#define USE_SPI_DEVICE_1

2
src/main/target/LUMBAF3/target.c
View file

@ -40,5 +40,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM16, CH1, PB4, TIM_USE_MOTOR, 0), // S5
DEF_TIM(TIM15, CH1, PA2, TIM_USE_LED, 0), // LED_STRIP
DEF_TIM(TIM2, CH1, PA15, TIM_USE_ANY, 0), // CAMERA CONTROL
DEF_TIM(TIM2, CH1, PA15, TIM_USE_CAMERA_CONTROL, 0), // CAMERA CONTROL
};

2
src/main/target/LUMBAF3/target.h
View file

@ -77,8 +77,6 @@
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define CAMERA_CONTROL_PIN PA15
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART1

2
src/main/target/OMNIBUSF4FW/target.c
View file

@ -41,7 +41,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
// Other functions
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // D(1,0)
DEF_TIM(TIM10, CH1, PB8, TIM_USE_PPM, 0, 0), // PPM
DEF_TIM(TIM11, CH1, PB9, TIM_USE_NONE, 0, 0), // CAM_CTL
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAM_CTL
// Spare pins and backdoor timer
DEF_TIM(TIM8, CH1, PC6, TIM_USE_NONE, 0, 0), // UART6_TX

2
src/main/target/OMNIBUSF4FW/target.h
View file

@ -150,8 +150,6 @@
#define I2C2_SDA NONE // PB11, shared with UART3RX
#define I2C_DEVICE (I2CDEV_2)
#define CAMERA_CONTROL_PIN PB9
#define USE_ADC
#define ADC_INSTANCE ADC2
#define CURRENT_METER_ADC_PIN PC1 // Direct from CRNT pad (part of onboard sensor for Pro)

3
src/main/target/OMNIBUSF7/target.c
View file

@ -30,7 +30,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#ifdef FPVM_BETAFLIGHTF7
DEF_TIM(TIM8, CH3, PC8, TIM_USE_ANY, 0, 0), // USED FOR CAMERA CONTROL
DEF_TIM(TIM8, CH3, PC8, TIM_USE_CAMERA_CONTROL, 0, 0), // USED FOR CAMERA CONTROL
#endif
DEF_TIM(TIM1, CH3, PE13, TIM_USE_NONE, 0, 1 ), // RC1 / PPM, unusable
@ -50,5 +50,4 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
// For ESC serial
DEF_TIM(TIM9, CH1, PA2, TIM_USE_NONE, 0, 0 ), // UART2_TX (unwired)
};

6
src/main/target/OMNIBUSF7/target.h
View file

@ -40,12 +40,6 @@
#define BEEPER_PIN PD15
#define BEEPER_INVERTED
//CAMERA CONTROL----------------------------
#ifdef FPVM_BETAFLIGHTF7
//define camera control
#define CAMERA_CONTROL_PIN PC8 // Camera control.
#endif
//GYRO & ACC--------------------------------
#define USE_ACC

2
src/main/target/OMNINXT/target.c
View file

@ -47,7 +47,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM1, CH2, PA9, TIM_USE_LED, 0, 0),
// CAMCTL
DEF_TIM(TIM12, CH2, PB15, TIM_USE_NONE, 0, 0),
DEF_TIM(TIM12, CH2, PB15, TIM_USE_CAMERA_CONTROL, 0, 0),
// Backdoor timers on UARTs
DEF_TIM(TIM4, CH1, PB6, TIM_USE_NONE, 0, 0), // UART1_TX Collision with PPM

2
src/main/target/OMNINXT/target.h
View file

@ -177,8 +177,6 @@
#define RSSI_ADC_PIN PC4
#define EXTERNAL1_ADC_PIN PA4
#define CAMERA_CONTROL_PIN PB15
#define USE_TRANSPONDER
#define USE_RANGEFINDER

2
src/main/target/PYRODRONEF4/target.c
View file

@ -27,7 +27,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM11, CH1, PB9, TIM_USE_ANY, 0, 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL_PIN
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M1_OUT - D1_ST2_CH5
DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // M2_OUT - D2_ST3_CH7

1
src/main/target/PYRODRONEF4/target.h
View file

@ -28,7 +28,6 @@
#define BEEPER_INVERTED
#define INVERTER_PIN_UART1 PC3 // PC3 used as sBUS inverter select GPIO
#define CAMERA_CONTROL_PIN PB9 // define dedicated camera_osd_control pin
#define USE_EXTI
#define MPU_INT_EXTI PC4

2
src/main/target/SKYZONEF405/target.c
View file

@ -41,5 +41,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // LED STRIP(1,0)
DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM, 0, 0), // FC CAM
DEF_TIM(TIM2, CH2, PB3, TIM_USE_CAMERA_CONTROL, 0, 0), // FC CAM
};

2
src/main/target/SKYZONEF405/target.h
View file

@ -33,8 +33,6 @@
#define BEEPER_PIN PC13
#define BEEPER_INVERTED
#define CAMERA_CONTROL_PIN PB3
#define USE_SPI
#define USE_SPI_DEVICE_1

2
src/main/target/YUPIF4/target.c
View file

@ -34,7 +34,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0 ), // S3_OUT - DMA1_ST1
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1 ), // S4_OUT - DMA1_ST6
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0 ), // S5_OUT - DMA1_ST7
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S6_OUT - DMA1_ST3
DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR | TIM_USE_LED | TIM_USE_CAMERA_CONTROL, 0, 0 ), // S6_OUT - DMA1_ST3
DEF_TIM(TIM3, CH4, PB1, TIM_USE_ANY, 0, 0 ), // Camera control
DEF_TIM(TIM3, CH4, PC9, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM
DEF_TIM(TIM12, CH1, PB14, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM OPT

3
src/main/target/YUPIF4/target.h
View file

@ -30,9 +30,6 @@
#define LED1_PIN PB4
#define LED2_PIN PB5
//define camera control
#define CAMERA_CONTROL_PIN PB7 // Camera control
#define USE_BEEPER
#define BEEPER_PIN PC9
#define BEEPER_OPT PB14

2
src/main/target/YUPIF7/target.c
View file

@ -35,7 +35,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM5, CH4, PA3, TIM_USE_MOTOR, 0, 1 ), // S4_OUT - DMA1_ST6
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0 ), // S5_OUT - DMA1_ST7 - LED Control
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S6_OUT
DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // Camera Control
DEF_TIM(TIM4, CH2, PB7, TIM_USE_CAMERA_CONTROL, 0, 0 ), // Camera Control
DEF_TIM(TIM12, CH1, PB14, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM
};

3
src/main/target/YUPIF7/target.h
View file

@ -27,9 +27,6 @@
#define LED0_PIN PB4
//define camera control
#define CAMERA_CONTROL_PIN PB7
#define USE_BEEPER
#define BEEPER_PIN PB14
#define BEEPER_PWM_HZ 3150