From 2466d5309f3cfb59946c8508c13b381157c27fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 22 Aug 2023 08:25:39 -0300 Subject: [PATCH 1/6] timingApp: add PINI to DevEnbl-Sel records. This makes it so the value from autosave is actually written to hardware. --- timingApp/Db/eve.db | 1 + timingApp/Db/evg.db | 1 + timingApp/Db/evr.db | 1 + timingApp/Db/fout.db | 1 + 4 files changed, 4 insertions(+) diff --git a/timingApp/Db/eve.db b/timingApp/Db/eve.db index deb84c1..55d8772 100644 --- a/timingApp/Db/eve.db +++ b/timingApp/Db/eve.db @@ -29,6 +29,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") { diff --git a/timingApp/Db/evg.db b/timingApp/Db/evg.db index 25f3931..b837abb 100644 --- a/timingApp/Db/evg.db +++ b/timingApp/Db/evg.db @@ -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") { diff --git a/timingApp/Db/evr.db b/timingApp/Db/evr.db index 0b66233..482e004 100644 --- a/timingApp/Db/evr.db +++ b/timingApp/Db/evr.db @@ -29,6 +29,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") { diff --git a/timingApp/Db/fout.db b/timingApp/Db/fout.db index 1fbef2d..c630794 100644 --- a/timingApp/Db/fout.db +++ b/timingApp/Db/fout.db @@ -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") { From 36e8169f1abd3d5746aeafbfd056da8a9d7628b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 22 Aug 2023 18:04:32 -0300 Subject: [PATCH 2/6] timingApp: remove unused records from evg.db. --- timingApp/Db/evg.db | 9 --------- 1 file changed, 9 deletions(-) diff --git a/timingApp/Db/evg.db b/timingApp/Db/evg.db index b837abb..00c84bc 100644 --- a/timingApp/Db/evg.db +++ b/timingApp/Db/evg.db @@ -767,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") From f8cf8731097481b74d5bfbbc29e852890a522148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 22 Aug 2023 18:04:59 -0300 Subject: [PATCH 3/6] timingApp: add EGU to FPGAClk-Cte. --- timingApp/Db/eve.db | 1 + timingApp/Db/evr.db | 1 + 2 files changed, 2 insertions(+) diff --git a/timingApp/Db/eve.db b/timingApp/Db/eve.db index 55d8772..23bc84a 100644 --- a/timingApp/Db/eve.db +++ b/timingApp/Db/eve.db @@ -3,6 +3,7 @@ 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") diff --git a/timingApp/Db/evr.db b/timingApp/Db/evr.db index 482e004..30a8735 100644 --- a/timingApp/Db/evr.db +++ b/timingApp/Db/evr.db @@ -3,6 +3,7 @@ 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") From dbbcfe294f83d103e48aa7d30db2c8eb89c1a49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 22 Aug 2023 18:05:19 -0300 Subject: [PATCH 4/6] timingApp: update FPGAClk-Cte.INP. Since we have autosave on most of these, it will be necessary to update them manually with PV writes. However, for documentation purposes, and to make bringing up a new IOC simpler, we update the value here. --- timingApp/Db/eve.db | 2 +- timingApp/Db/evr.db | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/timingApp/Db/eve.db b/timingApp/Db/eve.db index 23bc84a..2079468 100644 --- a/timingApp/Db/eve.db +++ b/timingApp/Db/eve.db @@ -7,7 +7,7 @@ record(ai, "$(P)$(R)FPGAClk-Cte") { 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"){ diff --git a/timingApp/Db/evr.db b/timingApp/Db/evr.db index 30a8735..0e38fc1 100644 --- a/timingApp/Db/evr.db +++ b/timingApp/Db/evr.db @@ -7,7 +7,7 @@ record(ai, "$(P)$(R)FPGAClk-Cte") { 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"){ From 5b52ee3c00417f0d2486d669dc190f9aa0fc1130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 24 Aug 2023 10:44:57 -0300 Subject: [PATCH 5/6] timingApp: add PINI to OTP State-Sel. --- timingApp/Db/evre_otp.db | 1 + 1 file changed, 1 insertion(+) diff --git a/timingApp/Db/evre_otp.db b/timingApp/Db/evre_otp.db index 447dfc0..432f95f 100644 --- a/timingApp/Db/evre_otp.db +++ b/timingApp/Db/evre_otp.db @@ -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") { From 8553f7db262102f760f7cb6d5a8c3ee58f697bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 24 Aug 2023 10:45:55 -0300 Subject: [PATCH 6/6] timingApp: add PINI to IntlkCtrlEnbl-Sel. --- timingApp/Db/evg.db | 1 + 1 file changed, 1 insertion(+) diff --git a/timingApp/Db/evg.db b/timingApp/Db/evg.db index 00c84bc..4b6c724 100644 --- a/timingApp/Db/evg.db +++ b/timingApp/Db/evg.db @@ -1011,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") {