From ddbdc908ec8573301d8079f1ffd0dc7e10a43e1d Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Fri, 23 Aug 2019 08:49:40 +1200 Subject: [PATCH] Merge pull request #8621 from MerakRC/master Added MERAKRCF405 target and MERAKRCF722 target --- docs/boards/Board - MERAKRCF405.md | 89 ++++++++++++ docs/boards/Board - MERAKRCF722.md | 89 ++++++++++++ src/main/target/MERAKRCF405/target.c | 47 +++++++ src/main/target/MERAKRCF405/target.h | 154 +++++++++++++++++++++ src/main/target/MERAKRCF405/target.mk | 14 ++ src/main/target/MERAKRCF722/target.c | 47 +++++++ src/main/target/MERAKRCF722/target.h | 154 +++++++++++++++++++++ src/main/target/MERAKRCF722/target.mk | 14 ++ unified_targets/configs/MERAKRCF405.config | 107 ++++++++++++++ unified_targets/configs/MERAKRCF722.config | 105 ++++++++++++++ 10 files changed, 820 insertions(+) create mode 100644 docs/boards/Board - MERAKRCF405.md create mode 100644 docs/boards/Board - MERAKRCF722.md create mode 100644 src/main/target/MERAKRCF405/target.c create mode 100644 src/main/target/MERAKRCF405/target.h create mode 100644 src/main/target/MERAKRCF405/target.mk create mode 100644 src/main/target/MERAKRCF722/target.c create mode 100644 src/main/target/MERAKRCF722/target.h create mode 100644 src/main/target/MERAKRCF722/target.mk create mode 100644 unified_targets/configs/MERAKRCF405.config create mode 100644 unified_targets/configs/MERAKRCF722.config diff --git a/docs/boards/Board - MERAKRCF405.md b/docs/boards/Board - MERAKRCF405.md new file mode 100644 index 0000000000..07d2b08ce5 --- /dev/null +++ b/docs/boards/Board - MERAKRCF405.md @@ -0,0 +1,89 @@ +# Board - MERAKRCF405 + +MERAKRCF405 flight control is carefully optimized layout, so that users can be more concise,convenient wiring,.For ensure a good flight experience ,we use of high-performance MPU6000 gyroscope. After a long flight verification test, the flight control ensures stable flight performance. For details of flight control, please visit MERAK RC website:(http://www.merakrc.com) + +### Hardware + +* Processors and Sensors + * *MCU: STM32F405RGT6 + * IMU_1 MPU6000(0 deg) + * *OSD:* BetaFlight OSD (AT7456E) + * Blackbox: FLASH W25Q128 (16MB) + +* 6 Dshot outputs + +* 5 UARTs (UART5 support SerialRC) + +* Stable voltage regulation,9V/2A DCDC BEC for VTX/camera etc.5V/2A DCDC BEC for FC/WS2812 etc. + +* Independent camera control. + +### Pinout + +### All uarts have pad on board + +| Value | Identifier | RX | TX | Notes | +| :---: | :--------: | :--: | :--: | :------: | +| 1 | USART1 | PA10 | PA9 | | +| 2 | USART2 | PA3 | PA2 | | +| 3 | USART3 | PB11 | PB10 | | +| 4 | USART4 | PC11 | PC10 | | +| 5 | USART5 | PD2 | PC12 | Rx input | + +### Buzzer/LED output + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | LED0 | LED | PC13 | | +| 2 | BEEPER | BEEP | PC14 | | + +### VBAT input, Current input, Analog RSSI input + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | ADC1 | VBAT | PC2 | | +| 2 | ADC1 | CURRENT | PC1 | | +| 3 | ADC1 | RSSI | PC3 | | + +### PWM Input & PWM Output & LED strip & Camera control + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :---------: | :--: | :---: | +| 1 | TIM8_CH3 | PPM | PC8 | | +| 2 | TIM3_CH1 | Motor1 | PC6 | | +| 3 | TIM3_CH2 | Motor2 | PC7 | | +| 4 | TIM5_CH1 | Motor3 | PA0 | | +| 5 | TIM5_CH2 | Motor4 | PA1 | | +| 6 | TIM3_CH3 | Motor5 | PB0 | | +| 7 | TIM1_CH3N | Motor6 | PB1 | | +| 8 | TIM4_CH3 | LED strip | PB8 | | +| 9 | TIM11_CH1 | CAM Control | PB9 | | + +### Gyro & ACC MPU6000 + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :------------: | +| 1 | SPI2 | SCK | PB13 | MPU6000 | +| 2 | SPI2 | MISO | PB14 | MPU6000 | +| 3 | SPI2 | MOSI | PB15 | MPU6000 | +| 4 | SPI2 | CS1 | PB12 | MPU6000_CS | +| 5 | IO | INT2 | PC4 | MPU6000_INT | + +### OSD MAX7456 + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | SPI3 | SCK | PB3 | | +| 2 | SPI3 | MISO | PB4 | | +| 3 | SPI3 | MOSI | PB5 | | +| 4 | SPI3 | CS | PA15 | | + +### FLash Blackbox + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | SPI1 | SCK | PA5 | | +| 2 | SPI1 | MISO | PA6 | | +| 3 | SPI1 | MOSI | PA7 | | +| 4 | SPI1 | CS | PA4 | | + diff --git a/docs/boards/Board - MERAKRCF722.md b/docs/boards/Board - MERAKRCF722.md new file mode 100644 index 0000000000..18246f3eab --- /dev/null +++ b/docs/boards/Board - MERAKRCF722.md @@ -0,0 +1,89 @@ +# Board - MERAKRCF405 + +MERAKRCF405 flight control is carefully optimized layout, so that users can be more concise,convenient wiring,.For ensure a good flight experience ,we use of high-performance MPU6000 gyroscope. After a long flight verification test, the flight control ensures stable flight performance. For details of flight control, please visit MERAK RC website:(http://www.merakrc.com) + +### Hardware + +* Processors and Sensors + * *MCU: STM32F722RET6 + * IMU_1 MPU6000(0 deg) + * *OSD:* BetaFlight OSD (AT7456E) + * Blackbox: FLASH W25Q128 (16MB) + +* 6 Dshot outputs + +* 5 UARTs (UART5 support SerialRC) + +* Stable voltage regulation,9V/2A DCDC BEC for VTX/camera etc.5V/2A DCDC BEC for FC/WS2812 etc. + +* Independent camera control. + +### Pinout + +### All uarts have pad on board + +| Value | Identifier | RX | TX | Notes | +| :---: | :--------: | :--: | :--: | :------: | +| 1 | USART1 | PA10 | PA9 | | +| 2 | USART2 | PA3 | PA2 | | +| 3 | USART3 | PB11 | PB10 | | +| 4 | USART4 | PC11 | PC10 | | +| 5 | USART5 | PD2 | PC12 | Rx input | + +### Buzzer/LED output + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | LED0 | LED | PC13 | | +| 2 | BEEPER | BEEP | PC14 | | + +### VBAT input, Current input, Analog RSSI input + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | ADC1 | VBAT | PC2 | | +| 2 | ADC1 | CURRENT | PC1 | | +| 3 | ADC1 | RSSI | PC3 | | + +### PWM Input & PWM Output & LED strip & Camera control + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :---------: | :--: | :---: | +| 1 | TIM8_CH3 | PPM | PC8 | | +| 2 | TIM3_CH1 | Motor1 | PC6 | | +| 3 | TIM3_CH2 | Motor2 | PC7 | | +| 4 | TIM5_CH1 | Motor3 | PA0 | | +| 5 | TIM5_CH2 | Motor4 | PA1 | | +| 6 | TIM3_CH3 | Motor5 | PB0 | | +| 7 | TIM1_CH3N | Motor6 | PB1 | | +| 8 | TIM4_CH3 | LED strip | PB8 | | +| 9 | TIM11_CH1 | CAM Control | PB9 | | + +### Gyro & ACC MPU6000 + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :------------: | +| 1 | SPI2 | SCK | PB13 | MPU6000 | +| 2 | SPI2 | MISO | PB14 | MPU6000 | +| 3 | SPI2 | MOSI | PB15 | MPU6000 | +| 4 | SPI2 | CS1 | PB12 | MPU6000_CS | +| 5 | IO | INT2 | PC4 | MPU6000_INT | + +### OSD MAX7456 + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | SPI3 | SCK | PB3 | | +| 2 | SPI3 | MISO | PB4 | | +| 3 | SPI3 | MOSI | PB5 | | +| 4 | SPI3 | CS | PA15 | | + +### FLash Blackbox + +| Value | Identifier | function | pin | Notes | +| :---: | :--------: | :------: | :--: | :---: | +| 1 | SPI1 | SCK | PA5 | | +| 2 | SPI1 | MISO | PA6 | | +| 3 | SPI1 | MOSI | PA7 | | +| 4 | SPI1 | CS | PA4 | | + diff --git a/src/main/target/MERAKRCF405/target.c b/src/main/target/MERAKRCF405/target.c new file mode 100644 index 0000000000..a68368fe5c --- /dev/null +++ b/src/main/target/MERAKRCF405/target.c @@ -0,0 +1,47 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software 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 and Betaflight are distributed in the hope that they + * 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 this software. + * + * If not, see . + */ + +#include + +#include "platform.h" +#include "drivers/io.h" + +#include "drivers/dma.h" +#include "drivers/timer.h" +#include "drivers/timer_def.h" + +const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { + DEF_TIM(TIM8, CH3, PC8, TIM_USE_PPM, 0, 0), // PPM + + // Motors + DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M1 + DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M2 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M3 + DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M4 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M5 + DEF_TIM(TIM1, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M6 + + // LED strip + DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED + + //CAMERA_CONTROL + DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL + +}; \ No newline at end of file diff --git a/src/main/target/MERAKRCF405/target.h b/src/main/target/MERAKRCF405/target.h new file mode 100644 index 0000000000..354b342ea7 --- /dev/null +++ b/src/main/target/MERAKRCF405/target.h @@ -0,0 +1,154 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software 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 and Betaflight are distributed in the hope that they + * 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 this software. + * + * If not, see . + */ + +#pragma once + +#define TARGET_BOARD_IDENTIFIER "MEF4" +#define USBD_PRODUCT_STRING "MERAKRCF405" + +#define LED0_PIN PC13 + +#define USE_BEEPER +#define BEEPER_PIN PC14 +#define BEEPER_INVERTED + +// *************** Gyro & ACC ********************** +#define USE_SPI +#define USE_SPI_DEVICE_2 + +#define SPI2_SCK_PIN PB13 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 + +#define GYRO_1_CS_PIN PB12 +#define GYRO_1_SPI_INSTANCE SPI2 + +#define USE_EXTI +#define USE_GYRO_EXTI +#define GYRO_1_EXTI_PIN PC4 +#define USE_MPU_DATA_READY_SIGNAL + +#define USE_GYRO +#define USE_GYRO_SPI_MPU6000 +#define GYRO_1_ALIGN CW0_DEG + +#define USE_ACC +#define USE_ACC_SPI_MPU6000 + +// *************** BLACKBOX ************************** +#define USE_SPI_DEVICE_1 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 + +#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT +#define USE_FLASHFS +#define USE_FLASH_M25P16 +#define FLASH_CS_PIN PA4 +#define FLASH_SPI_INSTANCE SPI1 + +// *************** OSD ***************************** +#define USE_SPI_DEVICE_3 +#define SPI3_SCK_PIN PB3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PB5 + +#define USE_MAX7456 +#define MAX7456_SPI_INSTANCE SPI3 +#define MAX7456_SPI_CS_PIN PA15 + +// *************** I2C ************************** +#define USE_I2C +#define USE_I2C_DEVICE_1 +#define I2C_DEVICE (I2CDEV_1) +#define I2C1_SCL PB6 +#define I2C1_SDA PB7 + +// *************** BARO ************************** +#define USE_BARO +#define BARO_I2C_INSTANCE (I2CDEV_1) +#define USE_BARO_BMP085 +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 + +// *************** MAG ************************** +#define USE_MAG +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define USE_MAG_AK8975 +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883l + +// *************** UART ***************************** +#define USE_VCP + +#define USE_UART1 +#define UART1_RX_PIN PA10 +#define UART1_TX_PIN PA9 + +#define USE_UART2 +#define UART2_RX_PIN PA3 +#define UART2_TX_PIN PA2 + +#define USE_UART3 +#define UART3_RX_PIN PB11 +#define UART3_TX_PIN PB10 + +#define USE_UART4 +#define UART4_RX_PIN PC11 +#define UART4_TX_PIN PC10 + +#define USE_UART5 +#define UART5_RX_PIN PD2 +#define UART5_TX_PIN PC12 + +#define USE_SOFTSERIAL1 +#define USE_SOFTSERIAL2 + +#define SERIAL_PORT_COUNT 8 + +#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define SERIALRX_PROVIDER SERIALRX_SBUS + +// *************** ADC ***************************** +#define USE_ADC +#define ADC_INSTANCE ADC1 +#define ADC1_DMA_OPT 0 + +#define VBAT_ADC_PIN PC2 +#define CURRENT_METER_ADC_PIN PC1 +#define RSSI_ADC_PIN PC3 + +#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_SOFTSERIAL) +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define CURRENT_METER_SCALE_DEFAULT 179 + +#define ENABLE_DSHOT_DMAR true + +#define USE_ESCSERIAL +#define ESCSERIAL_TIMER_TX_PIN PA3 + +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB 0xffff +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (BIT(2)) + +#define USABLE_TIMER_CHANNEL_COUNT 9 +#define USED_TIMERS (TIM_N(1)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(11)) diff --git a/src/main/target/MERAKRCF405/target.mk b/src/main/target/MERAKRCF405/target.mk new file mode 100644 index 0000000000..6285dcebd7 --- /dev/null +++ b/src/main/target/MERAKRCF405/target.mk @@ -0,0 +1,14 @@ +F405_TARGETS += $(TARGET) +FEATURES += VCP ONBOARDFLASH + +TARGET_SRC = \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ + drivers/max7456.c diff --git a/src/main/target/MERAKRCF722/target.c b/src/main/target/MERAKRCF722/target.c new file mode 100644 index 0000000000..a68368fe5c --- /dev/null +++ b/src/main/target/MERAKRCF722/target.c @@ -0,0 +1,47 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software 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 and Betaflight are distributed in the hope that they + * 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 this software. + * + * If not, see . + */ + +#include + +#include "platform.h" +#include "drivers/io.h" + +#include "drivers/dma.h" +#include "drivers/timer.h" +#include "drivers/timer_def.h" + +const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { + DEF_TIM(TIM8, CH3, PC8, TIM_USE_PPM, 0, 0), // PPM + + // Motors + DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M1 + DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M2 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M3 + DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M4 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M5 + DEF_TIM(TIM1, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M6 + + // LED strip + DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED + + //CAMERA_CONTROL + DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL + +}; \ No newline at end of file diff --git a/src/main/target/MERAKRCF722/target.h b/src/main/target/MERAKRCF722/target.h new file mode 100644 index 0000000000..196c447c4c --- /dev/null +++ b/src/main/target/MERAKRCF722/target.h @@ -0,0 +1,154 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software 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 and Betaflight are distributed in the hope that they + * 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 this software. + * + * If not, see . + */ + +#pragma once + +#define TARGET_BOARD_IDENTIFIER "MEF7" +#define USBD_PRODUCT_STRING "MERAKRCF722" + +#define LED0_PIN PC13 + +#define USE_BEEPER +#define BEEPER_PIN PC14 +#define BEEPER_INVERTED + +// *************** Gyro & ACC ********************** +#define USE_SPI +#define USE_SPI_DEVICE_2 + +#define SPI2_SCK_PIN PB13 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 + +#define GYRO_1_CS_PIN PB12 +#define GYRO_1_SPI_INSTANCE SPI2 + +#define USE_EXTI +#define USE_GYRO_EXTI +#define GYRO_1_EXTI_PIN PC4 +#define USE_MPU_DATA_READY_SIGNAL + +#define USE_GYRO +#define USE_GYRO_SPI_MPU6000 +#define GYRO_1_ALIGN CW0_DEG + +#define USE_ACC +#define USE_ACC_SPI_MPU6000 + +// *************** BLACKBOX ************************** +#define USE_SPI_DEVICE_1 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 + +#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT +#define USE_FLASHFS +#define USE_FLASH_M25P16 +#define FLASH_CS_PIN PA4 +#define FLASH_SPI_INSTANCE SPI1 + +// *************** OSD ***************************** +#define USE_SPI_DEVICE_3 +#define SPI3_SCK_PIN PB3 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PB5 + +#define USE_MAX7456 +#define MAX7456_SPI_INSTANCE SPI3 +#define MAX7456_SPI_CS_PIN PA15 + +// *************** I2C ************************** +#define USE_I2C +#define USE_I2C_DEVICE_1 +#define I2C_DEVICE (I2CDEV_1) +#define I2C1_SCL PB6 +#define I2C1_SDA PB7 + +// *************** BARO ************************** +#define USE_BARO +#define BARO_I2C_INSTANCE (I2CDEV_1) +#define USE_BARO_BMP085 +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 + +// *************** MAG ************************** +#define USE_MAG +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define USE_MAG_AK8975 +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883l + +// *************** UART ***************************** +#define USE_VCP + +#define USE_UART1 +#define UART1_RX_PIN PA10 +#define UART1_TX_PIN PA9 + +#define USE_UART2 +#define UART2_RX_PIN PA3 +#define UART2_TX_PIN PA2 + +#define USE_UART3 +#define UART3_RX_PIN PB11 +#define UART3_TX_PIN PB10 + +#define USE_UART4 +#define UART4_RX_PIN PC11 +#define UART4_TX_PIN PC10 + +#define USE_UART5 +#define UART5_RX_PIN PD2 +#define UART5_TX_PIN PC12 + +#define USE_SOFTSERIAL1 +#define USE_SOFTSERIAL2 + +#define SERIAL_PORT_COUNT 8 + +#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define SERIALRX_PROVIDER SERIALRX_SBUS + +// *************** ADC ***************************** +#define USE_ADC +#define ADC_INSTANCE ADC1 +#define ADC1_DMA_OPT 0 + +#define VBAT_ADC_PIN PC2 +#define CURRENT_METER_ADC_PIN PC1 +#define RSSI_ADC_PIN PC3 + +#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_SOFTSERIAL) +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define CURRENT_METER_SCALE_DEFAULT 179 + +#define ENABLE_DSHOT_DMAR true + +#define USE_ESCSERIAL +#define ESCSERIAL_TIMER_TX_PIN PA3 + +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB 0xffff +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (BIT(2)) + +#define USABLE_TIMER_CHANNEL_COUNT 9 +#define USED_TIMERS (TIM_N(1)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(11)) diff --git a/src/main/target/MERAKRCF722/target.mk b/src/main/target/MERAKRCF722/target.mk new file mode 100644 index 0000000000..45be63356c --- /dev/null +++ b/src/main/target/MERAKRCF722/target.mk @@ -0,0 +1,14 @@ +F7X2RE_TARGETS += $(TARGET) +FEATURES += VCP ONBOARDFLASH + +TARGET_SRC = \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ + drivers/max7456.c diff --git a/unified_targets/configs/MERAKRCF405.config b/unified_targets/configs/MERAKRCF405.config new file mode 100644 index 0000000000..16ee27609e --- /dev/null +++ b/unified_targets/configs/MERAKRCF405.config @@ -0,0 +1,107 @@ +# Betaflight / STM32F405 (S405) 4.0.4 Jun 30 2019 / 14:58:15 (f3a95efa3) MSP API: 1.41 + +board_name MERAKRCF405 +manufacturer_id MERA + +# resources +resource BEEPER 1 C14 +resource MOTOR 1 C06 +resource MOTOR 2 C07 +resource MOTOR 3 A00 +resource MOTOR 4 A01 +resource MOTOR 5 B00 +resource MOTOR 6 B01 +resource PPM 1 C08 +resource LED_STRIP 1 B08 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_TX 3 B10 +resource SERIAL_TX 4 C10 +resource SERIAL_TX 5 C12 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource SERIAL_RX 3 B11 +resource SERIAL_RX 4 C11 +resource SERIAL_RX 5 D02 +resource I2C_SCL 1 B06 +resource I2C_SDA 1 B07 +resource LED 1 C13 +resource SPI_SCK 1 A05 +resource SPI_SCK 2 B13 +resource SPI_SCK 3 B03 +resource SPI_MISO 1 A06 +resource SPI_MISO 2 B14 +resource SPI_MISO 3 B04 +resource SPI_MOSI 1 A07 +resource SPI_MOSI 2 B15 +resource SPI_MOSI 3 B05 +resource ESCSERIAL 1 A03 +resource CAMERA_CONTROL 1 B09 +resource ADC_BATT 1 C02 +resource ADC_RSSI 1 C03 +resource ADC_CURR 1 C01 +resource FLASH_CS 1 A04 +resource OSD_CS 1 A15 +resource GYRO_EXTI 1 C04 +resource GYRO_CS 1 B12 + +# timer +timer C08 AF3 +# pin C08: TIM8 CH3 (AF3) +timer C06 AF2 +# pin C06: TIM3 CH1 (AF2) +timer C07 AF2 +# pin C07: TIM3 CH2 (AF2) +timer A00 AF2 +# pin A00: TIM5 CH1 (AF2) +timer A01 AF2 +# pin A01: TIM5 CH2 (AF2) +timer B00 AF2 +# pin B00: TIM3 CH3 (AF2) +timer B01 AF1 +# pin B01: TIM1 CH3N (AF1) +timer B08 AF2 +# pin B08: TIM4 CH3 (AF2) +timer B09 AF3 +# pin B09: TIM11 CH1 (AF3) + +# dma +dma ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dma pin C08 0 +# pin C08: DMA2 Stream 2 Channel 0 +dma pin C06 0 +# pin C06: DMA1 Stream 4 Channel 5 +dma pin C07 0 +# pin C07: DMA1 Stream 5 Channel 5 +dma pin A00 0 +# pin A00: DMA1 Stream 2 Channel 6 +dma pin A01 0 +# pin A01: DMA1 Stream 4 Channel 6 +dma pin B00 0 +# pin B00: DMA1 Stream 7 Channel 5 +dma pin B01 0 +# pin B01: DMA2 Stream 6 Channel 0 +dma pin B08 0 +# pin B08: DMA1 Stream 7 Channel 2 + +# master +set mag_bustype = I2C +set mag_i2c_device = 1 +set baro_bustype = I2C +set baro_i2c_device = 1 +set blackbox_device = SPIFLASH +set dshot_burst = ON +set current_meter = ADC +set battery_meter = ADC +set ibata_scale = 179 +set beeper_inversion = ON +set beeper_od = OFF +set system_hse_mhz = 8 +set max7456_spi_bus = 3 +set dashboard_i2c_bus = 1 +set flash_spi_bus = 1 +set gyro_1_bustype = SPI +set gyro_1_spibus = 2 +set gyro_1_sensor_align = CW0 +set gyro_2_spibus = 2 \ No newline at end of file diff --git a/unified_targets/configs/MERAKRCF722.config b/unified_targets/configs/MERAKRCF722.config new file mode 100644 index 0000000000..4fbea8b25b --- /dev/null +++ b/unified_targets/configs/MERAKRCF722.config @@ -0,0 +1,105 @@ +# Betaflight / STM32F7X2 (S7X2) 4.0.4 Jun 30 2019 / 15:00:13 (f3a95efa3) MSP API: 1.41 + +board_name MERAKRCF722 +manufacturer_id MERA + +# resources +resource BEEPER 1 C14 +resource MOTOR 1 C06 +resource MOTOR 2 C07 +resource MOTOR 3 A00 +resource MOTOR 4 A01 +resource MOTOR 5 B00 +resource MOTOR 6 B01 +resource PPM 1 C08 +resource LED_STRIP 1 B08 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_TX 3 B10 +resource SERIAL_TX 4 C10 +resource SERIAL_TX 5 C12 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource SERIAL_RX 3 B11 +resource SERIAL_RX 4 C11 +resource SERIAL_RX 5 D02 +resource I2C_SCL 1 B06 +resource I2C_SDA 1 B07 +resource LED 1 C13 +resource SPI_SCK 1 A05 +resource SPI_SCK 2 B13 +resource SPI_SCK 3 B03 +resource SPI_MISO 1 A06 +resource SPI_MISO 2 B14 +resource SPI_MISO 3 B04 +resource SPI_MOSI 1 A07 +resource SPI_MOSI 2 B15 +resource SPI_MOSI 3 B05 +resource CAMERA_CONTROL 1 B09 +resource ADC_BATT 1 C02 +resource ADC_RSSI 1 C03 +resource ADC_CURR 1 C01 +resource FLASH_CS 1 A04 +resource OSD_CS 1 A15 +resource GYRO_EXTI 1 C04 +resource GYRO_CS 1 B12 + +# timer +timer C08 AF3 +# pin C08: TIM8 CH3 (AF3) +timer C06 AF2 +# pin C06: TIM3 CH1 (AF2) +timer C07 AF2 +# pin C07: TIM3 CH2 (AF2) +timer A00 AF2 +# pin A00: TIM5 CH1 (AF2) +timer A01 AF2 +# pin A01: TIM5 CH2 (AF2) +timer B00 AF2 +# pin B00: TIM3 CH3 (AF2) +timer B01 AF1 +# pin B01: TIM1 CH3N (AF1) +timer B08 AF2 +# pin B08: TIM4 CH3 (AF2) +timer B09 AF3 +# pin B09: TIM11 CH1 (AF3) + +# dma +dma ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dma pin C08 0 +# pin C08: DMA2 Stream 2 Channel 0 +dma pin C06 0 +# pin C06: DMA1 Stream 4 Channel 5 +dma pin C07 0 +# pin C07: DMA1 Stream 5 Channel 5 +dma pin A00 0 +# pin A00: DMA1 Stream 2 Channel 6 +dma pin A01 0 +# pin A01: DMA1 Stream 4 Channel 6 +dma pin B00 0 +# pin B00: DMA1 Stream 7 Channel 5 +dma pin B01 0 +# pin B01: DMA2 Stream 6 Channel 0 +dma pin B08 0 +# pin B08: DMA1 Stream 7 Channel 2 + +# master +set mag_bustype = I2C +set mag_i2c_device = 1 +set baro_bustype = I2C +set baro_i2c_device = 1 +set blackbox_device = SPIFLASH +set dshot_burst = ON +set current_meter = ADC +set battery_meter = ADC +set ibata_scale = 179 +set beeper_inversion = ON +set beeper_od = OFF +set max7456_spi_bus = 3 +set dashboard_i2c_bus = 1 +set flash_spi_bus = 1 +set gyro_1_bustype = SPI +set gyro_1_spibus = 2 +set gyro_1_sensor_align = CW0 +set gyro_2_spibus = 2 \ No newline at end of file