fix

burrbull · burrbull · commit c38ddfea5096 · 2025-05-02T20:11:13.000+03:00
diff --git 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
@@ -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
@@ -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
@@ -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:
