diff --git a/evrisland/evrislandApp/Db/evr-island.template b/evrisland/evrislandApp/Db/evr-island.template index d234ba86e1714a91e92985f4bc188df4d78dd653..b653b383235ccd31875e9c075eacbf116adf24fb 100644 --- a/evrisland/evrislandApp/Db/evr-island.template +++ b/evrisland/evrislandApp/Db/evr-island.template @@ -15,7 +15,7 @@ record(ao, "$(P)$(R=)CycleFreq-SP") { record(calc, "$(P)$(R=)CycleFreq-RB") { field(DESC, "Cycle frequency readback") - field(INPA, "$(EVRPREFIX)PS0-Rate-I CP") + field(INPA, "$(EVRPREFIX)PS-0-Rate-I CP") field(CALC, "A*1000000") field(PREC, "3") field(EGU, "Hz") @@ -24,7 +24,7 @@ record(calc, "$(P)$(R=)CycleFreq-RB") { record(calcout, "$(P)$(R=)RFFreq-Divider") { field(INPA, "$(P)$(R=)CycleFreq-SP") field(CALC, "(88052500 / A)") - field(OUT, "$(EVRPREFIX)PS0-Div-SP PP") + field(OUT, "$(EVRPREFIX)PS-0-Div-SP PP") field(TPRO, "0") } @@ -68,7 +68,7 @@ record(ao, "$(P)$(R=)RFSyncWdt-SP") { field(EGU, "us") field(DRVL, "1") field(DRVH, "10000") - field(OUT, "$(EVRPREFIX)DlyGen1-Width-SP PP") + field(OUT, "$(EVRPREFIX)DlyGen-1-Width-SP PP") info(autosaveFields_pass0, "VAL") } @@ -111,10 +111,10 @@ record(calcout, "$(P)$(R=)#SetBeamWidth"){ # Set fixed values record(seq, "$(P)$(R=)#SeqFixedVals") { field(DOL0, "$(P)$(R=)PrePulseDly-RB") - field(LNK0, "$(EVRPREFIX)DlyGen0-Delay-SP PP") + field(LNK0, "$(EVRPREFIX)DlyGen-0-Delay-SP PP") field(DOL1, "$(P)$(R=)HVSyncWdt-RB") - field(LNK1, "$(EVRPREFIX)DlyGen0-Width-SP PP") + field(LNK1, "$(EVRPREFIX)DlyGen-0-Width-SP PP") } # Pulser 1 @@ -122,7 +122,7 @@ record(calcout, "$(P)$(R=)#SetPulser1Dly"){ field(INPA, "$(P)$(R=)PrePulseDly-RB") field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr field(CALC, "A+B") - field(OUT, "$(EVRPREFIX)DlyGen1-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-1-Delay-SP PP" ) } # Pulser 2 @@ -131,7 +131,7 @@ record(calcout, "$(P)$(R=)#SetPulser2Dly"){ field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr field(INPC, "5") # Removing 5us, time for LLRF firmware field(CALC, "A+B-C") - field(OUT, "$(EVRPREFIX)DlyGen2-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-2-Delay-SP PP" ) } # Pulser 3 @@ -140,7 +140,7 @@ record(calcout, "$(P)$(R=)#SetPulser3Dly"){ field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr field(INPC, "$(P)$(R=)RFSyncWdt-SP CP") # When updates value, update evr field(CALC, "A+B+C") - field(OUT, "$(EVRPREFIX)DlyGen3-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-3-Delay-SP PP" ) } # Pulser 4 @@ -149,7 +149,7 @@ record(calcout, "$(P)$(R=)#SetPulser4Dly"){ field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr field(INPC, "$(P)$(R=)BeamPulseDly-SP CP") # When updates value, update evr field(CALC, "A+B+C") - field(OUT, "$(EVRPREFIX)DlyGen4-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-4-Delay-SP PP" ) } # Pulser 5 @@ -159,14 +159,14 @@ record(calcout, "$(P)$(R=)#SetPulser5Dly"){ field(INPC, "$(P)$(R=)BeamPulseDly-SP CP") # When updates value, update evr field(INPD, "$(P)$(R=)BeamPulseWdt-SP CP") # When updates value, update evr field(CALC, "A+B+C+D") - field(OUT, "$(EVRPREFIX)DlyGen5-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-5-Delay-SP PP" ) } # Pulser 6 record(calcout, "$(P)$(R=)#SetPulser6Dly"){ field(INPA, "$(P)$(R=)FIMDly-RB CP") # When updates value, update evr field(CALC, "A") - field(OUT, "$(EVRPREFIX)DlyGen6-Delay-SP PP" ) + field(OUT, "$(EVRPREFIX)DlyGen-6-Delay-SP PP" ) } # Set all initial values @@ -187,13 +187,13 @@ record(seq, "$(P)$(R=)Seq0-Enable") { field(SELM, "All") # Load sequencer 0 field(DOL0, "1") - field(LNK0, "$(EVRPREFIX)SoftSeq0-Load-Cmd CP") + field(LNK0, "$(EVRPREFIX)SoftSeq-0-Load-Cmd CP") # Commit sequencer 0 field(DOL1, "1") - field(LNK1, "$(EVRPREFIX)SoftSeq0-Commit-Cmd CP") + field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd CP") # Enable sequencer 0 field(DOL2, "1") - field(LNK2, "$(EVRPREFIX)SoftSeq0-Enable-Cmd CP") + field(LNK2, "$(EVRPREFIX)SoftSeq-0-Enable-Cmd CP") field(TPRO, "0") } @@ -206,7 +206,7 @@ record(calc, "$(P)$(R=)Cycle-Cnt") field(DESC, "Cycle Counter") field(CALC, "A") field(SCAN, "Passive") - field(INPA, "$(EVRPREFIX)SoftSeq0-NumOfStarts-I CPP") + field(INPA, "$(EVRPREFIX)SoftSeq-0-NumOfStarts-I CPP") } ######################################################## @@ -235,7 +235,7 @@ record(seq, "$(P)$(R=)SeqDisableAll") { # Disable sequencer 0 field(DOL1, "1") - field(LNK1, "$(EVRPREFIX)SoftSeq0-Disable-Cmd CP") + field(LNK1, "$(EVRPREFIX)SoftSeq-0-Disable-Cmd CP") # Save current number of cycles field(DOL2, "$(P)$(R=)Cycle-Cnt") @@ -356,11 +356,11 @@ record(mbbo, "$(P)$(R=)MixFreq") { record(seq, "$(P)$(R=)#SeqSetMixed"){ # Get the current Frequency for Mixed Mode field(DOL0, "$(P)$(R=)MixFreq.RVAL") - field(LNK0, "$(EVRPREFIX)SoftSeq0-TrigSrc-0-Sel PP") + field(LNK0, "$(EVRPREFIX)SoftSeq-0-TrigSrc-0-Sel PP") # Commit sequencer 0 field(DOL1, "1") - field(LNK1, "$(EVRPREFIX)SoftSeq0-Commit-Cmd CP") + field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd CP") # Block Cycle Frequency from Island mode field(DOL2, "1") @@ -376,11 +376,11 @@ record(seq, "$(P)$(R=)#SeqSetMixed"){ record(seq, "$(P)$(R=)#SeqSetLocal"){ # Get the current Frequency for Mixed Mode field(DOL0, "2") - field(LNK0, "$(EVRPREFIX)SoftSeq0-TrigSrc-2-Sel PP") + field(LNK0, "$(EVRPREFIX)SoftSeq-0-TrigSrc-2-Sel PP") # Commit sequencer 0 field(DOL1, "1") - field(LNK1, "$(EVRPREFIX)SoftSeq0-Commit-Cmd CP") + field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd CP") # Unblock Cycle Frequency from Island mode field(DOL2, "0") @@ -396,9 +396,9 @@ record(seq, "$(P)$(R=)#SeqSetLocal"){ record(seq, "$(P)$(R=)#SeqChgFreqMix"){ # Get the current Frequency for Mixed Mode field(DOL0, "$(P)$(R=)MixFreq.RVAL") - field(LNK0, "$(EVRPREFIX)SoftSeq0-TrigSrc-0-Sel PP") + field(LNK0, "$(EVRPREFIX)SoftSeq-0-TrigSrc-0-Sel PP") # Commit sequencer 0 field(DOL1, "1") - field(LNK1, "$(EVRPREFIX)SoftSeq0-Commit-Cmd CP") + field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd CP") } diff --git a/iocsh/evr-island-base.iocsh b/iocsh/evr-island-base.iocsh index cb1314104e1b0a721cff287d94971cdb515c2e58..da0ea81590c50ac3e02fcfeeeb58b40673a0b210 100644 --- a/iocsh/evr-island-base.iocsh +++ b/iocsh/evr-island-base.iocsh @@ -33,97 +33,97 @@ dbLoadRecords("evrevent.db","EN=$(PREFIX)-$(Island_event), OBJ=$(OBJ), CODE=$(Is #- Backplane trigger line configuration / Front output # Pulser 0 - HV Sync - Modulator -afterInit("dbpf $(PREFIX):DlyGen0-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen0-Delay-SP 100") # Pre-pulse delay -afterInit("dbpf $(PREFIX):DlyGen0-Width-SP 100") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen0-Label-I 'Modulator'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-0-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-0-Delay-SP 100") # Pre-pulse delay +afterInit("dbpf $(PREFIX):DlyGen-0-Width-SP 100") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-0-Label-I 'Modulator'") # Set labels ## FP 0 and 1 -afterInit("dbpf $(PREFIX):OutFP0-Src-SP 0") -afterInit("dbpf $(PREFIX):OutFP1-Src-SP 0") +afterInit("dbpf $(PREFIX):Out-FP0-Src-SP 0") +afterInit("dbpf $(PREFIX):Out-FP1-Src-SP 0") ## FP UNIVTTL 0 -afterInit("dbpf $(PREFIX):OutFPUV0-Src-SP 0") +afterInit("dbpf $(PREFIX):Out-FPUV0-Src-SP 0") # Pulser 1 - RF Sync -afterInit("dbpf $(PREFIX):DlyGen1-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen1-Delay-SP 2000") # Pre-pulse delay + RF Sync Delay -afterInit("dbpf $(PREFIX):DlyGen1-Width-SP 3000") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen1-Label-I 'RF Start'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-1-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-1-Delay-SP 2000") # Pre-pulse delay + RF Sync Delay +afterInit("dbpf $(PREFIX):DlyGen-1-Width-SP 3000") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-1-Label-I 'RF Start'") # Set labels ## FP 1 and 2 -afterInit("dbpf $(PREFIX):OutFP2-Src-SP 1") -afterInit("dbpf $(PREFIX):OutFP3-Src-SP 1") +afterInit("dbpf $(PREFIX):Out-FP2-Src-SP 1") +afterInit("dbpf $(PREFIX):Out-FP3-Src-SP 1") ## FP UNIVTTL 1, 2 and 3 -afterInit("dbpf $(PREFIX):OutFPUV1-Src-SP 1") -afterInit("dbpf $(PREFIX):OutFPUV2-Src-SP 1") -afterInit("dbpf $(PREFIX):OutFPUV3-Src-SP 1") +afterInit("dbpf $(PREFIX):Out-FPUV1-Src-SP 1") +afterInit("dbpf $(PREFIX):Out-FPUV2-Src-SP 1") +afterInit("dbpf $(PREFIX):Out-FPUV3-Src-SP 1") # Pulser 2 - LLRF Start - TX17 -afterInit("dbpf $(PREFIX):DlyGen2-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen2-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):OutBack1-Src-SP 2") # trigger from delay generator 2 to TX17 -afterInit("dbpf $(PREFIX):OutBack1-Label-I 'LLRF Start'") # Set labels -afterInit("dbpf $(PREFIX):DlyGen2-Label-I 'LLRF Start'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-2-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-2-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):Out-Back1-Src-SP 2") # trigger from delay generator 2 to TX17 +afterInit("dbpf $(PREFIX):Out-Back1-Label-I 'LLRF Start'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-2-Label-I 'LLRF Start'") # Set labels #Pulser 3 - LLRF End - TX20 -afterInit("dbpf $(PREFIX):DlyGen3-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen3-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):OutBack7-Src-SP 3") # trigger from delay generator 3 to TX20 -afterInit("dbpf $(PREFIX):OutBack7-Label-I 'LLRF End'") # Set labels -afterInit("dbpf $(PREFIX):DlyGen3-Label-I 'LLRF End'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-3-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-3-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):Out-Back7-Src-SP 3") # trigger from delay generator 3 to TX20 +afterInit("dbpf $(PREFIX):Out-Back7-Label-I 'LLRF End'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-3-Label-I 'LLRF End'") # Set labels #Pulser 4 Beam Start - RX18 -afterInit("dbpf $(PREFIX):DlyGen4-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen4-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):OutBack2-Src-SP 4") # trigger from delay generator 4 to RX18 -afterInit("dbpf $(PREFIX):OutBack2-Label-I 'Beam Start'") # Set labels -afterInit("dbpf $(PREFIX):DlyGen4-Label-I 'Beam Start'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-4-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-4-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):Out-Back2-Src-SP 4") # trigger from delay generator 4 to RX18 +afterInit("dbpf $(PREFIX):Out-Back2-Label-I 'Beam Start'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-4-Label-I 'Beam Start'") # Set labels #Pulser 5 Beam End - TX18 -afterInit("dbpf $(PREFIX):DlyGen5-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen5-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):OutBack3-Src-SP 5") # trigger from delay generator 5 to TX18 -afterInit("dbpf $(PREFIX):OutBack3-Label-I 'Beam End'") # Set labels -afterInit("dbpf $(PREFIX):DlyGen5-Label-I 'Beam End'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-5-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-5-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):Out-Back3-Src-SP 5") # trigger from delay generator 5 to TX18 +afterInit("dbpf $(PREFIX):Out-Back3-Label-I 'Beam End'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-5-Label-I 'Beam End'") # Set labels # Pulser 6 - FIM Trigger - RX17 -afterInit("dbpf $(PREFIX):DlyGen6-Evt-Trig0-SP $(Island_event)") -afterInit("dbpf $(PREFIX):DlyGen6-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):OutBack0-Src-SP 6") # trigger from delay generator 6 to RX17 -afterInit("dbpf $(PREFIX):OutBack0-Label-I 'FIM'") # Set labels -afterInit("dbpf $(PREFIX):DlyGen6-Label-I 'FIM'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-6-Evt-Trig0-SP $(Island_event)") +afterInit("dbpf $(PREFIX):DlyGen-6-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):Out-Back0-Src-SP 6") # trigger from delay generator 6 to RX17 +afterInit("dbpf $(PREFIX):Out-Back0-Label-I 'FIM'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-6-Label-I 'FIM'") # Set labels ####################################################### ####### Pulsers for Frequency events from Global timing ####################################################### # Pulser 8 - 0.5Hz -afterInit("dbpf $(PREFIX):DlyGen8-Evt-Trig0-SP $(F0Hz5)") -afterInit("dbpf $(PREFIX):DlyGen8-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen8-Label-I '0.5 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-8-Evt-Trig0-SP $(F0Hz5)") +afterInit("dbpf $(PREFIX):DlyGen-8-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-8-Label-I '0.5 Hz from Global Timing'") # Set labels # Pulser 9 - 1Hz -afterInit("dbpf $(PREFIX):DlyGen9-Evt-Trig0-SP $(F1Hz)") -afterInit("dbpf $(PREFIX):DlyGen9-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen9-Label-I '1 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-9-Evt-Trig0-SP $(F1Hz)") +afterInit("dbpf $(PREFIX):DlyGen-9-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-9-Label-I '1 Hz from Global Timing'") # Set labels # Pulser 10 - 2Hz -afterInit("dbpf $(PREFIX):DlyGen10-Evt-Trig0-SP $(F2Hz)") -afterInit("dbpf $(PREFIX):DlyGen10-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen10-Label-I '2 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-10-Evt-Trig0-SP $(F2Hz)") +afterInit("dbpf $(PREFIX):DlyGen-10-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-10-Label-I '2 Hz from Global Timing'") # Set labels # Pulser 11 - 3.5Hz -afterInit("dbpf $(PREFIX):DlyGen11-Evt-Trig0-SP $(F3Hz5)") -afterInit("dbpf $(PREFIX):DlyGen11-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen11-Label-I '3.5 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-11-Evt-Trig0-SP $(F3Hz5)") +afterInit("dbpf $(PREFIX):DlyGen-11-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-11-Label-I '3.5 Hz from Global Timing'") # Set labels # Pulser 12 - 7Hz -afterInit("dbpf $(PREFIX):DlyGen12-Evt-Trig0-SP $(F7Hz)") -afterInit("dbpf $(PREFIX):DlyGen12-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen12-Label-I '7 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-12-Evt-Trig0-SP $(F7Hz)") +afterInit("dbpf $(PREFIX):DlyGen-12-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-12-Label-I '7 Hz from Global Timing'") # Set labels # Pulser 13 - 14Hz -afterInit("dbpf $(PREFIX):DlyGen13-Evt-Trig0-SP $(F14Hz)") -afterInit("dbpf $(PREFIX):DlyGen13-Width-SP 2") # time in micro-seconds -afterInit("dbpf $(PREFIX):DlyGen13-Label-I '14 Hz from Global Timing'") # Set labels +afterInit("dbpf $(PREFIX):DlyGen-13-Evt-Trig0-SP $(F14Hz)") +afterInit("dbpf $(PREFIX):DlyGen-13-Width-SP 2") # time in micro-seconds +afterInit("dbpf $(PREFIX):DlyGen-13-Label-I '14 Hz from Global Timing'") # Set labels # Set Initial values afterInit("dbpf $(PREFIX):#SetInitVals.PROC 1") @@ -131,20 +131,20 @@ afterInit("dbpf $(PREFIX):#SetInitVals.PROC 1") # Configure sequencer -afterInit("dbpf $(PREFIX):PS0-Div-SP 6289464") +afterInit("dbpf $(PREFIX):PS-0-Div-SP 6289464") -afterInit("dbpf $(PREFIX):SoftSeq0-RunMode-Sel Normal") +afterInit("dbpf $(PREFIX):SoftSeq-0-RunMode-Sel Normal") -afterInit("dbpf $(PREFIX):SoftSeq0-TrigSrc-2-Sel 'Prescaler 0'") +afterInit("dbpf $(PREFIX):SoftSeq-0-TrigSrc-2-Sel 'Prescaler 0'") -afterInit("dbpf $(PREFIX):SoftSeq0-TsResolution-Sel 'uSec'") +afterInit("dbpf $(PREFIX):SoftSeq-0-TsResolution-Sel 'uSec'") -afterInit("system 'caput -a $(PREFIX):SoftSeq0-EvtCode-SP 1 150'") +afterInit("system 'caput -a $(PREFIX):SoftSeq-0-EvtCode-SP 1 150'") -afterInit("system 'caput -a $(PREFIX):SoftSeq0-Timestamp-SP 1 0'") +afterInit("system 'caput -a $(PREFIX):SoftSeq-0-Timestamp-SP 1 0'") -afterInit("dbpf $(PREFIX):SoftSeq0-Load-Cmd 1") -afterInit("dbpf $(PREFIX):SoftSeq0-Enable-Cmd 1") -afterInit("dbpf $(PREFIX):SoftSeq0-Commit-Cmd 1") +afterInit("dbpf $(PREFIX):SoftSeq-0-Load-Cmd 1") +afterInit("dbpf $(PREFIX):SoftSeq-0-Enable-Cmd 1") +afterInit("dbpf $(PREFIX):SoftSeq-0-Commit-Cmd 1") diff --git a/iocsh/island_with_mrfioc.iocsh b/iocsh/island_with_mrfioc.iocsh index aa6ed64277453ff6501b86ee6119ec498c756ba4..0f21f3bdfd9f6e7e80f37e57133c1670c1b7c063 100644 --- a/iocsh/island_with_mrfioc.iocsh +++ b/iocsh/island_with_mrfioc.iocsh @@ -5,7 +5,7 @@ require evrisland epicsEnvSet(PREFIX, "$(EVRPREFIX)") epicsEnvSet(PCI_SLOT, "$(EVRSLOT)") -iocshLoad "$(mrfioc2_DIR)/evr.iocsh" "P=$(PREFIX), PCIID=$(PCI_SLOT), $(INITARGS=)" +iocshLoad "$(mrfioc2_DIR)/evr.iocsh" "P=$(PREFIX), PCIID=$(PCI_SLOT), $(INITARGS=), EVRDB=$(EVRDB=evr-mtca-300-univ.db)" # - Load EVR Island application dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVRPREFIX=$(PREFIX):") @@ -14,5 +14,5 @@ iocshLoad("$(evrisland_DIR)/evr-island-base.iocsh") # Load default configuration from timing -afterInit('iocshLoad($(mrfioc2_DIR)/evrr.iocsh "P=$(PREFIX), INTREF=$(INTREF=)")') -afterInit('iocshLoad($(mrfioc2_DIR)/evrtclkr.iocsh "P=$(PREFIX)")') +afterInit('iocshLoad($(mrfioc2_DIR)/evr.r.iocsh "P=$(PREFIX), INTREF=$(INTREF=)")') +afterInit('iocshLoad($(mrfioc2_DIR)/evrtclk.r.iocsh "P=$(PREFIX)")') diff --git a/iocsh/island_with_mrfioc_evm.iocsh b/iocsh/island_with_mrfioc_evm.iocsh index 12b07dd7eaf8e026567bf6d458481e742758dc44..c69a5b1a0a2aa59cbf7748b6fafa59d8b37a9e91 100644 --- a/iocsh/island_with_mrfioc_evm.iocsh +++ b/iocsh/island_with_mrfioc_evm.iocsh @@ -5,7 +5,7 @@ require evrisland epicsEnvSet(PREFIX, "$(EVRPREFIX)") epicsEnvSet(PCI_SLOT, "$(EVRSLOT)") -iocshLoad "$(mrfioc2_DIR)/evr.iocsh" "P=$(PREFIX), PCIID=$(PCI_SLOT), $(INITARGS=)" +iocshLoad "$(mrfioc2_DIR)/evr.iocsh" "P=$(PREFIX), PCIID=$(PCI_SLOT), $(INITARGS=), EVRDB=$(EVRDB=evr-mtca-300-univ.db)" # - Load EVR Island application dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVRPREFIX=$(PREFIX):") @@ -14,5 +14,5 @@ iocshLoad("$(evrisland_DIR)/evr-island-base.iocsh") # Load default configuration from timing -afterInit('iocshLoad($(mrfioc2_DIR)/evrr.iocsh "P=$(PREFIX), INTREF=#")') -afterInit('iocshLoad($(mrfioc2_DIR)/evrtclkr.iocsh "P=$(PREFIX)")') +afterInit('iocshLoad($(mrfioc2_DIR)/evr.r.iocsh "P=$(PREFIX), INTREF=#")') +afterInit('iocshLoad($(mrfioc2_DIR)/evrtclk.r.iocsh "P=$(PREFIX)")')