Skip to content

Commit 17b09ca

Browse files
haslinghuisot0tot
andauthored
NEUTRONRCH7BT Add gate for MAG (#941)
* NEUTRONRCH7BT Add gate for MAG * Fix DMA/timer assignments Also removed second USE_MAG define and moved USE_BARO to head. --------- Co-authored-by: ot0tot <[email protected]>
1 parent d2ace6f commit 17b09ca

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

configs/NEUTRONRCH7BT/config.h

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
#define USE_FLASH
3131
#define USE_FLASH_W25N01G
3232
#define USE_MAX7456
33+
#define USE_BARO
3334
#define USE_BARO_DPS310
35+
#define USE_SDCARD
36+
37+
38+
#ifndef USE_MAG
3439
#define USE_MAG
3540
#define USE_MAG_QMC5883
36-
#define USE_SDCARD
41+
#endif
3742

3843
#define BEEPER_PIN PA15
3944
#define MOTOR1_PIN PB0
@@ -106,31 +111,15 @@
106111
TIMER_PIN_MAP( 5, PA3 , 2, 5) \
107112
TIMER_PIN_MAP( 6, PD12, 1, 6) \
108113
TIMER_PIN_MAP( 7, PD13, 1, 7) \
109-
TIMER_PIN_MAP( 8, PD14, 1, 12) \
110-
TIMER_PIN_MAP( 9, PD15, 1, -1) \
111-
TIMER_PIN_MAP(10, PE5 , 1, 0) \
112-
TIMER_PIN_MAP(11, PE6 , 1, -1) \
113-
TIMER_PIN_MAP(12, PA8 , 1, 14) \
114-
TIMER_PIN_MAP(13, PA15, 1, 0) \
115-
TIMER_PIN_MAP(14, PC7 , 2, 0) \
116-
TIMER_PIN_MAP(15, PC6 , 2, 0) \
117-
TIMER_PIN_MAP(16, PB8 , 1, 0) \
118-
TIMER_PIN_MAP(17, PB9 , 1, 0)
119-
114+
TIMER_PIN_MAP( 8, PA8 , 1, 14)
120115

121116
#define ADC1_DMA_OPT 8
122117
#define ADC3_DMA_OPT 9
123-
#define TIMUP1_DMA_OPT 0
124-
#define TIMUP2_DMA_OPT 0
125-
#define TIMUP3_DMA_OPT 2
126-
#define TIMUP4_DMA_OPT 1
127-
#define TIMUP5_DMA_OPT 0
128-
#define TIMUP8_DMA_OPT 0
118+
#define TIMUP3_DMA_OPT 10
119+
#define TIMUP5_DMA_OPT 11
129120

130121
#define DEFAULT_GYRO_TO_USE GYRO_CONFIG_USE_GYRO_BOTH
131122
#define MAG_I2C_INSTANCE I2CDEV_1
132-
#define USE_BARO
133-
#define USE_MAG
134123
#define BARO_I2C_INSTANCE I2CDEV_2
135124
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
136125
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC

0 commit comments

Comments
 (0)