fix: fix several mtca evm db errors

.github/workflows/ci-scripts-build.yml

@@ -104,11 +104,11 @@ jobs:
             base: "7.0"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Cache Dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.cache
         key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}

evgMrmApp/Db/evgEvtClk.db

@@ -113,13 +113,13 @@ record(ao, "$(P)FracSynFreq-SP") {
   field(PINI, "YES")
   field(VAL,  "$(FEVT=124.916)")
   field(UDF,  "0")
-  field(HIHI, "130.5")
+  field(HIHI, "143.3")
   field(LOLO, "49.5")
   field(HHSV, "MAJOR")
   field(LLSV, "MAJOR")
-  field(HOPR, "130")
+  field(HOPR, "142.8")
   field(LOPR, "50")
-  field(DRVH, "130")
+  field(DRVH, "142.8")
   field(DRVL, "50")
   field(PREC, "3")
   field(FLNK, "$(P)FracSynFreq-RB")
@@ -131,7 +131,7 @@ record(ai, "$(P)FracSynFreq-RB") {
   field(DTYP, "Obj Prop double")
   field(INP,  "@OBJ=$(OBJ), PROP=FracSynFreq")
   field(EGU,  "MHz")
-  field(HIHI, "125.5")
+  field(HIHI, "143.3")
   field(LOLO, "49.5")
   field(HHSV, "MAJOR")
   field(LLSV, "MAJOR")

evgMrmApp/Db/evgInput.db

@@ -6,7 +6,7 @@ record(bo, "$(P)EnaIrq-Sel") {
   field(ONAM, "Enabled")
   field(OMSL, "closed_loop")
     # see evgMrm.db
-  field(DOL,  "$(PP=$(SYS){$(D)})1ppsInp-MbbiDir_.B$(Num) CP")
+  field(DOL,  "$(PP=$(SYS){$(D)})1ppsInp$(CONT=-)MbbiDir_.B$(Num) CP")
   field(FLNK, "$(P)EnaIrq-RB")
   info(autosaveFields_pass0, "VAL")
 }

evgMrmApp/Db/evgMrm.db

@@ -110,7 +110,7 @@ record(mbbo, "$(P)1ppsInp-Sel") {
   field(FVST, "Univ2")
   field(SXST, "Univ3")
   field(SVST, "Sys Clk")
-  field(EIST, "Front1")
+  field(EIST, "Front2")
   field(NIST, "Univ4")
   field(TEST, "Univ5")
   field(ELST, "Univ6")
@@ -149,7 +149,48 @@ record(mbbiDirect, "$(P)1ppsInp-MbbiDir_") {
   field(DESC, "EVG 1PPS Input")
   field(INP,  "$(P)1ppsInp-Sel.RVAL NPP")
 }
+record(mbbo, "$(P)1ppsInpCont-Sel") {
+  field(DESC, "EVG 1PPS Input")
+  field(PINI, "YES")
+  field(UDF,  "0")
+  field(VAL,  "0")
+  field(ZRST, "None")
+  field(ONST, "UnivInp11")
+  field(TWST, "UnivInp12")
+  field(THST, "UnivInp13")
+  field(FRST, "UnivInp14")
+  field(FVST, "UnivInp15")
+  field(ZRVL, "0x0")
+  field(ONVL, "0x1")
+  field(TWVL, "0x2")
+  field(THVL, "0x4")
+  field(FRVL, "0x8")
+  field(FVVL, "0x10")
+  field(SXSV, "INVALID")
+  field(SVSV, "INVALID")
+  field(EISV, "INVALID")
+  field(NISV, "INVALID")
+  field(TESV, "INVALID")
+  field(ELSV, "INVALID")
+  field(TVSV, "INVALID")
+  field(TTSV, "INVALID")
+  field(FTSV, "INVALID")
+  field(FFSV, "INVALID")
+  field(UNSV, "INVALID")
+  field(IVOA, "Don't drive outputs")
+  field(FLNK, "$(P)1ppsInpCont-MbbiDir_")
+  info(autosaveFields_pass0, "VAL")
+}
 
+#
+# Each bit of the 1ppsInp-MbbiDir record is used to toggle the external input
+# interrupt of the corresponding external input.
+#
+record(mbbiDirect, "$(P)1ppsInpCont-MbbiDir_") {
+  field(ASG, "private")
+  field(DESC, "EVG 1PPS Input")
+  field(INP,  "$(P)1ppsInpCont-Sel.RVAL NPP")
+}
 record(longin, "$(P)DbusStatus-RB" ) {
   field(DESC, "EVG Dbus Status")
   field(DTYP, "Obj Prop uint32")

evgMrmApp/Db/evm-mtca-300-evr.uv.substitutions

@@ -22,7 +22,7 @@ file "mrmevrdc.template"
 file "evrevent.db"
 {pattern
 {EN, OBJ, CODE, EVNT}
-{"\$(P)Pps",  "$(EVG):EVR$(T)", 0x7d, 125}
+{"\$(P)1hz",  "$(EVG):EVR$(T)", 0x7d, 125}
 {"\$(P)EvtA", "$(EVG):EVR$(T)", 255,  255}
 {"\$(P)EvtB", "$(EVG):EVR$(T)", 255,  255}
 {"\$(P)EvtC", "$(EVG):EVR$(T)", 255,  255}
@@ -33,17 +33,38 @@ file "evrevent.db"
 {"\$(P)EvtH", "$(EVG):EVR$(T)", 255,  255}
 }
 
+file "evrscale.db"
+{pattern
+{IDX, P, SN, OBJ, EVR, MAX}
+{0, "\$(P)", "\$(P)PS$(IDX)", "$(EVG):EVR$(T):PS$(IDX)", "$(EVG):EVR$(T)", "0xffffffff"}
+{1, "\$(P)", "\$(P)PS$(IDX)", "$(EVG):EVR$(T):PS$(IDX)", "$(EVG):EVR$(T)", "0xffffffff"}
+{2, "\$(P)", "\$(P)PS$(IDX)", "$(EVG):EVR$(T):PS$(IDX)", "$(EVG):EVR$(T)", "0xffffffff"}
+}
+
+file "evrin.db"
+{pattern
+{IN, OBJ, DESC}
+{"\$(P)InFP0", "$(EVG):EVR$(T):FPIn0", "$(T)FPIN0 Src !$(T)FP0"}
+{"\$(P)InFP1", "$(EVG):EVR$(T):FPIn1", "$(T)FPIN1 Src !$(T)FP1"}
+{"\$(P)InFP2", "$(EVG):EVR$(T):FPIn2", "$(T)FPIN2 Src !$(T)FP2"}
+{"\$(P)InFP3", "$(EVG):EVR$(T):FPIn3", "$(T)FPIN3 Src !$(T)FP3"}
+{"\$(P)InFP4", "$(EVG):EVR$(T):FPIn4", "$(T)FPIN4 Src !$(T)FP4"}
+{"\$(P)InFP5", "$(EVG):EVR$(T):FPIn5", "$(T)FPIN5 Src !$(T)FP5"}
+{"\$(P)InFP6", "$(EVG):EVR$(T):FPIn6", "$(T)FPIN6 Src !$(T)FP6"}
+{"\$(P)InFP7", "$(EVG):EVR$(T):FPIn7", "$(T)FPIN7 Src !$(T)FP7"}
+}
+
 file "mrmevrout.db"
 {pattern
 {ON, OBJ, DESC}
-{"\$(P)OutFP0", "$(EVG):EVR$(T):FrontOut0", "$(T)FP0 Src EVG UVIN8 !$(T)FPIN0"}
-{"\$(P)OutFP1", "$(EVG):EVR$(T):FrontOut1", "$(T)FP1 Src EVG UVIN9 !$(T)FPIN1"}
-{"\$(P)OutFP2", "$(EVG):EVR$(T):FrontOut2", "$(T)FP2 Src EVG UVIN10 !$(T)FPIN2"}
-{"\$(P)OutFP3", "$(EVG):EVR$(T):FrontOut3", "$(T)FP3 Src EVG UVIN11 !$(T)FPIN3"}
-{"\$(P)OutFP4", "$(EVG):EVR$(T):FrontOut4", "$(T)FP4 Src EVG UVIN12 !$(T)FPIN4"}
-{"\$(P)OutFP5", "$(EVG):EVR$(T):FrontOut5", "$(T)FP5 Src EVG UVIN13 !$(T)FPIN5"}
-{"\$(P)OutFP6", "$(EVG):EVR$(T):FrontOut6", "$(T)FP6 Src EVG UVIN14 !$(T)FPIN6"}
-{"\$(P)OutFP7", "$(EVG):EVR$(T):FrontOut7", "$(T)FP7 Src EVG UVIN15 !$(T)FPIN7"}
+{"\$(P)OutFP0", "$(EVG):EVR$(T):FrontOut0", "$(T)FP0 Dst EVG UVIN[0|8]  & !$(T)FPIN0"}
+{"\$(P)OutFP1", "$(EVG):EVR$(T):FrontOut1", "$(T)FP1 Dst EVG UVIN[1|9]  & !$(T)FPIN1"}
+{"\$(P)OutFP2", "$(EVG):EVR$(T):FrontOut2", "$(T)FP2 Dst EVG UVIN[2|10] & !$(T)FPIN2"}
+{"\$(P)OutFP3", "$(EVG):EVR$(T):FrontOut3", "$(T)FP3 Dst EVG UVIN[3|11] & !$(T)FPIN3"}
+{"\$(P)OutFP4", "$(EVG):EVR$(T):FrontOut4", "$(T)FP4 Dst EVG UVIN[4|12] & !$(T)FPIN4"}
+{"\$(P)OutFP5", "$(EVG):EVR$(T):FrontOut5", "$(T)FP5 Dst EVG UVIN[5|13] & !$(T)FPIN5"}
+{"\$(P)OutFP6", "$(EVG):EVR$(T):FrontOut6", "$(T)FP6 Dst EVG UVIN[6|14] & !$(T)FPIN6"}
+{"\$(P)OutFP7", "$(EVG):EVR$(T):FrontOut7", "$(T)FP7 Dst EVG UVIN[7|15] & !$(T)FPIN7"}
 }
 
 # Pulse generators w/o a prescaler set NOPS=1
@@ -286,15 +307,3 @@ file "evrdcpulser.template"
 {15, "\$(P)", "\$(P)DlyGen$(PID)", "$(EVG):EVR$(T):Pul$(PID)"}
 }
 
-file "evrin.db"
-{pattern
-{IN, OBJ, DESC}
-{"\$(P)InFP0", "$(EVG):EVR$(T):FPIn0", "$(T)IN0 Src !$(T)FP0"}
-{"\$(P)InFP1", "$(EVG):EVR$(T):FPIn1", "$(T)IN1 Src !$(T)FP1"}
-{"\$(P)InFP2", "$(EVG):EVR$(T):FPIn2", "$(T)IN2 Src !$(T)FP2"}
-{"\$(P)InFP3", "$(EVG):EVR$(T):FPIn3", "$(T)IN3 Src !$(T)FP3"}
-{"\$(P)InFP4", "$(EVG):EVR$(T):FPIn4", "$(T)IN4 Src !$(T)FP4"}
-{"\$(P)InFP5", "$(EVG):EVR$(T):FPIn5", "$(T)IN5 Src !$(T)FP5"}
-{"\$(P)InFP6", "$(EVG):EVR$(T):FPIn6", "$(T)IN6 Src !$(T)FP6"}
-{"\$(P)InFP7", "$(EVG):EVR$(T):FPIn7", "$(T)IN7 Src !$(T)FP7"}
-}

evgMrmApp/Db/evm-mtca-300.uv.substitutions

@@ -49,11 +49,13 @@ file "evgInput.db"
 {"\$(P)InpUniv8",  "$(EVG):UnivInp8",   B}
 {"\$(P)InpUniv9",  "$(EVG):UnivInp9",   C}
 {"\$(P)InpUniv10", "$(EVG):UnivInp10",  D}
-{"\$(P)InpUniv11", "$(EVG):UnivInp11",  E}
-{"\$(P)InpUniv12", "$(EVG):UnivInp12",  F}
-{"\$(P)InpUniv13", "$(EVG):UnivInp13",  X}
-{"\$(P)InpUniv14", "$(EVG):UnivInp14",  X}
-{"\$(P)InpUniv15", "$(EVG):UnivInp15",  X}
+pattern
+{P, OBJ, Num, CONT}
+{"\$(P)InpUniv11", "$(EVG):UnivInp11",  0, "Cont-"}
+{"\$(P)InpUniv12", "$(EVG):UnivInp12",  1, "Cont-"}
+{"\$(P)InpUniv13", "$(EVG):UnivInp13",  2, "Cont-"}
+{"\$(P)InpUniv14", "$(EVG):UnivInp14",  3, "Cont-"}
+{"\$(P)InpUniv15", "$(EVG):UnivInp15",  4, "Cont-"}
 }
 
 file "evgMrm.db"

evrApp/Db/evrcml.db

@@ -352,7 +352,7 @@ record(ao, "$(ON)Freq$(s=:)Init-SP") {
   field(LINR, "LINEAR")
   field(ESLO, "1e9")
   field(PREC, "3")
-  field(FLNK, "$(ON)Freq$(s=:)High-RB")
+  field(FLNK, "$(ON)Freq$(s=:)Init-RB")
   info(autosaveFields_pass0, "VAL")
 }
 

evrMrmApp/Db/evrSoftEvt.template

@@ -20,8 +20,9 @@ record(ai, "$(P)TimeErr-I") {
   field(DTYP, "Obj Prop double")
   field(INP , "@OBJ=$(OBJ), PROP=Time Error")
 }
-
-record(mbbo, "$(P)TimeSrc-Sel") {
+# This TimeSrc is usually used for EVR standalone test.
+# It is better to distinguish another similar db name $(P)Time$(s=:)Src-Sel inside evrbase.db
+record(mbbo, "$(P)SoftTimeSrc-Sel") {
   field(DTYP, "Obj Prop uint32")
   field(OUT , "@OBJ=$(OBJ), PROP=TimeSrc")
   field(ZRST, "Disable (noop)")

evrMrmApp/Db/mrmevrdc.template

@@ -92,19 +92,31 @@ record(mbbi, "$(P)LckDat-Sts") {
   field(DESC, "DC data from master?")
   field(DTYP, "Obj Prop uint32")
   field(INP, "@OBJ=$(OBJ), PROP=DCStatusRaw")
-  field(MASK, "0x300")
+  field(MASK, "0x700")
   field(SHFT, "8")
   field(ZRVL, "0")
   field(ONVL, "1")
   field(TWVL, "2")
   field(THVL, "3")
+  field(FRVL, "4")
+  field(FVVL, "5")
+  field(SXVL, "6")
+  field(SVVL, "7")
   field(ZRST, "No Mstr")
   field(ONST, "Coarse")
   field(TWST, "Invalid")
-  field(THST, "Fine")
+  field(THST, "Medium")
+  field(FRST, "Invalid")
+  field(FVST, "Invalid")
+  field(SXST, "Invalid")
+  field(SVST, "Fine")
   field(ZRSV, "MAJOR")
   field(ONSV, "MINOR")
   field(TWSV, "INVALID")
+  field(THSV, "MINOR")
+  field(FRSV, "INVALID")
+  field(FVSV, "INVALID")
+  field(SXSV, "INVALID")
   field(FLNK, "$(P)ID-I")
 }
 record(longin, "$(P)ID-I") {

mrmShared/Db/mrmSoftSeq.template

@@ -252,6 +252,7 @@ record(bo, "$(P)SoftTrig-Cmd") {
 record(mbbo, "$(P)SwMask-Sel") {
   field(DTYP, "Obj Prop uint32")
   field(DESC, "Sequence RAM soft trigger")
+  field(NOBT, "4")
   field(OUT,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWMASK")
 }
 
@@ -265,6 +266,7 @@ record(mbbi, "$(P)SwMask-RB") {
 record(mbbo, "$(P)SwEna-Sel") {
   field(DTYP, "Obj Prop uint32")
   field(DESC, "Sequence RAM soft trigger")
+  field(NOBT, "4")
   field(OUT,  "@OBJ=$(EVG):SEQ$(seqNum), CLASS=SeqManager, PARENT=$(EVG):SEQMGR, PROP=SWENA")
 }
 

opi/bob/evr/evr-expert.bob

@@ -1695,7 +1695,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="combo" version="2.0.0">
       <name>Menu Button</name>
-      <pv_name>$(P):TimeSrc-Sel</pv_name>
+      <pv_name>$(P):SoftTimeSrc-Sel</pv_name>
       <x>96</x>
       <y>41</y>
       <width>73</width>