From 1e948a72a50f5069e255217af4b3373803e0e9a1 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:15 -0300 Subject: [PATCH 1/8] separate interlock records database file --- iocBoot/ioctiming/stEVG.cmd | 1 + timingApp/Db/Makefile | 1 + timingApp/Db/evg.db | 396 ---------------------------------- timingApp/Db/evg_interlock.db | 395 +++++++++++++++++++++++++++++++++ 4 files changed, 397 insertions(+), 396 deletions(-) create mode 100644 timingApp/Db/evg_interlock.db diff --git a/iocBoot/ioctiming/stEVG.cmd b/iocBoot/ioctiming/stEVG.cmd index 469d46d..a24a3a6 100755 --- a/iocBoot/ioctiming/stEVG.cmd +++ b/iocBoot/ioctiming/stEVG.cmd @@ -29,6 +29,7 @@ dbLoadRecords "${TOP}/db/SeqRAM.db", "P=${P}, R=${R}" dbLoadRecords("${TOP}/db/fw_version.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2") dbLoadRecords("${TOP}/db/event_log.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2") +dbLoadRecords("${TOP}/db/evg_interlock.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2") dbLoadRecords("${TOP}/db/rx_locked.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2, DEVICE=evg") diff --git a/timingApp/Db/Makefile b/timingApp/Db/Makefile index 9ff78c5..0078dfe 100644 --- a/timingApp/Db/Makefile +++ b/timingApp/Db/Makefile @@ -26,6 +26,7 @@ DB += fw_version.db DB += event_log.db DB += rx_locked.db DB += digital_input.db +DB += evg_interlock.db DB += $(AUTOSAVE)/asApp/Db/save_restoreStatus.db diff --git a/timingApp/Db/evg.db b/timingApp/Db/evg.db index b2198c0..0a4329b 100644 --- a/timingApp/Db/evg.db +++ b/timingApp/Db/evg.db @@ -497,402 +497,6 @@ record(longout, "$(P)$(R)cmd_tmstmp_set"){ field(VAL, "0x73") } -######################################################################## -# Interlock map [56] - -record(seq, "$(P)$(R)ilock_seq1") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.B0") - field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.B1") - field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.B2") - field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.B3") - field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.B4") - field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.B5") - field(DOL7, "$(P)$(R)IntlkTbl0to15-Sts.B6") - field(DOL8, "$(P)$(R)IntlkTbl0to15-Sts.B7") - field(DOL9, "$(P)$(R)IntlkTbl0to15-Sts.B8") - field(DOLA, "$(P)$(R)IntlkTbl0to15-Sts.B9") - field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.B0") - field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.B1") - field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.B2") - field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.B3") - field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.B4") - field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.B5") - field(LNK7, "$(P)$(R)IntlkTbl0to15-Sel.B6") - field(LNK8, "$(P)$(R)IntlkTbl0to15-Sel.B7") - field(LNK9, "$(P)$(R)IntlkTbl0to15-Sel.B8") - field(LNKA, "$(P)$(R)IntlkTbl0to15-Sel.B9") - field(FLNK, "$(P)$(R)ilock_seq2") -} - -record(seq, "$(P)$(R)ilock_seq2") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.BA") - field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.BB") - field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.BC") - field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.BD") - field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.BE") - field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.BF") - field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.BA") - field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.BB") - field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.BC") - field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.BD") - field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.BE") - field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.BF") -} - -record(seq, "$(P)$(R)ilock_seq3") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.B0") - field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.B1") - field(DOL3, "$(P)$(R)IntlkTbl16to27-Sts.B2") - field(DOL4, "$(P)$(R)IntlkTbl16to27-Sts.B3") - field(DOL5, "$(P)$(R)IntlkTbl16to27-Sts.B4") - field(DOL6, "$(P)$(R)IntlkTbl16to27-Sts.B5") - field(DOL7, "$(P)$(R)IntlkTbl16to27-Sts.B6") - field(DOL8, "$(P)$(R)IntlkTbl16to27-Sts.B7") - field(DOL9, "$(P)$(R)IntlkTbl16to27-Sts.B8") - field(DOLA, "$(P)$(R)IntlkTbl16to27-Sts.B9") - field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.B0") - field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.B1") - field(LNK3, "$(P)$(R)IntlkTbl16to27-Sel.B2") - field(LNK4, "$(P)$(R)IntlkTbl16to27-Sel.B3") - field(LNK5, "$(P)$(R)IntlkTbl16to27-Sel.B4") - field(LNK6, "$(P)$(R)IntlkTbl16to27-Sel.B5") - field(LNK7, "$(P)$(R)IntlkTbl16to27-Sel.B6") - field(LNK8, "$(P)$(R)IntlkTbl16to27-Sel.B7") - field(LNK9, "$(P)$(R)IntlkTbl16to27-Sel.B8") - field(LNKA, "$(P)$(R)IntlkTbl16to27-Sel.B9") - field(FLNK, "$(P)$(R)ilock_seq4") -} - -record(seq, "$(P)$(R)ilock_seq4") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.BA") - field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.BB") - field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.BA") - field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.BB") -} - -record(mbboDirect, "$(P)$(R)IntlkTbl0to15-Sel") { - field(DESC, "interlock input to output map") - field(FLNK, "$(P)$(R)IntlkTblCalc") - field(ASG, "Interlock") -} - -record(mbboDirect, "$(P)$(R)IntlkTbl16to27-Sel") { - field(DESC, "interlock input to output map") - field(FLNK, "$(P)$(R)IntlkTblCalc") - field(ASG, "Interlock") -} - -record(calcout, "$(P)$(R)IntlkTblCalc") { - #field(ASG, "Reserved") - field(DESC, "interlock map calc") - field(DTYP, "stream") - field(INPA, "$(P)$(R)IntlkTbl16to27-Sel") - field(INPB, "$(P)$(R)IntlkTbl0to15-Sel") - field(CALC, "(A<<16)+B") - field(OUT, "@timing.proto evg_ilockmap_map_set($(P),$(R)) $(PORT)") -} - -record(longout, "$(P)$(R)IntlkEvtIn0-SP") { - field(DESC, "interlock input 0 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev0_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn1-SP") { - field(DESC, "interlock input 1 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev1_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn2-SP") { - field(DESC, "interlock input 2 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev2_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn3-SP") { - field(DESC, "interlock input 3 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev3_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn4-SP") { - field(DESC, "interlock input 4 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev4_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn5-SP") { - field(DESC, "interlock input 5 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev5_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtIn6-SP") { - field(DESC, "interlock input 6 event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev6_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)IntlkEvtOut-SP") { - field(DESC, "interlock output event code") - field(DRVH, "255") - field(DRVL, "0") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_evout_set($(P),$(R)) $(PORT)") - field(ASG, "Interlock") -} - -record(longout, "$(P)$(R)cmd_evg_ilockmap_set") { - field(ASG, "Reserved") - field(DESC, "Command code to write to Interlock Map") - field(VAL, "0x78") -} - -record(longout, "$(P)$(R)cmd_evg_ilockmap_get") { - field(ASG, "Reserved") - field(DESC, "Command code to read Interlock Map") - field(VAL, "0xB8") -} - -record(mbbiDirect, "$(P)$(R)IntlkTbl0to15-Sts") { - field(DESC, "interlock input to output map RBV") - field(FLNK, "$(P)$(R)ilock_seq1") -} - -record(mbbiDirect, "$(P)$(R)IntlkTbl16to27-Sts") { - field(DESC, "interlock input to output map RBV") - field(FLNK, "$(P)$(R)ilock_seq3") -} - -record(longin, "$(P)$(R)IntlkEvtIn0-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 0 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn1-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 1 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn2-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 2 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn3-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 3 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn4-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 4 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn5-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 5 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtIn6-RB") { - field(ASG, "Reserved") - field(DESC, "interlock input 6 event code RBV") -} - -record(longin, "$(P)$(R)IntlkEvtOut-RB") { - field(ASG, "Reserved") - field(DESC, "interlock output event code RBV") -} - -######################################################################## -# Interlock Control and Status [57] - -record(longout, "$(P)$(R)cmd_evg_ilockcontrol_set") { - field(ASG, "Reserved") - field(DESC, "Command code to write Interlock Control") - field(VAL, "0x79") -} - -record(longout, "$(P)$(R)cmd_evg_ilockcontrol_get") { - field(ASG, "Reserved") - field(DESC, "Command code to read Interlock Control") - field(SCAN, "1 second") - field(VAL, "0xB9") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_get($(P),$(R)) $(PORT)") -} - -record(mbboDirect, "$(P)$(R)IntlkLogEnbl-SP") { - field(DESC, "Each bit sets interlock map log enable") - field(NOBT, "8") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") -} - -record(mbbiDirect, "$(P)$(R)IntlkLogEnbl-RB") { - field(ASG, "Reserved") - field(DESC, "Interlock map log enable status") - field(NOBT, "8") - field(DTYP, "stream") - field(SCAN, "I/O Intr") - field(INP, "@timing.proto evg_ilock_log_intr $(PORT)") -} - -record(bo, "$(P)$(R)IntlkCtrlEnbl-Sel") { - field(DESC, "Interlock map enable") - field(MASK, "1") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(FLNK, "$(P)$(R)IntlkCtrlEnblCalc") - field(PINI, YES) -} - -record(bo, "$(P)$(R)IntlkCtrlRst-Sel") { - field(DESC, "Interlock map reset") - field(MASK, "1") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(HIGH, "1") - field(FLNK, "$(P)$(R)IntlkCtrlRstCalc") -} - -record(bo, "$(P)$(R)IntlkCtrlRepeat-Sel") { - field(DESC, "Interlock map enable continuous mode") - field(MASK, "1") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(FLNK, "$(P)$(R)IntlkCtrlRepeatCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlEnblCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),EnblCalc) $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlRstCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RstCalc) $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlRepeatCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RepeatCalc) $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") -} - -record(longout, "$(P)$(R)IntlkCtrlRepeatTime-SP") { - field(DESC, "Interlock event output repeat time") - field(DRVH, "4294967295") - field(DRVL, "1") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") -} - -record(longin, "$(P)$(R)IntlkCtrlRepeatTime-RB") { - #field(ASG, "Reserved") - field(DESC, "Interlock evtout repeat time RBV") - field(SCAN, "I/O Intr") - field(DTYP, "stream") - field(INP, "@timing.proto evg_ilock_repeat_time_intr $(PORT)") -} - -record(mbbiDirect, "$(P)$(R)IntlkCtrlRaw") { - #field(ASG, "Reserved") - field(DESC, "Interlock control RBV.") - field(NOBT, "8") - field(SCAN, "I/O Intr") - field(DTYP, "stream") - field(INP, "@timing.proto evg_ilock_control_intr $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlEnbl-Sts") -} - -record(bi, "$(P)$(R)IntlkCtrlEnbl-Sts") { - field(DESC, "Interlock map enable RBV") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(INP, "$(P)$(R)IntlkCtrlRaw.B7") - field(FLNK, "$(P)$(R)IntlkCtrlRst-Sts") -} - -record(bi, "$(P)$(R)IntlkCtrlRst-Sts") { - field(DESC, "Interlock map reset RBV") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(INP, "$(P)$(R)IntlkCtrlRaw.B6") - field(FLNK, "$(P)$(R)IntlkCtrlRepeat-Sts") -} - -record(bi, "$(P)$(R)IntlkCtrlRepeat-Sts") { - field(DESC, "Interlock map enable continuous mode RBV") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(INP, "$(P)$(R)IntlkCtrlRaw.B5") -} - -record(mbbiDirect, "$(P)$(R)IntlkEvtStatus-Mon") { - #field(ASG, "Reserved") - field(DESC, "Interlock event status") - field(NOBT, "8") - field(SCAN, "I/O Intr") - field(DTYP, "stream") - field(INP, "@timing.proto evg_ilock_status_intr $(PORT)") -} - ######################################################################## # Configuration Register [63] diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db new file mode 100644 index 0000000..28a4831 --- /dev/null +++ b/timingApp/Db/evg_interlock.db @@ -0,0 +1,395 @@ +######################################################################## +# Interlock map [56] + +record(seq, "$(P)$(R)ilock_seq1") { + field(DESC, "interlock input to output map") + field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.B0") + field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.B1") + field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.B2") + field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.B3") + field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.B4") + field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.B5") + field(DOL7, "$(P)$(R)IntlkTbl0to15-Sts.B6") + field(DOL8, "$(P)$(R)IntlkTbl0to15-Sts.B7") + field(DOL9, "$(P)$(R)IntlkTbl0to15-Sts.B8") + field(DOLA, "$(P)$(R)IntlkTbl0to15-Sts.B9") + field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.B0") + field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.B1") + field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.B2") + field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.B3") + field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.B4") + field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.B5") + field(LNK7, "$(P)$(R)IntlkTbl0to15-Sel.B6") + field(LNK8, "$(P)$(R)IntlkTbl0to15-Sel.B7") + field(LNK9, "$(P)$(R)IntlkTbl0to15-Sel.B8") + field(LNKA, "$(P)$(R)IntlkTbl0to15-Sel.B9") + field(FLNK, "$(P)$(R)ilock_seq2") +} + +record(seq, "$(P)$(R)ilock_seq2") { + field(DESC, "interlock input to output map") + field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.BA") + field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.BB") + field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.BC") + field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.BD") + field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.BE") + field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.BF") + field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.BA") + field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.BB") + field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.BC") + field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.BD") + field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.BE") + field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.BF") +} + +record(seq, "$(P)$(R)ilock_seq3") { + field(DESC, "interlock input to output map") + field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.B0") + field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.B1") + field(DOL3, "$(P)$(R)IntlkTbl16to27-Sts.B2") + field(DOL4, "$(P)$(R)IntlkTbl16to27-Sts.B3") + field(DOL5, "$(P)$(R)IntlkTbl16to27-Sts.B4") + field(DOL6, "$(P)$(R)IntlkTbl16to27-Sts.B5") + field(DOL7, "$(P)$(R)IntlkTbl16to27-Sts.B6") + field(DOL8, "$(P)$(R)IntlkTbl16to27-Sts.B7") + field(DOL9, "$(P)$(R)IntlkTbl16to27-Sts.B8") + field(DOLA, "$(P)$(R)IntlkTbl16to27-Sts.B9") + field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.B0") + field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.B1") + field(LNK3, "$(P)$(R)IntlkTbl16to27-Sel.B2") + field(LNK4, "$(P)$(R)IntlkTbl16to27-Sel.B3") + field(LNK5, "$(P)$(R)IntlkTbl16to27-Sel.B4") + field(LNK6, "$(P)$(R)IntlkTbl16to27-Sel.B5") + field(LNK7, "$(P)$(R)IntlkTbl16to27-Sel.B6") + field(LNK8, "$(P)$(R)IntlkTbl16to27-Sel.B7") + field(LNK9, "$(P)$(R)IntlkTbl16to27-Sel.B8") + field(LNKA, "$(P)$(R)IntlkTbl16to27-Sel.B9") + field(FLNK, "$(P)$(R)ilock_seq4") +} + +record(seq, "$(P)$(R)ilock_seq4") { + field(DESC, "interlock input to output map") + field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.BA") + field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.BB") + field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.BA") + field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.BB") +} + +record(mbboDirect, "$(P)$(R)IntlkTbl0to15-Sel") { + field(DESC, "interlock input to output map") + field(FLNK, "$(P)$(R)IntlkTblCalc") + field(ASG, "Interlock") +} + +record(mbboDirect, "$(P)$(R)IntlkTbl16to27-Sel") { + field(DESC, "interlock input to output map") + field(FLNK, "$(P)$(R)IntlkTblCalc") + field(ASG, "Interlock") +} + +record(calcout, "$(P)$(R)IntlkTblCalc") { + #field(ASG, "Reserved") + field(DESC, "interlock map calc") + field(DTYP, "stream") + field(INPA, "$(P)$(R)IntlkTbl16to27-Sel") + field(INPB, "$(P)$(R)IntlkTbl0to15-Sel") + field(CALC, "(A<<16)+B") + field(OUT, "@timing.proto evg_ilockmap_map_set($(P),$(R)) $(PORT)") +} + +record(longout, "$(P)$(R)IntlkEvtIn0-SP") { + field(DESC, "interlock input 0 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev0_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn1-SP") { + field(DESC, "interlock input 1 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev1_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn2-SP") { + field(DESC, "interlock input 2 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev2_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn3-SP") { + field(DESC, "interlock input 3 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev3_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn4-SP") { + field(DESC, "interlock input 4 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev4_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn5-SP") { + field(DESC, "interlock input 5 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev5_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtIn6-SP") { + field(DESC, "interlock input 6 event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_ev6_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)IntlkEvtOut-SP") { + field(DESC, "interlock output event code") + field(DRVH, "255") + field(DRVL, "0") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_evout_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") +} + +record(longout, "$(P)$(R)cmd_evg_ilockmap_set") { + field(ASG, "Reserved") + field(DESC, "Command code to write to Interlock Map") + field(VAL, "0x78") +} + +record(longout, "$(P)$(R)cmd_evg_ilockmap_get") { + field(ASG, "Reserved") + field(DESC, "Command code to read Interlock Map") + field(VAL, "0xB8") +} + +record(mbbiDirect, "$(P)$(R)IntlkTbl0to15-Sts") { + field(DESC, "interlock input to output map RBV") + field(FLNK, "$(P)$(R)ilock_seq1") +} + +record(mbbiDirect, "$(P)$(R)IntlkTbl16to27-Sts") { + field(DESC, "interlock input to output map RBV") + field(FLNK, "$(P)$(R)ilock_seq3") +} + +record(longin, "$(P)$(R)IntlkEvtIn0-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 0 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn1-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 1 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn2-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 2 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn3-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 3 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn4-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 4 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn5-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 5 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtIn6-RB") { + field(ASG, "Reserved") + field(DESC, "interlock input 6 event code RBV") +} + +record(longin, "$(P)$(R)IntlkEvtOut-RB") { + field(ASG, "Reserved") + field(DESC, "interlock output event code RBV") +} + +######################################################################## +# Interlock Control and Status [57] + +record(longout, "$(P)$(R)cmd_evg_ilockcontrol_set") { + field(ASG, "Reserved") + field(DESC, "Command code to write Interlock Control") + field(VAL, "0x79") +} + +record(longout, "$(P)$(R)cmd_evg_ilockcontrol_get") { + field(ASG, "Reserved") + field(DESC, "Command code to read Interlock Control") + field(SCAN, "1 second") + field(VAL, "0xB9") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockcontrol_get($(P),$(R)) $(PORT)") +} + +record(mbboDirect, "$(P)$(R)IntlkLogEnbl-SP") { + field(DESC, "Each bit sets interlock map log enable") + field(NOBT, "8") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") +} + +record(mbbiDirect, "$(P)$(R)IntlkLogEnbl-RB") { + field(ASG, "Reserved") + field(DESC, "Interlock map log enable status") + field(NOBT, "8") + field(DTYP, "stream") + field(SCAN, "I/O Intr") + field(INP, "@timing.proto evg_ilock_log_intr $(PORT)") +} + +record(bo, "$(P)$(R)IntlkCtrlEnbl-Sel") { + field(DESC, "Interlock map enable") + field(MASK, "1") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(FLNK, "$(P)$(R)IntlkCtrlEnblCalc") + field(PINI, YES) +} + +record(bo, "$(P)$(R)IntlkCtrlRst-Sel") { + field(DESC, "Interlock map reset") + field(MASK, "1") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(HIGH, "1") + field(FLNK, "$(P)$(R)IntlkCtrlRstCalc") +} + +record(bo, "$(P)$(R)IntlkCtrlRepeat-Sel") { + field(DESC, "Interlock map enable continuous mode") + field(MASK, "1") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(FLNK, "$(P)$(R)IntlkCtrlRepeatCalc") +} + +record(calcout, "$(P)$(R)IntlkCtrlEnblCalc") { + field(ASG, "Reserved") + field(DESC, "Interlock control. En, reset, cont.") + field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") + field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") + field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") + field(CALC, "(A<<7)|(B<<6)|(C<<5)") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),EnblCalc) $(PORT)") + field(FLNK, "$(P)$(R)IntlkCtrlCalc") +} + +record(calcout, "$(P)$(R)IntlkCtrlRstCalc") { + field(ASG, "Reserved") + field(DESC, "Interlock control. En, reset, cont.") + field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") + field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") + field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") + field(CALC, "(A<<7)|(B<<6)|(C<<5)") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RstCalc) $(PORT)") + field(FLNK, "$(P)$(R)IntlkCtrlCalc") +} + +record(calcout, "$(P)$(R)IntlkCtrlRepeatCalc") { + field(ASG, "Reserved") + field(DESC, "Interlock control. En, reset, cont.") + field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") + field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") + field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") + field(CALC, "(A<<7)|(B<<6)|(C<<5)") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RepeatCalc) $(PORT)") + field(FLNK, "$(P)$(R)IntlkCtrlCalc") +} + +record(calcout, "$(P)$(R)IntlkCtrlCalc") { + field(ASG, "Reserved") + field(DESC, "Interlock control. En, reset, cont.") + field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") + field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") + field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") + field(CALC, "(A<<7)|(B<<6)|(C<<5)") +} + +record(longout, "$(P)$(R)IntlkCtrlRepeatTime-SP") { + field(DESC, "Interlock event output repeat time") + field(DRVH, "4294967295") + field(DRVL, "1") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") +} + +record(longin, "$(P)$(R)IntlkCtrlRepeatTime-RB") { + #field(ASG, "Reserved") + field(DESC, "Interlock evtout repeat time RBV") + field(SCAN, "I/O Intr") + field(DTYP, "stream") + field(INP, "@timing.proto evg_ilock_repeat_time_intr $(PORT)") +} + +record(mbbiDirect, "$(P)$(R)IntlkCtrlRaw") { + #field(ASG, "Reserved") + field(DESC, "Interlock control RBV.") + field(NOBT, "8") + field(SCAN, "I/O Intr") + field(DTYP, "stream") + field(INP, "@timing.proto evg_ilock_control_intr $(PORT)") + field(FLNK, "$(P)$(R)IntlkCtrlEnbl-Sts") +} + +record(bi, "$(P)$(R)IntlkCtrlEnbl-Sts") { + field(DESC, "Interlock map enable RBV") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(INP, "$(P)$(R)IntlkCtrlRaw.B7") + field(FLNK, "$(P)$(R)IntlkCtrlRst-Sts") +} + +record(bi, "$(P)$(R)IntlkCtrlRst-Sts") { + field(DESC, "Interlock map reset RBV") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(INP, "$(P)$(R)IntlkCtrlRaw.B6") + field(FLNK, "$(P)$(R)IntlkCtrlRepeat-Sts") +} + +record(bi, "$(P)$(R)IntlkCtrlRepeat-Sts") { + field(DESC, "Interlock map enable continuous mode RBV") + field(ZNAM, "Dsbl") + field(ONAM, "Enbl") + field(INP, "$(P)$(R)IntlkCtrlRaw.B5") +} + +record(mbbiDirect, "$(P)$(R)IntlkEvtStatus-Mon") { + #field(ASG, "Reserved") + field(DESC, "Interlock event status") + field(NOBT, "8") + field(SCAN, "I/O Intr") + field(DTYP, "stream") + field(INP, "@timing.proto evg_ilock_status_intr $(PORT)") +} \ No newline at end of file From 0faa7f877dd5fe02d85378bd20a0784ebc4d84b4 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:25 -0300 Subject: [PATCH 2/8] evg_interlock.db: remove seqs forcing readbacks --- timingApp/Db/evg_interlock.db | 78 +---------------------------------- 1 file changed, 2 insertions(+), 76 deletions(-) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index 28a4831..8fda309 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -1,80 +1,6 @@ ######################################################################## # Interlock map [56] -record(seq, "$(P)$(R)ilock_seq1") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.B0") - field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.B1") - field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.B2") - field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.B3") - field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.B4") - field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.B5") - field(DOL7, "$(P)$(R)IntlkTbl0to15-Sts.B6") - field(DOL8, "$(P)$(R)IntlkTbl0to15-Sts.B7") - field(DOL9, "$(P)$(R)IntlkTbl0to15-Sts.B8") - field(DOLA, "$(P)$(R)IntlkTbl0to15-Sts.B9") - field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.B0") - field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.B1") - field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.B2") - field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.B3") - field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.B4") - field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.B5") - field(LNK7, "$(P)$(R)IntlkTbl0to15-Sel.B6") - field(LNK8, "$(P)$(R)IntlkTbl0to15-Sel.B7") - field(LNK9, "$(P)$(R)IntlkTbl0to15-Sel.B8") - field(LNKA, "$(P)$(R)IntlkTbl0to15-Sel.B9") - field(FLNK, "$(P)$(R)ilock_seq2") -} - -record(seq, "$(P)$(R)ilock_seq2") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl0to15-Sts.BA") - field(DOL2, "$(P)$(R)IntlkTbl0to15-Sts.BB") - field(DOL3, "$(P)$(R)IntlkTbl0to15-Sts.BC") - field(DOL4, "$(P)$(R)IntlkTbl0to15-Sts.BD") - field(DOL5, "$(P)$(R)IntlkTbl0to15-Sts.BE") - field(DOL6, "$(P)$(R)IntlkTbl0to15-Sts.BF") - field(LNK1, "$(P)$(R)IntlkTbl0to15-Sel.BA") - field(LNK2, "$(P)$(R)IntlkTbl0to15-Sel.BB") - field(LNK3, "$(P)$(R)IntlkTbl0to15-Sel.BC") - field(LNK4, "$(P)$(R)IntlkTbl0to15-Sel.BD") - field(LNK5, "$(P)$(R)IntlkTbl0to15-Sel.BE") - field(LNK6, "$(P)$(R)IntlkTbl0to15-Sel.BF") -} - -record(seq, "$(P)$(R)ilock_seq3") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.B0") - field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.B1") - field(DOL3, "$(P)$(R)IntlkTbl16to27-Sts.B2") - field(DOL4, "$(P)$(R)IntlkTbl16to27-Sts.B3") - field(DOL5, "$(P)$(R)IntlkTbl16to27-Sts.B4") - field(DOL6, "$(P)$(R)IntlkTbl16to27-Sts.B5") - field(DOL7, "$(P)$(R)IntlkTbl16to27-Sts.B6") - field(DOL8, "$(P)$(R)IntlkTbl16to27-Sts.B7") - field(DOL9, "$(P)$(R)IntlkTbl16to27-Sts.B8") - field(DOLA, "$(P)$(R)IntlkTbl16to27-Sts.B9") - field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.B0") - field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.B1") - field(LNK3, "$(P)$(R)IntlkTbl16to27-Sel.B2") - field(LNK4, "$(P)$(R)IntlkTbl16to27-Sel.B3") - field(LNK5, "$(P)$(R)IntlkTbl16to27-Sel.B4") - field(LNK6, "$(P)$(R)IntlkTbl16to27-Sel.B5") - field(LNK7, "$(P)$(R)IntlkTbl16to27-Sel.B6") - field(LNK8, "$(P)$(R)IntlkTbl16to27-Sel.B7") - field(LNK9, "$(P)$(R)IntlkTbl16to27-Sel.B8") - field(LNKA, "$(P)$(R)IntlkTbl16to27-Sel.B9") - field(FLNK, "$(P)$(R)ilock_seq4") -} - -record(seq, "$(P)$(R)ilock_seq4") { - field(DESC, "interlock input to output map") - field(DOL1, "$(P)$(R)IntlkTbl16to27-Sts.BA") - field(DOL2, "$(P)$(R)IntlkTbl16to27-Sts.BB") - field(LNK1, "$(P)$(R)IntlkTbl16to27-Sel.BA") - field(LNK2, "$(P)$(R)IntlkTbl16to27-Sel.BB") -} - record(mbboDirect, "$(P)$(R)IntlkTbl0to15-Sel") { field(DESC, "interlock input to output map") field(FLNK, "$(P)$(R)IntlkTblCalc") @@ -182,13 +108,13 @@ record(longout, "$(P)$(R)cmd_evg_ilockmap_get") { } record(mbbiDirect, "$(P)$(R)IntlkTbl0to15-Sts") { + field(ASG, "Reserved") field(DESC, "interlock input to output map RBV") - field(FLNK, "$(P)$(R)ilock_seq1") } record(mbbiDirect, "$(P)$(R)IntlkTbl16to27-Sts") { + field(ASG, "Reserved") field(DESC, "interlock input to output map RBV") - field(FLNK, "$(P)$(R)ilock_seq3") } record(longin, "$(P)$(R)IntlkEvtIn0-RB") { From 5a4e9c92ba5c134d1debb6adda8928187a5c4eb8 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:32 -0300 Subject: [PATCH 3/8] evg_interlock.db: add PINI to interlock map register --- timingApp/Db/evg_interlock.db | 1 + 1 file changed, 1 insertion(+) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index 8fda309..0d7ccb3 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -5,6 +5,7 @@ record(mbboDirect, "$(P)$(R)IntlkTbl0to15-Sel") { field(DESC, "interlock input to output map") field(FLNK, "$(P)$(R)IntlkTblCalc") field(ASG, "Interlock") + field(PINI, YES) } record(mbboDirect, "$(P)$(R)IntlkTbl16to27-Sel") { From 793c593252cea55bd5c52dba5f9b23d9877d9e79 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:37 -0300 Subject: [PATCH 4/8] evg interlock map protocol simplification --- timingApp/Db/evg_interlock.db | 18 ++++++------ timingApp/Db/timing.proto | 53 ++--------------------------------- 2 files changed, 12 insertions(+), 59 deletions(-) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index 0d7ccb3..fb104b0 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -21,7 +21,7 @@ record(calcout, "$(P)$(R)IntlkTblCalc") { field(INPA, "$(P)$(R)IntlkTbl16to27-Sel") field(INPB, "$(P)$(R)IntlkTbl0to15-Sel") field(CALC, "(A<<16)+B") - field(OUT, "@timing.proto evg_ilockmap_map_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") } record(longout, "$(P)$(R)IntlkEvtIn0-SP") { @@ -29,7 +29,7 @@ record(longout, "$(P)$(R)IntlkEvtIn0-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev0_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -38,7 +38,7 @@ record(longout, "$(P)$(R)IntlkEvtIn1-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev1_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -47,7 +47,7 @@ record(longout, "$(P)$(R)IntlkEvtIn2-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev2_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -56,7 +56,7 @@ record(longout, "$(P)$(R)IntlkEvtIn3-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev3_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -65,7 +65,7 @@ record(longout, "$(P)$(R)IntlkEvtIn4-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev4_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -74,7 +74,7 @@ record(longout, "$(P)$(R)IntlkEvtIn5-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev5_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -83,7 +83,7 @@ record(longout, "$(P)$(R)IntlkEvtIn6-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_ev6_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } @@ -92,7 +92,7 @@ record(longout, "$(P)$(R)IntlkEvtOut-SP") { field(DRVH, "255") field(DRVL, "0") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockmap_evout_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") } diff --git a/timingApp/Db/timing.proto b/timingApp/Db/timing.proto index e1ea2a4..250e97c 100644 --- a/timingApp/Db/timing.proto +++ b/timingApp/Db/timing.proto @@ -688,53 +688,8 @@ evg_ilockmap_get { in "\x02%*04r\x00\x0D%*r%(\$1\$2IntlkTbl16to27-Sts)02r%(\$1\$2IntlkTbl0to15-Sts)02r%(\$1\$2IntlkEvtOut-RB)0r%(\$1\$2IntlkEvtIn6-RB)0r%(\$1\$2IntlkEvtIn5-RB)0r%(\$1\$2IntlkEvtIn4-RB)0r%(\$1\$2IntlkEvtIn3-RB)0r%(\$1\$2IntlkEvtIn2-RB)0r%(\$1\$2IntlkEvtIn1-RB)0r%(\$1\$2IntlkEvtIn0-RB)0r"; } -evg_ilockmap_upload { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_get)r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; - in "\x02%*04r\x00\x0D%*r%(\$1\$2IntlkTbl16to27-Sel)02r%(\$1\$2IntlkTbl0to15-Sel)02r%(\$1\$2IntlkEvtOut-RB)0r%(\$1\$2IntlkEvtIn6-RB)0r%(\$1\$2IntlkEvtIn5-RB)0r%(\$1\$2IntlkEvtIn4-RB)0r%(\$1\$2IntlkEvtIn3-RB)0r%(\$1\$2IntlkEvtIn2-RB)0r%(\$1\$2IntlkEvtIn1-RB)0r%(\$1\$2IntlkEvtIn0-RB)0r"; -} - -evg_ilockmap_map_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTblCalc).4r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev0_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-SP)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev1_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-SP)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev2_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-SP)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev3_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-SP)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev4_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-SP)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev5_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-SP)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_ev6_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-RB)r%(\$1\$2IntlkEvtIn6-SP)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; - evg_ilockmap_get; -} - -evg_ilockmap_evout_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sts).2r%(\$1\$2IntlkTbl0to15-Sts).2r%(\$1\$2IntlkEvtOut-SP)r%(\$1\$2IntlkEvtIn6-RB)r%(\$1\$2IntlkEvtIn5-RB)r%(\$1\$2IntlkEvtIn4-RB)r%(\$1\$2IntlkEvtIn3-RB)r%(\$1\$2IntlkEvtIn2-RB)r%(\$1\$2IntlkEvtIn1-RB)r%(\$1\$2IntlkEvtIn0-RB)r"; +evg_ilockmap_set { + out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTblCalc).4r%(\$1\$2IntlkEvtOut-SP)r%(\$1\$2IntlkEvtIn6-SP)r%(\$1\$2IntlkEvtIn5-SP)r%(\$1\$2IntlkEvtIn4-SP)r%(\$1\$2IntlkEvtIn3-SP)r%(\$1\$2IntlkEvtIn2-SP)r%(\$1\$2IntlkEvtIn1-SP)r%(\$1\$2IntlkEvtIn0-SP)r"; evg_ilockmap_get; } @@ -1094,7 +1049,6 @@ evg_get_rbv{ evg_tmstmp_get; # Interlock Map and Control evg_ilockmap_get; - #evg_ilockmap_upload; evg_ilockcontrol_get; } @@ -1209,8 +1163,7 @@ evg_download{ out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_mux_set7).1r\x00\x00\x00%(\$1\$2Clk7MuxEnbl-Sel.RVAL).1r\x00\x00\x00\x00%(\$1\$2Clk7MuxDiv-SP.RVAL).4r"; # interlock map - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sel).2r%(\$1\$2IntlkTbl0to15-Sel).2r%(\$1\$2IntlkEvtOut-SP)r%(\$1\$2IntlkEvtIn6-SP)r%(\$1\$2IntlkEvtIn5-SP)r%(\$1\$2IntlkEvtIn4-SP)r%(\$1\$2IntlkEvtIn3-SP)r%(\$1\$2IntlkEvtIn2-SP)r%(\$1\$2IntlkEvtIn1-SP)r%(\$1\$2IntlkEvtIn0-SP)r"; - + evg_ilockmap_set; # interlock control out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r%(\$1\$2IntlkCtrlCalc)r\x00\x00\x00%(\$1\$2IntlkCtrlRepeatTime-SP).4r\x00\x00\x00\x00"; From f6c3b30255e06f1503e996a4f7ca566a7bf919fb Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:43 -0300 Subject: [PATCH 5/8] remove not needed calc record --- timingApp/Db/evg_interlock.db | 14 +++----------- timingApp/Db/timing.proto | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index fb104b0..181ed85 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -3,25 +3,17 @@ record(mbboDirect, "$(P)$(R)IntlkTbl0to15-Sel") { field(DESC, "interlock input to output map") - field(FLNK, "$(P)$(R)IntlkTblCalc") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") field(ASG, "Interlock") field(PINI, YES) } record(mbboDirect, "$(P)$(R)IntlkTbl16to27-Sel") { field(DESC, "interlock input to output map") - field(FLNK, "$(P)$(R)IntlkTblCalc") - field(ASG, "Interlock") -} - -record(calcout, "$(P)$(R)IntlkTblCalc") { - #field(ASG, "Reserved") - field(DESC, "interlock map calc") field(DTYP, "stream") - field(INPA, "$(P)$(R)IntlkTbl16to27-Sel") - field(INPB, "$(P)$(R)IntlkTbl0to15-Sel") - field(CALC, "(A<<16)+B") field(OUT, "@timing.proto evg_ilockmap_set($(P),$(R)) $(PORT)") + field(ASG, "Interlock") } record(longout, "$(P)$(R)IntlkEvtIn0-SP") { diff --git a/timingApp/Db/timing.proto b/timingApp/Db/timing.proto index 250e97c..6c2f310 100644 --- a/timingApp/Db/timing.proto +++ b/timingApp/Db/timing.proto @@ -689,7 +689,7 @@ evg_ilockmap_get { } evg_ilockmap_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTblCalc).4r%(\$1\$2IntlkEvtOut-SP)r%(\$1\$2IntlkEvtIn6-SP)r%(\$1\$2IntlkEvtIn5-SP)r%(\$1\$2IntlkEvtIn4-SP)r%(\$1\$2IntlkEvtIn3-SP)r%(\$1\$2IntlkEvtIn2-SP)r%(\$1\$2IntlkEvtIn1-SP)r%(\$1\$2IntlkEvtIn0-SP)r"; + out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockmap_set)r%(\$1\$2IntlkTbl16to27-Sel).2r%(\$1\$2IntlkTbl0to15-Sel).2r%(\$1\$2IntlkEvtOut-SP)r%(\$1\$2IntlkEvtIn6-SP)r%(\$1\$2IntlkEvtIn5-SP)r%(\$1\$2IntlkEvtIn4-SP)r%(\$1\$2IntlkEvtIn3-SP)r%(\$1\$2IntlkEvtIn2-SP)r%(\$1\$2IntlkEvtIn1-SP)r%(\$1\$2IntlkEvtIn0-SP)r"; evg_ilockmap_get; } From 05b4261859a314e3827ef738a7ee847b2ca536f7 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:50 -0300 Subject: [PATCH 6/8] interlock control protocol simplification --- timingApp/Db/evg_interlock.db | 46 +++++------------------------------ timingApp/Db/timing.proto | 14 ++--------- 2 files changed, 8 insertions(+), 52 deletions(-) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index 181ed85..6e9ff63 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -172,7 +172,7 @@ record(mbboDirect, "$(P)$(R)IntlkLogEnbl-SP") { field(DESC, "Each bit sets interlock map log enable") field(NOBT, "8") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R)) $(PORT)") } record(mbbiDirect, "$(P)$(R)IntlkLogEnbl-RB") { @@ -189,7 +189,7 @@ record(bo, "$(P)$(R)IntlkCtrlEnbl-Sel") { field(MASK, "1") field(ZNAM, "Dsbl") field(ONAM, "Enbl") - field(FLNK, "$(P)$(R)IntlkCtrlEnblCalc") + field(FLNK, "$(P)$(R)IntlkCtrlCalc") field(PINI, YES) } @@ -199,7 +199,7 @@ record(bo, "$(P)$(R)IntlkCtrlRst-Sel") { field(ZNAM, "Dsbl") field(ONAM, "Enbl") field(HIGH, "1") - field(FLNK, "$(P)$(R)IntlkCtrlRstCalc") + field(FLNK, "$(P)$(R)IntlkCtrlCalc") } record(bo, "$(P)$(R)IntlkCtrlRepeat-Sel") { @@ -207,42 +207,6 @@ record(bo, "$(P)$(R)IntlkCtrlRepeat-Sel") { field(MASK, "1") field(ZNAM, "Dsbl") field(ONAM, "Enbl") - field(FLNK, "$(P)$(R)IntlkCtrlRepeatCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlEnblCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),EnblCalc) $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlRstCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sts") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RstCalc) $(PORT)") - field(FLNK, "$(P)$(R)IntlkCtrlCalc") -} - -record(calcout, "$(P)$(R)IntlkCtrlRepeatCalc") { - field(ASG, "Reserved") - field(DESC, "Interlock control. En, reset, cont.") - field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sts") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sts") - field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") - field(CALC, "(A<<7)|(B<<6)|(C<<5)") - field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R),RepeatCalc) $(PORT)") field(FLNK, "$(P)$(R)IntlkCtrlCalc") } @@ -253,6 +217,8 @@ record(calcout, "$(P)$(R)IntlkCtrlCalc") { field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") field(CALC, "(A<<7)|(B<<6)|(C<<5)") + field(DTYP, "stream") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R)) $(PORT)") } record(longout, "$(P)$(R)IntlkCtrlRepeatTime-SP") { @@ -260,7 +226,7 @@ record(longout, "$(P)$(R)IntlkCtrlRepeatTime-SP") { field(DRVH, "4294967295") field(DRVL, "1") field(DTYP, "stream") - field(OUT, "@timing.proto evg_ilockrepeat_time_log_set($(P),$(R)) $(PORT)") + field(OUT, "@timing.proto evg_ilockcontrol_set($(P),$(R)) $(PORT)") } record(longin, "$(P)$(R)IntlkCtrlRepeatTime-RB") { diff --git a/timingApp/Db/timing.proto b/timingApp/Db/timing.proto index 6c2f310..2f905b3 100644 --- a/timingApp/Db/timing.proto +++ b/timingApp/Db/timing.proto @@ -702,12 +702,7 @@ evg_ilockcontrol_get { } evg_ilockcontrol_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r%(\$1\$2IntlkCtrl\$3)r\x00\x00\x00%(\$1\$2IntlkCtrlRepeatTime-RB).4r\x00\x00%(\$1\$2IntlkLogEnbl-RB).1r\x00"; - evg_ilockcontrol_get; -} - -evg_ilockrepeat_time_log_set { - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r%(\$1\$2IntlkCtrlRaw)r\x00\x00\x00%(\$1\$2IntlkCtrlRepeatTime-SP).4r\x00\x00%(\$1\$2IntlkLogEnbl-SP).1r\x00"; + out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r%(\$1\$2IntlkCtrlCalc)r\x00\x00\x00%(\$1\$2IntlkCtrlRepeatTime-SP).4r\x00\x00%(\$1\$2IntlkLogEnbl-SP).1r\x00"; evg_ilockcontrol_get; } @@ -727,11 +722,6 @@ evg_ilock_log_intr { in "\x02%*04r\x00\x0D\xF9%*04r%*04r%*02r%01r%*r"; } -#evg_ilock_status { -# out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; -# in "\x02%*04r\x00\x0D\xF9%(\$1\$2IntlkCtrlRaw)r%*03r%*04r%*03r%(\$1\$2IntlkEvtStatus-Mon)r"; -#} - ################################################################################ # Asynchronous event EVG [58] @@ -1165,7 +1155,7 @@ evg_download{ # interlock map evg_ilockmap_set; # interlock control - out "\x02\x00\x00\x00\x00\x00\x0D%(\$1\$2cmd_evg_ilockcontrol_set)r%(\$1\$2IntlkCtrlCalc)r\x00\x00\x00%(\$1\$2IntlkCtrlRepeatTime-SP).4r\x00\x00\x00\x00"; + evg_ilockcontrol_set; # ac line settings evg_acline_set; From e4d09f5070cf8f83441839acc68c69eaddab9872 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:41:56 -0300 Subject: [PATCH 7/8] autosave_evg.req: adjust interlock control records --- timingApp/Db/autosave_evg.req | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/timingApp/Db/autosave_evg.req b/timingApp/Db/autosave_evg.req index b8d3431..ee43859 100644 --- a/timingApp/Db/autosave_evg.req +++ b/timingApp/Db/autosave_evg.req @@ -83,9 +83,10 @@ $(P)$(R)Evt61DelayType-Sel $(P)$(R)Evt62DelayType-Sel $(P)$(R)Evt63DelayType-Sel $(P)$(R)InjectionEvt-Sel +$(P)$(R)IntlkLogEnbl-SP $(P)$(R)IntlkCtrlEnbl-Sel $(P)$(R)IntlkCtrlRepeat-Sel -$(P)$(R)IntlkCtrlRst-Sel +$(P)$(R)IntlkCtrlRepeatTime-SP $(P)$(R)SeqEnbl-Sel $(P)$(R)UTCRefSrc-Sel $(P)$(R)DevFun-Sel From 939d2cdbb1f2726fa4a74b8fb61b82a1793de3c3 Mon Sep 17 00:00:00 2001 From: Mauricio Donatti Date: Thu, 13 Jun 2024 13:39:46 -0300 Subject: [PATCH 8/8] evg_interlock.db: change interlock reset record to be a command instead SP and RB structure --- timingApp/Db/evg_interlock.db | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/timingApp/Db/evg_interlock.db b/timingApp/Db/evg_interlock.db index 6e9ff63..2371af3 100644 --- a/timingApp/Db/evg_interlock.db +++ b/timingApp/Db/evg_interlock.db @@ -193,8 +193,8 @@ record(bo, "$(P)$(R)IntlkCtrlEnbl-Sel") { field(PINI, YES) } -record(bo, "$(P)$(R)IntlkCtrlRst-Sel") { - field(DESC, "Interlock map reset") +record(bo, "$(P)$(R)IntlkCtrlRst-Cmd") { + field(DESC, "Interlock map reset command") field(MASK, "1") field(ZNAM, "Dsbl") field(ONAM, "Enbl") @@ -214,7 +214,7 @@ record(calcout, "$(P)$(R)IntlkCtrlCalc") { field(ASG, "Reserved") field(DESC, "Interlock control. En, reset, cont.") field(INPA, "$(P)$(R)IntlkCtrlEnbl-Sel") - field(INPB, "$(P)$(R)IntlkCtrlRst-Sel") + field(INPB, "$(P)$(R)IntlkCtrlRst-Cmd") field(INPC, "$(P)$(R)IntlkCtrlRepeat-Sel") field(CALC, "(A<<7)|(B<<6)|(C<<5)") field(DTYP, "stream") @@ -252,14 +252,6 @@ record(bi, "$(P)$(R)IntlkCtrlEnbl-Sts") { field(ZNAM, "Dsbl") field(ONAM, "Enbl") field(INP, "$(P)$(R)IntlkCtrlRaw.B7") - field(FLNK, "$(P)$(R)IntlkCtrlRst-Sts") -} - -record(bi, "$(P)$(R)IntlkCtrlRst-Sts") { - field(DESC, "Interlock map reset RBV") - field(ZNAM, "Dsbl") - field(ONAM, "Enbl") - field(INP, "$(P)$(R)IntlkCtrlRaw.B6") field(FLNK, "$(P)$(R)IntlkCtrlRepeat-Sts") }