Skip to content

Commit

Permalink
fix: fix db name
Browse files Browse the repository at this point in the history 
change 1ppsInp to PpsInp
change 1hz to Pps of 300 series
change PpsInpCONT to PpsInp1 to keep naming convention
  • Loading branch information
@Insomnia1437 @jerzyjamroz
Insomnia1437 authored and jerzyjamroz committed Mar 27, 2024
1 parent d757be7 commit b284857
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion evgMrmApp/Db/evgInput.db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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$(CONT=-)MbbiDir_.B$(Num) CP")
field(DOL, "$(PP=$(SYS){$(D)})PpsInp$(CONT=)-MbbiDir_.B$(Num) CP")
field(FLNK, "$(P)EnaIrq-RB")
info(autosaveFields_pass0, "VAL")
}
Expand Down
30 changes: 15 additions & 15 deletions evgMrmApp/Db/evgMrm.db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ record(bo, "$(P)SimTimestamp-Sel") {
field(DTYP, "Obj Prop bool")
field(OUT , "@OBJ=$(OBJ), PROP=SimTime")
field(OMSL, "closed_loop")
field(DOL , "$(P)1ppsInp-MbbiDir_.BF CP")
field(DOL , "$(P)PpsInp-MbbiDir_.BF CP")
field(ZNAM, "Normal")
field(ONAM, "Simulate")
}
Expand All @@ -97,8 +97,8 @@ record(bo,"$(P)SyncTimestamp-Cmd" ) {
field(DESC, "EVG Sync TimeStamp")
}

