Skip to content

Commit

Permalink
Merge branch 'master' into 20231101_SKYSTARSF7HDPRO_BMI270
Browse files Browse the repository at this point in the history
  • Loading branch information
nerdCopter authored Nov 2, 2023
2 parents 5484fe9 + 2bb2a72 commit 3e8e99c
Show file tree
Hide file tree
Showing 12 changed files with 260 additions and 18 deletions.
8 changes: 7 additions & 1 deletion src/main/target/FLYWOOF411_5IN1_AIO/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,16 @@
#define USE_ACC_SPI_ICM42688P

#define ICM42688P_SPI_INSTANCE SPI1
#define ICM42688P_CS_PIN PB2
#define ICM42688P_CS_PIN PA4
#define ACC_ICM42688P_ALIGN CW0_DEG_FLIP
#define GYRO_ICM42688P_ALIGN CW0_DEG_FLIP

#define USE_SPI_GYRO
#define BMI270_SPI_INSTANCE SPI1
#define BMI270_CS_PIN PA4
#define ACC_BMI270_ALIGN CW0_DEG_FLIP
#define GYRO_BMI270_ALIGN CW0_DEG_FLIP

// *************** Baro **************************
#define USE_I2C

Expand Down
25 changes: 13 additions & 12 deletions src/main/target/FLYWOOF411_5IN1_AIO/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@ F411_TARGETS += $(TARGET)
FEATURES += VCP

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/accgyro/accgyro_spi_icm20689.c \
drivers/accgyro/accgyro_spi_icm426xx.c \
drivers/barometer/barometer_bmp085.c \
drivers/barometer/barometer_bmp280.c \
drivers/barometer/barometer_ms5611.c \
drivers/compass/compass_hmc5883l.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_bmi270.c \
drivers/accgyro/accgyro_spi_icm20689.c \
drivers/accgyro/accgyro_spi_icm426xx.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_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/max7456.c \
drivers/rx/rx_cc2500.c \
rx/cc2500_common.c \
rx/cc2500_common.c \
rx/cc2500_frsky_shared.c \
rx/cc2500_frsky_d.c \
rx/cc2500_frsky_x.c \
rx/cc2500_redpine.c \
rx/cc2500_frsky_x.c \
rx/cc2500_redpine.c \
rx/cc2500_sfhss.c\
drivers/rx/rx_a7105.c \
drivers/light_ws2811strip.c
drivers/light_ws2811strip.c
Empty file.
16 changes: 16 additions & 0 deletions src/main/target/FOXEERF745_AIO/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@
#pragma once

#define TARGET_BOARD_IDENTIFIER "FOXE"
#define TARGET_MANUFACTURER_IDENTIFIER "FOXE"

#if defined(FOXEERF745_AIO_V2)
#define USBD_PRODUCT_STRING "FOXEERF745_AIO_V2"
#else
#define USBD_PRODUCT_STRING "FOXEERF745_AIO"
#endif

#define LED0_PIN PC13

Expand Down Expand Up @@ -55,6 +61,16 @@
//#define MAG_HMC5883_ALIGN CW270_DEG_FLIP
//#define MAG_ALIGN CW180_DEG //not sure if this command will work or if should be more specific to mag

#if defined(FOXEERF745_AIO_V2)
//BMI270
#define USE_SPI_GYRO
#define USE_ACCGYRO_BMI270
#define BMI270_CS_PIN PA15
#define BMI270_SPI_INSTANCE SPI3
#define ACC_BMI270_ALIGN CW180_DEG
#define GYRO_BMI270_ALIGN CW180_DEG
#endif

#define USE_BARO
#define USE_BARO_BMP280
#define BARO_I2C_INSTANCE (I2CDEV_1)
Expand Down
5 changes: 3 additions & 2 deletions src/main/target/FOXEERF745_AIO/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ F7X5XG_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH

TARGET_SRC = \
drivers/accgyro/accgyro_spi_bmi270.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu.c \
drivers/barometer/barometer_bmp280.c \
drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/compass/compass_lis3mdl.c \
drivers/compass/compass_lis3mdl.c \
drivers/light_ws2811strip.c \
drivers/max7456.c
2 changes: 1 addition & 1 deletion src/main/target/IFLIGHT_F745_AIO_V2/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define USE_DUAL_GYRO

#define USE_SPI_GYRO
//#define USE_ACCGYRO_BMI270
#define USE_ACCGYRO_BMI270
#define USE_GYRO_SPI_MPU6000
#define USE_ACC_SPI_MPU6000

Expand Down
2 changes: 1 addition & 1 deletion src/main/target/IFLIGHT_F745_AIO_V2/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ F7X5XG_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH

TARGET_SRC = \
drivers/accgyro/accgyro_spi_bmi270.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/accgyro/accgyro_mpu.c \
drivers/barometer/barometer_ms5611.c \
drivers/barometer/barometer_bmp280.c \
drivers/barometer/barometer_bmp085.c \
drivers/barometer/barometer_ms5611.c \
drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/light_ws2811strip.c \
Expand Down
37 changes: 37 additions & 0 deletions src/main/target/NBD_INFINITYAIOV2PRO/target.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/

#include <stdint.h>

#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(TIM1, CH2, PA9, TIM_USE_LED, 0, 0 ), // LED_STRIP,

