1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00

OSD is always enabled for SPRACINGH7RF and comments in config fix (#12440)

This commit is contained in:
J Blackman 2023-03-04 12:43:08 +11:00 committed by GitHub
parent 3cc056f192
commit 3470fd5584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 89 deletions

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F405
#define BOARD_NAME FF_RACEPIT
@ -73,12 +67,12 @@
#define MAX7456_SPI_INSTANCE SPI2
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB0 , 2, 0 # pin B00: DMA1 Stream 7 Channel 5) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 # pin B01: DMA1 Stream 2 Channel 5) \
TIMER_PIN_MAP( 2, PB11, 1, 1 # pin B11: DMA1 Stream 7 Channel 3) \
TIMER_PIN_MAP( 3, PB10, 1, 0 # pin B10: DMA1 Stream 1 Channel 3) \
TIMER_PIN_MAP( 0, PB0 , 2, 0 ) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 ) \
TIMER_PIN_MAP( 2, PB11, 1, 1 ) \
TIMER_PIN_MAP( 3, PB10, 1, 0 ) \
TIMER_PIN_MAP( 4, PA10, 1, -1) \
TIMER_PIN_MAP( 5, PB6 , 1, 0 # pin B06: DMA1 Stream 0 Channel 2) \
TIMER_PIN_MAP( 5, PB6 , 1, 0 ) \
#define MOTOR1_PIN PB0

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F405
#define BOARD_NAME FF_RACEPIT_MINI
@ -72,12 +66,12 @@
#define MAX7456_SPI_INSTANCE SPI2
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB0 , 2, 0 # pin B00: DMA1 Stream 7 Channel 5) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 # pin B01: DMA1 Stream 2 Channel 5) \
TIMER_PIN_MAP( 2, PB11, 1, 1 # pin B11: DMA1 Stream 7 Channel 3) \
TIMER_PIN_MAP( 3, PB10, 1, 0 # pin B10: DMA1 Stream 1 Channel 3) \
TIMER_PIN_MAP( 0, PB0 , 2, 0 ) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 ) \
TIMER_PIN_MAP( 2, PB11, 1, 1 ) \
TIMER_PIN_MAP( 3, PB10, 1, 0 ) \
TIMER_PIN_MAP( 4, PA10, 1, -1) \
TIMER_PIN_MAP( 5, PB6 , 1, 0 # pin B06: DMA1 Stream 0 Channel 2) \
TIMER_PIN_MAP( 5, PB6 , 1, 0 ) \
#define MOTOR1_PIN PB0

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F405
#define BOARD_NAME PYRODRONEF4
@ -71,11 +65,11 @@
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB9 , 2, -1) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 # pin B01: DMA1 Stream 2 Channel 5) \
TIMER_PIN_MAP( 2, PB0 , 3, 0 # pin B00: DMA2 Stream 2 Channel 0) \
TIMER_PIN_MAP( 3, PC9 , 2, 0 # pin C09: DMA2 Stream 7 Channel 7) \
TIMER_PIN_MAP( 4, PA8 , 1, 1 # pin A08: DMA2 Stream 1 Channel 6) \
TIMER_PIN_MAP( 5, PB8 , 1, 0 # pin B08: DMA1 Stream 7 Channel 2) \
TIMER_PIN_MAP( 1, PB1 , 2, 0 ) \
TIMER_PIN_MAP( 2, PB0 , 3, 0 ) \
TIMER_PIN_MAP( 3, PC9 , 2, 0 ) \
TIMER_PIN_MAP( 4, PA8 , 1, 1 ) \
TIMER_PIN_MAP( 5, PB8 , 1, 0 ) \

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32H750
#define BOARD_NAME SPRACINGH7EXTREME
@ -206,7 +200,7 @@
#define GYRO_1_ALIGN CW180_DEG
#define USE_SPI_GYRO
#define GYRO_2_SPI_INSTANCE SPI2
#define GYRO_2_ALIGN CUSTOM
#define GYRO_2_ALIGN ALIGN_CUSTOM
#define GYRO_2_ALIGN_ROLL 0
#define GYRO_2_ALIGN_PITCH 0
#define GYRO_2_ALIGN_YAW 2250

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32H730
#define BOARD_NAME SPRACINGH7RF
@ -161,7 +155,10 @@
#define USE_FLASH_W25Q128FV
#define USE_SDCARD
#ifndef USE_OSD
#define USE_OSD
#endif
#define SPRACING_PIXEL_OSD_BLACK_PIN PE12
#define SPRACING_PIXEL_OSD_WHITE_PIN PE13
#define SPRACING_PIXEL_OSD_MASK_ENABLE_PIN PE14
@ -243,10 +240,9 @@
#define SDIO_D2_PIN PC10
#define SDIO_D3_PIN PC11
#define PINIO1_PIN PC15
//#define PINIO1_PIN PC15
#define RX_SPI_CS_PIN PB12
#define RX_SPI_EXTI_PIN PC6
//#define RX_SPI_EXTI_PIN PC6
#define RX_SPI_BIND_PIN NONE
#define RX_SPI_LED_PIN NONE
#define RX_SPI_EXPRESSLRS_RESET_PIN PD10

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F405
#define BOARD_NAME TALONF4V2
@ -76,12 +70,12 @@
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB9 , 2, -1) \
TIMER_PIN_MAP( 1, PB0 , 1, 0 # pin B00: DMA2 Stream 6 Channel 0) \
TIMER_PIN_MAP( 2, PB1 , 3, 0 # pin B01: DMA2 Stream 2 Channel 0) \
TIMER_PIN_MAP( 3, PA3 , 1, 1 # pin A03: DMA1 Stream 6 Channel 3) \
TIMER_PIN_MAP( 4, PA2 , 1, 0 # pin A02: DMA1 Stream 1 Channel 3) \
TIMER_PIN_MAP( 5, PB4 , 1, 0 # pin B04: DMA1 Stream 4 Channel 5) \
TIMER_PIN_MAP( 6, PB8 , 1, 0 # pin B08: DMA1 Stream 7 Channel 2) \
TIMER_PIN_MAP( 1, PB0 , 1, 0 ) \
TIMER_PIN_MAP( 2, PB1 , 3, 0 ) \
TIMER_PIN_MAP( 3, PA3 , 1, 1 ) \
TIMER_PIN_MAP( 4, PA2 , 1, 0 ) \
TIMER_PIN_MAP( 5, PB4 , 1, 0 ) \
TIMER_PIN_MAP( 6, PB8 , 1, 0 ) \

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F7X2
#define BOARD_NAME TALONF7FUSION
@ -81,15 +75,15 @@
#define GYRO_2_CS_PIN PC13
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB3 , 1, 0 # pin B03: DMA1 Stream 6 Channel 3) \
TIMER_PIN_MAP( 1, PB6 , 1, 0 # pin B06: DMA1 Stream 0 Channel 2) \
TIMER_PIN_MAP( 2, PB7 , 1, 0 # pin B07: DMA1 Stream 3 Channel 2) \
TIMER_PIN_MAP( 3, PB8 , 1, 0 # pin B08: DMA1 Stream 7 Channel 2) \
TIMER_PIN_MAP( 0, PB3 , 1, 0 ) \
TIMER_PIN_MAP( 1, PB6 , 1, 0 ) \
TIMER_PIN_MAP( 2, PB7 , 1, 0 ) \
TIMER_PIN_MAP( 3, PB8 , 1, 0 ) \
TIMER_PIN_MAP( 4, PB9 , 1, -1) \
TIMER_PIN_MAP( 5, PA1 , 2, 0 # pin A01: DMA1 Stream 4 Channel 6) \
TIMER_PIN_MAP( 6, PC8 , 2, 0 # pin C08: DMA2 Stream 2 Channel 0) \
TIMER_PIN_MAP( 7, PC9 , 2, 0 # pin C09: DMA2 Stream 7 Channel 7) \
TIMER_PIN_MAP( 8, PB1 , 2, 0 # pin B01: DMA1 Stream 2 Channel 5) \
TIMER_PIN_MAP( 5, PA1 , 2, 0 ) \
TIMER_PIN_MAP( 6, PC8 , 2, 0 ) \
TIMER_PIN_MAP( 7, PC9 , 2, 0 ) \
TIMER_PIN_MAP( 8, PB1 , 2, 0 ) \

View file

@ -19,12 +19,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file has been auto generated from unified-targets repo.
The auto generation is transitional only, please remove this comment once the file is edited.
*/
#define FC_TARGET_MCU STM32F7X2
#define BOARD_NAME TALONF7V2
@ -78,15 +72,15 @@
#define GYRO_1_CS_PIN PA4
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, PB3 , 1, 0 # pin B03: DMA1 Stream 6 Channel 3) \
TIMER_PIN_MAP( 1, PB6 , 1, 0 # pin B06: DMA1 Stream 0 Channel 2) \
TIMER_PIN_MAP( 2, PB7 , 1, 0 # pin B07: DMA1 Stream 3 Channel 2) \
TIMER_PIN_MAP( 3, PB8 , 1, 0 # pin B08: DMA1 Stream 7 Channel 2) \
TIMER_PIN_MAP( 0, PB3 , 1, 0 ) \
TIMER_PIN_MAP( 1, PB6 , 1, 0 ) \
TIMER_PIN_MAP( 2, PB7 , 1, 0 ) \
TIMER_PIN_MAP( 3, PB8 , 1, 0 ) \
TIMER_PIN_MAP( 4, PB9 , 1, -1) \
TIMER_PIN_MAP( 5, PA1 , 2, 0 # pin A01: DMA1 Stream 4 Channel 6) \
TIMER_PIN_MAP( 6, PC8 , 2, 0 # pin C08: DMA2 Stream 2 Channel 0) \
TIMER_PIN_MAP( 7, PC9 , 2, 0 # pin C09: DMA2 Stream 7 Channel 7) \
TIMER_PIN_MAP( 8, PB1 , 2, 0 # pin B01: DMA1 Stream 2 Channel 5) \
TIMER_PIN_MAP( 5, PA1 , 2, 0 ) \
TIMER_PIN_MAP( 6, PC8 , 2, 0 ) \
TIMER_PIN_MAP( 7, PC9 , 2, 0 ) \
TIMER_PIN_MAP( 8, PB1 , 2, 0 ) \