diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/OrqaFC3030F405_Board.png b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/OrqaFC3030F405_Board.png
new file mode 100644
index 0000000000..1c1a2cc53e
Binary files /dev/null and b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/OrqaFC3030F405_Board.png differ
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/README.md b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/README.md
new file mode 100644
index 0000000000..b78866eb3e
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/README.md
@@ -0,0 +1,87 @@
+# Orqa FC 3030 F405 Flight Controller
+
+The Orqa FC 3030 F405 is a flight controller produced by [Orqa](https://enterprise.orqafpv.com/).
+
+## Features
+
+ - MCU - STM32F405 32-bit processor
+ - IMU - MPU6000
+ - Barometer - DPS310
+ - OSD - AT7456E
+ - Onboard Flash: 128Mbit
+ - 4x UARTs
+ - 8x PWM Outputs (8 Motor Output)
+ - Battery input voltage: 2S-6S
+ - BEC 5V 2A
+ - BEC 10V 2A
+
+## Pinout
+
+![Orqa FC 3030 F405 Board](OrqaFC3030F405_Board.png "Orqa FC 3030 F405")
+
+## UART Mapping
+
+The UARTs are marked Rn and Tn in the above pinouts. The Rn pin is the
+receive pin for UARTn. The Tn pin is the transmit pin for UARTn.
+
+ - SERIAL0 -> USB
+ - SERIAL1 -> UART1 (RX/GHST, DMA-enabled)
+ - SERIAL3 -> UART3 (GPS, DMA-enabled)
+ - SERIAL5 -> UART5 (ESC Telemetry)
+ - SERIAL6 -> UART6 (Sik/MAVLink)
+
+## RC Input
+
+RC input is configured for GHST by default on the T1 (UART1_TX) pin using half-duplex. To support other RC protocols set SERIAL1_OPTIONS to 0. This will support all serial RC protocols except SBUS. For PPM and SBUS support on UART1_RX set BRD_ALT_CONFIG to 1.
+  
+## OSD Support
+
+The Orqa FC 3030 F405 supports OSD using OSD_TYPE 1 (MAX7456 driver) or OSD_TYPE 3 if using DJI OSD
+
+## PWM Output
+
+The Orqa FC 3030 F405 supports up to 8 PWM outputs in the JST-GH ESC and MFC connectors. Outputs 5-8 are labeled as GPIO1-4 on the 7pin JST-GH connector
+
+The PWM is in 3 groups:
+
+ - PWM 1,4-6 in group1
+ - PWM 2-3 in group2
+ - PWM 7-8 in group3
+
+Channels within the same group need to use the same output rate. If
+any channel in a group uses DShot then all channels in the group need
+to use dshot. All channels support dshot. Channels 1-4 support bi-directional dshot.
+All channels can also be used for GPIO.
+
+## Battery Monitoring
+
+The board has a builting voltage and current sensor. The current
+sensor can read up to 130 Amps. The voltage sensor can handle up to 6S
+LiPo batteries.
+
+The correct battery setting parameters are:
+
+ - BATT_MONITOR 4
+ - BATT_VOLT_PIN 13
+ - BATT_CURR_PIN 12
+ - BATT_VOLT_MULT 8.3
+ - BATT_AMP_PERVLT 92.6
+
+## VTX Control
+
+Switching between Camera1 and Camera2 can be achieved via GPIO pin 74 which is configured on RELAY2
+
+## Compass
+
+The Orqa FC 3030 F405 does not have a builtin compass, but you can attach an external compass using I2C on the SDA and SCL pin.
+
+## Loading Firmware
+
+Initial firmware load can be done with DFU by plugging in USB with the
+bootloader button pressed. Then you should load the "with_bl.hex"
+firmware, using your favourite DFU loading tool.
+
+Once the initial firmware is loaded you can update the firmware using
+any ArduPilot ground station software. Updates should be done with the
+*.apj firmware files.
+
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef-bl.dat
new file mode 100644
index 0000000000..f602396f6e
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef-bl.dat
@@ -0,0 +1,43 @@
+
+# hw definition file for processing by chibios_hwdef.py
+# for F4PRO hardware.
+# thanks to betaflight for pin information
+
+# MCU class and specific type
+MCU STM32F4xx STM32F405xx
+
+# board ID for firmware load
+APJ_BOARD_ID 1155
+
+# crystal frequency, setup to use external oscillator
+OSCILLATOR_HZ 8000000
+
+FLASH_SIZE_KB 1024
+
+# bootloader starts at zero offset
+FLASH_RESERVE_START_KB 0
+
+# the location where the bootloader will put the firmware
+FLASH_BOOTLOADER_LOAD_KB 48
+
+# order of UARTs (and USB)
+SERIAL_ORDER OTG1
+
+# PA10 IO-debug-console
+PA11 OTG_FS_DM OTG1
+PA12 OTG_FS_DP OTG1
+
+PA13 JTMS-SWDIO SWD
+PA14 JTCK-SWCLK SWD
+
+# default to all pins low to avoid ESD issues
+DEFAULTGPIO OUTPUT LOW PULLDOWN
+
+
+# Chip select pins
+PB3 FLASH1_CS CS
+PB12 OSD1_CS CS
+PA4 GYRO1_CS CS
+
+PA15 LED_BOOTLOADER OUTPUT LOW
+define HAL_LED_ON 0
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef.dat
new file mode 100644
index 0000000000..ffa8aff06c
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OrqaF405Pro/hwdef.dat
@@ -0,0 +1,154 @@
+
+# hw definition file for processing by chibios_hwdef.py
+# for Orqa F405 PRO hardware.
+# thanks to betaflight for pin information
+
+# MCU class and specific type
+MCU STM32F4xx STM32F405xx
+
+# board ID for firmware load
+APJ_BOARD_ID 1155
+
+# crystal frequency, setup to use external oscillator
+OSCILLATOR_HZ 8000000
+
+FLASH_SIZE_KB 1024
+
+# bootloader takes first sector
+FLASH_RESERVE_START_KB 48
+
+define HAL_STORAGE_SIZE 16384
+define STORAGE_FLASH_PAGE 1
+
+STM32_ST_USE_TIMER 5
+
+# SPI devices
+
+# SPI1
+PA5 SPI1_SCK SPI1
+PA6 SPI1_MISO SPI1
+PA7 SPI1_MOSI SPI1
+
+# SPI2
+PB13 SPI2_SCK SPI2
+PB14 SPI2_MISO SPI2
+PB15 SPI2_MOSI SPI2
+
+# SPI3
+PB5 SPI3_MOSI SPI3
+PC10 SPI3_SCK SPI3
+PC11 SPI3_MISO SPI3
+
+# Chip select pins
+PB3 FLASH1_CS CS
+PB12 OSD1_CS CS
+PA4 GYRO1_CS CS
+
+# Beeper
+PA8 TIM1_CH1 TIM1 GPIO(80) ALARM
+PA8 BUZZER OUTPUT GPIO(81) LOW ALT(1)
+
+# SERIAL ports
+SERIAL_ORDER OTG1 USART1 EMPTY USART3 EMPTY UART5 USART6
+# PA10 IO-debug-console
+PA11 OTG_FS_DM OTG1
+PA12 OTG_FS_DP OTG1
+
+# USART1 - RX
+PA10 USART1_RX USART1
+PA9 USART1_TX USART1
+# Default is GHST protocol
+define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_RCIN
+define DEFAULT_SERIAL1_OPTIONS 4
+PA10 TIM1_CH3 TIM1 RCININT PULLDOWN LOW ALT(1)
+
+# USART3 - GPS
+PB10 USART3_TX USART3
+PB11 USART3_RX USART3
+define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS
+
+# UART5 - ESC Telemetry
+PD2 UART5_RX UART5 NODMA
+define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_ESCTelemetry
+
+# USART6 - Sik
+PC6 USART6_TX USART6 NODMA
+PC7 USART6_RX USART6 NODMA
+define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MAVLink2
+
+# I2C ports
+I2C_ORDER I2C1
+# I2C1
+PB6 I2C1_SCL I2C1
+PB7 I2C1_SDA I2C1
+
+# VTX switch
+PB9 VTX_SW OUTPUT GPIO(74) LOW
+define RELAY2_PIN_DEFAULT 74
+
+# ADC ports
+# ADC1
+PC1 BATT_VOLTAGE_SENS ADC1 SCALE(1)
+define HAL_BATT_VOLT_PIN 11
+define HAL_BATT_VOLT_SCALE 8.3
+PC3 BATT_CURRENT_SENS ADC1 SCALE(1)
+define HAL_BATT_CURR_PIN 13
+define HAL_BATT_CURR_SCALE 92.6
+define HAL_BATT_MONITOR_DEFAULT 4
+
+# MOTORS
+PA3 TIM2_CH4 TIM2 PWM(1) GPIO(50) BIDIR # M1
+PB0 TIM3_CH3 TIM3 PWM(2) GPIO(51)       # M2
+PB1 TIM3_CH4 TIM3 PWM(3) GPIO(52) BIDIR # M3
+PA2 TIM2_CH3 TIM2 PWM(4) GPIO(53)       # M4
+
+PA0 TIM2_CH1 TIM2 PWM(5) GPIO(54)       # M5
+PA1 TIM2_CH2 TIM2 PWM(6) GPIO(55)       # M6
+PC8 TIM8_CH3 TIM8 PWM(7) GPIO(56)       # M7
+PC9 TIM8_CH4 TIM8 PWM(8) GPIO(57)       # M8
+
+# LEDs
+# Red
+PA15 LED0 OUTPUT LOW GPIO(90)
+define HAL_GPIO_B_LED_PIN 90
+# Green
+PB4 LED1 OUTPUT LOW GPIO(91)
+define HAL_GPIO_A_LED_PIN 91
+define HAL_GPIO_LED_OFF 1
+
+# Dataflash setup
+SPIDEV dataflash SPI3 DEVID1 FLASH1_CS     MODE3 104*MHZ 104*MHZ
+
+define HAL_LOGGING_DATAFLASH_ENABLED 1
+
+# OSD setup
+SPIDEV osd SPI2 DEVID1 OSD1_CS   MODE0  10*MHZ  10*MHZ
+
+define OSD_ENABLED 1
+define HAL_OSD_TYPE_DEFAULT 1
+ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
+
+# Barometer setup
+BARO DPS310 I2C:0:0x77
+        
+# IMU setup
+
+# IMU setup
+SPIDEV imu1   SPI1 DEVID1 GYRO1_CS   MODE3   1*MHZ   8*MHZ
+SPIDEV imu2   SPI1 DEVID1 GYRO1_CS   MODE3   1*MHZ   8*MHZ
+
+IMU Invensense SPI:imu1 ROTATION_YAW_90
+DMA_NOSHARE TIM2_UP TIM3_UP SPI1*
+DMA_PRIORITY TIM2_UP TIM3_UP SPI1*
+
+# no built-in compass, but probe the i2c bus for all possible
+# external compass types
+define ALLOW_ARM_NO_COMPASS
+define HAL_PROBE_EXTERNAL_I2C_COMPASSES
+define HAL_I2C_INTERNAL_MASK 0
+define HAL_COMPASS_AUTO_ROT_DEFAULT 2
+define HAL_DEFAULT_INS_FAST_SAMPLE 1
+# Motor order implies Betaflight/X for standard ESCs
+define HAL_FRAME_TYPE_DEFAULT 12
+
+include ../include/minimize_fpv_osd.inc