Skip to content

Commit 7aaa9af

Browse files
authored
Merge pull request embassy-rs#812 from embassy-rs/revert-806-fix-tim-on-stm32n6
Revert "Add TIM peripherals for N6"
2 parents c94b826 + 25bf653 commit 7aaa9af

1 file changed

Lines changed: 8 additions & 24 deletions

File tree

stm32-data-gen/src/perimap.rs

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -528,35 +528,18 @@ pub static PERIMAP: RegexMap<(&str, &str, &str)> = RegexMap::new(&[
528528
// AN4013 Table 4: STM32Gx/Hx/Ux/Wx (and Cx) serials
529529
// timer_v2 for STM32Gx/Hx/Ux/Wx (and Cx) serials
530530
("STM32(U5|U3).*:TIM(3|4):.*", ("timer", "v2", "TIM_GP32")),
531-
("STM32N6.*:TIM4:.*", ("timer", "v2", "TIM_GP32")),
531+
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM(1|8|20):.*", ("timer", "v2", "TIM_ADV")),
532532
(
533-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(1|8|20):.*",
534-
("timer", "v2", "TIM_ADV"),
535-
),
536-
(
537-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(2|5|23|24):.*",
533+
"STM32(G4|H5|U0|U3|U5|WBA).*:TIM(2|5|23|24):.*",
538534
("timer", "v2", "TIM_GP32"),
539535
),
540536
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM(3|4):.*", ("timer", "v2", "TIM_GP16")),
541-
("STM32N6.*:TIM3:.*", ("timer", "v2", "TIM_GP16")),
542-
(
543-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(6|7|18):.*",
544-
("timer", "v2", "TIM_BASIC"),
545-
),
546-
(
547-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(10|13|14):.*",
548-
("timer", "v2", "TIM_1CH"),
549-
),
550-
(
551-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(9|12):.*",
552-
("timer", "v2", "TIM_2CH"),
553-
),
554-
(
555-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM15:.*",
556-
("timer", "v2", "TIM_2CH_CMP"),
557-
),
537+
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM(6|7):.*", ("timer", "v2", "TIM_BASIC")),
538+
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM(13|14):.*", ("timer", "v2", "TIM_1CH")),
539+
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM12:.*", ("timer", "v2", "TIM_2CH")),
540+
("STM32(G4|H5|U0|U3|U5|WBA).*:TIM15:.*", ("timer", "v2", "TIM_2CH_CMP")),
558541
(
559-
"STM32(G4|H5|N6|U0|U3|U5|WBA).*:TIM(16|17):.*",
542+
"STM32(G4|H5|U0|U3|U5|WBA).*:TIM(16|17):.*",
560543
("timer", "v2", "TIM_1CH_CMP"),
561544
),
562545
("STM32G4.*:HRTIM1:.*", ("hrtim", "v2", "HRTIM")),
@@ -585,6 +568,7 @@ pub static PERIMAP: RegexMap<(&str, &str, &str)> = RegexMap::new(&[
585568
("STM32WB0[59].*:TIM2:.*", ("timer", "v3", "TIM_GP32")),
586569
("STM32WB0[67].*:TIM1:.*", ("timer", "v3", "TIM_GP32")),
587570
("STM32[CGHUW].*:HRTIM1?:.*", ("hrtim", "v1", "HRTIM")),
571+
("STM32N6.*:TIM9:.*", ("timer", "v3", "TIM_2CH")),
588572
// LPTIM for STM32Gx/Hx/Ux/Wx (and Cx) serials
589573
("STM32U0.*:LPTIM.*:.*", ("lptim", "v2b", "LPTIM")),
590574
("STM32(H5|U3|U5|WBA).*:LPTIM[12356]:.*", ("lptim", "v2a", "LPTIM")),

0 commit comments

Comments
 (0)