diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
index e8e0561788..2e8658b66b 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
@@ -32,7 +32,13 @@ STM32_VDD 330U
 I2C_ORDER I2C1
 
 # order of UARTs (and USB), USART3 should be in second place to map order with the board's silk screen
-UART_ORDER OTG1 USART3 USART1 USART2 UART4
+UART_ORDER OTG1 USART3 USART1 USART2 UART4 UART7
+
+# buzzer
+PD15 BUZZER OUTPUT GPIO(80) LOW
+define HAL_BUZZER_PIN 80
+define HAL_BUZZER_ON 1
+define HAL_BUZZER_OFF 0
 
 # PA10 IO-debug-console
 PA11 OTG_FS_DM OTG1
@@ -41,8 +47,6 @@ PA12 OTG_FS_DP OTG1
 PA13 JTMS-SWDIO SWD
 PA14 JTCK-SWCLK SWD
 
-PA2 LED0 OUTPUT LOW
-
 # SPI1 for SDCard
 PA4 SDCARD_CS CS
 PA5 SPI1_SCK SPI1
@@ -76,6 +80,8 @@ define HAL_BATT_CURR_SCALE 17.0
  
 PC5 RSSI_ADC ADC1
 
+PA2 LED0 OUTPUT LOW
+
 # USART1
 PA10 USART1_RX USART1
 PA9  USART1_TX USART1
@@ -85,8 +91,8 @@ PD5 USART2_TX USART2
 PD6 USART2_RX USART2
 
 # USART3 (GPS)
-PB11 USART3_RX USART3 NODMA
-PB10 USART3_TX USART3 NODMA
+PB11 USART3_RX USART3
+PB10 USART3_TX USART3
 
 # UART4 (GPS2)
 PA0 UART4_TX UART4 NODMA
@@ -96,19 +102,16 @@ PA1 UART4_RX UART4 NODMA
 PC7 TIM8_CH2 TIM8 RCININT FLOAT LOW
 
 # UART7 USED BY ESC FROM ORIGINAL DESIGN
-#PE7 UART7_RX UART7
+PE7 UART7_RX UART7
+PE8 UART7_TX UART7
 
-PB0  TIM3_CH3 TIM3 PWM(1)
-PB1  TIM3_CH4 TIM3 PWM(2)
-PE9  TIM1_CH1 TIM1 PWM(3)
-PE11 TIM1_CH2 TIM1 PWM(4)
-PC9  TIM8_CH4 TIM8 PWM(5)
-PA3  TIM5_CH4 TIM5 PWM(6)
-
-PD15 BUZZER OUTPUT GPIO(80) LOW
-define HAL_BUZZER_PIN 80
-define HAL_BUZZER_ON 1
-define HAL_BUZZER_OFF 0
+# Motors
+PB0  TIM3_CH3 TIM3 PWM(4) GPIO(53)
+PB1  TIM1_CH3N TIM1 PWM(1) GPIO(50)
+PE9  TIM1_CH1 TIM1 PWM(2) GPIO(51)
+PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52)
+PA3  TIM5_CH4 TIM5 PWM(6) GPIO(55)
+PC9  TIM3_CH4 TIM3 PWM(5) GPIO(54)
 
 DMA_PRIORITY S*
 
@@ -138,7 +141,11 @@ define HAL_INS_DEFAULT_ROTATION ROTATION_YAW_180
 
 define HAL_OS_FATFS_IO 1
 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
+define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 
 # setup for OSD
 define OSD_ENABLED ENABLED
 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
+
+define BOARD_PWM_COUNT_DEFAULT 6
+define STM32_PWM_USE_ADVANCED TRUE
\ No newline at end of file