From 410ca51a4adec1710cd1f570860797bd432188ed Mon Sep 17 00:00:00 2001
From: Ryan Johnston <31726584+ryanjAA@users.noreply.github.com>
Date: Sun, 21 Feb 2021 20:08:38 -0600
Subject: [PATCH] boards: MRO Control Zero F7 OEM minor update

 - Updating Serial port mapping to be the same across all Control Zero boards
 - CAN2 Silent Pin Update
---
 boards/mro/ctrl-zero-f7-oem/default.cmake              | 2 +-
 boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig | 6 +++---
 boards/mro/ctrl-zero-f7-oem/src/board_config.h         | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/boards/mro/ctrl-zero-f7-oem/default.cmake b/boards/mro/ctrl-zero-f7-oem/default.cmake
index 99c9a8bc59..609f544966 100644
--- a/boards/mro/ctrl-zero-f7-oem/default.cmake
+++ b/boards/mro/ctrl-zero-f7-oem/default.cmake
@@ -14,7 +14,7 @@ px4_add_board(
 		TEL2:/dev/ttyS1
 		GPS1:/dev/ttyS2
 		#RC:/dev/ttyS3
-		#CONSOLE:/dev/ttyS4
+		TEL3:/dev/ttyS4
 		#FRSKY:/dev/ttyS5
 	DRIVERS
 		adc/board_adc
diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig
index fdad0fa052..2cc405eb3f 100644
--- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig
+++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig
@@ -160,8 +160,8 @@ CONFIG_STM32F7_DMA2=y
 CONFIG_STM32F7_DMACAPABLE=y
 CONFIG_STM32F7_FLOWCONTROL_BROKEN=y
 CONFIG_STM32F7_I2C1=y
-CONFIG_STM32H7_I2C3=y
-CONFIG_STM32H7_I2C4=y
+CONFIG_STM32F7_I2C3=y
+CONFIG_STM32F7_I2C4=y
 CONFIG_STM32F7_I2C_DYNTIMEO=y
 CONFIG_STM32F7_I2C_DYNTIMEO_STARTSTOP=10
 CONFIG_STM32F7_OTGFS=y
@@ -208,11 +208,11 @@ CONFIG_UART4_RXDMA=y
 CONFIG_UART4_TXBUFSIZE=1500
 CONFIG_UART7_BAUD=57600
 CONFIG_UART7_RXBUFSIZE=600
-CONFIG_UART7_SERIAL_CONSOLE=y
 CONFIG_UART7_TXBUFSIZE=1500
 CONFIG_UART8_BAUD=57600
 CONFIG_UART8_RXBUFSIZE=600
 CONFIG_UART8_TXBUFSIZE=1500
+CONFIG_UART8_SERIAL_CONSOLE=y
 CONFIG_USART2_BAUD=57600
 CONFIG_USART2_IFLOWCONTROL=y
 CONFIG_USART2_OFLOWCONTROL=y
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 a98f9c40e4..ea3efff8a7 100644
--- a/boards/mro/ctrl-zero-f7-oem/src/board_config.h
+++ b/boards/mro/ctrl-zero-f7-oem/src/board_config.h
@@ -104,6 +104,7 @@
 
 /* CAN Silence: Silent mode control \ ESC Mux select */
 #define GPIO_CAN1_SILENT_S0  /* PF5  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN5)
+#define GPIO_CAN2_SILENT_S0  /* PF5  */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTF|GPIO_PIN5)
 
 /* PWM */
 #define DIRECT_PWM_OUTPUT_CHANNELS  8
@@ -190,8 +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_nPOWER_IN_A,                 \
 		GPIO_VDD_3V3_SPEKTRUM_POWER_EN,   \
 		GPIO_TONE_ALARM_IDLE,             \