Skip to content

TIM 16bit v1/v2 #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions devices/patches/tim/size16b.yaml

This file was deleted.

1 change: 1 addition & 0 deletions devices/patches/tim/tim10_14_missing_opm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ CR1:
OPM:
bitOffset: 3
bitWidth: 1
access: read-write
description: One-pulse mode
5 changes: 5 additions & 0 deletions devices/patches/tim/v1/16bit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_modify:
"?*":
size: 16
ARR:
resetValue: 0xffff
5 changes: 5 additions & 0 deletions devices/patches/tim/v1/tim1_16bit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_modify:
"[A-CE-Z]*,DIER,DCR":
size: 16
ARR:
resetValue: 0xffff
5 changes: 5 additions & 0 deletions devices/patches/tim/v1/tim2_16bit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_modify:
"[BD-Z]*,CR?,CCMR*,CCER":
size: 16
ARR:
resetValue: 0xffffffff
4 changes: 4 additions & 0 deletions devices/patches/tim/v2/arr_16bit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_modify:
ARR:
size: 16
resetValue: 0xffff
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,DIER,EGR,PSC,REP,CCR[1-46],DCR":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,DIER,SR,EGR,CCER,PSC,CCR?":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim13.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,DIER,SR,EGR,CCER,PSC,CCR?":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim15.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,CR2,DIER,SR,EGR,CCER,PSC,RCR,CCR?,DCR,DMAR":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim16.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,CR2,DIER,SR,EGR,CCER,PSC,RCR,CCR?,DCR,DMAR":
size: 16
3 changes: 3 additions & 0 deletions devices/patches/tim/v2/tim2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_modify:
"CR1,CR2,DIER,SR,EGR,CCER,PSC,DCR,DMAR":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,CR2,DIER,SR,EGR,CCER,PSC,CCR?,DCR,DMAR":
size: 16
19 changes: 19 additions & 0 deletions devices/patches/tim/v2/tim3_with_mask.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
_include:
- tim3.yaml

_modify:
"ARR,CCR?":
resetMask: 0xffff

CNT:
_modify:
CNT:
bitWidth: 16
ARR:
_modify:
ARR:
bitWidth: 16
CCR?:
_modify:
CCR?:
bitWidth: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,CR2,DIER,SR,PSC":
size: 16
5 changes: 5 additions & 0 deletions devices/patches/tim/v2/tim9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_include:
- arr_16bit.yaml
_modify:
"CR1,CR2,DIER,SR,EGR,CCER,PSC,CCR?":
size: 16
3 changes: 3 additions & 0 deletions devices/stm32c011.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ TIM3:
_modify:
CNT_alternate:
name: CNT_remap
"ARR,CCR?":
resetMask: 0xffff
_include:
- patches/tim/v2/tim3.yaml
- patches/tim/ccmr1_alternate.yaml
- patches/tim/ccmr2_alternate.yaml
- patches/tim/v2/oc1m.yaml
Expand Down
3 changes: 3 additions & 0 deletions devices/stm32c031.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ TIM3:
_modify:
CNT_alternate:
name: CNT_remap
"ARR,CCR?":
resetMask: 0xffff
_include:
- patches/tim/v2/tim3.yaml
- patches/tim/ccmr1_alternate.yaml
- patches/tim/ccmr2_alternate.yaml
- patches/tim/v2/oc1m.yaml
Expand Down
1 change: 1 addition & 0 deletions devices/stm32c071.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ TIM3:
CNT_ALTERNATE1:
name: CNT_remap
_include:
- patches/tim/v2/tim3_with_mask.yaml
- fields/tim/v2/tim3.yaml
- collect/tim/ccr.yaml

Expand Down
6 changes: 6 additions & 0 deletions devices/stm32f0x0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,34 +125,40 @@ SYSCFG:

TIM1:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/icpsc.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim1.yaml
- collect/tim/ccr.yaml

TIM3:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim_ch_16bit_l.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim3.yaml
- collect/tim/ccr.yaml

TIM6:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim6.yaml

TIM14:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim13.yaml
- collect/tim/ccr.yaml

TIM15:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim15.yaml
- collect/tim/ccr.yaml

TIM16:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim16.yaml
- collect/tim/ccr.yaml

Expand Down
7 changes: 7 additions & 0 deletions devices/stm32f0x1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,41 +122,48 @@ SYSCFG:

TIM1:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/icpsc.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim1.yaml
- collect/tim/ccr.yaml

TIM2:
_include:
- patches/tim/v1/tim2_16bit.yaml
- patches/tim/tim2_common_32bit.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim2.yaml
- collect/tim/ccr.yaml

TIM3:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim_ch_16bit_l.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim3.yaml
- collect/tim/ccr.yaml

TIM6:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim6.yaml

TIM14:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim13.yaml
- collect/tim/ccr.yaml

TIM15:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim15.yaml
- collect/tim/ccr.yaml

TIM16:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim16.yaml
- collect/tim/ccr.yaml

Expand Down
7 changes: 7 additions & 0 deletions devices/stm32f0x2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,41 +135,48 @@ SYSCFG:

TIM1:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/icpsc.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim1.yaml
- collect/tim/ccr.yaml

TIM2:
_include:
- patches/tim/v1/tim2_16bit.yaml
- patches/tim/tim2_common_32bit.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim2.yaml
- collect/tim/ccr.yaml

TIM3:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim_ch_16bit_l.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim3.yaml
- collect/tim/ccr.yaml

TIM6:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim6.yaml

TIM14:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim13.yaml
- collect/tim/ccr.yaml

TIM15:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim15.yaml
- collect/tim/ccr.yaml

TIM16:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim16.yaml
- collect/tim/ccr.yaml

Expand Down
7 changes: 7 additions & 0 deletions devices/stm32f0x8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,41 +118,48 @@ SYSCFG:

TIM1:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/icpsc.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim1.yaml
- collect/tim/ccr.yaml

TIM2:
_include:
- patches/tim/v1/tim2_16bit.yaml
- patches/tim/tim2_common_32bit.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim2.yaml
- collect/tim/ccr.yaml

TIM3:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim_ch_16bit_l.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim3.yaml
- collect/tim/ccr.yaml

TIM6:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim6.yaml

TIM14:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim13.yaml
- collect/tim/ccr.yaml

TIM15:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim15.yaml
- collect/tim/ccr.yaml

TIM16:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim16.yaml
- collect/tim/ccr.yaml

Expand Down
7 changes: 7 additions & 0 deletions devices/stm32f100.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,40 +97,47 @@ SPI1:

TIM1:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/icpsc.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim1.yaml
- collect/tim/ccr.yaml

TIM2:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/tim_mms_ts_sms.yaml
- fields/tim/v1/tim3.yaml
- collect/tim/ccr.yaml

TIM6:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim6.yaml

TIM12:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim9_ic1f.yaml
- fields/tim/v1/tim9.yaml
- collect/tim/ccr.yaml

TIM13:
_include:
- patches/tim/v1/16bit.yaml
- patches/tim/tim10_14_missing_opm.yaml
- fields/tim/v1/tim13.yaml
- collect/tim/ccr.yaml

TIM15:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim15.yaml
- collect/tim/ccr.yaml

TIM16:
_include:
- patches/tim/v1/16bit.yaml
- fields/tim/v1/tim16.yaml
- collect/tim/ccr.yaml

Expand Down
Loading
Loading