From f25c5dfcfa6ecd3325fafffef0374d2ed35593db Mon Sep 17 00:00:00 2001 From: MJ666 Date: Sun, 21 Apr 2019 14:13:39 +0200 Subject: [PATCH] FuriousFPV RacePIT target updates --- src/main/target/FF_RACEPIT/config.c | 4 + src/main/target/FF_RACEPIT/target.h | 101 +++++++++++----------- unified_targets/configs/FF_RACEPIT.config | 10 +-- 3 files changed, 60 insertions(+), 55 deletions(-) diff --git a/src/main/target/FF_RACEPIT/config.c b/src/main/target/FF_RACEPIT/config.c index f79904447..c685e477b 100644 --- a/src/main/target/FF_RACEPIT/config.c +++ b/src/main/target/FF_RACEPIT/config.c @@ -27,12 +27,16 @@ #include "telemetry/telemetry.h" +#include "pg/pinio.h" #include "pg/piniobox.h" void targetConfiguration(void) { telemetryConfigMutable()->halfDuplex = false; + + pinioConfigMutable()->config[1] = PINIO_CONFIG_OUT_INVERTED | PINIO_CONFIG_MODE_OUT_PP; pinioBoxConfigMutable()->permanentId[0] = 40; + pinioBoxConfigMutable()->permanentId[1] = 41; } #endif diff --git a/src/main/target/FF_RACEPIT/target.h b/src/main/target/FF_RACEPIT/target.h index 6af6b018e..cbe573e22 100644 --- a/src/main/target/FF_RACEPIT/target.h +++ b/src/main/target/FF_RACEPIT/target.h @@ -30,19 +30,20 @@ /*------------BEEPER---------------*/ #define USE_BEEPER -#define BEEPER_PIN PB3 +#define BEEPER_PIN PC3 #define BEEPER_INVERTED /*---------------------------------*/ /*---------- VTX POWER SWITCH---------*/ #define USE_PINIO #define PINIO1_PIN PC0 // VTX power switcher +#define PINIO2_PIN PC8 // 2xCamera switcher #define USE_PINIOBOX /*------------SENSORS--------------*/ // MPU interrupt #define USE_EXTI -#define GYRO_1_INT_EXTI_PIN PC4 +#define GYRO_1_INT_EXTI_PIN PC4 #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW @@ -53,24 +54,24 @@ #define USE_GYRO_SPI_MPU6000 #define USE_ACC_SPI_MPU6000 -#define GYRO_1_CS_PIN SPI1_NSS_PIN -#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_CS_PIN SPI1_NSS_PIN +#define GYRO_1_SPI_INSTANCE SPI1 -#define GYRO_1_ALIGN CW90_DEG_FLIP +#define GYRO_1_ALIGN CW90_DEG_FLIP /*---------------------------------*/ /*-------------OSD-----------------*/ #define USE_MAX7456 -#define MAX7456_SPI_INSTANCE SPI2 -#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) +#define MAX7456_SPI_INSTANCE SPI2 +#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN +#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz +#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) /*---------------------------------*/ /*------------FLASH----------------*/ -#define FLASH_CS_PIN PA15 -#define FLASH_SPI_INSTANCE SPI3 +#define FLASH_CS_PIN PA15 +#define FLASH_SPI_INSTANCE SPI3 #define USE_FLASHFS #define USE_FLASH_M25P16 @@ -80,62 +81,62 @@ #define USE_VCP #define USE_UART1 -#define UART1_RX_PIN PB7 -#define UART1_TX_PIN PA9 +#define UART1_RX_PIN PB7 +#define UART1_TX_PIN PA9 #define USE_UART2 -#define UART2_RX_PIN PA3 -#define UART2_TX_PIN PA2 +#define UART2_RX_PIN PA3 +#define UART2_TX_PIN PA2 #define USE_UART3 -#define UART3_RX_PIN PC11 -#define UART3_TX_PIN PC10 -#define INVERTER_PIN_UART3 PC15 +#define UART3_RX_PIN PC11 +#define UART3_TX_PIN PC10 +#define INVERTER_PIN_UART3 PC15 #define USE_UART4 -#define UART4_TX_PIN PA0 -#define UART4_RX_PIN PA1 +#define UART4_TX_PIN PA0 +#define UART4_RX_PIN PA1 #define USE_UART5 -#define UART5_RX_PIN PD2 -#define UART5_TX_PIN PC12 +#define UART5_RX_PIN PD2 +#define UART5_TX_PIN PC12 #define USE_UART6 -#define UART6_RX_PIN PC7 -#define UART6_TX_PIN PC6 +#define UART6_RX_PIN PC7 +#define UART6_TX_PIN PC6 -#define SERIAL_PORT_COUNT 7 +#define SERIAL_PORT_COUNT 7 /*---------------------------------*/ /*-------------SPIs----------------*/ #define USE_SPI #define USE_SPI_DEVICE_1 -#define SPI1_NSS_PIN PA4 -#define SPI1_SCK_PIN PA5 -#define SPI1_MISO_PIN PA6 -#define SPI1_MOSI_PIN PA7 +#define SPI1_NSS_PIN PA4 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 #define USE_SPI_DEVICE_2 -#define SPI2_NSS_PIN PB12 -#define SPI2_SCK_PIN PB13 -#define SPI2_MISO_PIN PB14 -#define SPI2_MOSI_PIN PB15 +#define SPI2_NSS_PIN PB12 +#define SPI2_SCK_PIN PB13 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 #define USE_SPI_DEVICE_3 -#define SPI3_NSS_PIN PA15 -#define SPI3_SCK_PIN PB3 -#define SPI3_MISO_PIN PB4 -#define SPI3_MOSI_PIN PB5 +#define SPI3_NSS_PIN PA15 +#define SPI3_SCK_PIN PB3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PB5 /*---------------------------------*/ /*-------------I2C-----------------*/ #define USE_I2C #define USE_I2C_PULLUP #define USE_I2C_DEVICE_3 -#define I2C_DEVICE (I2CDEV_3) -#define I2C3_SCL PA8 -#define I2C3_SDA PC9 +#define I2C_DEVICE (I2CDEV_3) +#define I2C3_SCL PA8 +#define I2C3_SDA PC9 /*---------------------------------*/ /*-------------ADCs----------------*/ @@ -149,22 +150,22 @@ /*-------------ESCs----------------*/ #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_PIN PB0 // (HARDWARE=0) +#define ESCSERIAL_TIMER_TX_PIN PB0 // (HARDWARE=0) /*---------------------------------*/ /*--------DEFAULT VALUES-----------*/ -#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define SERIALRX_PROVIDER SERIALRX_SBUS -#define SERIALRX_UART SERIAL_PORT_USART3 -#define DEFAULT_FEATURES ( FEATURE_LED_STRIP | FEATURE_OSD | FEATURE_MOTOR_STOP ) +#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define SERIALRX_PROVIDER SERIALRX_SBUS +#define SERIALRX_UART SERIAL_PORT_USART3 +#define DEFAULT_FEATURES FEATURE_OSD -#define TARGET_IO_PORTA 0xffff -#define TARGET_IO_PORTB 0xffff -#define TARGET_IO_PORTC 0xffff -#define TARGET_IO_PORTD (BIT(2)) +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB 0xffff +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (BIT(2)) /*---------------------------------*/ /*--------------TIMERS-------------*/ #define USABLE_TIMER_CHANNEL_COUNT 6 -#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) ) +#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) ) /*---------------------------------*/ diff --git a/unified_targets/configs/FF_RACEPIT.config b/unified_targets/configs/FF_RACEPIT.config index 2dfec400e..51dc10f56 100644 --- a/unified_targets/configs/FF_RACEPIT.config +++ b/unified_targets/configs/FF_RACEPIT.config @@ -11,7 +11,7 @@ defaults nosave # Basic I/O resource LED 1 B09 resource LED 2 B08 -resource BEEPER 1 B03 +resource BEEPER 1 C03 set beeper_inversion = ON set beeper_od = OFF resource PINIO 1 C00 @@ -69,7 +69,7 @@ dma pin B06 0 # pin B06: DMA1 Stream 0 Channel 2 dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 dma pin B10 0 # pin B10: DMA1 Stream 1 Channel 3 -dma pin B11 0 # pin B11: DMA1 Stream 7 Channel 3 +dma pin B11 1 # pin B11: DMA1 Stream 7 Channel 3 set dshot_burst = ON set motor_pwm_protocol = Dshot600 @@ -104,16 +104,16 @@ resource ESCSERIAL 1 B00 # Some configs feature RX_SERIAL feature OSD -feature LED_STRIP -feature MOTOR_STOP serial 0 0 115200 57600 0 115200 serial 1 0 115200 57600 0 115200 serial 2 64 115200 57600 0 115200 serial 3 0 115200 57600 0 115200 serial 4 0 115200 57600 0 115200 serial 5 0 115200 57600 0 115200 -set pinio_box = 40,255,255,255 +set pinio_config = 1,129,1,1 +set pinio_box = 40,41,255,255 set tlm_halfduplex = OFF +set blackbox_device = SPIFLASH set adc_device = 2 set battery_meter = ADC set current_meter = ADC