record(mbbo, "$(P)1ppsInp-Sel") {
field(DESC, "EVG 1PPS Input")
record(mbbo, "$(P)PpsInp-Sel") {
field(DESC, "EVG Pps Input")
field(PINI, "YES")
field(UDF, "0")
field(VAL, "0")
Expand Down Expand Up @@ -136,21 +136,21 @@ record(mbbo, "$(P)1ppsInp-Sel") {
field(FFVL, "0x2000")
field(UNSV, "INVALID")
field(IVOA, "Don't drive outputs")
field(FLNK, "$(P)1ppsInp-MbbiDir_")
field(FLNK, "$(P)PpsInp-MbbiDir_")
info(autosaveFields_pass0, "VAL")
}

#
# Each bit of the 1ppsInp-MbbiDir record is used to toggle the external input
# Each bit of the PpsInp-MbbiDir record is used to toggle the external input
# interrupt of the corresponding external input.
#
record(mbbiDirect, "$(P)1ppsInp-MbbiDir_") {
record(mbbiDirect, "$(P)PpsInp-MbbiDir_") {
field(ASG, "private")
field(DESC, "EVG 1PPS Input")
field(INP, "$(P)1ppsInp-Sel.RVAL NPP")
field(DESC, "EVG Pps Input")
field(INP, "$(P)PpsInp-Sel.RVAL NPP")
}
record(mbbo, "$(P)1ppsInpCont-Sel") {
field(DESC, "EVG 1PPS Input")
record(mbbo, "$(P)PpsInp1-Sel") {
field(DESC, "EVG Pps Input")
field(PINI, "YES")
field(UDF, "0")
field(VAL, "0")
Expand Down Expand Up @@ -178,18 +178,18 @@ record(mbbo, "$(P)1ppsInpCont-Sel") {
field(FFSV, "INVALID")
field(UNSV, "INVALID")
field(IVOA, "Don't drive outputs")
field(FLNK, "$(P)1ppsInpCont-MbbiDir_")
field(FLNK, "$(P)PpsInp1-MbbiDir_")
info(autosaveFields_pass0, "VAL")
}

#
# Each bit of the 1ppsInp-MbbiDir record is used to toggle the external input
# Each bit of the PpsInp-MbbiDir record is used to toggle the external input
# interrupt of the corresponding external input.
#
record(mbbiDirect, "$(P)1ppsInpCont-MbbiDir_") {
record(mbbiDirect, "$(P)PpsInp1-MbbiDir_") {
field(ASG, "private")
field(DESC, "EVG 1PPS Input")
field(INP, "$(P)1ppsInpCont-Sel.RVAL NPP")
field(DESC, "EVG Pps Input")
field(INP, "$(P)PpsInp1-Sel.RVAL NPP")
}
record(longin, "$(P)DbusStatus-RB" ) {
field(DESC, "EVG Dbus Status")
Expand Down
34 changes: 17 additions & 17 deletions evgMrmApp/Db/evm-mtca-300-evr.uv.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ file "mrmevrdc.template"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"\$(P)1hz", "$(EVG):EVR$(T)", 0x7d, 125}
{"\$(P)Pps", "$(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}
Expand All @@ -44,27 +44,27 @@ file "evrscale.db"
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"}
{"\$(P)InFP0", "$(EVG):EVR$(T):FPIn0", "$(T)FPIN0 <- !$(T)FP0"}
{"\$(P)InFP1", "$(EVG):EVR$(T):FPIn1", "$(T)FPIN1 <- !$(T)FP1"}
{"\$(P)InFP2", "$(EVG):EVR$(T):FPIn2", "$(T)FPIN2 <- !$(T)FP2"}
{"\$(P)InFP3", "$(EVG):EVR$(T):FPIn3", "$(T)FPIN3 <- !$(T)FP3"}
{"\$(P)InFP4", "$(EVG):EVR$(T):FPIn4", "$(T)FPIN4 <- !$(T)FP4"}
{"\$(P)InFP5", "$(EVG):EVR$(T):FPIn5", "$(T)FPIN5 <- !$(T)FP5"}
{"\$(P)InFP6", "$(EVG):EVR$(T):FPIn6", "$(T)FPIN6 <- !$(T)FP6"}
{"\$(P)InFP7", "$(EVG):EVR$(T):FPIn7", "$(T)FPIN7 <- !$(T)FP7"}
}

file "mrmevrout.db"
{pattern
{ON, OBJ, DESC}
{"\$(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"}
{"\$(P)OutFP0", "$(EVG):EVR$(T):FrontOut0", "InEVG[$(T)==D?0:8]&!$(T)InFP0"}
{"\$(P)OutFP1", "$(EVG):EVR$(T):FrontOut1", "InEVG[$(T)==D?1:9]&!$(T)InFP0"}
{"\$(P)OutFP2", "$(EVG):EVR$(T):FrontOut2", "InEVG[$(T)==D?2:10]&!$(T)InFP0"}
{"\$(P)OutFP3", "$(EVG):EVR$(T):FrontOut3", "InEVG[$(T)==D?3:11]&!$(T)InFP0"}
{"\$(P)OutFP4", "$(EVG):EVR$(T):FrontOut4", "InEVG[$(T)==D?4:12]&!$(T)InFP0"}
{"\$(P)OutFP5", "$(EVG):EVR$(T):FrontOut5", "InEVG[$(T)==D?5:13]&!$(T)InFP0"}
{"\$(P)OutFP6", "$(EVG):EVR$(T):FrontOut6", "InEVG[$(T)==D?6:14]&!$(T)InFP0"}
{"\$(P)OutFP7", "$(EVG):EVR$(T):FrontOut7", "InEVG[$(T)==D?7:15]&!$(T)InFP0"}
}

# Pulse generators w/o a prescaler set NOPS=1
Expand Down
10 changes: 5 additions & 5 deletions evgMrmApp/Db/evm-mtca-300.uv.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ file "evgInput.db"
{"\$(P)InpUniv10", "$(EVG):UnivInp10", D}
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-"}
{"\$(P)InpUniv11", "$(EVG):UnivInp11", 0, "1"}
{"\$(P)InpUniv12", "$(EVG):UnivInp12", 1, "1"}
{"\$(P)InpUniv13", "$(EVG):UnivInp13", 2, "1"}
{"\$(P)InpUniv14", "$(EVG):UnivInp14", 3, "1"}
{"\$(P)InpUniv15", "$(EVG):UnivInp15", 4, "1"}
}

file "evgMrm.db"
Expand Down
4 changes: 2 additions & 2 deletions evgMrmApp/Db/mtca-evm-300.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ file "mrmevrdc.template"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)U}1hz", "$(EVG):EVRU", 0x7d, 125}
{"$(SYS){$(D)U}Pps", "$(EVG):EVRU", 0x7d, 125}
{"$(SYS){$(D)U}EvtA", "$(EVG):EVRU", 10, 10}
{"$(SYS){$(D)U}EvtB", "$(EVG):EVRU", 11, 11}
{"$(SYS){$(D)U}EvtC", "$(EVG):EVRU", 12, 12}
Expand Down Expand Up @@ -311,7 +311,7 @@ file "mrmevrdc.template"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)D}1hz", "$(EVG):EVRD", 0x7d, 125}
{"$(SYS){$(D)D}Pps", "$(EVG):EVRD", 0x7d, 125}
{"$(SYS){$(D)D}EvtA", "$(EVG):EVRD", 10, 10}
{"$(SYS){$(D)D}EvtB", "$(EVG):EVRD", 11, 11}
{"$(SYS){$(D)D}EvtC", "$(EVG):EVRD", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-cpci-300.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)}1hz", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}Pps", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}EvtA", "$(EVR)", 10, 10}
{"$(SYS){$(D)}EvtB", "$(EVR)", 11, 11}
{"$(SYS){$(D)}EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-mtca-300.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)}1hz", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}Pps", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}EvtA", "$(EVR)", 10, 10}
{"$(SYS){$(D)}EvtB", "$(EVR)", 11, 11}
{"$(SYS){$(D)}EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-mtca-300rf.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"\$(P)\$(ES)1hz", "$(EVR)", 0x7d, 125}
{"\$(P)\$(ES)Pps", "$(EVR)", 0x7d, 125}
{"\$(P)\$(ES)EvtA", "$(EVR)", 10, 10}
{"\$(P)\$(ES)EvtB", "$(EVR)", 11, 11}
{"\$(P)\$(ES)EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-mtca-300u.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"\$(P)\$(ES)1hz", "$(EVR)", 0x7d, 125}
{"\$(P)\$(ES)Pps", "$(EVR)", 0x7d, 125}
{"\$(P)\$(ES)EvtA", "$(EVR)", 10, 10}
{"\$(P)\$(ES)EvtB", "$(EVR)", 11, 11}
{"\$(P)\$(ES)EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-mtca-300u.uv.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"\$(P)1hz", "$(EVR)", 0x7d, 125}
{"\$(P)Pps", "$(EVR)", 0x7d, 125}
{"\$(P)EvtA", "$(EVR)", 10, 10}
{"\$(P)EvtB", "$(EVR)", 11, 11}
{"\$(P)EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-pcie-300dc.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)}1hz", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}Pps", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}EvtA", "$(EVR)", 10, 10}
{"$(SYS){$(D)}EvtB", "$(EVR)", 11, 11}
{"$(SYS){$(D)}EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion evrMrmApp/Db/evr-tg-300.substitutions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ file "evrmap.db"
file "evrevent.db"
{pattern
{EN, OBJ, CODE, EVNT}
{"$(SYS){$(D)}1hz", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}Pps", "$(EVR)", 0x7d, 125}
{"$(SYS){$(D)}EvtA", "$(EVR)", 10, 10}
{"$(SYS){$(D)}EvtB", "$(EVR)", 11, 11}
{"$(SYS){$(D)}EvtC", "$(EVR)", 12, 12}
Expand Down
2 changes: 1 addition & 1 deletion opi/bob/evg/evm-mtca-300.bob
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button</name>
<pv_name>$(P):1ppsInp-Sel</pv_name>
<pv_name>$(P):PpsInp-Sel</pv_name>
<x>6</x>
<y>24</y>
<width>91</width>
Expand Down

0 comments on commit b284857

Please sign in to comment.