From cd490fd7f3b55d311598001f1879ba3a2c6f4c02 Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Fri, 26 Jan 2024 22:10:48 +0800 Subject: [PATCH] let TIM_GP16 based on TIM_2CH --- data/registers/timer_v1.yaml | 77 ++++---------------------- data/registers/timer_v2.yaml | 101 ++++++++--------------------------- 2 files changed, 34 insertions(+), 144 deletions(-) diff --git a/data/registers/timer_v1.yaml b/data/registers/timer_v1.yaml index f2d368b..a7206f6 100644 --- a/data/registers/timer_v1.yaml +++ b/data/registers/timer_v1.yaml @@ -43,7 +43,7 @@ block/TIM_1CH: len: 1 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: TISEL description: input selection register byte_offset: 104 @@ -142,7 +142,7 @@ block/TIM_2CH: len: 2 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: TISEL description: input selection register byte_offset: 104 @@ -196,7 +196,7 @@ block/TIM_2CH_CMP: len: 2 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: BDTR description: break and dead-time register byte_offset: 68 @@ -265,7 +265,7 @@ block/TIM_ADV: - name: CCR6 description: capture/compare register 6 byte_offset: 92 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: AF1 description: alternate function register 1 byte_offset: 96 @@ -319,7 +319,7 @@ block/TIM_CORE: byte_offset: 44 fieldset: ARR_CORE block/TIM_GP16: - extends: TIM_BASIC + extends: TIM_2CH description: General purpose 16-bit timers items: - name: CR1 @@ -353,7 +353,7 @@ block/TIM_GP16: len: 2 stride: 4 byte_offset: 24 - fieldset: CCMR_Input_GP16 + fieldset: CCMR_Input_2CH - name: CCMR_Output description: capture/compare mode register 1-2 (output mode) array: @@ -371,7 +371,7 @@ block/TIM_GP16: len: 4 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: DCR description: DMA control register byte_offset: 72 @@ -857,32 +857,6 @@ fieldset/CCMR_Input_2CH: len: 2 stride: 8 enum: FilterValue -fieldset/CCMR_Input_GP16: - description: capture/compare mode register x (x=1-2) (input mode) - fields: - - name: CCS - description: Capture/Compare y selection - bit_offset: 0 - bit_size: 2 - array: - len: 2 - stride: 8 - enum: CCMR_Input_CCS - - name: ICPSC - description: Input capture y prescaler - bit_offset: 2 - bit_size: 2 - array: - len: 2 - stride: 8 - - name: ICF - description: Input capture y filter - bit_offset: 4 - bit_size: 4 - array: - len: 2 - stride: 8 - enum: FilterValue fieldset/CCMR_Output_1CH: description: capture/compare mode register x (x=1) (output mode) fields: @@ -951,38 +925,9 @@ fieldset/CCMR_Output_2CH: stride: 8 enum: OCM fieldset/CCMR_Output_GP16: - description: capture/compare mode register x (x=1-3) (output mode) + extends: CCMR_Output_2CH + description: capture/compare mode register x (x=1-2) (output mode) fields: - - name: CCS - description: Capture/Compare y selection - bit_offset: 0 - bit_size: 2 - array: - len: 2 - stride: 8 - enum: CCMR_Output_CCS - - name: OCFE - description: Output compare y fast enable - bit_offset: 2 - bit_size: 1 - array: - len: 2 - stride: 8 - - name: OCPE - description: Output compare y preload enable - bit_offset: 3 - bit_size: 1 - array: - len: 2 - stride: 8 - - name: OCM - description: Output compare y mode - bit_offset: 4 - bit_size: 3 - array: - len: 2 - stride: 8 - enum: OCM - name: OCCE description: Output compare y clear enable bit_offset: 7 @@ -991,7 +936,7 @@ fieldset/CCMR_Output_GP16: len: 2 stride: 8 fieldset/CCR5_ADV: - extends: CCR_GP16 + extends: CCR_1CH description: capture/compare register 5 fields: - name: GC5C @@ -1002,7 +947,7 @@ fieldset/CCR5_ADV: len: 3 stride: 1 enum: GC5C -fieldset/CCR_GP16: +fieldset/CCR_1CH: description: capture/compare register x (x=1-4,6) fields: - name: CCR diff --git a/data/registers/timer_v2.yaml b/data/registers/timer_v2.yaml index 02ab121..bd37d6d 100644 --- a/data/registers/timer_v2.yaml +++ b/data/registers/timer_v2.yaml @@ -43,14 +43,14 @@ block/TIM_1CH: len: 1 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: CCR_DITHER description: capture/compare register x (x=1) (Dither mode enabled) array: len: 1 stride: 4 byte_offset: 52 - fieldset: CCR_DITHER_GP16 + fieldset: CCR_DITHER_1CH - name: TISEL description: input selection register byte_offset: 92 @@ -157,14 +157,14 @@ block/TIM_2CH: len: 2 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: CCR_DITHER description: capture/compare register x (x=1-2) (Dither mode enabled) array: len: 2 stride: 4 byte_offset: 52 - fieldset: CCR_DITHER_GP16 + fieldset: CCR_DITHER_1CH - name: TISEL description: input selection register byte_offset: 92 @@ -218,7 +218,7 @@ block/TIM_2CH_CMP: len: 2 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: BDTR description: break and dead-time register byte_offset: 68 @@ -275,11 +275,11 @@ block/TIM_ADV: - name: CCR6 description: capture/compare register 6 (Dither mode disabled) byte_offset: 76 - fieldset: CCR_GP16 + fieldset: CCR_1CH - name: CCR6_DITHER description: capture/compare register 6 (Dither mode enabled) byte_offset: 76 - fieldset: CCR_DITHER_GP16 + fieldset: CCR_DITHER_1CH - name: CCMR3 description: capture/compare mode register 3 byte_offset: 80 @@ -345,7 +345,7 @@ block/TIM_CORE: byte_offset: 44 fieldset: ARR_DITHER_CORE block/TIM_GP16: - extends: TIM_BASIC + extends: TIM_2CH description: General purpose 16-bit timers items: - name: CR1 @@ -379,7 +379,7 @@ block/TIM_GP16: len: 2 stride: 4 byte_offset: 24 - fieldset: CCMR_Input_GP16 + fieldset: CCMR_Input_2CH - name: CCMR_Output description: capture/compare mode register 1-2 (output mode) array: @@ -397,14 +397,14 @@ block/TIM_GP16: len: 4 stride: 4 byte_offset: 52 - fieldset: CCR_GP16 + fieldset: CCR_1CH - 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_GP16 + fieldset: CCR_DITHER_1CH - name: ECR description: encoder control register byte_offset: 88 @@ -939,32 +939,6 @@ fieldset/CCMR_Input_2CH: len: 2 stride: 8 enum: FilterValue -fieldset/CCMR_Input_GP16: - description: capture/compare mode register x (x=1-2) (input mode) - fields: - - name: CCS - description: Capture/Compare y selection - bit_offset: 0 - bit_size: 2 - array: - len: 2 - stride: 8 - enum: CCMR_Input_CCS - - name: ICPSC - description: Input capture y prescaler - bit_offset: 2 - bit_size: 2 - array: - len: 2 - stride: 8 - - name: ICF - description: Input capture y filter - bit_offset: 4 - bit_size: 4 - array: - len: 2 - stride: 8 - enum: FilterValue fieldset/CCMR_Output_1CH: description: capture/compare mode register x (x=1) (output mode) fields: @@ -1033,38 +1007,9 @@ fieldset/CCMR_Output_2CH: stride: 8 enum: OCM fieldset/CCMR_Output_GP16: - description: capture/compare mode register x (x=1-3) (output mode) + extends: CCMR_Output_2CH + description: capture/compare mode register x (x=1-2) (output mode) fields: - - name: CCS - description: Capture/Compare y selection - bit_offset: 0 - bit_size: 2 - array: - len: 2 - stride: 8 - enum: CCMR_Output_CCS - - name: OCFE - description: Output compare y fast enable - bit_offset: 2 - bit_size: 1 - array: - len: 2 - stride: 8 - - name: OCPE - description: Output compare y preload enable - bit_offset: 3 - bit_size: 1 - array: - len: 2 - stride: 8 - - name: OCM - description: Output compare y mode - bit_offset: 4 - bit_size: 3 - array: - len: 2 - stride: 8 - enum: OCM - name: OCCE description: Output compare y clear enable bit_offset: 7 @@ -1073,7 +1018,7 @@ fieldset/CCMR_Output_GP16: len: 2 stride: 8 fieldset/CCR5_ADV: - extends: CCR_GP16 + extends: CCR_1CH description: capture/compare register 5 (Dither mode disabled) fields: - name: GC5C @@ -1085,7 +1030,7 @@ fieldset/CCR5_ADV: stride: 1 enum: GC5C fieldset/CCR5_DITHER_ADV: - extends: CCR_DITHER_GP16 + extends: CCR_DITHER_1CH description: capture/compare register 5 (Dither mode enabled) fields: - name: GC5C @@ -1096,7 +1041,14 @@ fieldset/CCR5_DITHER_ADV: len: 3 stride: 1 enum: GC5C -fieldset/CCR_DITHER_GP16: +fieldset/CCR_1CH: + 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: 16 +fieldset/CCR_DITHER_1CH: description: capture/compare register x (x=1-4,6) (Dither mode enabled) fields: - name: DITHER @@ -1118,13 +1070,6 @@ fieldset/CCR_DITHER_GP32: 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: - - name: CCR - description: capture/compare x (x=1-4,6) value - bit_offset: 0 - bit_size: 16 fieldset/CCR_GP32: description: capture/compare register x (x=1-4,6) (Dither mode disabled) fields: