From de273fb76d9f57d060bddec4feb120be82b4e2d2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jan 2022 16:33:27 +1100 Subject: [PATCH] hwdef: fixed f405-MatekGPS storage location and CAN this allows for CAN firmware update using f405-MatekGPS bootloader by fixing a typo, then moves storage to allow the bootloader with can to fit on the board this will allow CAN update of peripheral firmware for Matek GPS and airspeed sensors --- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat | 5 +++-- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat index 0dcb6c1973..91fd9eae63 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat @@ -40,11 +40,12 @@ PD2 UART5_RX UART5 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 -define HAL_USE_CAN1 TRUE +PC13 GPIO_CAN1_SILENT OUTPUT PUSHPULL SPEED_LOW LOW + +define HAL_USE_CAN TRUE define STM32_CAN_USE_CAN1 TRUE define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekGPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat index e29a432774..43482087a9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat @@ -7,8 +7,8 @@ MCU STM32F4xx STM32F405xx FLASH_RESERVE_START_KB 64 FLASH_SIZE_KB 1024 -# store parameters in pages 11 and 12 -STORAGE_FLASH_PAGE 1 +# store parameters in pages 2 and 3 +STORAGE_FLASH_PAGE 2 define HAL_STORAGE_SIZE 15360 # board ID for firmware load