From daf744c67854789bc3f78d10ad0fd10f351d6936 Mon Sep 17 00:00:00 2001
From: Ryan Johnston <31726584+ryanjAA@users.noreply.github.com>
Date: Fri, 5 Mar 2021 14:26:15 -0600
Subject: [PATCH]   MRO Control Zero F7 OEM Fixes (#16977)

* Update i2c 4 pinmap on F7 OEM

Update i2c 4 pinmap

* Fix i2c Internal to External on F7 OEM

Fix i2c Internal to External on F7 OEM

* Add Can2 Silent Pin

Add Can2 Silent Pin
---
 boards/mro/ctrl-zero-f7-oem/nuttx-config/include/board.h | 4 ++--
 boards/mro/ctrl-zero-f7-oem/src/board_config.h           | 4 ++--
 boards/mro/ctrl-zero-f7-oem/src/i2c.cpp                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/include/board.h b/boards/mro/ctrl-zero-f7-oem/nuttx-config/include/board.h
index 51260395e5..4f7dfd37c3 100644
--- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/include/board.h
+++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/include/board.h
@@ -296,5 +296,5 @@
 #define GPIO_I2C3_SCL GPIO_I2C3_SCL_2       /* PH7 */
 #define GPIO_I2C3_SDA GPIO_I2C3_SDA_2       /* PH8 */
 
-#define GPIO_I2C4_SCL GPIO_I2C4_SCL_2       /* PF14 */
-#define GPIO_I2C4_SDA GPIO_I2C4_SDA_2       /* PF15 */
+#define GPIO_I2C4_SCL GPIO_I2C4_SCL_4       /* PB6 */
+#define GPIO_I2C4_SDA GPIO_I2C4_SDA_5       /* PB7 */
diff --git a/boards/mro/ctrl-zero-f7-oem/src/board_config.h b/boards/mro/ctrl-zero-f7-oem/src/board_config.h
index ea3efff8a7..1d86505b72 100644
--- a/boards/mro/ctrl-zero-f7-oem/src/board_config.h
+++ b/boards/mro/ctrl-zero-f7-oem/src/board_config.h
@@ -191,9 +191,9 @@
 		GPIO_CAN1_TX,                     \
 		GPIO_CAN1_RX,                     \
 		GPIO_CAN2_TX,                     \
-		GPIO_CAN2_RX,           	  \
+		GPIO_CAN2_RX,           	        \
 		GPIO_CAN1_SILENT_S0,              \
-		GPIO_CAN2_SILENT_S0,              \
+		GPIO_CAN2_SILENT_S0,		          \
 		GPIO_nPOWER_IN_A,                 \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_TONE_ALARM_IDLE,             \
diff --git a/boards/mro/ctrl-zero-f7-oem/src/i2c.cpp b/boards/mro/ctrl-zero-f7-oem/src/i2c.cpp
index de6742ac58..1b8927c699 100644
--- a/boards/mro/ctrl-zero-f7-oem/src/i2c.cpp
+++ b/boards/mro/ctrl-zero-f7-oem/src/i2c.cpp
@@ -35,6 +35,6 @@
 
 constexpr px4_i2c_bus_t px4_i2c_buses[I2C_BUS_MAX_BUS_ITEMS] = {
 	initI2CBusExternal(1),
-	initI2CBusInternal(3),
+	initI2CBusExternal(3),
 	initI2CBusExternal(4),
 };