Skip to content

Commit 485f789

Browse files
Merge pull request #11127 from functionpointer/nexus_xr_fix_resource_conflict
NEXUSX: fix UART3/I2C2 resource conflict
2 parents 8437209 + d3b63d2 commit 485f789

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/main/target/NEXUSX/target.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#define USE_I2C_DEVICE_2 // clashes with UART3
5151
#define I2C2_SCL PB10
5252
#define I2C2_SDA PB11
53+
#define I2C_DEVICE_2_SHARES_UART3
5354
#define DEFAULT_I2C BUS_I2C2
5455

5556
#define USE_BARO
@@ -78,11 +79,9 @@
7879
// *************** UART *****************************
7980
#define USE_VCP
8081

81-
#ifdef NEXUSX
8282
#define USE_UART1 // clashes with I2C1
8383
#define UART1_TX_PIN PB6 // pin labelled "AUX"
8484
#define UART1_RX_PIN PB7 // pin labelled "SBUS"
85-
#endif
8685

8786
#define USE_UART2
8887
#define UART2_TX_PIN PA2 // pin labelled as "RPM"

0 commit comments

Comments
 (0)