From 70aef84997c2fe1e87278e02e914e2a1ce735649 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 19 Aug 2021 12:13:47 +1000 Subject: [PATCH] AP_HAL_ChibiOS: remove definitions of BOARD_PWM_COUNT_DEFAULT No longer used --- libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/fmuv3-bdshot/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/fmuv5-bdshot/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat | 4 ---- .../AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-bdshot/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat | 4 ---- 59 files changed, 134 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat index d1edce7a8a..cb70289f31 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat @@ -133,7 +133,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define BOARD_PWM_COUNT_DEFAULT 5 define STM32_PWM_USE_ADVANCED TRUE # save some flash diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat index 014695aa51..e133e16327 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat @@ -136,5 +136,4 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define BOARD_PWM_COUNT_DEFAULT 5 define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat index ba2a02593b..bbce37427c 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat @@ -175,7 +175,6 @@ PH6 TIM12_CH1 TIM12 PWM(13) GPIO(62) NODMA PH9 TIM12_CH2 TIM12 PWM(14) GPIO(63) NODMA # allow for 14 PWMs by default -define BOARD_PWM_COUNT_DEFAULT 14 # PWM output for buzzer PE5 TIM15_CH1 TIM15 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat index c05e87a5b9..0e0ea68020 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat @@ -178,7 +178,6 @@ PH6 TIM12_CH1 TIM12 PWM(13) GPIO(62) NODMA PH9 TIM12_CH2 TIM12 PWM(14) GPIO(63) NODMA # allow for 14 PWMs by default -define BOARD_PWM_COUNT_DEFAULT 14 # PWM output for buzzer PE5 TIM15_CH1 TIM15 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat index 44cc5b2227..60591c8791 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat @@ -36,9 +36,6 @@ PA5 TIM2_CH1 TIM2 PWM(9) GPIO(58) PB3 TIM2_CH2 TIM2 PWM(10) GPIO(59) PB11 TIM2_CH4 TIM2 PWM(11) GPIO(60) -undef BOARD_PWM_COUNT_DEFAULT -define BOARD_PWM_COUNT_DEFAULT 11 - # RCInput on the PPM pin, for all protocols undef PG9 undef USART6_RX diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat index e5b07f005a..e05f060325 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat @@ -167,8 +167,6 @@ PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) -define BOARD_PWM_COUNT_DEFAULT 4 - # Pin for PWM Voltage Selection PB4 PWM_VOLT_SEL OUTPUT HIGH GPIO(3) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat index bacc62e8d1..a83e641fc4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat @@ -242,9 +242,6 @@ define HAL_BATT_CURR_SCALE 17.0 define HAL_SERIAL5_PROTOCOL SerialProtocol_MAVLink2 define HAL_SERIAL5_BAUD 921600 -# 8 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 6 - # We can't share the IO UART (USART6). DMA_NOSHARE USART6_TX USART6_RX ADC1 DMA_PRIORITY USART6* diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat index ec0b329528..b04f41dc02 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat @@ -183,8 +183,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PH6 TIM12_CH1 TIM12 PWM(7) GPIO(56) NODMA PH9 TIM12_CH2 TIM12 PWM(8) GPIO(57) NODMA -define BOARD_PWM_COUNT_DEFAULT 8 - # PWM output for buzzer PE5 TIM15_CH1 TIM15 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index 77567a3064..0d62b1e73f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -112,7 +112,6 @@ PB6 I2C1_SCL I2C1 PB7 I2C1_SDA I2C1 # PWM pins S1-S6 -define BOARD_PWM_COUNT_DEFAULT 6 define STM32_PWM_USE_ADVANCED TRUE PC8 TIM8_CH3 TIM8 PWM(1) GPIO(50) PC9 TIM8_CH4 TIM8 PWM(2) GPIO(51) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat index cfaaddaa1c..9e278e34bb 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat @@ -167,4 +167,3 @@ PB0 EXTI_MPU6000 INPUT PULLUP PB1 DRDY_HMC5883 INPUT PULLUP define AP_FEATURE_BRD_PWM_COUNT_PARAM 1 -define BOARD_PWM_COUNT_DEFAULT 12 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 7ede81bce6..0a39d47dde 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -150,7 +150,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define BOARD_PWM_COUNT_DEFAULT 10 define STM32_PWM_USE_ADVANCED TRUE # FFT option (disabled by default) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat index af27bfce9d..bcc8a43d22 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat @@ -113,8 +113,6 @@ PG14 SPI6_MOSI SPI6 PF7 SPI5_SCK SPI5 PF9 SPI5_MOSI SPI5 - -define BOARD_PWM_COUNT_DEFAULT 0 define BOARD_SER1_RTSCTS_DEFAULT 0 #gps f9 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat index 7394183088..beb63aab02 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef.dat @@ -142,7 +142,6 @@ PC11 SDMMC1_D3 SDMMC1 PC12 SDMMC1_CK SDMMC1 PD2 SDMMC1_CMD SDMMC1 -define BOARD_PWM_COUNT_DEFAULT 0 define BOARD_SER1_RTSCTS_DEFAULT 0 define HAL_OS_FATFS_IO 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index bffaa0eef0..7643ed833e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -148,6 +148,3 @@ define HAL_LOGGING_DATAFLASH define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin - -# 8 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 8 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat index 16e83443c2..d412c992b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat @@ -5,7 +5,6 @@ include ../KakuteF4/hwdef.dat undef APJ_BOARD_ID undef PB0 PB1 PA3 PA2 PB11 PB10 PD2 PC8 -undef BOARD_PWM_COUNT_DEFAULT undef SERIAL_ORDER undef CH_CFG_ST_RESOLUTION undef STM32_ST_USE_TIMER @@ -38,7 +37,6 @@ PC8 TIM8_CH3 TIM8 PWM(5) GPIO(56) # LED strip DMA_PRIORITY ADC* USART3* TIM3* TIM5* SPI3* SPI1* DMA_NOSHARE SPI3_RX -define BOARD_PWM_COUNT_DEFAULT 5 define STM32_PWM_USE_ADVANCED TRUE # save some flash diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 75a4e16099..510f977233 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -146,7 +146,6 @@ define OSD_PARAM_ENABLED 0 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define BOARD_PWM_COUNT_DEFAULT 6 define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS and fuel battery monitors to save flash diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 54fbf1008c..bca7d18b17 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -149,7 +149,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define BOARD_PWM_COUNT_DEFAULT 6 define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS and fuel battery monitors to save flash diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat index 98e3073e4e..fb784817b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat @@ -156,5 +156,3 @@ define HAL_OSD_TYPE_DEFAULT 1 # Font for OSD ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin - -define BOARD_PWM_COUNT_DEFAULT 4 \ No newline at end of file diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat index b654463177..e91c7fc2e7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat @@ -154,6 +154,3 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # To complementary channels work we define this #define STM32_PWM_USE_ADVANCED TRUE - -define BOARD_PWM_COUNT_DEFAULT 4 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat index c1e2989520..e12d3399fc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat @@ -41,7 +41,6 @@ PB7 TIM4_CH2 TIM4 PWM(8) GPIO(57) PA15 TIM2_CH1 TIM2 PWM(9) GPIO(58) # LED pin -define BOARD_PWM_COUNT_DEFAULT 9 define STM32_PWM_USE_ADVANCED TRUE # Beeper diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 7e0681ca37..0c6eff4e77 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -178,8 +178,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define BOARD_PWM_COUNT_DEFAULT 10 - define STM32_PWM_USE_ADVANCED TRUE # disable SMBUS and fuel battery monitors to save flash diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat index 7edfd6546d..2eae461780 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat @@ -153,9 +153,6 @@ define HAL_OS_FATFS_IO 1 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" -# 8 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 8 - # setup for OSD define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat index d99c95de47..c245db9c07 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat @@ -202,6 +202,3 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin - -define BOARD_PWM_COUNT_DEFAULT 13 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat index 66c279077f..53c78fca4d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat @@ -213,5 +213,3 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin - -define BOARD_PWM_COUNT_DEFAULT 13 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat index d10819294e..540e1ffe16 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat @@ -172,7 +172,6 @@ define HAL_OS_FATFS_IO 1 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" -define BOARD_PWM_COUNT_DEFAULT 6 define STM32_PWM_USE_ADVANCED TRUE # we are low on flash on this board diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index 86f7a6a932..3e42436e0e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -146,8 +146,6 @@ define HAL_OSD_TYPE_DEFAULT 1 #To complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE -define BOARD_PWM_COUNT_DEFAULT 4 - #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat index 3650a3a32e..abb392479d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat @@ -230,5 +230,3 @@ PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52) PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) - -define BOARD_PWM_COUNT_DEFAULT 6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef.dat index 9bb42d09db..eec868cd4e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef.dat @@ -210,10 +210,6 @@ define HAL_BATT_CURR_SCALE 17.0 define HAL_SERIAL5_PROTOCOL SerialProtocol_MAVLink2 define HAL_SERIAL5_BAUD 921600 -# 6 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 6 - - # two IMUs IMU Invensense SPI:icm20608 ROTATION_ROLL_180_YAW_90 IMU Invensense SPI:mpu9250 ROTATION_ROLL_180_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef.dat index fcc545fcd6..6ad2c965de 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef.dat @@ -227,5 +227,3 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin PA15 DRDY_ICM20689 INPUT PA10 DRDY_ICM20602 INPUT PD11 DRDY_ICM20649 INPUT - -define BOARD_PWM_COUNT_DEFAULT 14 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat index 15eb4e21a2..45c4faec27 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat @@ -179,6 +179,3 @@ BARO SPL06 SPI:spl06 define HAL_OS_FATFS_IO 1 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" - -define BOARD_PWM_COUNT_DEFAULT 8 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat index 817ad11248..9303107b33 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat @@ -123,8 +123,6 @@ define HAL_BATT_CURR_SCALE 18.2 define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 -define BOARD_PWM_COUNT_DEFAULT 4 - #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat index c85036ac8c..a2c6b17d41 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat @@ -166,9 +166,6 @@ define HAL_BATT_CURR_SCALE 17.0 define STM32_PWM_USE_ADVANCED TRUE -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 14 - # save some flash define GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat index dad0966d11..bd02730338 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat @@ -165,7 +165,3 @@ define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 define STM32_PWM_USE_ADVANCED TRUE - -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 14 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat index e7a7fbaa60..2de65e6958 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat @@ -166,7 +166,3 @@ define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 define STM32_PWM_USE_ADVANCED TRUE - -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 14 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat index 0f75875486..2764c35254 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat @@ -165,7 +165,3 @@ define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 define STM32_PWM_USE_ADVANCED TRUE - -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 14 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat index b9628d6738..29173f57b2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat @@ -171,9 +171,6 @@ define HAL_BATT_CURR_SCALE 17.0 define STM32_PWM_USE_ADVANCED TRUE -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 14 - # save some flash define GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index f6aa9b7b5f..e21be86718 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -103,5 +103,3 @@ define HAL_GPIO_A_LED_PIN 57 #To complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE - -define BOARD_PWM_COUNT_DEFAULT 6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3-bdshot/hwdef.dat index 241afc0c23..ff88b67947 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3-bdshot/hwdef.dat @@ -337,8 +337,6 @@ PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) NODMA PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) NODMA -define BOARD_PWM_COUNT_DEFAULT 4 - # This is the invensense data-ready pin. We don't use it in the # default driver. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat index f96223f20d..fec01b8583 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat @@ -337,8 +337,6 @@ PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) PD13 TIM4_CH2 TIM4 PWM(5) GPIO(54) PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) -define BOARD_PWM_COUNT_DEFAULT 4 - # This is the invensense data-ready pin. We don't use it in the # default driver. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5-bdshot/hwdef.dat index fe16d96aa1..9d9e9cfe37 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5-bdshot/hwdef.dat @@ -180,8 +180,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) NODMA PH6 TIM12_CH1 TIM12 PWM(7) GPIO(56) NODMA PH9 TIM12_CH2 TIM12 PWM(8) GPIO(57) NODMA -define BOARD_PWM_COUNT_DEFAULT 8 - # PWM output for buzzer PE5 TIM9_CH1 TIM9 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat index 1f78818b79..9fec8e858d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat @@ -180,8 +180,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PH6 TIM12_CH1 TIM12 PWM(7) GPIO(56) NODMA PH9 TIM12_CH2 TIM12 PWM(8) GPIO(57) NODMA -define BOARD_PWM_COUNT_DEFAULT 8 - # PWM output for buzzer PE5 TIM9_CH1 TIM9 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat index ce129f87ee..47a85d46c6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat @@ -172,10 +172,6 @@ define HAL_BATT_CURR_SCALE 17.0 define HAL_SERIAL5_PROTOCOL SerialProtocol_MAVLink2 define HAL_SERIAL5_BAUD 921600 -# 6 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 6 - - # Set one or two IMUs #IMU Invensense SPI:icm20608 ROTATION_YAW_180 IMU BMI088 SPI:bmi088_a SPI:bmi088_g ROTATION_ROLL_180_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat index fcf1f62bc4..6858adaa2f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat @@ -209,10 +209,6 @@ define HAL_BATT_CURR_SCALE 17.0 define HAL_SERIAL5_PROTOCOL SerialProtocol_MAVLink define HAL_SERIAL5_BAUD 921600 -# 6 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 6 - - # two IMUs #IMU Invensense SPI:icm20608 ROTATION_YAW_180 IMU BMI088 SPI:bmi088_a SPI:bmi088_g ROTATION_ROLL_180_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef.dat index d58e186ac8..42bce8b4f6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef.dat @@ -237,8 +237,6 @@ PE5 TIM15_CH1 TIM15 PWM(10) GPIO(59) PC6 TIM8_CH1 TIM8 PWM(11) GPIO(60) PD15 TIM4_CH4 TIM4 PWM(12) GPIO(61) -define BOARD_PWM_COUNT_DEFAULT 12 - # This is the invensense data-ready pin. We don't use it in the # default driver. PG2 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat index cabbf3eb17..9c3a38f15d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat @@ -199,8 +199,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PI5 TIM8_CH1 TIM8 PWM(7) GPIO(56) PI6 TIM8_CH2 TIM8 PWM(8) GPIO(57) -define BOARD_PWM_COUNT_DEFAULT 8 - # This is the invensense data-ready pin. We don't use it in the # default driver. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef.dat index 12516fae34..f13b5bc1e4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef.dat @@ -202,8 +202,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PI5 TIM8_CH1 TIM8 PWM(7) GPIO(56) PI6 TIM8_CH2 TIM8 PWM(8) GPIO(57) -define BOARD_PWM_COUNT_DEFAULT 8 - # This is the invensense 20602 data-ready pin. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef.dat index d051aba85f..1817978543 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef.dat @@ -214,8 +214,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PI5 TIM8_CH1 TIM8 PWM(7) GPIO(56) PI6 TIM8_CH2 TIM8 PWM(8) GPIO(57) -define BOARD_PWM_COUNT_DEFAULT 8 - # This is the invensense 20602 data-ready pin. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat index 389faf3513..d02bacff9e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat @@ -119,8 +119,6 @@ PB5 CAN2_RX CAN2 PB7 GPIO_CAN2_SILENT OUTPUT PUSHPULL LOW GPIO(73) -define BOARD_PWM_COUNT_DEFAULT 0 - # This is the invensense data-ready pin. We don't use it in the # default driver. PD8 DRDY_ADIS16470 INPUT GPIO(93) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef.dat index 970b3dafb3..4bb4a4c92f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef.dat @@ -204,8 +204,6 @@ PD14 TIM4_CH3 TIM4 PWM(6) GPIO(55) PI5 TIM8_CH1 TIM8 PWM(7) GPIO(56) PI6 TIM8_CH2 TIM8 PWM(8) GPIO(57) -define BOARD_PWM_COUNT_DEFAULT 8 - # This is the invensense data-ready pin. We don't use it in the # default driver. PD15 MPU_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat index 21da3e8499..4916425a6c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat @@ -205,6 +205,3 @@ define HAL_BATT_VOLT_PIN 12 define HAL_BATT_CURR_PIN 10 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 - -# 12 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 12 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat index a21e186a4d..044218dc55 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat @@ -15,7 +15,3 @@ APJ_BOARD_ID 1002 #Overide it to use as GPS UART port PC8 SBUS_INVERT_RX OUTPUT LOW PC9 SBUS_INVERT_TX OUTPUT LOW - - -undef BOARD_PWM_COUNT_DEFAULT -define BOARD_PWM_COUNT_DEFAULT 6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index 4a75363f43..a925626ac9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -145,8 +145,6 @@ define HAL_OSD_TYPE_DEFAULT 1 #To complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE -define BOARD_PWM_COUNT_DEFAULT 8 - #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat index 833de66bbd..17243d82d9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat @@ -147,8 +147,6 @@ define HAL_GPIO_A_LED_PIN 41 #To have complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE -define BOARD_PWM_COUNT_DEFAULT 6 - define OSD_ENABLED 1 #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-bdshot/hwdef.dat index f9a0dd4c15..00f3934814 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-bdshot/hwdef.dat @@ -8,6 +8,3 @@ PB0 TIM3_CH3 TIM3 PWM(1) GPIO(50) PB1 TIM3_CH4 TIM3 PWM(2) GPIO(51) BIDIR PA3 TIM2_CH4 TIM2 PWM(3) GPIO(52) BIDIR PA2 TIM2_CH3 TIM2 PWM(4) GPIO(53) - -undef BOARD_PWM_COUNT_DEFAULT -define BOARD_PWM_COUNT_DEFAULT 4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat index e846da5c20..94d78e5dd4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat @@ -8,6 +8,3 @@ PB0 TIM3_CH3 TIM3 PWM(1) GPIO(50) PB1 TIM3_CH4 TIM3 PWM(2) GPIO(51) BIDIR PA3 TIM2_CH4 TIM2 PWM(3) GPIO(52) BIDIR PA2 TIM2_CH3 TIM2 PWM(4) GPIO(53) - -undef BOARD_PWM_COUNT_DEFAULT -define BOARD_PWM_COUNT_DEFAULT 4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat index cac589ec7b..a6a4e8f3b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat @@ -149,6 +149,4 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH -# 6 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 8 define HAL_WITH_DSP FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat index 5d3ac3b57d..841845a2f9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat @@ -130,7 +130,5 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH -# 8 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 8 define HAL_WITH_DSP FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index f2a803fcf6..bf7e989b4d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -136,7 +136,5 @@ define HAL_LOGGING_DATAFLASH define STM32_PWM_USE_ADVANCED TRUE -define BOARD_PWM_COUNT_DEFAULT 7 - # we are low on flash on this board define HAL_MINIMIZE_FEATURES 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index c2e0e64ab9..0d3a739fa9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -142,10 +142,6 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH - -# 8 PWM available by default -define BOARD_PWM_COUNT_DEFAULT 8 - # setup for OSD define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1