Skip to content

Commit d80c92d

Browse files
burrbullburrbull
committed
v2 tims
1 parent 1a326c3 commit d80c92d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+542
-383
lines changed

‎devices/patches/tim/tim10_14_missing_opm.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ CR1:
33
OPM:
44
bitOffset: 3
55
bitWidth: 1
6+
access: read-write
67
description: One-pulse mode

‎devices/patches/tim/v2/16bit.yaml

-3
This file was deleted.

‎devices/patches/tim/v2/tim1.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,DIER,EGR,PSC,REP,CCR[1-46],DCR":
5+
size: 16

‎devices/patches/tim/v2/tim10.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,DIER,SR,EGR,CCER,PSC,CCR?":
5+
size: 16

‎devices/patches/tim/v2/tim13.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,DIER,SR,EGR,CCER,PSC,CCR?":
5+
size: 16

‎devices/patches/tim/v2/tim15.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,CR2,DIER,SR,EGR,CCER,PSC,RCR,CCR?,DCR,DMAR":
5+
size: 16

‎devices/patches/tim/v2/tim16.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,CR2,DIER,SR,EGR,CCER,PSC,RCR,CCR?,DCR,DMAR":
5+
size: 16

‎devices/patches/tim/v2/tim2.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_modify:
2+
"CR1,CR2,DIER,SR,EGR,CCER,PSC,DCR,DMAR":
3+
size: 16

‎devices/patches/tim/v2/tim3.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,CR2,DIER,SR,EGR,CCER,PSC,CCR?,DCR,DMAR":
5+
size: 16

‎devices/patches/tim/v2/tim3_with_mask.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
_include:
2+
- tim3.yaml
3+
4+
_modify:
5+
"ARR,CCR?":
6+
resetMask: 0xffff
7+
8+
CNT:
9+
_modify:
10+
CNT:
11+
bitWidth: 16
12+
ARR:
13+
_modify:
14+
ARR:
15+
bitWidth: 16
16+
CCR?:
17+
_modify:
18+
CCR?:
19+
bitWidth: 16

‎devices/patches/tim/v2/tim1_16bit.yaml renamed to ‎devices/patches/tim/v2/tim6.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
_include:
22
- arr_16bit.yaml
33
_modify:
4-
"PSC,REP,DCR":
4+
"CR1,CR2,DIER,SR,PSC":
55
size: 16

‎devices/patches/tim/v2/tim9.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_include:
2+
- arr_16bit.yaml
3+
_modify:
4+
"CR1,CR2,DIER,SR,EGR,CCER,PSC,CCR?":
5+
size: 16

‎devices/stm32c011.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ TIM3:
102102
_modify:
103103
CNT_alternate:
104104
name: CNT_remap
105+
"ARR,CCR?":
106+
resetMask: 0xffff
105107
_include:
108+
- patches/tim/v2/tim3.yaml
106109
- patches/tim/ccmr1_alternate.yaml
107110
- patches/tim/ccmr2_alternate.yaml
108111
- patches/tim/v2/oc1m.yaml

‎devices/stm32c031.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ TIM3:
106106
_modify:
107107
CNT_alternate:
108108
name: CNT_remap
109+
"ARR,CCR?":
110+
resetMask: 0xffff
109111
_include:
112+
- patches/tim/v2/tim3.yaml
110113
- patches/tim/ccmr1_alternate.yaml
111114
- patches/tim/ccmr2_alternate.yaml
112115
- patches/tim/v2/oc1m.yaml

‎devices/stm32c071.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ TIM3:
134134
CNT_ALTERNATE1:
135135
name: CNT_remap
136136
_include:
137+
- patches/tim/v2/tim3_with_mask.yaml
137138
- fields/tim/v2/tim3.yaml
138139
- collect/tim/ccr.yaml
139140

‎devices/stm32f301.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ SYSCFG:
181181

182182
TIM1:
183183
_include:
184-
- patches/tim/v2/tim1_16bit.yaml
184+
- patches/tim/v2/tim1.yaml
185185
- patches/tim/icpsc.yaml
186186
- patches/tim/dmab_32.yaml
187187
- fields/tim/tim_mms_ts_sms.yaml
@@ -196,7 +196,7 @@ TIM1:
196196

197197
TIM2:
198198
_include:
199-
- patches/tim/v2/16bit.yaml
199+
- patches/tim/v2/tim2.yaml
200200
- patches/tim/tim_o24ce.yaml
201201
- patches/tim/tim2_common_32bit.yaml
202202
- fields/tim/tim_mms_ts_sms.yaml
@@ -205,8 +205,7 @@ TIM2:
205205

