From b149089830dca8d40e9d2d8b74a9767139bde32a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 23 Jun 2018 19:27:28 +1000 Subject: [PATCH] HAL_ChibiOS: fixed board IDs and added more bootloaders --- .../hwdef/KakuteF4/hwdef-bl.dat | 5 ++- .../hwdef/MatekF405/hwdef-bl.dat | 3 +- .../hwdef/airbotf4/hwdef-bl.dat | 42 ++++++++++++++++++ .../AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f405-min/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f4by-ch/hwdef.dat | 2 +- .../hwdef/omnibusf4pro/hwdef-bl.dat | 43 +++++++++++++++++++ .../hwdef/omnibusf4pro/hwdef.dat | 2 +- .../hwdef/revo-mini/hwdef-bl.dat | 3 +- .../hwdef/skyviper-f412-rev1/hwdef.dat | 2 +- .../hwdef/skyviper-f412/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat | 43 +++++++++++++++++++ .../AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 +- 14 files changed, 143 insertions(+), 12 deletions(-) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat index ecf1168f56..f6cf1f97c2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat @@ -12,7 +12,7 @@ STM32_PLLM_VALUE 8 FLASH_SIZE_KB 1024 -USB_STRING_PRODUCT "f405-BL" +USB_STRING_PRODUCT "ArduPilot-KakuteF4-BL" # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 @@ -34,4 +34,5 @@ PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat index fcd9511a68..04c04ba28b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat @@ -36,4 +36,5 @@ PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat new file mode 100644 index 0000000000..309eb3751c --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat @@ -0,0 +1,42 @@ +# hw definition file for processing by chibios_pins.py +# for airbotf4 bootloader + +# MCU class and specific type +MCU STM32F4xx STM32F405xx + +# board ID for firmware load +APJ_BOARD_ID 128 + +# crystal frequency +OSCILLATOR_HZ 8000000 +STM32_PLLM_VALUE 8 + +FLASH_SIZE_KB 1024 + +# don't allow bootloader to use more than 16k +FLASH_USE_MAX_KB 16 + +USB_STRING_PRODUCT "ArduPilot-airbotf4-BL" + +# bootloader is installed at zero offset +FLASH_RESERVE_START_KB 0 + +# LEDs +PB5 LED_BOOTLOADER OUTPUT LOW +define HAL_LED_ON 0 + +# the location where the bootloader will put the firmware +define FLASH_BOOTLOADER_LOAD_KB 64 + +# board voltage +STM32_VDD 330U + +# order of UARTs +UART_ORDER OTG1 + +PA11 OTG_FS_DM OTG1 +PA12 OTG_FS_DP OTG1 + +define HAL_USE_EMPTY_STORAGE 1 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index 89014f3825..3c7053312e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -7,7 +7,7 @@ MCU STM32F4xx STM32F405xx HAL_CHIBIOS_ARCH_F405 1 # board ID for firmware load -APJ_BOARD_ID 70 +APJ_BOARD_ID 128 # crystal frequency OSCILLATOR_HZ 8000000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat index 1f54984660..ccf31c390e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat @@ -5,7 +5,7 @@ MCU STM32F4xx STM32F405xx # board ID for firmware load -APJ_BOARD_ID 70 +APJ_BOARD_ID 12 define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_CRAZYFLIE2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-min/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-min/hwdef.dat index 9f93c23b78..c15479d598 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-min/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-min/hwdef.dat @@ -22,7 +22,7 @@ PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE define HAL_INS_DEFAULT HAL_INS_NONE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f4by-ch/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f4by-ch/hwdef.dat index dd083ea727..0a4da151cf 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/f4by-ch/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f4by-ch/hwdef.dat @@ -5,7 +5,7 @@ MCU STM32F4xx STM32F407xx # board ID for firmware load -APJ_BOARD_ID 20 +APJ_BOARD_ID 129 define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_F4BY # USB setup diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat new file mode 100644 index 0000000000..f5ccb9fbe4 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat @@ -0,0 +1,43 @@ +# hw definition file for processing by chibios_pins.py +# for omnibusf4pro bootloader + +# MCU class and specific type +MCU STM32F4xx STM32F405xx + +# board ID for firmware load +APJ_BOARD_ID 131 + +# crystal frequency +OSCILLATOR_HZ 8000000 +STM32_PLLM_VALUE 8 + +FLASH_SIZE_KB 1024 + +# don't allow bootloader to use more than 16k +FLASH_USE_MAX_KB 16 + +USB_STRING_PRODUCT "ArduPilot-omnibusf4pro-BL" + +# bootloader is installed at zero offset +FLASH_RESERVE_START_KB 0 + +# LEDs +PB5 LED_BOOTLOADER OUTPUT LOW +PBB LED_ACTIVITY OUTPUT LOW +define HAL_LED_ON 0 + +# the location where the bootloader will put the firmware +define FLASH_BOOTLOADER_LOAD_KB 64 + +# board voltage +STM32_VDD 330U + +# order of UARTs +UART_ORDER OTG1 + +PA11 OTG_FS_DM OTG1 +PA12 OTG_FS_DP OTG1 + +define HAL_USE_EMPTY_STORAGE 1 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index de96a4a52a..5e3ab4751d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -7,7 +7,7 @@ MCU STM32F4xx STM32F405xx HAL_CHIBIOS_ARCH_F405 1 # board ID for firmware load -APJ_BOARD_ID 70 +APJ_BOARD_ID 131 # crystal frequency OSCILLATOR_HZ 8000000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat index b8e455a834..73497e0589 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat @@ -39,4 +39,5 @@ PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat index 86684033ac..5905db455b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat @@ -120,7 +120,7 @@ define HAL_GPIO_RADIO_IRQ 100 define HAL_RCINPUT_WITH_AP_RADIO 1 define STORAGE_FLASH_PAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 # setup defines for ArduCopter config define TOY_MODE_ENABLED ENABLED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat index 5409171940..e48687d9f9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat @@ -112,7 +112,7 @@ define HAL_GPIO_RADIO_IRQ 100 define HAL_RCINPUT_WITH_AP_RADIO 1 define STORAGE_FLASH_PAGE 1 -define HAL_STORAGE_SIZE 16384 +define HAL_STORAGE_SIZE 15360 # setup defines for ArduCopter config define TOY_MODE_ENABLED ENABLED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat new file mode 100644 index 0000000000..1622726541 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat @@ -0,0 +1,43 @@ +# hw definition file for processing by chibios_pins.py +# for sparky2 bootloader + +# MCU class and specific type +MCU STM32F4xx STM32F405xx + +# board ID for firmware load +APJ_BOARD_ID 130 + +# crystal frequency +OSCILLATOR_HZ 8000000 +STM32_PLLM_VALUE 8 + +FLASH_SIZE_KB 1024 + +# don't allow bootloader to use more than 16k +FLASH_USE_MAX_KB 16 + +USB_STRING_PRODUCT "ArduPilot-sparky2-BL" + +# bootloader is installed at zero offset +FLASH_RESERVE_START_KB 0 + +# LEDs +PB5 LED_BOOTLOADER OUTPUT LOW +PB4 LED_ACTIVITY OUTPUT LOW +define HAL_LED_ON 0 + +# the location where the bootloader will put the firmware +define FLASH_BOOTLOADER_LOAD_KB 64 + +# board voltage +STM32_VDD 330U + +# order of UARTs +UART_ORDER OTG1 + +PA11 OTG_FS_DM OTG1 +PA12 OTG_FS_DP OTG1 + +define HAL_USE_EMPTY_STORAGE 1 +define HAL_STORAGE_SIZE 15360 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index 2d4b9f634e..3edbd39d49 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -5,7 +5,7 @@ MCU STM32F4xx STM32F405xx # board ID for firmware load -APJ_BOARD_ID 70 +APJ_BOARD_ID 130 # crystal frequency OSCILLATOR_HZ 8000000