From f4de61a1e03d9de67070ad2bb5bf8f16b7034866 Mon Sep 17 00:00:00 2001 From: Sean Bolton Date: Tue, 21 Jun 2022 08:34:21 -0700 Subject: [PATCH] Fix TIM timer types across all lines --- stm32data/__main__.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/stm32data/__main__.py b/stm32data/__main__.py index 193f5bb..eedb422 100755 --- a/stm32data/__main__.py +++ b/stm32data/__main__.py @@ -275,20 +275,17 @@ perimap = [ (r'.*LPTIM\d.*:G0xx_lptimer1_v1_4', ('lptim', 'g0', 'LPTIM')), - ('STM32H7.*:TIM1:.*', ('timer', 'v1', 'TIM_ADV')), - ('STM32H7.*:TIM2:.*', ('timer', 'v1', 'TIM_GP32')), - ('STM32H7.*:TIM5:.*', ('timer', 'v1', 'TIM_GP32')), - ('STM32H7.*:TIM6:.*', ('timer', 'v1', 'TIM_BASIC')), - ('STM32H7.*:TIM7:.*', ('timer', 'v1', 'TIM_BASIC')), - ('STM32H7.*:TIM8:.*', ('timer', 'v1', 'TIM_ADV')), + ('STM32F1.*:TIM(1|8):.*', ('timer', 'v1', 'TIM_ADV')), + ('STM32F1.*:TIM(2|5):.*', ('timer', 'v1', 'TIM_GP16')), + ('STM32F1.*:TIM(6|7):.*', ('timer', 'v1', 'TIM_BASIC')), - ('STM32F3.*:TIM(6|7){1}:.*', ('timer', 'v1', 'TIM_BASIC')), - ('STM32F3.*:TIM(3|4|15|16|17){1}:.*', ('timer', 'v1', 'TIM_GP16')), - ('STM32F3.*:TIM2:.*', ('timer', 'v1', 'TIM_GP32')), - ('STM32F3.*:TIM(1|8|20){1}:.*', ('timer', 'v1', 'TIM_ADV')), + ('STM32L0.*:TIM2:.*', ('timer', 'v1', 'TIM_GP16')), - ('STM32F7.*:TIM1:.*', ('timer', 'v1', 'TIM_ADV')), - ('STM32F7.*:TIM8:.*', ('timer', 'v1', 'TIM_ADV')), + ('STM32U5.*:TIM(2|3|4|5):.*', ('timer', 'v1', 'TIM_GP32')), + + ('STM32.*:TIM(1|8|20):.*', ('timer', 'v1', 'TIM_ADV')), + ('STM32.*:TIM(2|5|23|24):.*', ('timer', 'v1', 'TIM_GP32')), + ('STM32.*:TIM(6|7|18):.*', ('timer', 'v1', 'TIM_BASIC')), (r'.*TIM\d.*:gptimer.*', ('timer', 'v1', 'TIM_GP16')), ('STM32F0.*:DBGMCU:.*', ('dbgmcu', 'f0', 'DBGMCU')),