From d8cda41e6094ddb13892b71b348592546e51b6d5 Mon Sep 17 00:00:00 2001 From: "daniel.li" Date: Wed, 15 Nov 2023 12:29:37 +0800 Subject: [PATCH] hwdef: STM32_PWM_USE_ADVANCED cleanup Since STM32_PWM_USE_ADVANCED was used in an earlier version of ChibiOS, it's not used anymore. Just do the cleanup stuff in hwdef. --- libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/ACNS-F405AIO/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/BlitzF745AIO/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6-bdshot/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h | 3 --- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat | 4 ---- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 -- 37 files changed, 77 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/hwdef.dat index 0d481c8c641a5..b7ccd9ff579f7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/hwdef.dat @@ -187,9 +187,6 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 #define OSD_ENABLED 0 -define STM32_PWM_USE_ADVANCED TRUE - - # --------------------- save flash ---------------------- include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ACNS-F405AIO/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ACNS-F405AIO/hwdef.dat index 5faa2efed3aef..44c3518a1fa59 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ACNS-F405AIO/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ACNS-F405AIO/hwdef.dat @@ -192,10 +192,6 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 #define OSD_ENABLED 0 -define STM32_PWM_USE_ADVANCED TRUE - - - # --------------------- save flash ---------------------- include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat index 496e7563d1185..934aa8484bd9f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat @@ -134,8 +134,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/save_some_flash.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat index 174747369a40a..bee007f12dcea 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat @@ -10,7 +10,6 @@ undef BARO undef PD15 undef PE9 PE11 PB8 PB9 PB11 PB10 PA10 PA9 PA3 PA2 undef HAL_DEFAULT_INS_FAST_SAMPLE DMA_PRIORITY DMA_NOSHARE -undef STM32_PWM_USE_ADVANCED undef I2C1 # board ID for firmware load diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat index 183b3eb52fd32..5b2bc2ff9d2a5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat @@ -135,8 +135,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define STM32_PWM_USE_ADVANCED TRUE - define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat index be1ca4f118b18..8dad9af769f3c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat @@ -10,7 +10,6 @@ undef BARO undef PD15 undef PE9 PE11 PB8 PB9 PB11 PB10 PA10 PA9 PA3 PA2 undef HAL_DEFAULT_INS_FAST_SAMPLE DMA_PRIORITY DMA_NOSHARE -undef STM32_PWM_USE_ADVANCED undef I2C1 # board ID for firmware load diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BlitzF745AIO/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BlitzF745AIO/hwdef.dat index ca57956fab526..4f3162c2a4be4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BlitzF745AIO/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BlitzF745AIO/hwdef.dat @@ -146,8 +146,6 @@ BARO DPS310 I2C:1:0x76 define ALLOW_ARM_NO_COMPASS define HAL_I2C_INTERNAL_MASK 0 -define STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/save_some_flash.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index 708b574cef45f..cccc1e50bb754 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 STM32_PWM_USE_ADVANCED TRUE PC8 TIM8_CH3 TIM8 PWM(1) GPIO(50) PC9 TIM8_CH4 TIM8 PWM(2) GPIO(51) PB8 TIM4_CH3 TIM4 PWM(3) GPIO(52) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 6470d4b28e773..ef24bfa4afa8c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -158,8 +158,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define STM32_PWM_USE_ADVANCED TRUE - # FFT option (disabled by default) # define HAL_GYROFFT_ENABLED 1 # define AC_OAPATHPLANNER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat index 086240a0f809e..1eae4a0b84af4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat @@ -43,8 +43,6 @@ PB14 TIM1_CH2N TIM1 PWM(8) GPIO(57) PA8 TIM1_CH1 TIM1 PWM(9) GPIO(58) BIDIR PA15 TIM2_CH1 TIM2 PWM(10) GPIO(59) NODMA # no output -define STM32_PWM_USE_ADVANCED TRUE - # Beeper #PA7 TIM3_CH2 TIM3 GPIO(32) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat index 45a23fa080259..daab9120f2b90 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat @@ -37,8 +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 STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/save_some_flash.inc define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 4c8b7c627e664..0f23a73078136 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -138,8 +138,6 @@ define HAL_BARO_ALLOW_INIT_NO_BARO define HAL_OS_FATFS_IO 1 -define STM32_PWM_USE_ADVANCED TRUE - # disable parachute to save flash define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 561fc3011616a..a5cdbd7645c2a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -150,8 +150,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define STM32_PWM_USE_ADVANCED TRUE - # disable parachute and sprayer to save flash define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat index fed99f38f4d14..6b8fee4ff7856 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat @@ -155,6 +155,4 @@ define HAL_OS_FATFS_IO 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define STM32_PWM_USE_ADVANCED TRUE - define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat index 5182038ebdfc2..0c2d49296f146 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat @@ -157,8 +157,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define STM32_PWM_USE_ADVANCED TRUE - define DEFAULT_NTF_LED_TYPES 257 define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat index 239686e80caae..d2f244e88782b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat @@ -192,8 +192,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define STM32_PWM_USE_ADVANCED TRUE - define DEFAULT_NTF_LED_TYPES 257 define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat index 78cd31eaaaf3d..00e07b7bb15d8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat @@ -41,8 +41,6 @@ PB7 TIM4_CH2 TIM4 PWM(8) GPIO(57) PA15 TIM2_CH1 TIM2 PWM(9) GPIO(58) # LED pin -define STM32_PWM_USE_ADVANCED TRUE - # Beeper PA8 TIM1_CH1 TIM1 GPIO(32) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat index a69d9a94cf9ca..b306aff3e184b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat @@ -44,8 +44,6 @@ PA6 TIM13_CH1 TIM13 PWM(10) GPIO(59) NODMA PB6 TIM4_CH1 TIM4 PWM(11) GPIO(60) NODMA PB1 TIM3_CH4 TIM3 PWM(12) GPIO(61) # LED pad -define STM32_PWM_USE_ADVANCED TRUE - # Beeper PB9 TIM11_CH1 TIM11 GPIO(32) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 089fd07fdfebd..73e864c16f68e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -180,8 +180,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define STM32_PWM_USE_ADVANCED TRUE - # reduce max size of embedded params for apj_tool.py define AP_PARAM_MAX_EMBEDDED_PARAM 1024 define HAL_GYROFFT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat index 1df2460bd438e..76b7af6ca6ece 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat @@ -159,7 +159,5 @@ BARO BMP280 I2C:0:0x76 define HAL_OS_FATFS_IO 1 -define STM32_PWM_USE_ADVANCED TRUE - # we are low on flash on this board include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6-bdshot/hwdef.dat index e95336fc32397..d9487d64df3f9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6-bdshot/hwdef.dat @@ -3,7 +3,6 @@ include ../OmnibusNanoV6/hwdef.dat undef PB0 PB1 PA3 PB5 -undef STM32_PWM_USE_ADVANCED PB0 TIM3_CH3 TIM3 PWM(1) GPIO(50) PB1 TIM3_CH4 TIM3 PWM(2) GPIO(51) BIDIR diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index 8554ca376670b..5a9b40c46d259 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -143,9 +143,6 @@ define HAL_GPIO_A_LED_PIN 41 define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 -#To complementary channels work we define this -define STM32_PWM_USE_ADVANCED TRUE - #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat index 356570353543c..1c6a85662d780 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/RADIX2HD/hwdef.dat @@ -169,8 +169,6 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES # filesystem setup on sdcard define HAL_OS_FATFS_IO 1 -define STM32_PWM_USE_ADVANCED TRUE - define HAL_STORAGE_SIZE 16384 # DMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat index ad2e4b04c33fe..2d9aaec024589 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat @@ -143,8 +143,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin -define STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/save_some_flash.inc include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat index 643ddb4fed807..2e25bcc6a00be 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat @@ -188,7 +188,6 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define HAL_OS_FATFS_IO 1 define BOARD_PWM_COUNT_DEFAULT 11 -define STM32_PWM_USE_ADVANCED TRUE define HAL_STORAGE_SIZE 16384 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat index 7668e12020a91..78239e60a14ec 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat @@ -193,8 +193,6 @@ define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define STM32_PWM_USE_ADVANCED TRUE - define DEFAULT_NTF_LED_TYPES 257 define AP_SCRIPTING_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat index 1ddcd7c9eb8aa..2ea9ceb59e7d0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat @@ -167,8 +167,6 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin #VTX power control PC13 PINIO1 OUTPUT GPIO(81) LOW -define STM32_PWM_USE_ADVANCED TRUE - # reduce max size of embedded params for apj_tool.py define AP_PARAM_MAX_EMBEDDED_PARAM 1024 define HAL_WITH_DSP FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat index a4e96f0fdd157..efe9c18bd6874 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat @@ -161,7 +161,5 @@ define HAL_BATT_CURR_PIN 11 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -define STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat index 83c80fe017bf7..8c6a2f4858473 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat @@ -161,7 +161,5 @@ define HAL_BATT_CURR_PIN 11 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -define STM32_PWM_USE_ADVANCED TRUE - # minimal drivers to reduce flash usage include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat index ebdf9b10bf518..fe63339b61e47 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat @@ -162,4 +162,3 @@ define HAL_BATT_CURR_PIN 11 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat index 4336c7dcfa07b..770c0a75a676f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat @@ -161,7 +161,5 @@ define HAL_BATT_CURR_PIN 11 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -define STM32_PWM_USE_ADVANCED TRUE - # minimal drivers to reduce flash usage include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat index f5e2451e2d453..54908c9a97a85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat @@ -166,8 +166,6 @@ define HAL_BATT_CURR_PIN -1 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -define STM32_PWM_USE_ADVANCED TRUE - # save some flash include ../include/save_some_flash.inc define HAL_SPEKTRUM_TELEM_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index 4385464744b34..f8cadff4e2e8c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -100,8 +100,5 @@ define HAL_BATT_CURR_SCALE 18.2 define HAL_GPIO_A_LED_PIN 57 -#To complementary channels work we define this -define STM32_PWM_USE_ADVANCED TRUE - # 64kB FLASH_RESERVE_START_KB means we're lacking a lot of space: include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h index 384e48c331291..cc76a2b38d2cf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h +++ b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32f47_mcuconf.h @@ -446,9 +446,6 @@ /* * PWM driver system settings. */ -#ifndef STM32_PWM_USE_ADVANCED -#define STM32_PWM_USE_ADVANCED FALSE -#endif #define STM32_PWM_TIM1_IRQ_PRIORITY 7 #define STM32_PWM_TIM2_IRQ_PRIORITY 7 #define STM32_PWM_TIM3_IRQ_PRIORITY 7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index d3ed1d6f22151..99548592f7a1f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -144,9 +144,6 @@ define HAL_BATT_CURR_SCALE 18.2 define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 -#To complementary channels work we define this -define STM32_PWM_USE_ADVANCED TRUE - #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 3ed2139872c19..4bdd5e91d8d9b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat @@ -144,10 +144,6 @@ define BOARD_RSSI_ANA_PIN 0 define HAL_GPIO_A_LED_PIN 41 - -#To have complementary channels work we define this -define STM32_PWM_USE_ADVANCED TRUE - define OSD_ENABLED 1 #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index 28d11889cc445..9d026c7552ffc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -134,7 +134,5 @@ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash define HAL_LOGGING_DATAFLASH_ENABLED 1 -define STM32_PWM_USE_ADVANCED TRUE - # we are low on flash on this board include ../include/minimize_features.inc