diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/F4AIO.png b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/F4AIO.png
new file mode 100644
index 0000000000..bf2054fac5
Binary files /dev/null and b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/F4AIO.png differ
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/README.md b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/README.md
index 5f91842f97..e5c560f65c 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/README.md
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/README.md
@@ -1,6 +1,10 @@
 # BETAFPV F405 AIO Flight Controller
 
-The BETAFPV F405 AIO is a flight controller produced by [BETAFPV](https://betafpv.com/collections/brushless-flight-controller/products/f4-1s-12a-aio-brushless-flight-controller-v3-0).
+The BETAFPV F405 AIO is a series of flight controllers produced by [BETAFPV](https://betafpv.com)
+
+[BETAFPV F4 1S 12A AIO Brushless Flight Controller V3](https://betafpv.com/collections/brushless-flight-controller/products/f4-1s-12a-aio-brushless-flight-controller-v3-0).
+[BETAFPV F4 2-3S 20A AIO FC V1](https://betafpv.com/collections/flight-controller-1/products/f4-2-3s-20a-aio-fc-v1)
+[BETAFPV F405 4S 20A Toothpick Brushless Flight Controller V5](https://betafpv.com/collections/flight-controller-1/products/f405-4s-20a-toothpick-brushless-flight-controller-v5-blheli_s-icm42688)
 
 ## Features
 
@@ -10,13 +14,15 @@ The BETAFPV F405 AIO is a flight controller produced by [BETAFPV](https://betafp
  - BEC output: 5V, 2A@4V
  - Barometer: BMP280
  - OSD: AT7456E
- - 5 UARTS: (UART1, UART3, UART4, UART5, UART6)
+ - Up to 5 UARTS: (UART1, UART3, UART4, UART5, UART6)
  - 5 PWM outputs (4 motor outputs used internally for integrated 4-in-1 ESC and 1 integrated LED)
  - Integrated 4-in-1 BlueJay ESC
 
 ## Pinout
 
-![BETAFPV F405 AIO Board](betafpv_f405_pinout.jpg "BETAFPV F405 AIO")
+![BETAFPV F4 2-3S 20A AIO FC V1](F4AIO.png "BETAFPV F4 2-3S 20A AIO FC V1")
+![BETAFPV F405 4S 20A Toothpick Brushless Flight Controller V5](Toothpick20A.png "F405 4S 20A Toothpick Brushless Flight Controller V5")
+![BETAFPV F4 1S 12A AIO Brushless Flight Controller V3](betafpv_f405_pinout.jpg "F4 1S 12A AIO Brushless Flight Controller V3")
 
 ## UART Mapping
 
@@ -31,6 +37,18 @@ receive pin for UARTn. The Tn pin is the transmit pin for UARTn.
 |SERIAL5|RX5|UART5 (SBUS, inverted and connected to RX-only)|
 |SERIAL6|TX6/RX6|UART6 (Spare, DMA-enabled)|
 
+### F405 4S 20A Toothpick
+|Name|Pin|Function|
+|:-|:-|:-|
+|SERIAL3|RX3|UART3 (SBUS)
+|SERIAL5|RX5|UART5 (Missing)|
+
+### F404 1S 12A AIO v3
+|Name|Pin|Function|
+|:-|:-|:-|
+|SERIAL5|RX5|UART5 (Missing)|
+|SERIAL6|RX6|UART6 (SBUS)|
+
 ## RC Input
 
 RC input is configured on the on-board ELRS on UART3 or through (UART6_RX/UART6_TX) pins. It supports all serial RC protocols.
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/Toothpick20A.png b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/Toothpick20A.png
new file mode 100644
index 0000000000..9abc3c5936
Binary files /dev/null and b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/Toothpick20A.png differ
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat
index 383be60dc3..1b406b721c 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat
@@ -49,7 +49,7 @@ PB4 BUZZER OUTPUT GPIO(80) LOW
 define HAL_BUZZER_PIN 80
 
 # SERIAL ports
-SERIAL_ORDER OTG1 USART1 EMPTY USART3 UART4 EMPTY USART6
+SERIAL_ORDER OTG1 USART1 EMPTY USART3 UART4 UART5 USART6
 # PA10 IO-debug-console
 PA11 OTG_FS_DM OTG1
 PA12 OTG_FS_DP OTG1
@@ -151,7 +151,8 @@ define HAL_FRAME_TYPE_DEFAULT 12
 # Generally no compass so need accurate IMU source
 define HAL_INS_TEMPERATURE_CAL_ENABLE 1
 define AP_BARO_SPL06_BACKGROUND_ENABLE 1
-
+# 4S version has no baro
+define HAL_BARO_ALLOW_INIT_NO_BARO 1
 
 include ../include/minimize_fpv_osd.inc
 AUTOBUILD_TARGETS Copter