Skip to content

Commit 33605be

Browse files
authored
Fix ARK_FPV (betaflight#682)
* Fix ARK_FPV * Update DMA
1 parent a7bce78 commit 33605be

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

configs/ARK_FPV/config.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
// #define PINIO2_BOX 40
5454

5555
// GPS1 UART
56+
#ifndef USE_GPS
5657
#define USE_GPS
58+
#endif
5759
#define UART1_TX_PIN PB6
5860
#define UART1_RX_PIN PB7
5961
#define GPS_UART SERIAL_PORT_UART1
@@ -84,7 +86,6 @@
8486
#define MSP_DISPLAYPORT_UART SERIAL_PORT_UART5
8587

8688
// RC Input
87-
#define USE_SERIALRX
8889
#define UART6_TX_PIN PC6
8990
#define UART6_RX_PIN PC7
9091
#define SERIALRX_UART SERIAL_PORT_UART6
@@ -103,8 +104,12 @@
103104
#define BARO_I2C_INSTANCE I2CDEV_2
104105

105106
// Compass I2C bus
107+
#ifndef USE_MAG
106108
#define USE_MAG
109+
#endif
110+
#ifndef USE_MAG_LIS2MDL
107111
#define USE_MAG_LIS2MDL
112+
#endif
108113
#define I2C4_SCL_PIN PF14
109114
#define I2C4_SDA_PIN PF15
110115
#define MAG_I2C_INSTANCE I2CDEV_4
@@ -175,13 +180,13 @@
175180
// NOTE: dma_opt unnecessary since H7 has dmamux
176181
#define TIMER_PIN_MAPPING \
177182
TIMER_PIN_MAP(0, MOTOR1_PIN, 1, 0) \
178-
TIMER_PIN_MAP(1, MOTOR2_PIN, 1, 0) \
179-
TIMER_PIN_MAP(2, MOTOR3_PIN, 1, 0) \
180-
TIMER_PIN_MAP(3, MOTOR4_PIN, 1, 0) \
181-
TIMER_PIN_MAP(4, MOTOR5_PIN, 1, 0) \
182-
TIMER_PIN_MAP(5, MOTOR6_PIN, 1, 0) \
183-
TIMER_PIN_MAP(6, MOTOR7_PIN, 1, 0) \
184-
TIMER_PIN_MAP(7, MOTOR8_PIN, 1, 0)
183+
TIMER_PIN_MAP(1, MOTOR2_PIN, 1, 1) \
184+
TIMER_PIN_MAP(2, MOTOR3_PIN, 1, 2) \
185+
TIMER_PIN_MAP(3, MOTOR4_PIN, 1, 3) \
186+
TIMER_PIN_MAP(4, MOTOR5_PIN, 1, 4) \
187+
TIMER_PIN_MAP(5, MOTOR6_PIN, 1, 5) \
188+
TIMER_PIN_MAP(6, MOTOR7_PIN, 1, 6) \
189+
TIMER_PIN_MAP(7, MOTOR8_PIN, 1, 7)
185190

186191
// DMA stream assignment
187192
#define TIMUP8_DMA_OPT 10

0 commit comments

Comments
 (0)