Skip to content

Commit 1122eec

Browse files
burrbullburrbull
authored
Merge pull request #1190 from z-av/l4x-tim
Copy L4x2-6 timers from L4x1
2 parents c83b5d9 + f888189 commit 1122eec

File tree

6 files changed

+120
-51
lines changed

6 files changed

+120
-51
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ Family-specific:
410410
* Add CRSEN to APB1ENR1 (#580)
411411
* Fix bit offset for CRC and USART bits in RCC (#571)
412412
* Fix LCD RAM_COM register size and arrayify (#552)
413+
* Copy L4x2-6 timers from L4x1
413414
* L5:
414415
* Fix TIM15 CCR2 address offset (#518)
415416
* H7:

‎devices/stm32l412.yaml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ _clear_fields: "*"
1717
# ISR, TAMPCR, OR, BKP0R, and BKP31R removed.
1818
# SCR, MISR, SR, ICSR added
1919

20+
_copy:
21+
TIM1:
22+
from: ../svd/stm32l4x1.svd:TIM1
23+
TIM2:
24+
from: ../svd/stm32l4x1.svd:TIM2
25+
TIM6:
26+
from: ../svd/stm32l4x1.svd:TIM6
27+
TIM15:
28+
from: ../svd/stm32l4x1.svd:TIM15
29+
TIM16:
30+
from: ../svd/stm32l4x1.svd:TIM16
31+
2032
_derive:
2133
USART3: USART1
2234

@@ -192,24 +204,28 @@ SYSCFG: {}
192204

193205
TIM1:
194206
_include:
195-
- patches/tim/icpsc.yaml
196207
- patches/tim/v2/oc5m_bit3.yaml
197-
- patches/tim/rep_16b.yaml
208+
- patches/tim/v2/ocm_bit3.yaml
198209
- patches/tim/dmab_32.yaml
199210
- fields/tim/tim_mms_ts_sms.yaml
200211
- fields/tim/v2/tim1.yaml
201212
- collect/tim/ccr.yaml
213+
CCMR1_Input:
214+
_modify:
215+
IC2PCS:
216+
name: IC2PSC
202217

203218
TIM2:
219+
CNT:
220+
_modify:
221+
CNT_H:
222+
bitWidth: 16
204223
_include:
205-
- patches/tim/tim2_arr.yaml
206-
- patches/tim/tim2_cr.yaml
224+
- patches/tim/v2/ocm_bit3.yaml
225+
- patches/tim/tim2_common_32bit.yaml
207226
- fields/tim/tim_mms_ts_sms.yaml
208227
- fields/tim/v2/tim2.yaml
209228
- collect/tim/ccr.yaml
210-
CNT:
211-
_merge:
212-
CNT: CNT*
213229

214230
TIM6:
215231
_include:
@@ -224,6 +240,10 @@ TIM16:
224240
_include:
225241
- fields/tim/v2/tim16.yaml
226242
- collect/tim/ccr.yaml
243+
CCMR1_Output:
244+
_modify:
245+
OC1M_2:
246+
name: OC1M_3
227247

228248
TSC:
229249
_include:

‎devices/stm32l4x2.yaml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ _clear_fields: "*"
55
_delete:
66
- USB_FS
77

8-
# TIM3 is 16-bit, whilst TIM2 is 32-bit
98
_copy:
9+
TIM1:
10+
from: ../svd/stm32l4x1.svd:TIM1
11+
TIM2:
12+
from: ../svd/stm32l4x1.svd:TIM2
1013
TIM3:
11-
from: TIM2
14+
from: ../svd/stm32l4x1.svd:TIM2
15+
TIM6:
16+
from: ../svd/stm32l4x1.svd:TIM6
17+
TIM15:
18+
from: ../svd/stm32l4x1.svd:TIM15
19+
TIM16:
20+
from: ../svd/stm32l4x1.svd:TIM16
1221

1322
_derive:
1423
USART3: USART1
@@ -240,26 +249,32 @@ SYSCFG: {}
240249

241250
TIM1:
242251
_include:
243-
- patches/tim/icpsc.yaml
244252
- patches/tim/v2/oc5m_bit3.yaml
245-
- patches/tim/v2/add_ocm_bit3.yaml
246-
- patches/tim/rep_16b.yaml
253+
- patches/tim/v2/ocm_bit3.yaml
247254
- patches/tim/dmab_32.yaml
248255
- fields/tim/tim_mms_ts_sms.yaml
249256
- fields/tim/v2/tim1.yaml
250257
- collect/tim/ccr.yaml
258+
CCMR1_Input:
259+
_modify:
260+
IC2PCS:
261+
name: IC2PSC
251262

252263
TIM2:
264+
CNT:
265+
_modify:
266+
CNT_H:
267+
bitWidth: 16
253268
_include:
254-
- patches/tim/v2/add_ocm_bit3.yaml
269+
- patches/tim/v2/ocm_bit3.yaml
255270
- patches/tim/tim2_common_32bit.yaml
256271
- fields/tim/tim_mms_ts_sms.yaml
257272
- fields/tim/v2/tim2.yaml
258273
- collect/tim/ccr.yaml
259274

260275
TIM3:
261276
_include:
262-
- patches/tim/v2/add_ocm_bit3.yaml
277+
- patches/tim/v2/ocm_bit3.yaml
263278
- patches/tim/tim_ch_16bit_l.yaml
264279
- fields/tim/tim_mms_ts_sms.yaml
265280
- fields/tim/v2/tim3.yaml

‎devices/stm32l4x3.yaml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
_svd: ../svd/stm32l4x3.svd
22

3+
_copy:
4+
TIM1:
5+
from: ../svd/stm32l4x1.svd:TIM1
6+
TIM2:
7+
from: ../svd/stm32l4x1.svd:TIM2
8+
TIM6:
9+
from: ../svd/stm32l4x1.svd:TIM6
10+
TIM15:
11+
from: ../svd/stm32l4x1.svd:TIM15
12+
TIM16:
13+
from: ../svd/stm32l4x1.svd:TIM16
14+
315
_modify:
416
# The SVD calls ADC1 ADC.
517
ADC:
@@ -184,19 +196,25 @@ SYSCFG: {}
184196

185197
TIM1:
186198
_include:
187-
- patches/tim/icpsc.yaml
188199
- patches/tim/v2/oc5m_bit3.yaml
189-
- patches/tim/v2/add_ocm_bit3.yaml
190-
- patches/tim/rep_16b.yaml
200+
- patches/tim/v2/ocm_bit3.yaml
191201
- patches/tim/dmab_32.yaml
192202
- fields/tim/tim_mms_ts_sms.yaml
193203
- fields/tim/v2/tim1.yaml
194204
- collect/tim/ccr.yaml
205+
CCMR1_Input:
206+
_modify:
207+
IC2PCS:
208+
name: IC2PSC
195209

196210
TIM2:
211+
CNT:
212+
_modify:
213+
CNT_H:
214+
bitWidth: 16
197215
_include:
216+
- patches/tim/v2/ocm_bit3.yaml
198217
- patches/tim/tim2_common_32bit.yaml
199-
- patches/tim/v2/add_ocm_bit3.yaml
200218
- fields/tim/tim_mms_ts_sms.yaml
201219
- fields/tim/v2/tim2.yaml
202220
- collect/tim/ccr.yaml
@@ -205,17 +223,10 @@ TIM6:
205223
_include:
206224
- fields/tim/v2/tim6.yaml
207225

208-
TIM1[5]:
209-
_include: patches/tim/l4_tim15_ch2.yaml
210-
211226
TIM15:
212227
_include:
213228
- fields/tim/v2/tim15.yaml
214229
- collect/tim/ccr.yaml
215-
CCMR1_Output:
216-
_modify:
217-
OC1M_2:
218-
name: OC1M_3
219230

220231
TIM16:
221232
_include:

‎devices/stm32l4x5.yaml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
_svd: ../svd/stm32l4x5.svd
22

33
_copy:
4+
TIM1:
5+
from: ../svd/stm32l4x1.svd:TIM1
6+
TIM2:
7+
from: ../svd/stm32l4x1.svd:TIM2
48
TIM3:
5-
from: TIM2
9+
from: ../svd/stm32l4x1.svd:TIM2
10+
TIM6:
11+
from: ../svd/stm32l4x1.svd:TIM6
12+
TIM8:
13+
from: ../svd/stm32l4x1.svd:TIM8
14+
TIM15:
15+
from: ../svd/stm32l4x1.svd:TIM15
16+
TIM16:
17+
from: ../svd/stm32l4x1.svd:TIM16
618

719
_derive:
820
TIM4: TIM3
@@ -281,30 +293,36 @@ SYSCFG: {}
281293

282294
TIM[18]:
283295
_include:
284-
- patches/tim/icpsc.yaml
285296
- patches/tim/v2/oc5m_bit3.yaml
286-
- patches/tim/v2/add_ocm_bit3.yaml
287-
- patches/tim/rep_16b.yaml
297+
- patches/tim/v2/ocm_bit3.yaml
288298
- patches/tim/dmab_32.yaml
289299
- fields/tim/tim_mms_ts_sms.yaml
290300
- fields/tim/v2/tim1.yaml
291301
- collect/tim/ccr.yaml
302+
CCMR1_Input:
303+
_modify:
304+
IC2PCS:
305+
name: IC2PSC
292306

293307
TIM8:
294308
_include: collect/tim/tim8_derive.yaml
295309

296310
TIM2:
311+
CNT:
312+
_modify:
313+
CNT_H:
314+
bitWidth: 16
297315
_include:
298-
- patches/tim/v2/add_ocm_bit3.yaml
316+
- patches/tim/v2/ocm_bit3.yaml
299317
- patches/tim/tim2_common_32bit.yaml
300318
- fields/tim/tim_mms_ts_sms.yaml
301319
- fields/tim/v2/tim2.yaml
302320
- collect/tim/ccr.yaml
303321

304322
TIM3:
305323
_include:
324+
- patches/tim/v2/ocm_bit3.yaml
306325
- patches/tim/tim_ch_16bit_l.yaml
307-
- patches/tim/v2/add_ocm_bit3.yaml
308326
- fields/tim/tim_mms_ts_sms.yaml
309327
- fields/tim/v2/tim3.yaml
310328
- collect/tim/ccr.yaml
@@ -313,14 +331,7 @@ TIM6:
313331
_include:
314332
- fields/tim/v2/tim6.yaml
315333

316-
TIM1[5]:
317-
_include: patches/tim/l4_tim15_ch2.yaml
318-
319334
TIM15:
320-
CCMR1_Output:
321-
_modify:
322-
OC1M_2:
323-
name: OC1M_3
324335
_include:
325336
- fields/tim/v2/tim15.yaml
326337
- collect/tim/ccr.yaml

‎devices/stm32l4x6.yaml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ _svd: ../svd/stm32l4x6.svd
33
_clear_fields: "*"
44

55
_copy:
6+
TIM1:
7+
from: ../svd/stm32l4x1.svd:TIM1
8+
TIM2:
9+
from: ../svd/stm32l4x1.svd:TIM2
610
TIM3:
7-
from: TIM2
11+
from: ../svd/stm32l4x1.svd:TIM2
12+
TIM6:
13+
from: ../svd/stm32l4x1.svd:TIM6
14+
TIM8:
15+
from: ../svd/stm32l4x1.svd:TIM8
16+
TIM15:
17+
from: ../svd/stm32l4x1.svd:TIM15
18+
TIM16:
19+
from: ../svd/stm32l4x1.svd:TIM16
820

921
_derive:
1022
TIM4: TIM3
@@ -202,29 +214,35 @@ SYSCFG: {}
202214

203215
TIM[18]:
204216
_include:
205-
- patches/tim/icpsc.yaml
206217
- patches/tim/v2/oc5m_bit3.yaml
207-
- patches/tim/v2/add_ocm_bit3.yaml
208-
- patches/tim/rep_16b.yaml
218+
- patches/tim/v2/ocm_bit3.yaml
209219
- patches/tim/dmab_32.yaml
210220
- fields/tim/tim_mms_ts_sms.yaml
211221
- fields/tim/v2/tim1.yaml
212222
- collect/tim/ccr.yaml
223+
CCMR1_Input:
224+
_modify:
225+
IC2PCS:
226+
name: IC2PSC
213227

214228
TIM8:
215229
_include: collect/tim/tim8_derive.yaml
216230

217231
TIM2:
232+
CNT:
233+
_modify:
234+
CNT_H:
235+
bitWidth: 16
218236
_include:
219-
- patches/tim/v2/add_ocm_bit3.yaml
237+
- patches/tim/v2/ocm_bit3.yaml
220238
- patches/tim/tim2_common_32bit.yaml
221239
- fields/tim/tim_mms_ts_sms.yaml
222240
- fields/tim/v2/tim2.yaml
223241
- collect/tim/ccr.yaml
224242

225243
TIM3:
226244
_include:
227-
- patches/tim/v2/add_ocm_bit3.yaml
245+
- patches/tim/v2/ocm_bit3.yaml
228246
- patches/tim/tim_ch_16bit_l.yaml
229247
- fields/tim/tim_mms_ts_sms.yaml
230248
- fields/tim/v2/tim3.yaml
@@ -234,17 +252,10 @@ TIM6:
234252
_include:
235253
- fields/tim/v2/tim6.yaml
236254

237-
TIM1[5]:
238-
_include: patches/tim/l4_tim15_ch2.yaml
239-
240255
TIM15:
241256
_include:
242257
- fields/tim/v2/tim15.yaml
243258
- collect/tim/ccr.yaml
244-
CCMR1_Output:
245-
_modify:
246-
OC1M_2:
247-
name: OC1M_3
248259

249260
TIM16:
250261
_include:

0 commit comments

Comments
 (0)