From 1248519b11aa376b945586c3448106a31dac80d5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 21 Dec 2019 16:51:30 +1100 Subject: [PATCH] HAL_ChibiOS: account for empty uarts in uart count this fixes uart count on MatekF405-Wing --- libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index 4a401a24af..5832cf681f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -938,10 +938,12 @@ def write_UART_config(f): devnames = "ABCDEFGH" sdev = 0 idx = 0 + num_empty_uarts = 0 for dev in uart_list: if dev == 'EMPTY': f.write('#define HAL_UART%s_DRIVER Empty::UARTDriver uart%sDriver\n' % (devnames[idx], devnames[idx])) + num_empty_uarts += 1 else: f.write( '#define HAL_UART%s_DRIVER ChibiOS::UARTDriver uart%sDriver(%u)\n' @@ -1039,7 +1041,7 @@ def write_UART_config(f): num_uarts = len(devlist) if 'IOMCU_UART' in config: num_uarts -= 1 - f.write('#define HAL_UART_NUM_SERIAL_PORTS %u\n' % num_uarts) + f.write('#define HAL_UART_NUM_SERIAL_PORTS %u\n' % (num_uarts+num_empty_uarts)) def write_UART_config_bootloader(f): '''write UART config defines'''