From 986ad0dc27a0514b20db71683cc99f137b512830 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 14 Mar 2020 07:38:58 +1100 Subject: [PATCH] HAL_ChibiOS: removed unnecessary subtype defines --- libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat | 3 +-- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 -- 12 files changed, 1 insertion(+), 23 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat index 66d40285fc..42af72e686 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat @@ -1,8 +1,6 @@ # hw definition file for processing by chibios_hwdef.py # for FMUv4pro hardware (Pixhawk 3 Pro) -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_FMUV4PRO - define BOARD_TYPE_DEFAULT 14 # MCU class and specific type diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat index eab03baeb9..c5c172bd94 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat @@ -6,8 +6,7 @@ MCU STM32F4xx STM32F407xx # board ID for firmware load APJ_BOARD_ID 20 -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_F4BY - + # USB setup USB_VENDOR 0x27AC # Swift-Flyer USB_PRODUCT 0x0201 # fmu usb driver diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 9bef46f25c..d80926ed5f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -22,8 +22,6 @@ # MCU class and specific type MCU STM32F4xx STM32F405xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MATEKF405WING - # board ID for firmware load APJ_BOARD_ID 127 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat index 07bfd59503..402011b2ad 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat @@ -5,8 +5,6 @@ # MCU class and specific type MCU STM32F7xx STM32F745xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_OMNIBUSF7V2 - # board ID for firmware load APJ_BOARD_ID 121 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index 2a83a040a6..4287f68ea6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -81,8 +81,6 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_AIRBOTF4 - # one IMU IMU Invensense SPI:mpu6000_cs ROTATION_YAW_180 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat index 5e747a1b6e..69ecf215c0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat @@ -7,8 +7,6 @@ MCU STM32F4xx STM32F405xx # board ID for firmware load APJ_BOARD_ID 12 -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_CRAZYFLIE2 - # crystal frequency OSCILLATOR_HZ 8000000 STM32_PLLM_VALUE 8 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat index a455867a4c..994e4a123d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat @@ -4,7 +4,6 @@ # MCU class and specific type MCU STM32F4xx STM32F427xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MINDPXV2 define HAL_CHIBIOS_ARCH_MINDPXV2 1 # board ID for firmware load diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat index 7af66bc39d..c90220277b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat @@ -5,8 +5,6 @@ # MCU class and specific type MCU STM32F4xx STM32F427xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MINDPXV2 - # board ID for firmware load APJ_BOARD_ID 88 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat index 1f7b82119f..ae218dc272 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat @@ -4,8 +4,6 @@ # MCU class and specific type MCU STM32F4xx STM32F405xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MINIPIX - # board ID for firmware load APJ_BOARD_ID 3 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index 3e78b9b11c..e06e6a9313 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -96,8 +96,6 @@ SPIDEV sdcard SPI2 DEVID2 SDCARD_CS MODE0 400*KHZ 25*MHZ SPIDEV bmp280 SPI3 DEVID3 BMP280_CS MODE3 1*MHZ 8*MHZ SPIDEV osd SPI3 DEVID4 OSD_CS MODE0 10*MHZ 10*MHZ -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_OMNIBUSF4PRO - # one IMU IMU Invensense SPI:mpu6000 ROTATION_YAW_180 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat index 39c7cb24e1..b3ad90c2b0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat @@ -4,8 +4,6 @@ # MCU class and specific type MCU STM32F4xx STM32F405xx -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_REVOMINI - # board ID for firmware load APJ_BOARD_ID 124 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index f934a9de78..8075426899 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -137,8 +137,6 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH -define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_SPARKY2 - define STM32_PWM_USE_ADVANCED TRUE define BOARD_PWM_COUNT_DEFAULT 7