From 46140349730f191857287d4f7974a7de23ffd385 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Fri, 2 May 2025 19:01:03 +0300 Subject: [PATCH 1/3] HRTIM: derive RSTR --- devices/collect/hrtim/f3.yaml | 5 +++++ devices/collect/hrtim/h7.yaml | 5 +++++ devices/collect/hrtim/v1.yaml | 8 ++++++++ devices/collect/hrtim/v2.yaml | 22 ++++++++++++++++------ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/devices/collect/hrtim/f3.yaml b/devices/collect/hrtim/f3.yaml index 6752c1b28..56b3ba498 100644 --- a/devices/collect/hrtim/f3.yaml +++ b/devices/collect/hrtim/f3.yaml @@ -1,5 +1,10 @@ _include: v1.yaml +"HRTIM_TIM[B-F]": + RSTR: + _derive: + TIMACMP1: HRTIM_TIMA.RSTR.TIMACMP1 + HRTIM_Common: EECR3: _array: diff --git a/devices/collect/hrtim/h7.yaml b/devices/collect/hrtim/h7.yaml index a45f4bd5d..ee5203047 100644 --- a/devices/collect/hrtim/h7.yaml +++ b/devices/collect/hrtim/h7.yaml @@ -1 +1,6 @@ _include: v1.yaml + +"HRTIM_TIM[B-F]": + RSTR: + _derive: + TIMACMP1: HRTIM_TIMA.RSTR.TIMACMP1 diff --git a/devices/collect/hrtim/v1.yaml b/devices/collect/hrtim/v1.yaml index 82c3e1e95..7195bde71 100644 --- a/devices/collect/hrtim/v1.yaml +++ b/devices/collect/hrtim/v1.yaml @@ -112,6 +112,14 @@ HRTIM_Master: MSTU: HRTIM_TIMA.CR.MSTU UPDGAT: HRTIM_TIMA.CR.UPDGAT + RSTR: + _derive: + UPDT: HRTIM_TIMA.RSTR.UPDT + CMP2: HRTIM_TIMA.RSTR.CMP2 + MSTPER: HRTIM_TIMA.RSTR.MSTPER + MSTCMP1: HRTIM_TIMA.RSTR.MSTCMP1 + EXTEVNT1: HRTIM_TIMA.RSTR.EXTEVNT1 + HRTIM_Common: _derive: ADC3R: ADC1R diff --git a/devices/collect/hrtim/v2.yaml b/devices/collect/hrtim/v2.yaml index baa8dd8ce..9aa455d94 100644 --- a/devices/collect/hrtim/v2.yaml +++ b/devices/collect/hrtim/v2.yaml @@ -4,6 +4,22 @@ _include: v1.yaml CR2: HRTIM_TIMA.CR2 EEFR3: HRTIM_TIMA.EEFR3 +"HRTIM_TIM[B-F]": + CR: + _derive: + INTLVD: HRTIM_TIMA.CR.INTLVD + RSYNCU: HRTIM_TIMA.CR.RSYNCU + +"HRTIM_TIM[B-E]": + RSTR: + _derive: + TIMFCMP1: HRTIM_TIMA.RSTR.TIMFCMP1 + +HRTIM_TIM[F]: + RSTR: + _derive: + TIMECMP1: HRTIM_TIMA.RSTR.TIMFCMP1 + HRTIM_Common: _derive: BDTFUPR: BDTAUPR @@ -30,9 +46,3 @@ HRTIM_Common: dimIncrement: 8 FLT[1-6]CRES: dimIncrement: 8 - -"HRTIM_TIM[B-F]": - CR: - _derive: - INTLVD: HRTIM_TIMA.CR.INTLVD - RSYNCU: HRTIM_TIMA.CR.RSYNCU From c38ddfea5096d1b09fef790c4825aedac04b5e16 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Fri, 2 May 2025 20:11:13 +0300 Subject: [PATCH 2/3] fix --- devices/collect/hrtim/f3.yaml | 2 +- devices/collect/hrtim/h7.yaml | 2 +- devices/collect/hrtim/v1.yaml | 6 +++--- devices/collect/hrtim/v2.yaml | 9 +-------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/devices/collect/hrtim/f3.yaml b/devices/collect/hrtim/f3.yaml index 56b3ba498..86ac119db 100644 --- a/devices/collect/hrtim/f3.yaml +++ b/devices/collect/hrtim/f3.yaml @@ -3,7 +3,7 @@ _include: v1.yaml "HRTIM_TIM[B-F]": RSTR: _derive: - TIMACMP1: HRTIM_TIMA.RSTR.TIMACMP1 + TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMACMP1 HRTIM_Common: EECR3: diff --git a/devices/collect/hrtim/h7.yaml b/devices/collect/hrtim/h7.yaml index ee5203047..1b20fdb49 100644 --- a/devices/collect/hrtim/h7.yaml +++ b/devices/collect/hrtim/h7.yaml @@ -3,4 +3,4 @@ _include: v1.yaml "HRTIM_TIM[B-F]": RSTR: _derive: - TIMACMP1: HRTIM_TIMA.RSTR.TIMACMP1 + TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMACMP1 diff --git a/devices/collect/hrtim/v1.yaml b/devices/collect/hrtim/v1.yaml index 7195bde71..ba135dd7c 100644 --- a/devices/collect/hrtim/v1.yaml +++ b/devices/collect/hrtim/v1.yaml @@ -115,10 +115,10 @@ HRTIM_Master: RSTR: _derive: UPDT: HRTIM_TIMA.RSTR.UPDT - CMP2: HRTIM_TIMA.RSTR.CMP2 + CMP[24]: HRTIM_TIMA.RSTR.CMP2 MSTPER: HRTIM_TIMA.RSTR.MSTPER - MSTCMP1: HRTIM_TIMA.RSTR.MSTCMP1 - EXTEVNT1: HRTIM_TIMA.RSTR.EXTEVNT1 + MSTCMP[1-4]: HRTIM_TIMA.RSTR.MSTCMP1 + EXTEVNT*: HRTIM_TIMA.RSTR.EXTEVNT1 HRTIM_Common: _derive: diff --git a/devices/collect/hrtim/v2.yaml b/devices/collect/hrtim/v2.yaml index 9aa455d94..0fe4d2c95 100644 --- a/devices/collect/hrtim/v2.yaml +++ b/devices/collect/hrtim/v2.yaml @@ -9,16 +9,9 @@ _include: v1.yaml _derive: INTLVD: HRTIM_TIMA.CR.INTLVD RSYNCU: HRTIM_TIMA.CR.RSYNCU - -"HRTIM_TIM[B-E]": - RSTR: - _derive: - TIMFCMP1: HRTIM_TIMA.RSTR.TIMFCMP1 - -HRTIM_TIM[F]: RSTR: _derive: - TIMECMP1: HRTIM_TIMA.RSTR.TIMFCMP1 + TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMFCMP1 HRTIM_Common: _derive: From 9209897f9b22401323e87a9fcb025b067228740d Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Fri, 2 May 2025 20:16:32 +0300 Subject: [PATCH 3/3] fix --- devices/collect/hrtim/f3.yaml | 2 +- devices/collect/hrtim/h7.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/collect/hrtim/f3.yaml b/devices/collect/hrtim/f3.yaml index 86ac119db..8a181f704 100644 --- a/devices/collect/hrtim/f3.yaml +++ b/devices/collect/hrtim/f3.yaml @@ -3,7 +3,7 @@ _include: v1.yaml "HRTIM_TIM[B-F]": RSTR: _derive: - TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMACMP1 + TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMBCMP1 HRTIM_Common: EECR3: diff --git a/devices/collect/hrtim/h7.yaml b/devices/collect/hrtim/h7.yaml index 1b20fdb49..06086e8fe 100644 --- a/devices/collect/hrtim/h7.yaml +++ b/devices/collect/hrtim/h7.yaml @@ -3,4 +3,4 @@ _include: v1.yaml "HRTIM_TIM[B-F]": RSTR: _derive: - TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMACMP1 + TIM?CMP[1-4]: HRTIM_TIMA.RSTR.TIMBCMP1