Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PV Attributes and other fixes #19

Merged
merged 6 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion timingApp/Db/eve.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@

record(ai, "$(P)$(R)FPGAClk-Cte") {
field(DESC, "FPGA Clock from EVG")
field(EGU, "Hz")
field(SCAN, "1 second")
field(PINI, "1")
field(VAL, "124914500")
field(INP, "RA-RaMO:TI-EVG:FPGAClk-Cte")
field(INP, "AS-RaMO:TI-EVG:FPGAClk-Cte")
}

record(stringout, "$(P)$(R)IPAddr-Mon"){
Expand All @@ -29,6 +30,7 @@ record(bo, "$(P)$(R)DevEnbl-Sel") {
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(OUT, "@timing.proto evre_ctrl_set($(P),$(R)) $(PORT)")
field(PINI, YES)
}

record(mbbiDirect, "$(P)$(R)DevEnblRaw") {
Expand Down
11 changes: 2 additions & 9 deletions timingApp/Db/evg.db
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ record(bo, "$(P)$(R)DevEnbl-Sel"){
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(FLNK, "$(P)$(R)EVGEN")
field(PINI, YES)
}

record(longout, "$(P)$(R)cmd_ctrl_get") {
Expand Down Expand Up @@ -766,15 +767,6 @@ record(longout, "$(P)$(R)cmd_diginp_get1") {
########################################################################
# Interlock map [56]

record(mbboDirect, "$(P)$(R)ilock_mbbo") {
field(DESC, "interlock input to output map")
}

record(mbbiDirect, "$(P)$(R)ilock_mbbi") {
field(DESC, "interlock input to output map")
field(VAL, "1")
}

record(seq, "$(P)$(R)ilock_seq1") {
field(DESC, "interlock input to output map")
field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.B0")
Expand Down Expand Up @@ -1019,6 +1011,7 @@ record(bo, "$(P)$(R)IntlkCtrlEnbl-Sel") {
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(FLNK, "$(P)$(R)IntlkCtrlEnblCalc")
field(PINI, YES)
}

record(bo, "$(P)$(R)IntlkCtrlRst-Sel") {
Expand Down
4 changes: 3 additions & 1 deletion timingApp/Db/evr.db
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@

record(ai, "$(P)$(R)FPGAClk-Cte") {
field(DESC, "FPGA Clock from EVG")
field(EGU, "Hz")
field(SCAN, "1 second")
field(PINI, "1")
field(VAL, "124914500")
field(INP, "RA-RaMO:TI-EVG:FPGAClk-Cte")
field(INP, "AS-RaMO:TI-EVG:FPGAClk-Cte")
}

record(stringout, "$(P)$(R)IPAddr-Mon"){
Expand All @@ -29,6 +30,7 @@ record(bo, "$(P)$(R)DevEnbl-Sel") {
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(OUT, "@timing.proto evre_ctrl_set($(P),$(R)) $(PORT)")
field(PINI, YES)
}

record(mbbiDirect, "$(P)$(R)DevEnblRaw") {
Expand Down
1 change: 1 addition & 0 deletions timingApp/Db/evre_otp.db
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ record(bo, "$(P)$(R)OTP$(num)State-Sel") {
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(FLNK, "$(P)$(R)OTP$(num)RegAByte3")
field(PINI, YES)
}

record(bo, "$(P)$(R)OTP$(num)Polarity-Sel") {
Expand Down
1 change: 1 addition & 0 deletions timingApp/Db/fout.db
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ record(bo, "$(P)$(R)DevEnbl-Sel"){
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(OUT, "@timing.proto fout_ctrl_set($(P),$(R)) $(PORT)")
field(PINI, YES)
}

record(longout, "$(P)$(R)cmd_ctrl_get") {
Expand Down