206206
TIM6:
207207
_include:
208-
- patches/tim/v2/16bit.yaml
209-
- patches/tim/v2/arr_16bit.yaml
208+
- patches/tim/v2/tim6.yaml
210209
- fields/tim/v2/tim6.yaml
211210

212211
TIM15:
@@ -218,8 +217,7 @@ TIM15:
218217
bitWidth: 1
219218
access: read-write
220219
_include:
221-
- patches/tim/v2/16bit.yaml
222-
- patches/tim/v2/arr_16bit.yaml
220+
- patches/tim/v2/tim15.yaml
223221
- fields/tim/v2/tim15.yaml
224222
- collect/tim/ccr.yaml
225223

@@ -232,8 +230,7 @@ TIM16:
232230
bitWidth: 1
233231
access: read-write
234232
_include:
235-
- patches/tim/v2/16bit.yaml
236-
- patches/tim/v2/arr_16bit.yaml
233+
- patches/tim/v2/tim16.yaml
237234
- fields/tim/v2/tim16.yaml
238235
- collect/tim/ccr.yaml
239236

‎devices/stm32f302.yaml

+6-10
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ SYSCFG:
227227

228228
TIM[18]:
229229
_include:
230-
- patches/tim/v2/tim1_16bit.yaml
230+
- patches/tim/v2/tim1.yaml
231231
- patches/tim/icpsc.yaml
232232
- patches/tim/dmab_32.yaml
233233
- fields/tim/tim_mms_ts_sms.yaml
@@ -236,7 +236,7 @@ TIM[18]:
236236

237237
TIM2:
238238
_include:
239-
- patches/tim/v2/16bit.yaml
239+
- patches/tim/v2/tim2.yaml
240240
- patches/tim/tim_o24ce.yaml
241241
- patches/tim/tim2_common_32bit.yaml
242242
- fields/tim/tim_mms_ts_sms.yaml
@@ -245,8 +245,7 @@ TIM2:
245245

246246
TIM3:
247247
_include:
248-
- patches/tim/v2/16bit.yaml
249-
- patches/tim/v2/arr_16bit.yaml
248+
- patches/tim/v2/tim3.yaml
250249
- patches/tim/tim_o24ce.yaml
251250
- patches/tim/tim_ch_16bit_l.yaml
252251
- fields/tim/tim_mms_ts_sms.yaml
@@ -259,21 +258,18 @@ TIM3:
259258

260259
TIM6:
261260
_include:
262-
- patches/tim/v2/16bit.yaml
263-
- patches/tim/v2/arr_16bit.yaml
261+
- patches/tim/v2/tim6.yaml
264262
- fields/tim/v2/tim6.yaml
265263

266264
TIM15:
267265
_include:
268-
- patches/tim/v2/16bit.yaml
269-
- patches/tim/v2/arr_16bit.yaml
266+
- patches/tim/v2/tim15.yaml
270267
- fields/tim/v2/tim15.yaml
271268
- collect/tim/ccr.yaml
272269

273270
TIM1[67]:
274271
_include:
275-
- patches/tim/v2/16bit.yaml
276-
- patches/tim/v2/arr_16bit.yaml
272+
- patches/tim/v2/tim16.yaml
277273
- fields/tim/v2/tim16.yaml
278274
- collect/tim/ccr.yaml
279275

‎devices/stm32f303.yaml

+6-10
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ SYSCFG:
196196

197197
TIM[18]:
198198
_include:
199-
- patches/tim/v2/tim1_16bit.yaml
199+
- patches/tim/v2/tim1.yaml
200200
- patches/tim/icpsc.yaml
201201
- patches/tim/dmab_32.yaml
202202
- fields/tim/tim_mms_ts_sms.yaml
@@ -205,7 +205,7 @@ TIM[18]:
205205

206206
TIM2:
207207
_include:
208-
- patches/tim/v2/16bit.yaml
208+
- patches/tim/v2/tim2.yaml
209209
- patches/tim/tim_o24ce.yaml
210210
- patches/tim/tim2_common_32bit.yaml
211211
- fields/tim/tim_mms_ts_sms.yaml
@@ -214,8 +214,7 @@ TIM2:
214214

215215
TIM3:
216216
_include:
217-
- patches/tim/v2/16bit.yaml
218-
- patches/tim/v2/arr_16bit.yaml
217+
- patches/tim/v2/tim3.yaml
219218
- patches/tim/tim_o24ce.yaml
220219
- patches/tim/tim_ch_16bit_l.yaml
221220
- fields/tim/tim_mms_ts_sms.yaml
@@ -228,21 +227,18 @@ TIM3:
228227

