diff --git a/db/daq_soft_proton.db b/db/daq_soft_proton.db index ca9a6ba..0a2e31f 100644 --- a/db/daq_soft_proton.db +++ b/db/daq_soft_proton.db @@ -65,7 +65,7 @@ record(longout, "$(INSTR)$(NAME):PRESET-COUNT-TRIG") # Signal count preset as command field(VAL, 1) field(OUT, "$(INSTR)$(NAME):COMMAND-TRIG PP") - field(FLNK, "$(INSTR)$(NAME):COUNT-TYPE" + field(FLNK, "$(INSTR)$(NAME):COUNT-TYPE") } record(calcout, "$(INSTR)$(NAME):PRESET-TIME") @@ -79,14 +79,13 @@ record(calcout, "$(INSTR)$(NAME):PRESET-TIME") field(OOPT, "Every Time") field(DOPT, "Use OCAL") field(OUT, "$(INSTR)$(NAME):COMMAND-TRIG PP") - field(FLNK, "$(INSTR)$(NAME):COUNT-TYPE" + field(FLNK, "$(INSTR)$(NAME):COUNT-TYPE") } record(calcout, "$(INSTR)$(NAME):PAUSE") { field(DESC, "Pause the current count") field(VAL, 0) - field(FLNK, "$(INSTR)$(NAME):RAW-STATUS") field(OCAL, 3) field(OOPT, "Every Time") field(DOPT, "Use OCAL") @@ -97,7 +96,6 @@ record(calcout, "$(INSTR)$(NAME):CONTINUE") { field(DESC, "Continue with a count that was paused") field(VAL, "0") - field(FLNK, "$(INSTR)$(NAME):RAW-STATUS") field(OCAL, 4) field(OOPT, "Every Time") field(DOPT, "Use OCAL") @@ -183,8 +181,8 @@ record(aSub, "$(INSTR)$(NAME):EMULATION") { # Scan rate determines how often we sample the rate # and how often the counter value updates. - field(SCAN, "0.1 seconds" - field(SNAM, "processEmulatedCounter" + field(SCAN, ".1 second") + field(SNAM, "processEmulatedCounter") # The first 4 inputs are also mapped as the first 4 outputs field(INPA, "$(INSTR)$(NAME):STATUS") @@ -243,7 +241,7 @@ record(calc, "$(INSTR)$(NAME):R0") { field(DESC, "Rate of DAQ CH0 proton current") #field(INPA, "$(REMOTE_RATE_PV) CA") - field(INPA, "$(INSTR)$(NAME):PROTON_CURR)" + field(INPA, "$(INSTR)$(NAME):PROTON_CURR") field(INPB, "$(SHUTTER1_PV=0)") field(INPC, "$(SHUTTER1_CLOSED_VAL=1)") field(INPD, "$(SHUTTER2_PV=0)") @@ -266,7 +264,7 @@ record(calcout, "$(INSTR)$(NAME):C0") field(OOPT, "Every Time") field(DOPT, "Use OCAL") field(OCAL, "0") - field(OUT, "$(INSTR)$(NAME):M0 PP" + field(OUT, "$(INSTR)$(NAME):M0 PP") } # Current Status of Channel, i.e. is it ready to count? @@ -280,7 +278,7 @@ record(bi, "$(INSTR)$(NAME):S0") } record(calc, "$(INSTR)$(NAME):PROTON_CURR") { - field(SCAN, "0.05 seconds") + field(SCAN, ".1 second") field(CALC, "1500 * 101 * SIN(A)") field(INPA, "$(INSTR)$(NAME):PROTON_CURR_VAR PP") } diff --git a/src/daq.dbd b/src/daq.dbd index 3bfdf32..6d82dfe 100644 --- a/src/daq.dbd +++ b/src/daq.dbd @@ -3,3 +3,4 @@ #--------------------------------------------- device(stringin, INST_IO, devDAQStringError, "devDAQStringError") +function(processEmulatedCounter) diff --git a/src/daq_soft_proton.c b/src/daq_soft_proton.c index 5a27bd2..ccb568c 100644 --- a/src/daq_soft_proton.c +++ b/src/daq_soft_proton.c @@ -270,4 +270,5 @@ static long processEmulatedCounter(struct aSubRecord *psub) return 0; } +/* Register these symbols for use by IOC code: */ epicsRegisterFunction(processEmulatedCounter);