DEF_TIM(TIM3, CH4, PC9, TIM_USE_MOTOR, 0, 0 ), // M1
DEF_TIM(TIM3, CH3, PC8, TIM_USE_MOTOR, 0, 0 ), // M2
DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0 ), // M3
DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0 ), // M4
};
160 changes: 160 additions & 0 deletions src/main/target/NBD_INFINITYAIOV2PRO/target.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
/*
* 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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define TARGET_MANUFACTURER_IDENTIFIER "NEBD"
#define USBD_PRODUCT_STRING "NBD_INFINITYAIOV2PRO"

#define FC_TARGET_MCU STM32F745 // not used in EmuF
#define TARGET_BOARD_IDENTIFIER "S745" // generic ID

#define LED0_PIN PC0

#define USE_BEEPER
#define BEEPER_PIN PD13
#define BEEPER_INVERTED

#define USE_SPI_GYRO
#define USE_ACCGYRO_BMI270
#define BMI270_CS_PIN PE11
#define BMI270_SPI_INSTANCE SPI4
#define ACC_BMI270_ALIGN CW270_DEG
#define GYRO_BMI270_ALIGN CW270_DEG

// dual gyro
#define USE_DUAL_GYRO

#define USE_EXTI //REQUIRED when USE_GYRO_EXTI
#define USE_GYRO_EXTI
#define USE_MPU_DATA_READY_SIGNAL

// gyro 1
#define GYRO_1_CS_PIN PE11
#define GYRO_1_SPI_INSTANCE SPI4
#define GYRO_1_EXTI_PIN PB1
#define GYRO_1_ALIGN CW270_DEG
#define ACC_1_ALIGN CW270_DEG

// gyro 2
#define GYRO_2_CS_PIN PB12
#define GYRO_2_SPI_INSTANCE SPI2
#define GYRO_2_EXTI_PIN PD0
#define GYRO_2_ALIGN CW270_DEG
#define ACC_2_ALIGN CW270_DEG

#define USE_VCP
#define USE_USB_DETECT

#define USE_UART1
#define UART1_RX_PIN PB7

#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_UART5
#define UART5_RX_PIN PD2

#define USE_UART7
#define UART7_TX_PIN PE8

#define USE_UART8
#define UART8_RX_PIN PE0
#define UART8_TX_PIN PE1

#define SERIAL_PORT_COUNT 7 //VCP, USART1, USART2, USART3, UART5, USART7, UART8

#define USE_ESC_SENSOR

#define USE_SPI
#define USE_SPI_DEVICE_1
#define USE_SPI_DEVICE_2
#define USE_SPI_DEVICE_3
#define USE_SPI_DEVICE_4

#define SPI1_SCK_PIN PA5
#define SPI1_MISO_PIN PA6
#define SPI1_MOSI_PIN PA7

#define SPI2_SCK_PIN PB13
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15

#define SPI3_SCK_PIN PB3
#define SPI3_MISO_PIN PB4
#define SPI3_MOSI_PIN PD6

#define SPI4_SCK_PIN PE12
#define SPI4_MISO_PIN PE13
#define SPI4_MOSI_PIN PE14

#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15
#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)

#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define USE_FLASH
#define USE_FLASHFS
#define USE_FLASH_W25Q128FV //official
#define FLASH_CS_PIN PB0
#define FLASH_SPI_INSTANCE SPI1

#define USE_FLASH_M25P16 // testing // 16MB Micron M25P16 and others (ref: https://github.com/betaflight/betaflight/blob/master/src/main/drivers/flash_m25p16.c)
#define USE_FLASH_W25M // testing // 1Gb NAND flash support
#define USE_FLASH_W25M512 // testing // 16, 32, 64 or 128MB Winbond stacked die support
#define USE_FLASH_W25Q // testing // 512Kb (256Kb x 2 stacked) NOR flash support

#define USE_I2C
#define USE_I2C_DEVICE_1
#define I2C_DEVICE_1 (I2CDEV_1)
#define MAG_I2C_INSTANCE (I2CDEV_1)
#define I2C1_SCL PB8
#define I2C1_SDA PB9

#define USE_ADC
#define VBAT_ADC_PIN PC1
#define CURRENT_METER_ADC_PIN PC2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define CURRENT_METER_SCALE_DEFAULT 100

#define BEEPER_PWM_HZ 5400

#define USE_LED_STRIP
#define LED_STRIP_PIN PA9

#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD 0xffff
#define TARGET_IO_PORTE 0xffff

#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_RX_SERIAL)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

#define USABLE_TIMER_CHANNEL_COUNT 7
#define USED_TIMERS ( TIM_N(1) | TIM_N(3) | TIM_N(4) )
13 changes: 13 additions & 0 deletions src/main/target/NBD_INFINITYAIOV2PRO/target.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
F7X5XG_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH

TARGET_SRC = \
drivers/accgyro/accgyro_spi_bmi270.c \
drivers/light_ws2811strip.c \
drivers/max7456.c \
drivers/compass/compass_fake.c \
drivers/compass/compass_ak8963.c \
drivers/compass/compass_ak8975.c \
drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_lis3mdl.c \
drivers/compass/compass_qmc5883l.c \
7 changes: 7 additions & 0 deletions src/main/target/SKYSTARSF7HD/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@

#define USE_ACC

#define USE_SPI_GYRO
#define USE_ACCGYRO_BMI270
#define BMI270_CS_PIN PA4
#define BMI270_SPI_INSTANCE SPI1
#define ACC_BMI270_ALIGN CW180_DEG
#define GYRO_BMI270_ALIGN CW180_DEG

#define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1

Expand Down
3 changes: 2 additions & 1 deletion src/main/target/SKYSTARSF7HD/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ F7X2RE_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH

TARGET_SRC = \
drivers/accgyro/accgyro_spi_bmi270.c \
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_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip.c \
drivers/max7456.c

0 comments on commit 3e8e99c

Please sign in to comment.