229228
TIM6:
230229
_include:
231-
- patches/tim/v2/16bit.yaml
232-
- patches/tim/v2/arr_16bit.yaml
230+
- patches/tim/v2/tim6.yaml
233231
- fields/tim/v2/tim6.yaml
234232

235233
TIM15:
236234
_include:
237-
- patches/tim/v2/16bit.yaml
238-
- patches/tim/v2/arr_16bit.yaml
235+
- patches/tim/v2/tim15.yaml
239236
- fields/tim/v2/tim15.yaml
240237
- collect/tim/ccr.yaml
241238

242239
TIM1[67]:
243240
_include:
244-
- patches/tim/v2/16bit.yaml
245-
- patches/tim/v2/arr_16bit.yaml
241+
- patches/tim/v2/tim16.yaml
246242
- fields/tim/v2/tim16.yaml
247243
- collect/tim/ccr.yaml
248244

‎devices/stm32f3x4.yaml

+6-10
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ SYSCFG:
240240

241241
TIM1:
242242
_include:
243-
- patches/tim/v2/tim1_16bit.yaml
243+
- patches/tim/v2/tim1.yaml
244244
- patches/tim/icpsc.yaml
245245
- patches/tim/dmab_32.yaml
246246
- fields/tim/tim_mms_ts_sms.yaml
@@ -249,38 +249,34 @@ TIM1:
249249

250250
TIM2:
251251
_include:
252-
- patches/tim/v2/16bit.yaml
252+
- patches/tim/v2/tim2.yaml
253253
- patches/tim/tim2_common_32bit.yaml
254254
- fields/tim/tim_mms_ts_sms.yaml
255255
- fields/tim/v2/tim2.yaml
256256
- collect/tim/ccr.yaml
257257

258258
TIM3:
259259
_include:
260-
- patches/tim/v2/16bit.yaml
261-
- patches/tim/v2/arr_16bit.yaml
260+
- patches/tim/v2/tim3.yaml
262261
- patches/tim/v2/add_ocm_bit3.yaml
263262
- fields/tim/tim_mms_ts_sms.yaml
264263
- fields/tim/v2/tim3.yaml
265264
- collect/tim/ccr.yaml
266265

267266
TIM6:
268267
_include:
269-
- patches/tim/v2/16bit.yaml
270-
- patches/tim/v2/arr_16bit.yaml
268+
- patches/tim/v2/tim6.yaml
271269
- fields/tim/v2/tim6.yaml
272270

273271
TIM15:
274272
_include:
275-
- patches/tim/v2/16bit.yaml
276-
- patches/tim/v2/arr_16bit.yaml
273+
- patches/tim/v2/tim15.yaml
277274
- fields/tim/v2/tim15.yaml
278275
- collect/tim/ccr.yaml
279276

280277
TIM1[67]:
281278
_include:
282-
- patches/tim/v2/16bit.yaml
283-
- patches/tim/v2/arr_16bit.yaml
279+
- patches/tim/v2/tim16.yaml
284280
- fields/tim/v2/tim16.yaml
285281
- collect/tim/ccr.yaml
286282

‎devices/stm32f405.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -310,16 +310,9 @@ TIM1[01]:
310310
_include:
311311
- patches/tim/v1/16bit.yaml
312312
- patches/tim/icpsc.yaml
313+
- patches/tim/tim10_14_missing_opm.yaml
313314
- fields/tim/v1/tim10.yaml
314315
- collect/tim/ccr.yaml
315-
CR1:
316-
_add:
317-
# This field is missing from TIM10 and TIM11 compared to RM0090
318-
OPM:
319-
description: One-pulse mode
320-
bitOffset: 3
321-
bitWidth: 1
322-
access: read-write
323316

324317
UART4:
325318
_include:

‎devices/stm32f407.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -280,16 +280,9 @@ TIM1[01]:
280280
_include:
281281
- patches/tim/v1/16bit.yaml
282282
- patches/tim/icpsc.yaml
283+
- patches/tim/tim10_14_missing_opm.yaml
283284
- fields/tim/v1/tim10.yaml
284285
- collect/tim/ccr.yaml
285-
CR1:
286-
_add:
287-
# This field is missing from TIM10 and TIM11 compared to RM0090
288-
OPM:
289-
description: One-pulse mode
290-
bitOffset: 3
291-
bitWidth: 1
292-
access: read-write
293286

294287
UART4:
295288
_include:

0 commit comments

Comments
 (0)