diff --git a/data/registers/adc_v2.yaml b/data/registers/adc_v2.yaml index 5481fcd..b9873e9 100644 --- a/data/registers/adc_v2.yaml +++ b/data/registers/adc_v2.yaml @@ -302,7 +302,7 @@ fieldset/SR: description: status register fields: - name: AWD - description: Analog watchdog flag + description: Analog watchdog event occurred bit_offset: 0 bit_size: 1 - name: EOC @@ -314,15 +314,15 @@ fieldset/SR: bit_offset: 2 bit_size: 1 - name: JSTRT - description: Injected channel start flag + description: Injected channel conversion has started bit_offset: 3 bit_size: 1 - name: STRT - description: Regular channel start flag + description: Regular channel conversion has started bit_offset: 4 bit_size: 1 - name: OVR - description: Overrun + description: Overrun occurred bit_offset: 5 bit_size: 1 enum/ALIGN: diff --git a/data/registers/adccommon_f3.yaml b/data/registers/adccommon_f3.yaml index c48475b..cf37f6c 100644 --- a/data/registers/adccommon_f3.yaml +++ b/data/registers/adccommon_f3.yaml @@ -75,52 +75,30 @@ fieldset/CSR: description: End of sampling phase flag of the master ADC bit_offset: 1 bit_size: 1 - enum: ENDED - name: EOC_MST description: End of regular conversion of the master ADC bit_offset: 2 bit_size: 1 - enum: ENDED - name: EOS_MST description: End of regular sequence flag of the master ADC bit_offset: 3 bit_size: 1 - enum: ENDED - name: OVR_MST description: Overrun flag of the master ADC bit_offset: 4 bit_size: 1 - enum: OVR - name: JEOC_MST description: End of injected conversion of the master ADC bit_offset: 5 bit_size: 1 - enum: ENDED - name: JEOS description: End of injected sequence flag of the master ADC bit_offset: 6 bit_size: 1 - enum: ENDED - - name: AWD1_MST - description: Analog watchdog 1 flag of the master ADC - bit_offset: 7 - bit_size: 1 - enum: AWD - - name: AWD2_MST - description: Analog watchdog 2 flag of the master ADC - bit_offset: 8 - bit_size: 1 - enum: AWD - - name: AWD3_MST - description: Analog watchdog 3 flag of the master ADC - bit_offset: 9 - bit_size: 1 - enum: AWD - name: JQOVF_MST description: Injected context queue overflow flag of the master ADC bit_offset: 10 bit_size: 1 - enum: JQOVF - name: ADRDY_SLV description: Slave ADC ready bit_offset: 16 @@ -129,62 +107,44 @@ fieldset/CSR: description: End of sampling phase flag of the slave ADC bit_offset: 17 bit_size: 1 - enum: ENDED - name: EOC_SLV description: End of regular conversion of the slave ADC bit_offset: 18 bit_size: 1 - enum: ENDED - name: EOS_SLV description: End of regular sequence flag of the slave ADC bit_offset: 19 bit_size: 1 - enum: ENDED - name: OVR_SLV description: Overrun flag of the slave ADC bit_offset: 20 bit_size: 1 - enum: OVR - name: JEOC_SLV description: End of injected conversion of the slave ADC bit_offset: 21 bit_size: 1 - enum: ENDED - name: JEOS_SLV description: End of injected sequence flag of the slave ADC bit_offset: 22 bit_size: 1 - enum: ENDED - - name: AWD1_SLV - description: Analog watchdog 1 flag of the slave ADC - bit_offset: 23 - bit_size: 1 - enum: AWD - - name: AWD2_SLV - description: Analog watchdog 2 flag of the slave ADC - bit_offset: 24 - bit_size: 1 - enum: AWD - - name: AWD3_SLV - description: Analog watchdog 3 flag of the slave ADC - bit_offset: 25 - bit_size: 1 - enum: AWD - name: JQOVF_SLV description: Injected context queue overflow flag of the slave ADC bit_offset: 26 bit_size: 1 - enum: JQOVF -enum/AWD: - description: Analog watchdog flag - bit_size: 1 - variants: - - name: NoEvent - description: No analog watchdog event occurred - value: 0 - - name: Event - description: Analog watchdog event occurred - value: 1 + - name: AWD_MST + description: Analog watchdog flag of the master ADC + bit_offset: 7 + bit_size: 1 + array: + len: 3 + stride: 1 + - name: AWD_SLV + description: Analog watchdog flag of the slave ADC + bit_offset: 23 + bit_size: 1 + array: + len: 3 + stride: 1 enum/CKMODE: description: ADC clock mode bit_size: 2 @@ -239,26 +199,6 @@ enum/DUAL: - name: DualA description: Dual, alternate trigger mode only value: 9 -enum/ENDED: - description: End of operation - bit_size: 1 - variants: - - name: NotEnded - description: Operation is not ended - value: 0 - - name: Ended - description: Operation is ended - value: 1 -enum/JQOVF: - description: Injected context queue overflow flag - bit_size: 1 - variants: - - name: NoOverflow - description: No injected context queue overflow - value: 0 - - name: Overflow - description: Injected context queue overflow - value: 1 enum/MDMA: description: Direct memory access mode for multi ADC mode bit_size: 2 @@ -272,13 +212,3 @@ enum/MDMA: - name: Bit8_6 description: MDMA mode enabled for 8 and 6-bit resolution value: 3 -enum/OVR: - description: Overrun flag - bit_size: 1 - variants: - - name: NoOverrun - description: No overrun occurred - value: 0 - - name: Overrun - description: Overrun occurred - value: 1 diff --git a/data/registers/adccommon_v2.yaml b/data/registers/adccommon_v2.yaml index 284369f..bba7207 100644 --- a/data/registers/adccommon_v2.yaml +++ b/data/registers/adccommon_v2.yaml @@ -64,42 +64,42 @@ fieldset/CSR: description: ADC common status register fields: - name: AWD - description: Analog watchdog flag of ADC 1 + description: Analog watchdog event occurred bit_offset: 0 bit_size: 1 array: len: 3 stride: 8 - name: EOC - description: End of conversion of ADC 1 + description: End of conversion of ADC bit_offset: 1 bit_size: 1 array: len: 3 stride: 8 - name: JEOC - description: Injected channel end of conversion of ADC 1 + description: Injected channel end of conversion of ADC bit_offset: 2 bit_size: 1 array: len: 3 stride: 8 - name: JSTRT - description: Injected channel Start flag of ADC 1 + description: Injected channel conversion started bit_offset: 3 bit_size: 1 array: len: 3 stride: 8 - name: STRT - description: Regular channel Start flag of ADC 1 + description: regular channel conversion started bit_offset: 4 bit_size: 1 array: len: 3 stride: 8 - name: OVR - description: Overrun flag of ADC 1 + description: Overrun occurred bit_offset: 5 bit_size: 1 array: diff --git a/data/registers/adccommon_v3.yaml b/data/registers/adccommon_v3.yaml index c9b069c..3acd38f 100644 --- a/data/registers/adccommon_v3.yaml +++ b/data/registers/adccommon_v3.yaml @@ -92,18 +92,6 @@ fieldset/CSR: description: JEOS_MST bit_offset: 6 bit_size: 1 - - name: AWD1_MST - description: AWD1_MST - bit_offset: 7 - bit_size: 1 - - name: AWD2_MST - description: AWD2_MST - bit_offset: 8 - bit_size: 1 - - name: AWD3_MST - description: AWD3_MST - bit_offset: 9 - bit_size: 1 - name: JQOVF_MST description: JQOVF_MST bit_offset: 10 @@ -136,19 +124,21 @@ fieldset/CSR: description: End of injected sequence flag of the slave ADC bit_offset: 22 bit_size: 1 - - name: AWD1_SLV - description: Analog watchdog 1 flag of the slave ADC - bit_offset: 23 - bit_size: 1 - - name: AWD2_SLV - description: Analog watchdog 2 flag of the slave ADC - bit_offset: 24 - bit_size: 1 - - name: AWD3_SLV - description: Analog watchdog 3 flag of the slave ADC - bit_offset: 25 - bit_size: 1 - name: JQOVF_SLV description: Injected Context Queue Overflow flag of the slave ADC bit_offset: 26 bit_size: 1 + - name: AWD_MST + description: Analog watchdog flag of the master ADC + bit_offset: 7 + bit_size: 1 + array: + len: 3 + stride: 1 + - name: AWD_SLV + description: Analog watchdog 1 flag of the slave ADC + bit_offset: 23 + bit_size: 1 + array: + len: 3 + stride: 1 diff --git a/data/registers/adccommon_v4.yaml b/data/registers/adccommon_v4.yaml index f624977..68b0f3d 100644 --- a/data/registers/adccommon_v4.yaml +++ b/data/registers/adccommon_v4.yaml @@ -108,18 +108,6 @@ fieldset/CSR: description: End of injected sequence flag of the master ADC bit_offset: 6 bit_size: 1 - - name: AWD1_MST - description: Analog watchdog 1 flag of the master ADC - bit_offset: 7 - bit_size: 1 - - name: AWD2_MST - description: Analog watchdog 2 flag of the master ADC - bit_offset: 8 - bit_size: 1 - - name: AWD3_MST - description: Analog watchdog 3 flag of the master ADC - bit_offset: 9 - bit_size: 1 - name: JQOVF_MST description: Injected Context Queue Overflow flag of the master ADC bit_offset: 10 @@ -152,22 +140,24 @@ fieldset/CSR: description: End of injected sequence flag of the slave ADC bit_offset: 22 bit_size: 1 - - name: AWD1_SLV - description: Analog watchdog 1 flag of the slave ADC - bit_offset: 23 - bit_size: 1 - - name: AWD2_SLV - description: Analog watchdog 2 flag of the slave ADC - bit_offset: 24 - bit_size: 1 - - name: AWD3_SLV - description: Analog watchdog 3 flag of the slave ADC - bit_offset: 25 - bit_size: 1 - name: JQOVF_SLV description: Injected Context Queue Overflow flag of the slave ADC bit_offset: 26 bit_size: 1 + - name: AWD_MST + description: Analog watchdog flag of the master ADC + bit_offset: 7 + bit_size: 1 + array: + len: 3 + stride: 1 + - name: AWD_SLV + description: Analog watchdog flag of the slave ADC + bit_offset: 23 + bit_size: 1 + array: + len: 3 + stride: 1 enum/CKMODE: bit_size: 2 variants: diff --git a/transforms/ADC.yaml b/transforms/ADC.yaml index 3ae9f87..e9d6108 100644 --- a/transforms/ADC.yaml +++ b/transforms/ADC.yaml @@ -1,3 +1,13 @@ transforms: - !DeleteEnums - from: ^(AWD1?|J?EOC|JEOS|J?STRT|OVR|ADRDY|EOS(MP)?|JQOVF)(_MST)?$ + from: ^(AWD1?|J?EOC|JEOS|J?STRT|OVR|ADRDY|EOS(MP)?|JQOVF|ENDED)(_MST)?$ + + - !MakeFieldArray + fieldsets: CSR + from: AWD[1-3]_MST + to: AWD_MST + + - !MakeFieldArray + fieldsets: CSR + from: AWD[1-3]_SLV + to: AWD_SLV