From 65a7e873c6744827b5c012050f5447c361f53737 Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Sun, 21 Jan 2024 23:11:27 +0800 Subject: [PATCH] adv, gp16, gp32, basic merged --- data/registers/timbasic_v2.yaml | 177 ----------------- data/registers/timer_v2.yaml | 324 ++++++++++++++++++-------------- 2 files changed, 179 insertions(+), 322 deletions(-) delete mode 100644 data/registers/timbasic_v2.yaml diff --git a/data/registers/timbasic_v2.yaml b/data/registers/timbasic_v2.yaml deleted file mode 100644 index 5793f50..0000000 --- a/data/registers/timbasic_v2.yaml +++ /dev/null @@ -1,177 +0,0 @@ -block/TIM_BASIC: - description: Basic timers - items: - - name: CR1 - description: control register 1 - byte_offset: 0 - fieldset: CR1_BASIC - - name: CR2 - description: control register 2 - byte_offset: 4 - fieldset: CR2_BASIC - - name: DIER - description: DMA/Interrupt enable register - byte_offset: 12 - fieldset: DIER_BASIC - - name: SR - description: status register - byte_offset: 16 - fieldset: SR_BASIC - - name: EGR - description: event generation register - byte_offset: 20 - access: Write - fieldset: EGR_BASIC - - name: CNT - description: counter - byte_offset: 36 - fieldset: CNT_BASIC - - name: PSC - description: prescaler - byte_offset: 40 - fieldset: PSC_BASIC - - name: ARR - description: auto-reload register (Dither mode disabled) - byte_offset: 44 - fieldset: ARR_BASIC - - name: ARR_DITHER - description: auto-reload register (Dither mode enabled) - byte_offset: 44 - fieldset: ARR_DITHER_BASIC -fieldset/ARR_BASIC: - description: auto-reload register (Dither mode disabled) - fields: - - name: ARR - description: Auto-reload value - bit_offset: 0 - bit_size: 16 -fieldset/ARR_DITHER_BASIC: - description: auto-reload register (Dither mode enabled) - fields: - - name: DITHER - description: Dither value - bit_offset: 0 - bit_size: 4 - - name: ARR - description: Auto-reload value - bit_offset: 4 - bit_size: 16 -fieldset/CNT_BASIC: - description: counter - fields: - - name: CNT - description: counter value - bit_offset: 0 - bit_size: 16 - - name: UIFCPY - description: UIF copy - bit_offset: 31 - bit_size: 1 -fieldset/CR1_BASIC: - description: control register 1 - fields: - - name: CEN - description: Counter enable - bit_offset: 0 - bit_size: 1 - - name: UDIS - description: Update disable - bit_offset: 1 - bit_size: 1 - - name: URS - description: Update request source - bit_offset: 2 - bit_size: 1 - enum: URS - - name: OPM - description: One-pulse mode enbaled - bit_offset: 3 - bit_size: 1 - - name: ARPE - description: Auto-reload preload enable - bit_offset: 7 - bit_size: 1 - - name: UIFREMAP - description: UIF status bit remapping enable - bit_offset: 11 - bit_size: 1 - - name: DITHEN - description: Dithering enable - bit_offset: 12 - bit_size: 1 -fieldset/CR2_BASIC: - description: control register 2 - fields: - - name: MMS - description: Master mode selection - bit_offset: 4 - bit_size: 3 - enum: MMS -fieldset/DIER_BASIC: - description: DMA/Interrupt enable register - fields: - - name: UIE - description: Update interrupt enable - bit_offset: 0 - bit_size: 1 - - name: UDE - description: Update DMA request enable - bit_offset: 8 - bit_size: 1 -fieldset/EGR_BASIC: - description: event generation register - fields: - - name: UG - description: Update generation - bit_offset: 0 - bit_size: 1 -fieldset/PSC_BASIC: - description: prescaler - fields: - - name: PSC - description: Prescaler value - bit_offset: 0 - bit_size: 16 -fieldset/SR_BASIC: - description: status register - fields: - - name: UIF - description: Update interrupt flag - bit_offset: 0 - bit_size: 1 -enum/MMS: - bit_size: 3 - variants: - - name: Reset - description: The UG bit from the TIMx_EGR register is used as trigger output - value: 0 - - name: Enable - description: The counter enable signal, CNT_EN, is used as trigger output - value: 1 - - name: Update - description: The update event is selected as trigger output - value: 2 - - name: ComparePulse - description: The trigger output send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred - value: 3 - - name: CompareOC1 - description: OC1REF signal is used as trigger output - value: 4 - - name: CompareOC2 - description: OC2REF signal is used as trigger output - value: 5 - - name: CompareOC3 - description: OC3REF signal is used as trigger output - value: 6 - - name: CompareOC4 - description: OC4REF signal is used as trigger output - value: 7 -enum/URS: - bit_size: 1 - variants: - - name: AnyEvent - description: Any of counter overflow/underflow, setting UG, or update through slave mode, generates an update interrupt or DMA request - value: 0 - - name: CounterOnly - description: Only counter overflow/underflow generates an update interrupt or DMA request - value: 1 diff --git a/data/registers/timer_v2.yaml b/data/registers/timer_v2.yaml index a737c04..0cb5d26 100644 --- a/data/registers/timer_v2.yaml +++ b/data/registers/timer_v2.yaml @@ -1,91 +1,3 @@ -block/TIM_GP32: - extends: TIM_GP16 - description: General purpose 32-bit timers - items: - - name: CNT - description: counter (Dither mode disabled) - byte_offset: 36 - fieldset: CNT_GP32 - - name: CNT_DITHER - description: counter (Dither mode enbled) - byte_offset: 36 - fieldset: CNT_DITHER_GP32 - - name: ARR - description: auto-reload register (Dither mode disabled) - byte_offset: 44 - fieldset: ARR_GP32 - - name: ARR_DITHER - description: auto-reload register (Dither mode enabled) - byte_offset: 44 - fieldset: ARR_DITHER_GP32 - - name: CCR - description: capture/compare register x (x=1-4) (Dither mode disabled) - array: - len: 4 - stride: 4 - byte_offset: 52 - fieldset: CCR_GP32 - - name: CCR_DITHER - description: capture/compare register x (x=1-4) (Dither mode enabled) - array: - len: 4 - stride: 4 - byte_offset: 52 - fieldset: CCR_DITHER_GP32 -fieldset/CNT_GP32: - description: counter (Dither mode disabled) - fields: - - name: CNT - description: counter value - bit_offset: 0 - bit_size: 32 -fieldset/CNT_DITHER_GP32: - description: counter (Dither mode enabled) - fields: - - name: CNT - description: counter value - bit_offset: 0 - bit_size: 31 - - name: UIFCPY - description: UIF copy - bit_offset: 31 - bit_size: 1 -fieldset/ARR_GP32: - description: auto-reload register (Dither mode disabled) - fields: - - name: ARR - description: Auto-reload value - bit_offset: 0 - bit_size: 32 -fieldset/ARR_DITHER_GP32: - description: auto-reload register (Dither mode enabled) - fields: - - name: DITHER - description: Dither value - bit_offset: 0 - bit_size: 4 - - name: ARR - description: Auto-reload value - bit_offset: 4 - bit_size: 28 -fieldset/CCR_DITHER_GP32: - description: capture/compare register x (x=1-4,6) (Dither mode enabled) - fields: - - name: DITHER - description: Dither value - bit_offset: 0 - bit_size: 4 - - name: CCR - description: capture/compare x (x=1-4,6) value - bit_offset: 4 - bit_size: 28 -fieldset/CCR_GP32: - description: capture/compare register x (x=1-4,6) (Dither mode disabled) - fields: - - name: CCR - description: capture/compare x (x=1-4,6) value - bit_offset: 0 - bit_size: 32 block/TIM_ADV: extends: TIM_GP16 description: Advanced Control timers @@ -155,7 +67,48 @@ block/TIM_ADV: description: alternate function register 2 byte_offset: 100 fieldset: AF2_ADV +block/TIM_BASIC: + description: Basic timers + items: + - name: CR1 + description: control register 1 + byte_offset: 0 + fieldset: CR1_BASIC + - name: CR2 + description: control register 2 + byte_offset: 4 + fieldset: CR2_BASIC + - name: DIER + description: DMA/Interrupt enable register + byte_offset: 12 + fieldset: DIER_BASIC + - name: SR + description: status register + byte_offset: 16 + fieldset: SR_BASIC + - name: EGR + description: event generation register + byte_offset: 20 + access: Write + fieldset: EGR_BASIC + - name: CNT + description: counter + byte_offset: 36 + fieldset: CNT_BASIC + - name: PSC + description: prescaler + byte_offset: 40 + fieldset: PSC_BASIC + - name: ARR + description: auto-reload register (Dither mode disabled) + byte_offset: 44 + fieldset: ARR_BASIC + - name: ARR_DITHER + description: auto-reload register (Dither mode enabled) + byte_offset: 44 + fieldset: ARR_DITHER_BASIC block/TIM_GP16: + extends: TIM_BASIC description: General purpose 16-bit timers items: - name: CR1 @@ -201,26 +154,6 @@ block/TIM_GP16: description: capture/compare enable register byte_offset: 32 fieldset: CCER_GP16 - - name: CNT - description: counter - byte_offset: 36 - fieldset: CNT_GP16 - - name: PSC - description: prescaler - byte_offset: 40 - fieldset: PSC_GP16 - - name: ARR - description: auto-reload register (Dither mode disabled) - byte_offset: 44 - fieldset: ARR_GP16 - - name: ARR_DITHER - description: auto-reload register (Dither mode enabled) - byte_offset: 44 - fieldset: ARR_DITHER_GP16 - - name: RCR - description: repetition counter register - byte_offset: 48 - fieldset: RCR_GP16 - name: CCR description: capture/compare register x (x=1-4) (Dither mode disabled) array: @@ -259,6 +192,40 @@ block/TIM_GP16: description: DMA address for full transfer byte_offset: 992 fieldset: DMAR_GP16 +block/TIM_GP32: + extends: TIM_GP16 + description: General purpose 32-bit timers + items: + - name: CNT + description: counter (Dither mode disabled) + byte_offset: 36 + fieldset: CNT_GP32 + - name: CNT_DITHER + description: counter (Dither mode enbled) + byte_offset: 36 + fieldset: CNT_DITHER_GP32 + - name: ARR + description: auto-reload register (Dither mode disabled) + byte_offset: 44 + fieldset: ARR_GP32 + - name: ARR_DITHER + description: auto-reload register (Dither mode enabled) + byte_offset: 44 + fieldset: ARR_DITHER_GP32 + - name: CCR + description: capture/compare register x (x=1-4) (Dither mode disabled) + array: + len: 4 + stride: 4 + byte_offset: 52 + fieldset: CCR_GP32 + - name: CCR_DITHER + description: capture/compare register x (x=1-4) (Dither mode enabled) + array: + len: 4 + stride: 4 + byte_offset: 52 + fieldset: CCR_DITHER_GP32 fieldset/AF1_ADV: extends: AF1_GP16 description: alternate function register 1 @@ -329,7 +296,14 @@ fieldset/AF2_GP16: description: ocref_clr source selection bit_offset: 16 bit_size: 3 -fieldset/ARR_DITHER_GP16: +fieldset/ARR_BASIC: + description: auto-reload register (Dither mode disabled) + fields: + - name: ARR + description: Auto-reload value + bit_offset: 0 + bit_size: 16 +fieldset/ARR_DITHER_BASIC: description: auto-reload register (Dither mode enabled) fields: - name: DITHER @@ -340,13 +314,24 @@ fieldset/ARR_DITHER_GP16: description: Auto-reload value bit_offset: 4 bit_size: 16 -fieldset/ARR_GP16: +fieldset/ARR_DITHER_GP32: + description: auto-reload register (Dither mode enabled) + fields: + - name: DITHER + description: Dither value + bit_offset: 0 + bit_size: 4 + - name: ARR + description: Auto-reload value + bit_offset: 4 + bit_size: 28 +fieldset/ARR_GP32: description: auto-reload register (Dither mode disabled) fields: - name: ARR description: Auto-reload value bit_offset: 0 - bit_size: 16 + bit_size: 32 fieldset/BDTR_ADV: description: break and dead-time register fields: @@ -598,6 +583,17 @@ fieldset/CCR_DITHER_GP16: description: capture/compare x (x=1-4,6) value bit_offset: 4 bit_size: 16 +fieldset/CCR_DITHER_GP32: + description: capture/compare register x (x=1-4,6) (Dither mode enabled) + fields: + - name: DITHER + description: Dither value + bit_offset: 0 + bit_size: 4 + - name: CCR + description: capture/compare x (x=1-4,6) value + bit_offset: 4 + bit_size: 28 fieldset/CCR_GP16: description: capture/compare register x (x=1-4,6) (Dither mode disabled) fields: @@ -605,7 +601,14 @@ fieldset/CCR_GP16: description: capture/compare x (x=1-4,6) value bit_offset: 0 bit_size: 16 -fieldset/CNT_GP16: +fieldset/CCR_GP32: + description: capture/compare register x (x=1-4,6) (Dither mode disabled) + fields: + - name: CCR + description: capture/compare x (x=1-4,6) value + bit_offset: 0 + bit_size: 32 +fieldset/CNT_BASIC: description: counter fields: - name: CNT @@ -616,7 +619,25 @@ fieldset/CNT_GP16: description: UIF copy bit_offset: 31 bit_size: 1 -fieldset/CR1_GP16: +fieldset/CNT_DITHER_GP32: + description: counter (Dither mode enabled) + fields: + - name: CNT + description: counter value + bit_offset: 0 + bit_size: 31 + - name: UIFCPY + description: UIF copy + bit_offset: 31 + bit_size: 1 +fieldset/CNT_GP32: + description: counter (Dither mode disabled) + fields: + - name: CNT + description: counter value + bit_offset: 0 + bit_size: 32 +fieldset/CR1_BASIC: description: control register 1 fields: - name: CEN @@ -636,6 +657,22 @@ fieldset/CR1_GP16: description: One-pulse mode enbaled bit_offset: 3 bit_size: 1 + - name: ARPE + description: Auto-reload preload enable + bit_offset: 7 + bit_size: 1 + - name: UIFREMAP + description: UIF status bit remapping enable + bit_offset: 11 + bit_size: 1 + - name: DITHEN + description: Dithering enable + bit_offset: 12 + bit_size: 1 +fieldset/CR1_GP16: + extends: CR1_BASIC + description: control register 1 + fields: - name: DIR description: Direction bit_offset: 4 @@ -646,23 +683,11 @@ fieldset/CR1_GP16: bit_offset: 5 bit_size: 2 enum: CMS - - name: ARPE - description: Auto-reload preload enable - bit_offset: 7 - bit_size: 1 - name: CKD description: Clock division bit_offset: 8 bit_size: 2 enum: CKD - - name: UIFREMAP - description: UIF status bit remapping enable - bit_offset: 11 - bit_size: 1 - - name: DITHEN - description: Dithering enable - bit_offset: 12 - bit_size: 1 fieldset/CR2_ADV: extends: CR2_GP16 description: control register 2 @@ -694,7 +719,16 @@ fieldset/CR2_ADV: bit_offset: 20 bit_size: 4 enum: MMS2 +fieldset/CR2_BASIC: + description: control register 2 + fields: + - name: MMS + description: Master mode selection + bit_offset: 4 + bit_size: 3 + enum: MMS fieldset/CR2_GP16: + extends: CR2_BASIC description: control register 2 fields: - name: CCDS @@ -702,11 +736,6 @@ fieldset/CR2_GP16: bit_offset: 3 bit_size: 1 enum: CCDS - - name: MMS - description: Master mode selection - bit_offset: 4 - bit_size: 3 - enum: MMS - name: TI1S description: TI1 selection bit_offset: 7 @@ -744,13 +773,21 @@ fieldset/DIER_ADV: description: COM DMA request enable bit_offset: 13 bit_size: 1 -fieldset/DIER_GP16: +fieldset/DIER_BASIC: description: DMA/Interrupt enable register fields: - name: UIE description: Update interrupt enable bit_offset: 0 bit_size: 1 + - name: UDE + description: Update DMA request enable + bit_offset: 8 + bit_size: 1 +fieldset/DIER_GP16: + extends: DIER_BASIC + description: DMA/Interrupt enable register + fields: - name: CCIE description: Capture/Compare x (x=1-4) interrupt enable bit_offset: 1 @@ -766,10 +803,6 @@ fieldset/DIER_GP16: description: Break interrupt enable bit_offset: 7 bit_size: 1 - - name: UDE - description: Update DMA request enable - bit_offset: 8 - bit_size: 1 - name: CCDE description: Capture/Compare x (x=1-4) DMA request enable bit_offset: 9 @@ -869,13 +902,17 @@ fieldset/EGR_ADV: array: len: 2 stride: 1 -fieldset/EGR_GP16: +fieldset/EGR_BASIC: description: event generation register fields: - name: UG description: Update generation bit_offset: 0 bit_size: 1 +fieldset/EGR_GP16: + extends: EGR_BASIC + description: event generation register + fields: - name: CCG description: Capture/compare x (x=1-4) generation bit_offset: 1 @@ -887,7 +924,7 @@ fieldset/EGR_GP16: description: Trigger generation bit_offset: 6 bit_size: 1 -fieldset/PSC_GP16: +fieldset/PSC_BASIC: description: prescaler fields: - name: PSC @@ -901,13 +938,6 @@ fieldset/RCR_ADV: description: Repetition counter value bit_offset: 0 bit_size: 16 -fieldset/RCR_GP16: - description: repetition counter register - fields: - - name: REP - description: Repetition counter value - bit_offset: 0 - bit_size: 16 fieldset/SMCR_ADV: extends: SMCR_GP16 description: slave mode control register @@ -986,13 +1016,17 @@ fieldset/SR_ADV: description: Capture/compare 6 interrupt flag bit_offset: 17 bit_size: 1 -fieldset/SR_GP16: +fieldset/SR_BASIC: description: status register fields: - name: UIF description: Update interrupt flag bit_offset: 0 bit_size: 1 +fieldset/SR_GP16: + extends: SR_BASIC + description: status register + fields: - name: CCIF description: Capture/compare x (x=1-4) interrupt flag bit_offset: 1