diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c index 8437fc0ad..c7faeb073 100644 --- a/src/main/cms/cms_menu_osd.c +++ b/src/main/cms/cms_menu_osd.c @@ -71,7 +71,7 @@ OSD_Entry menuOsdActiveElemsEntries[] = {"NAME", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_CRAFT_NAME], 0}, {"THROTTLE", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_THROTTLE_POS], 0}, #ifdef VTX - {"VTX CHAN", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_VTX_CHANNEL]}, + {"VTX CHAN", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_VTX_CHANNEL], 0}, #endif // VTX {"CURRENT (A)", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_CURRENT_DRAW], 0}, {"USED MAH", OME_VISIBLE, NULL, &osdProfile()->item_pos[OSD_MAH_DRAWN], 0}, diff --git a/src/main/drivers/resource.c b/src/main/drivers/resource.c index 775907e6e..aa7b87a49 100644 --- a/src/main/drivers/resource.c +++ b/src/main/drivers/resource.c @@ -59,5 +59,6 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = { "INVERTER", "LED_STRIP", "TRANSPONDER" + "VTX", }; diff --git a/src/main/drivers/resource.h b/src/main/drivers/resource.h index a8dd0f012..f5ba5f6a5 100644 --- a/src/main/drivers/resource.h +++ b/src/main/drivers/resource.h @@ -59,6 +59,7 @@ typedef enum { OWNER_INVERTER, OWNER_LED_STRIP, OWNER_TRANSPONDER, + OWNER_VTX, OWNER_TOTAL_COUNT } resourceOwner_e; diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c index 08ec758e8..38915a875 100644 --- a/src/main/drivers/vtx_rtc6705.c +++ b/src/main/drivers/vtx_rtc6705.c @@ -32,6 +32,7 @@ #include "common/maths.h" #include "vtx_rtc6705.h" +#include "io.h" #include "bus_spi.h" #include "system.h" @@ -86,6 +87,12 @@ #define DISABLE_RTC6705 GPIO_SetBits(RTC6705_CS_GPIO, RTC6705_CS_PIN) #define ENABLE_RTC6705 GPIO_ResetBits(RTC6705_CS_GPIO, RTC6705_CS_PIN) +static IO_t vtxPowerPin = IO_NONE; + +#define ENABLE_VTX_POWER IOLo(vtxPowerPin) +#define DISABLE_VTX_POWER IOHi(vtxPowerPin) + + // Define variables static const uint32_t channelArray[RTC6705_BAND_MAX][RTC6705_CHANNEL_MAX] = { { RTC6705_SET_A1, RTC6705_SET_A2, RTC6705_SET_A3, RTC6705_SET_A4, RTC6705_SET_A5, RTC6705_SET_A6, RTC6705_SET_A7, RTC6705_SET_A8 }, @@ -129,8 +136,17 @@ static uint32_t reverse32(uint32_t in) /** * Start chip if available */ + bool rtc6705Init(void) { +#ifdef RTC6705_POWER_PIN + vtxPowerPin = IOGetByTag(IO_TAG(RTC6705_POWER_PIN)); + IOInit(vtxPowerPin, OWNER_VTX, 0); + IOConfigGPIO(vtxPowerPin, IOCFG_OUT_PP); + + ENABLE_VTX_POWER; +#endif + DISABLE_RTC6705; spiSetDivisor(RTC6705_SPI_INSTANCE, SPI_CLOCK_SLOW); return rtc6705IsReady(); diff --git a/src/main/io/osd.c b/src/main/io/osd.c index ca21509f2..563a6c8c2 100755 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -40,6 +40,9 @@ #include "drivers/max7456_symbols.h" #include "drivers/display.h" #include "drivers/system.h" +#ifdef USE_RTC6705 +#include "drivers/vtx_soft_spi_rtc6705.h" +#endif #include "cms/cms.h" #include "cms/cms_types.h" @@ -48,6 +51,9 @@ #include "io/flashfs.h" #include "io/osd.h" +#include "io/vtx.h" + + #include "fc/config.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" @@ -251,7 +257,7 @@ static void osdDrawSingleElement(uint8_t item) break; } -#ifdef VTX +#ifdef USE_RTC6705 case OSD_VTX_CHANNEL: { sprintf(buff, "CH:%d", current_vtx_channel % CHANNELS_PER_BAND + 1); diff --git a/src/main/io/osd.h b/src/main/io/osd.h index c3642218a..881dba990 100755 --- a/src/main/io/osd.h +++ b/src/main/io/osd.h @@ -17,6 +17,8 @@ #pragma once +#include "common/time.h" + #define VISIBLE_FLAG 0x0800 #define BLINK_FLAG 0x0400 #define VISIBLE(x) (x & VISIBLE_FLAG) diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c index 0b4e72791..8db4c4279 100644 --- a/src/main/io/vtx.c +++ b/src/main/io/vtx.c @@ -23,6 +23,7 @@ // Own interfaces #include "io/vtx.h" +#include "io/osd.h" //External dependencies #include "config/config_master.h" diff --git a/src/main/main.c b/src/main/main.c index 74f874deb..7b40976ee 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -196,18 +196,24 @@ void init(void) #endif #if defined(BUTTONS) +#ifdef BUTTON_A_PIN IO_t buttonAPin = IOGetByTag(IO_TAG(BUTTON_A_PIN)); IOInit(buttonAPin, OWNER_SYSTEM, 0); IOConfigGPIO(buttonAPin, IOCFG_IPU); +#endif +#ifdef BUTTON_B_PIN IO_t buttonBPin = IOGetByTag(IO_TAG(BUTTON_B_PIN)); IOInit(buttonBPin, OWNER_SYSTEM, 0); IOConfigGPIO(buttonBPin, IOCFG_IPU); +#endif // Check status of bind plug and exit if not active delayMicroseconds(10); // allow configuration to settle if (!isMPUSoftReset()) { +#if defined(BUTTON_A_PIN) && defined(BUTTON_B_PIN) + // two buttons required uint8_t secondsRemaining = 5; bool bothButtonsHeld; do { @@ -221,6 +227,7 @@ void init(void) LED0_TOGGLE; } } while (bothButtonsHeld); +#endif } #endif diff --git a/src/main/target/SPRACINGF3NEO/target.c b/src/main/target/SPRACINGF3NEO/target.c new file mode 100755 index 000000000..abfa46c70 --- /dev/null +++ b/src/main/target/SPRACINGF3NEO/target.c @@ -0,0 +1,46 @@ +/* + * This file is part of Cleanflight. + * + * Cleanflight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Cleanflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cleanflight. If not, see . + */ + +#include + +#include +#include "drivers/io.h" + +#include "drivers/timer.h" +#include "drivers/timer_def.h" +#include "drivers/dma.h" + +const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { + DEF_TIM(TIM15, CH2, PA3, TIM_USE_PPM, 1 ), // PWM1 / PPM / UART2 RX + DEF_TIM(TIM15, CH1, PA2, TIM_USE_PWM, 1 ), // PWM2 + + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1 ), // ESC1 + DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 1 ), // ESC2 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1 ), // ESC3 + DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 1 ), // ESC4 + + DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 1 ), // ESC5 + DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 1 ), // ESC6 + + DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 1 ), // PWM3 - PB10 - *TIM2_CH3, UART3_TX (AF7) + DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 1 ), // PWM4 - PB11 - *TIM2_CH4, UART3_RX (AF7) + + DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0 ), + + DEF_TIM(TIM8, CH1, PA15, TIM_USE_LED, 0 ), +}; + diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h new file mode 100755 index 000000000..5f7e59a94 --- /dev/null +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -0,0 +1,194 @@ +/* + * This file is part of Cleanflight. + * + * Cleanflight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Cleanflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cleanflight. If not, see . + */ + +#pragma once + +#define TARGET_BOARD_IDENTIFIER "SP3N" + +#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT + +#define LED0 PB9 +#define LED1 PB2 + +#define BEEPER PC15 +#define BEEPER_INVERTED + +#define USE_EXTI +#define MPU_INT_EXTI PC13 +#define EXTI15_10_CALLBACK_HANDLER_COUNT 4 // MPU_INT, SDCardDetect, OSD +#define USE_MPU_DATA_READY_SIGNAL +#define ENSURE_MPU_DATA_READY_IS_LOW + +#define USE_MAG_DATA_READY_SIGNAL +#define ENSURE_MAG_DATA_READY_IS_HIGH + +#define GYRO +#define USE_GYRO_SPI_MPU6500 + +#define ACC +#define USE_ACC_SPI_MPU6500 + +#define ACC_MPU6500_ALIGN CW0_DEG +#define GYRO_MPU6500_ALIGN CW0_DEG + +#define BARO +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 + +#define MAG +#define USE_MAG_AK8975 +#define USE_MAG_HMC5883 + +#define USB_IO + +#define USE_VCP +#define USE_UART1 +#define USE_UART2 +#define USE_UART3 +#define USE_UART4 +#define USE_UART5 +#define SERIAL_PORT_COUNT 6 + +#define UART1_TX_PIN PA9 +#define UART1_RX_PIN PA10 + +#define UART2_TX_PIN PA2 +#define UART2_RX_PIN PA3 + +#define UART3_TX_PIN PB10 +#define UART3_RX_PIN PB11 + +#define USE_I2C +#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA + +#define USE_SPI +#define USE_SPI_DEVICE_1 // MPU +#define USE_SPI_DEVICE_2 // SDCard +#define USE_SPI_DEVICE_3 // External (MAX7456 & RTC6705) + +#define SPI1_NSS_PIN PA4 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 + +#define SPI2_NSS_PIN PB12 +#define SPI2_SCK_PIN PB13 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 + +#define SPI3_NSS_PIN PA15 +#define SPI3_SCK_PIN PB3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PB5 + +#define VTX +#define RTC6705_CS_GPIO GPIOF +#define RTC6705_CS_PIN GPIO_Pin_4 +#define RTC6705_SPI_INSTANCE SPI3 + +#define RTC6705_POWER_PIN PC3 + +#define USE_MAX7456 +#define MAX7456_SPI_INSTANCE SPI3 +#define MAX7456_SPI_CS_PIN PA15 + +#define MAX7456_DMA_CHANNEL_TX DMA2_Channel2 +#define MAX7456_DMA_CHANNEL_RX DMA2_Channel1 +#define MAX7456_DMA_IRQ_HANDLER_ID DMA2_CH1_HANDLER + +#define USE_SDCARD +#define USE_SDCARD_SPI2 + +#define SDCARD_DETECT_INVERTED + +#define SDCARD_DETECT_PIN PC14 +#define SDCARD_SPI_INSTANCE SPI2 +#define SDCARD_SPI_CS_PIN SPI2_NSS_PIN + +// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: +#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 +// Divide to under 25MHz for normal operation: +#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 + +// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx. +#define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 +#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5 + +#define MPU6500_CS_PIN SPI1_NSS_PIN +#define MPU6500_SPI_INSTANCE SPI1 + +#define BOARD_HAS_VOLTAGE_DIVIDER +#define USE_ADC +#define ADC_INSTANCE ADC1 +#define VBAT_ADC_PIN PC1 +#define CURRENT_METER_ADC_PIN PC2 +#define RSSI_ADC_PIN PC0 + +#define LED_STRIP +#define USE_LED_STRIP_ON_DMA1_CHANNEL2 +#define WS2811_PIN PA8 +#define WS2811_TIMER TIM1 +#define WS2811_DMA_CHANNEL DMA1_Channel2 +#define WS2811_IRQ DMA1_Channel2_IRQn +#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC2 +#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER +#define WS2811_TIMER_GPIO_AF GPIO_AF_6 + +#define TRANSPONDER +#define TRANSPONDER_GPIO GPIOB +#define TRANSPONDER_GPIO_AHB_PERIPHERAL RCC_AHBPeriph_GPIOB +#define TRANSPONDER_GPIO_AF GPIO_AF_1 +#define TRANSPONDER_PIN GPIO_Pin_8 // TIM16_CH1 +#define TRANSPONDER_PIN_SOURCE GPIO_PinSource8 +#define TRANSPONDER_TIMER TIM16 +#define TRANSPONDER_TIMER_APB2_PERIPHERAL RCC_APB2Periph_TIM16 +#define TRANSPONDER_DMA_CHANNEL DMA1_Channel3 +#define TRANSPONDER_IRQ DMA1_Channel3_IRQn +#define TRANSPONDER_DMA_TC_FLAG DMA1_FLAG_TC3 +#define TRANSPONDER_DMA_HANDLER_IDENTIFER DMA1_CH3_HANDLER + +#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT + +#define OSD + + +#define DEFAULT_RX_FEATURE FEATURE_RX_PPM +#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY | FEATURE_OSD) + +#define BUTTONS +#define BUTTON_A_PIN PD2 + +#define SPEKTRUM_BIND +// USART3 +#define BIND_PIN PA3 + +#define HARDWARE_BIND_PLUG +#define BINDPLUG_PIN PD2 + + +#define USE_SERIAL_4WAY_BLHELI_INTERFACE + +// IO - assuming 303 in 64pin package, TODO +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB 0xffff +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (BIT(2)) +#define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)) + +#define USABLE_TIMER_CHANNEL_COUNT 12 // 2xPPM, 6xPWM, UART3 RX/TX, LED Strip, IR. +#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15) | TIM_N(16)) + diff --git a/src/main/target/SPRACINGF3NEO/target.mk b/src/main/target/SPRACINGF3NEO/target.mk new file mode 100755 index 000000000..c596c191c --- /dev/null +++ b/src/main/target/SPRACINGF3NEO/target.mk @@ -0,0 +1,21 @@ +F3_TARGETS += $(TARGET) +FEATURES = VCP SDCARD + +TARGET_SRC = \ + drivers/accgyro_mpu.c \ + drivers/accgyro_mpu6500.c \ + drivers/accgyro_spi_mpu6500.c \ + drivers/barometer_bmp280.c \ + drivers/barometer_ms5611.c \ + drivers/compass_ak8975.c \ + drivers/compass_hmc5883l.c \ + drivers/light_ws2811strip.c \ + drivers/light_ws2811strip_stm32f30x.c \ + drivers/serial_usb_vcp.c \ + drivers/transponder_ir.c \ + drivers/transponder_ir_stm32f30x.c \ + drivers/max7456.c \ + drivers/vtx_rtc6705.c \ + io/osd.c \ + io/transponder_ir.c \ + io/vtx.c