From 48041c787ea9d3398d982a2b06906ce8e2cafb59 Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 12 Jul 2023 17:33:23 -0500 Subject: [PATCH] adc/f3: some cleanup --- data/registers/adc_f3.yaml | 579 +++---------------------------------- 1 file changed, 44 insertions(+), 535 deletions(-) diff --git a/data/registers/adc_f3.yaml b/data/registers/adc_f3.yaml index 12d23f9..b25c66a 100644 --- a/data/registers/adc_f3.yaml +++ b/data/registers/adc_f3.yaml @@ -79,34 +79,21 @@ block/ADC1: description: offset register 4 byte_offset: 108 fieldset: OFR4 - - name: JDR1 + - name: JDR description: injected data register 1 byte_offset: 128 access: Read - fieldset: JDR1 - - name: JDR2 - description: injected data register 2 - byte_offset: 132 - access: Read - fieldset: JDR2 - - name: JDR3 - description: injected data register 3 - byte_offset: 136 - access: Read - fieldset: JDR3 - - name: JDR4 - description: injected data register 4 - byte_offset: 140 - access: Read - fieldset: JDR4 - - name: AWD2CR - description: "Analog Watchdog 2 Configuration\r Register" + fieldset: JDR + array: + len: 4 + stride: 4 + - name: AWDCR + description: "Analog Watchdog X Configuration\r Register" byte_offset: 160 - fieldset: AWD2CR - - name: AWD3CR - description: "Analog Watchdog 3 Configuration\r Register" - byte_offset: 164 - fieldset: AWD3CR + fieldset: AWDCR + array: + len: 2 + stride: 4 - name: DIFSEL description: "Differential Mode Selection Register\r 2" byte_offset: 176 @@ -115,192 +102,16 @@ block/ADC1: description: Calibration Factors byte_offset: 180 fieldset: CALFACT -fieldset/AWD2CR: +fieldset/AWDCR: description: "Analog Watchdog 2 Configuration\r Register" fields: - name: AWD2CH0 description: AWD2CH bit_offset: 1 bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH1 - description: AWD2CH - bit_offset: 2 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH2 - description: AWD2CH - bit_offset: 3 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH3 - description: AWD2CH - bit_offset: 4 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH4 - description: AWD2CH - bit_offset: 5 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH5 - description: AWD2CH - bit_offset: 6 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH6 - description: AWD2CH - bit_offset: 7 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH7 - description: AWD2CH - bit_offset: 8 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH8 - description: AWD2CH - bit_offset: 9 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH9 - description: AWD2CH - bit_offset: 10 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH10 - description: AWD2CH - bit_offset: 11 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH11 - description: AWD2CH - bit_offset: 12 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH12 - description: AWD2CH - bit_offset: 13 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH13 - description: AWD2CH - bit_offset: 14 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH14 - description: AWD2CH - bit_offset: 15 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH15 - description: AWD2CH - bit_offset: 16 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH16 - description: AWD2CH - bit_offset: 17 - bit_size: 1 - enum: AWD2CH0 - - name: AWD2CH17 - description: AWD2CH - bit_offset: 18 - bit_size: 1 - enum: AWD2CH0 -fieldset/AWD3CR: - description: "Analog Watchdog 3 Configuration\r Register" - fields: - - name: AWD3CH0 - description: AWD3CH - bit_offset: 1 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH1 - description: AWD3CH - bit_offset: 2 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH2 - description: AWD3CH - bit_offset: 3 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH3 - description: AWD3CH - bit_offset: 4 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH4 - description: AWD3CH - bit_offset: 5 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH5 - description: AWD3CH - bit_offset: 6 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH6 - description: AWD3CH - bit_offset: 7 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH7 - description: AWD3CH - bit_offset: 8 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH8 - description: AWD3CH - bit_offset: 9 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH9 - description: AWD3CH - bit_offset: 10 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH10 - description: AWD3CH - bit_offset: 11 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH11 - description: AWD3CH - bit_offset: 12 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH12 - description: AWD3CH - bit_offset: 13 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH13 - description: AWD3CH - bit_offset: 14 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH14 - description: AWD3CH - bit_offset: 15 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH15 - description: AWD3CH - bit_offset: 16 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH16 - description: AWD3CH - bit_offset: 17 - bit_size: 1 - enum: AWD3CH0 - - name: AWD3CH17 - description: AWD3CH - bit_offset: 18 - bit_size: 1 - enum: AWD3CH0 + array: + len: 17 + stride: 1 fieldset/CALFACT: description: Calibration Factors fields: @@ -619,97 +430,49 @@ fieldset/ISR: description: interrupt and status register fields: - name: ADRDY - description: ADRDY + description: ADC Ready bit_offset: 0 bit_size: 1 - enum_read: ADRDYR - enum_write: ADRDYW - name: EOSMP - description: EOSMP + description: End of sampling flag bit_offset: 1 bit_size: 1 - enum_read: EOSMPR - enum_write: EOSMPW - name: EOC - description: EOC + description: End of conversion flag bit_offset: 2 bit_size: 1 - enum_read: EOCR - enum_write: EOCW - name: EOS - description: EOS + description: End of regular sequence flag bit_offset: 3 bit_size: 1 - enum_read: EOSR - enum_write: EOSW - name: OVR - description: OVR + description: ADC overrun bit_offset: 4 bit_size: 1 - enum_read: OVRR - enum_write: OVRW - name: JEOC - description: JEOC + description: Injected channel end of conversion flag bit_offset: 5 bit_size: 1 - enum_read: JEOCR - enum_write: JEOCW - name: JEOS - description: JEOS + description: Injected channel end of sequence flag bit_offset: 6 bit_size: 1 - enum_read: JEOSR - enum_write: JEOSW - - name: AWD1 - description: AWD1 + - name: AWD + description: Analog watchdog flag bit_offset: 7 bit_size: 1 - enum_read: AWD1R - enum_write: AWD1W - - name: AWD2 - description: AWD2 - bit_offset: 8 - bit_size: 1 - enum_read: AWD1R - enum_write: AWD1W - - name: AWD3 - description: AWD3 - bit_offset: 9 - bit_size: 1 - enum_read: AWD1R - enum_write: AWD1W + array: + len: 3 + stride: 1 - name: JQOVF - description: JQOVF + description: Injected context queue overflow bit_offset: 10 bit_size: 1 - enum_read: JQOVFR - enum_write: JQOVFW -fieldset/JDR1: +fieldset/JDR: description: injected data register 1 fields: - - name: JDATA1 - description: JDATA1 - bit_offset: 0 - bit_size: 16 -fieldset/JDR2: - description: injected data register 2 - fields: - - name: JDATA2 - description: JDATA2 - bit_offset: 0 - bit_size: 16 -fieldset/JDR3: - description: injected data register 3 - fields: - - name: JDATA3 - description: JDATA3 - bit_offset: 0 - bit_size: 16 -fieldset/JDR4: - description: injected data register 4 - fields: - - name: JDATA4 - description: JDATA4 + - name: JDATA + description: Injected data bit_offset: 0 bit_size: 16 fieldset/JSQR: @@ -812,99 +575,25 @@ fieldset/OFR4: fieldset/SMPR1: description: sample time register 1 fields: - - name: SMP1 - description: SMP1 + - name: SMP + description: Channel x sampling time selection bit_offset: 3 bit_size: 3 - enum: SMP1 - - name: SMP2 - description: SMP2 - bit_offset: 6 - bit_size: 3 - enum: SMP1 - - name: SMP3 - description: SMP3 - bit_offset: 9 - bit_size: 3 - enum: SMP1 - - name: SMP4 - description: SMP4 - bit_offset: 12 - bit_size: 3 - enum: SMP1 - - name: SMP5 - description: SMP5 - bit_offset: 15 - bit_size: 3 - enum: SMP1 - - name: SMP6 - description: SMP6 - bit_offset: 18 - bit_size: 3 - enum: SMP1 - - name: SMP7 - description: SMP7 - bit_offset: 21 - bit_size: 3 - enum: SMP1 - - name: SMP8 - description: SMP8 - bit_offset: 24 - bit_size: 3 - enum: SMP1 - - name: SMP9 - description: SMP9 - bit_offset: 27 - bit_size: 3 - enum: SMP1 + enum: SMP + array: + len: 9 + stride: 3 fieldset/SMPR2: description: sample time register 2 fields: - - name: SMP10 - description: SMP10 + - name: SMP + description: Channel x sampling time selection bit_offset: 0 bit_size: 3 - enum: SMP10 - - name: SMP11 - description: SMP11 - bit_offset: 3 - bit_size: 3 - enum: SMP10 - - name: SMP12 - description: SMP12 - bit_offset: 6 - bit_size: 3 - enum: SMP10 - - name: SMP13 - description: SMP13 - bit_offset: 9 - bit_size: 3 - enum: SMP10 - - name: SMP14 - description: SMP14 - bit_offset: 12 - bit_size: 3 - enum: SMP10 - - name: SMP15 - description: SMP15 - bit_offset: 15 - bit_size: 3 - enum: SMP10 - - name: SMP16 - description: SMP16 - bit_offset: 18 - bit_size: 3 - enum: SMP10 - - name: SMP17 - description: SMP17 - bit_offset: 21 - bit_size: 3 - enum: SMP10 - - name: SMP18 - description: SMP18 - bit_offset: 24 - bit_size: 3 - enum: SMP10 + enum: SMP + array: + len: 9 + stride: 3 fieldset/SQR1: description: regular sequence register 1 fields: @@ -1075,21 +764,6 @@ enum/ADRDYIE: - name: Enabled description: ADC ready interrupt enabled value: 1 -enum/ADRDYR: - bit_size: 1 - variants: - - name: NotReady - description: ADC is not ready to start conversion - value: 0 - - name: Ready - description: ADC is ready to start conversion - value: 1 -enum/ADRDYW: - bit_size: 1 - variants: - - name: Clear - description: Clear ADC is ready to start conversion flag - value: 1 enum/ADSTARTR: bit_size: 1 variants: @@ -1168,15 +842,6 @@ enum/AWD1IE: - name: Enabled description: Analog watchdog interrupt enabled value: 1 -enum/AWD1R: - bit_size: 1 - variants: - - name: NoEvent - description: No analog watchdog event occurred - value: 0 - - name: Event - description: Analog watchdog event occurred - value: 1 enum/AWD1SGL: bit_size: 1 variants: @@ -1186,30 +851,6 @@ enum/AWD1SGL: - name: Single description: Analog watchdog 1 enabled on single channel selected in AWD1CH value: 1 -enum/AWD1W: - bit_size: 1 - variants: - - name: Clear - description: Clear analog watchdog event occurred flag - value: 1 -enum/AWD2CH0: - bit_size: 1 - variants: - - name: NotMonitored - description: Input channel not monitored by AWDx - value: 0 - - name: Monitored - description: Input channel monitored by AWDx - value: 1 -enum/AWD3CH0: - bit_size: 1 - variants: - - name: NotMonitored - description: Input channel not monitored by AWDx - value: 0 - - name: Monitored - description: Input channel monitored by AWDx - value: 1 enum/CONT: bit_size: 1 variants: @@ -1264,21 +905,6 @@ enum/EOCIE: - name: Enabled description: End of regular conversion interrupt enabled value: 1 -enum/EOCR: - bit_size: 1 - variants: - - name: NotComplete - description: Regular conversion is not complete - value: 0 - - name: Complete - description: Regular conversion complete - value: 1 -enum/EOCW: - bit_size: 1 - variants: - - name: Clear - description: Clear regular conversion complete flag - value: 1 enum/EOSIE: bit_size: 1 variants: @@ -1297,36 +923,6 @@ enum/EOSMPIE: - name: Enabled description: End of regular conversion sampling phase interrupt enabled value: 1 -enum/EOSMPR: - bit_size: 1 - variants: - - name: NotEnded - description: End of sampling phase no yet reached - value: 0 - - name: Ended - description: End of sampling phase reached - value: 1 -enum/EOSMPW: - bit_size: 1 - variants: - - name: Clear - description: Clear end of sampling phase reached flag - value: 1 -enum/EOSR: - bit_size: 1 - variants: - - name: NotComplete - description: Regular sequence is not complete - value: 0 - - name: Complete - description: Regular sequence complete - value: 1 -enum/EOSW: - bit_size: 1 - variants: - - name: Clear - description: Clear regular sequence complete flag - value: 1 enum/EXTEN: bit_size: 2 variants: @@ -1423,21 +1019,6 @@ enum/JEOCIE: - name: Enabled description: End of injected conversion interrupt enabled value: 1 -enum/JEOCR: - bit_size: 1 - variants: - - name: NotComplete - description: Injected conversion is not complete - value: 0 - - name: Complete - description: Injected conversion complete - value: 1 -enum/JEOCW: - bit_size: 1 - variants: - - name: Clear - description: Clear injected conversion complete flag - value: 1 enum/JEOSIE: bit_size: 1 variants: @@ -1447,21 +1028,6 @@ enum/JEOSIE: - name: Enabled description: End of injected sequence interrupt enabled value: 1 -enum/JEOSR: - bit_size: 1 - variants: - - name: NotComplete - description: Injected sequence is not complete - value: 0 - - name: Complete - description: Injected sequence complete - value: 1 -enum/JEOSW: - bit_size: 1 - variants: - - name: Clear - description: Clear Injected sequence complete flag - value: 1 enum/JEXTEN: bit_size: 2 variants: @@ -1540,21 +1106,6 @@ enum/JQOVFIE: - name: Enabled description: Injected context queue overflow interrupt enabled value: 1 -enum/JQOVFR: - bit_size: 1 - variants: - - name: NoOverflow - description: No injected context queue overflow has occurred - value: 0 - - name: Overflow - description: Injected context queue overflow has occurred - value: 1 -enum/JQOVFW: - bit_size: 1 - variants: - - name: Clear - description: Clear injected context queue overflow flag - value: 1 enum/OFFSET1_EN: bit_size: 1 variants: @@ -1609,21 +1160,6 @@ enum/OVRMOD: - name: Overwrite description: Overwrite DR register when an overrun is detected value: 1 -enum/OVRR: - bit_size: 1 - variants: - - name: NoOverrun - description: No overrun occurred - value: 0 - - name: Overrun - description: Overrun occurred - value: 1 -enum/OVRW: - bit_size: 1 - variants: - - name: Clear - description: Clear overrun occurred flag - value: 1 enum/RES: bit_size: 2 variants: @@ -1639,34 +1175,7 @@ enum/RES: - name: Bits6 description: 6-bit value: 3 -enum/SMP1: - bit_size: 3 - variants: - - name: Cycles1_5 - description: 1.5 ADC clock cycles - value: 0 - - name: Cycles2_5 - description: 2.5 ADC clock cycles - value: 1 - - name: Cycles4_5 - description: 4.5 ADC clock cycles - value: 2 - - name: Cycles7_5 - description: 7.5 ADC clock cycles - value: 3 - - name: Cycles19_5 - description: 19.5 ADC clock cycles - value: 4 - - name: Cycles61_5 - description: 61.5 ADC clock cycles - value: 5 - - name: Cycles181_5 - description: 181.5 ADC clock cycles - value: 6 - - name: Cycles601_5 - description: 601.5 ADC clock cycles - value: 7 -enum/SMP10: +enum/SMP: bit_size: 3 variants: - name: Cycles1_5