diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF407/hwdef.dat
index cc1714dddc..82c448a70d 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF407/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF407/hwdef.dat
@@ -82,8 +82,8 @@ PB4 SPI3_MISO SPI3
 PB5 SPI3_MOSI SPI3
 
 SPIDEV icm20689   SPI1 DEVID1  ICM20689_CS  MODE3   2*MHZ    8*MHZ
-SPIDEV ramtron    SPI2 DEVID1  FRAM_CS        MODE3   8*MHZ    8*MHZ
-SPIDEV sdcard     SPI2 DEVID2  FLASH_CS        MODE0   1*MHZ    8*MHZ
+SPIDEV ramtron    SPI2 DEVID1  FRAM_CS      MODE3   8*MHZ    8*MHZ
+SPIDEV sdcard     SPI2 DEVID2  FLASH_CS     MODE0   1*MHZ    8*MHZ
 
 # one IMU
 IMU Invensense SPI:icm20689 ROTATION_YAW_270
@@ -117,23 +117,23 @@ PB10 I2C2_SCL I2C2
 PB11 I2C2_SDA I2C2
 
 # PWM out pins
-PA0    TIM2_CH1 TIM2 PWM(1)   GPIO(50)
-PA1    TIM2_CH2 TIM2 PWM(2)   GPIO(51)
-PA2    TIM2_CH3 TIM2 PWM(3)   GPIO(52)
-PA3    TIM2_CH4 TIM2 PWM(4)   GPIO(53)
-PE9    TIM1_CH1 TIM1 PWM(5)   GPIO(54)
-PE11  TIM1_CH2 TIM1 PWM(6)   GPIO(55)
-PE13  TIM1_CH3 TIM1 PWM(7)   GPIO(56)
-PE14  TIM1_CH4 TIM1 PWM(8)   GPIO(57)
-PD12 TIM4_CH1 TIM4 PWM(9)   GPIO(58)
+PA0  TIM2_CH1 TIM2 PWM(1)  GPIO(50)
+PA1  TIM2_CH2 TIM2 PWM(2)  GPIO(51)
+PA2  TIM2_CH3 TIM2 PWM(3)  GPIO(52)
+PA3  TIM2_CH4 TIM2 PWM(4)  GPIO(53)
+PE9  TIM1_CH1 TIM1 PWM(5)  GPIO(54)
+PE11 TIM1_CH2 TIM1 PWM(6)  GPIO(55)
+PE13 TIM1_CH3 TIM1 PWM(7)  GPIO(56)
+PE14 TIM1_CH4 TIM1 PWM(8)  GPIO(57)
+PD12 TIM4_CH1 TIM4 PWM(9)  GPIO(58)
 PD13 TIM4_CH2 TIM4 PWM(10) GPIO(59)
 PD14 TIM4_CH3 TIM4 PWM(11) GPIO(60)
 PD15 TIM4_CH4 TIM4 PWM(12) GPIO(61)
 
-PE4   EXTERN_GPIO1 OUTPUT GPIO(1)
+PE4  EXTERN_GPIO1 OUTPUT GPIO(1)
 PC13 EXTERN_GPIO2 OUTPUT GPIO(2)
 PC14 EXTERN_GPIO3 OUTPUT GPIO(3)
-PE6   EXTERN_GPIO4 OUTPUT GPIO(4)
+PE6  EXTERN_GPIO4 OUTPUT GPIO(4)
 PC15 EXTERN_GPIO5 OUTPUT GPIO(5)
 define RELAY1_PIN_DEFAULT 1
 define RELAY2_PIN_DEFAULT 2
@@ -142,7 +142,7 @@ define RELAY4_PIN_DEFAULT 4
 define RELAY5_PIN_DEFAULT 5
 
 # also USART6_RX for serial RC
-PC7 TIM8_CH2 TIM8 RCIN PULLDOWN LOW DMA_CH0
+PC6 TIM8_CH1 TIM8 RCININT PULLDOWN LOW DMA_CH0
 
 # LED setup is similar to PixRacer
 define HAL_HAVE_PIXRACER_LED