Skip to content

Commit 4f1d915

Browse files
committed
Reshuffle and fixes
1 parent 0dea82a commit 4f1d915

File tree

1 file changed

+15
-24
lines changed

1 file changed

+15
-24
lines changed

configs/JHEG473/config.h

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define USE_ACCGYRO_BMI270
3434
#define USE_BARO
3535
#define USE_BARO_BMP280
36-
#define USE_BARO_DPS3120
36+
#define USE_BARO_DPS310
3737
#define USE_FLASH
3838
#define USE_FLASH_M25P16
3939
#define USE_MAX7456
@@ -45,26 +45,26 @@
4545
#define MOTOR4_PIN PC13
4646
#define LED_STRIP_PIN PB2
4747
#define UART1_TX_PIN PA9
48-
#define UART2_TX_PIN PA2
49-
#define UART3_TX_PIN PB10
50-
#define UART4_TX_PIN PC10
5148
#define UART1_RX_PIN PA10
49+
#define UART2_TX_PIN PA2
5250
#define UART2_RX_PIN PA3
51+
#define UART3_TX_PIN PB10
5352
#define UART3_RX_PIN PB11
53+
#define UART4_TX_PIN PC10
5454
#define UART4_RX_PIN PC11
5555
#define I2C1_SCL_PIN PA15
5656
#define I2C1_SDA_PIN PB7
5757
#define LED0_PIN PC15
5858
#define LED1_PIN PC14
5959
#define PINIO1_PIN PC6
6060
#define SPI1_SCK_PIN PA5
61-
#define SPI2_SCK_PIN PB13
62-
#define SPI3_SCK_PIN PB3
6361
#define SPI1_SDI_PIN PA6
64-
#define SPI2_SDI_PIN PB14
65-
#define SPI3_SDI_PIN PB4
6662
#define SPI1_SDO_PIN PA7
63+
#define SPI2_SCK_PIN PB13
64+
#define SPI2_SDI_PIN PB14
6765
#define SPI2_SDO_PIN PB15
66+
#define SPI3_SCK_PIN PB3
67+
#define SPI3_SDI_PIN PB4
6868
#define SPI3_SDO_PIN PB5
6969
#define ADC_VBAT_PIN PA0
7070
#define ADC_CURR_PIN PA1
@@ -74,29 +74,21 @@
7474
#define GYRO_1_CS_PIN PA4
7575

7676
#define TIMER_PIN_MAPPING \
77-
TIMER_PIN_MAP( 0, PB2, 1, 1 ) \
78-
TIMER_PIN_MAP( 1, PB0, 1, 2 ) \
79-
TIMER_PIN_MAP( 2, PB1, 1, 3 ) \
80-
TIMER_PIN_MAP( 3, PB6, 3, 4 ) \
81-
TIMER_PIN_MAP( 4, PC13, 2, 5 )
77+
TIMER_PIN_MAP( 0, LED_STRIP_PIN, 1, 0 ) \
78+
TIMER_PIN_MAP( 1, MOTOR1_PIN, 1, 1 ) \
79+
TIMER_PIN_MAP( 2, MOTOR2_PIN, 1, 2 ) \
80+
TIMER_PIN_MAP( 3, MOTOR3_PIN, 3, 3 ) \
81+
TIMER_PIN_MAP( 4, MOTOR4_PIN, 2, 4 )
8282

83-
#define ADC1_DMA_OPT 6
84-
85-
#define SPI1_TX_DMA_OPT 14
86-
#define SPI2_TX_DMA_OPT 10
87-
#define SPI3_TX_DMA_OPT 9
88-
#define SPI1_RX_DMA_OPT 13
89-
#define SPI2_RX_DMA_OPT 11
90-
#define SPI3_RX_DMA_OPT 8
83+
#define ADC1_DMA_OPT 8
9184

9285
#define VTX_SMARTAUDIO_UART SERIAL_PORT_USART2
9386
#define SERIALRX_UART SERIAL_PORT_USART3
9487

9588
#define BARO_I2C_INSTANCE I2CDEV_1
9689
#define MAG_I2C_INSTANCE I2CDEV_1
97-
#define SERIALRX_PROVIDER SERIALRX_CRSF
90+
9891
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
99-
//TODO #define DSHOT_IDLE_VALUE 450
10092
#define DEFAULT_DSHOT_BURST DSHOT_DMAR_OFF
10193
#define DEFAULT_DSHOT_BITBANG DSHOT_BITBANG_ON
10294
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
@@ -107,4 +99,3 @@
10799
#define FLASH_SPI_INSTANCE SPI3
108100
#define GYRO_1_SPI_INSTANCE SPI1
109101
#define GYRO_1_ALIGN CW180_DEG
110-
#define GYRO_1_ALIGN_YAW 1800

0 commit comments

Comments
 (0)