Skip to content

Commit c4f321f

Browse files
authored
Merge pull request #598 from skoe/merge_opamps_h_l4_u0
Consolidate OpAmp regs: h_v1, h_v2 and l4, u0 merged
2 parents a821bf5 + d9b6e7a commit c4f321f

File tree

5 files changed

+5
-340
lines changed

5 files changed

+5
-340
lines changed

data/registers/opamp_h_v2.yaml renamed to data/registers/opamp_h.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ enum/VM_SEL:
162162
description: INM1 connected to OPAMP_VINM input
163163
value: 1
164164
- name: Pga
165-
description: Feedback resistor is connected to the OPAMP_VINM input (PGA mode), Inverting input selection depends on the PGA_GAIN setting
165+
description: Feedback resistor connected to the OPAMP_VINM input (PGA mode), Inverting input selection depends on the PGA_GAIN setting
166166
value: 2
167167
- name: Follower
168168
description: opamp_out connected to OPAMP_VINM input (Follower mode)
@@ -177,5 +177,5 @@ enum/VP_SEL:
177177
description: DAC connected to VINP
178178
value: 1
179179
- name: GpioInp2
180-
description: GPIO INP2 is connected to OPAMP_VINP
180+
description: GPIO INP2 connected to OPAMP_VINP (not available on all chips)
181181
value: 2

data/registers/opamp_h_v1.yaml

Lines changed: 0 additions & 178 deletions
This file was deleted.
File renamed without changes.

data/registers/opamp_u0.yaml

Lines changed: 0 additions & 156 deletions
This file was deleted.

stm32-data-gen/src/perimap.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,9 @@ pub static PERIMAP: RegexMap<(&str, &str, &str)> = RegexMap::new(&[
131131
("STM32F301.*:SDADC:.*", ("sdadc", "v1", "SDADC")),
132132
("STM32G4.*:OPAMP:G4_tsmc90_fastOpamp", ("opamp", "g4", "OPAMP")),
133133
("STM32F3.*:OPAMP:tsmc018_ull_opamp_v1_0", ("opamp", "f3", "OPAMP")),
134-
("STM32H7.*:OPAMP:.*", ("opamp", "h_v1", "OPAMP")),
135-
("STM32H5.*:OPAMP:.*", ("opamp", "h_v2", "OPAMP")),
136-
("STM32L4.*:OPAMP:.*", ("opamp", "l4", "OPAMP")),
137-
("STM32U0.*:OPAMP:.*", ("opamp", "u0", "OPAMP")),
134+
("STM32H[57].*:OPAMP:.*", ("opamp", "h", "OPAMP")),
135+
("STM32L4.*:OPAMP:.*", ("opamp", "l4u0", "OPAMP")),
136+
("STM32U0.*:OPAMP:.*", ("opamp", "l4u0", "OPAMP")),
138137
(".*:DCMI:.*", ("dcmi", "v1", "DCMI")),
139138
("STM32C0.*:SYSCFG:.*", ("syscfg", "c0", "SYSCFG")),
140139
("STM32F0.*:SYSCFG:.*", ("syscfg", "f0", "SYSCFG")),

0 commit comments

Comments
 (0)