diff --git a/db/sans_llb_beamstop.db b/db/sans_llb_beamstop.db index aef322b..2141554 100644 --- a/db/sans_llb_beamstop.db +++ b/db/sans_llb_beamstop.db @@ -26,11 +26,11 @@ record(longout, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP") record(longout, "$(INSTR)$(SPS_REGISTER_NAME):RESTART-RETRIES") { - field(DESC, "Empty retries as got knew move command") + field(DESC, "Empty retries as got new move command") field(OUT, "$(INSTR)$(SPS_REGISTER_NAME):RETRIES NPP") field(DOL, "0") field(OMSL, "closed_loop") - field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):RETRYING-TRIGGER PP") + field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):INIT-TRIGGER-DELAY PP") } record(seq, "$(INSTR)$(SPS_REGISTER_NAME):INIT-TRIGGER-DELAY") @@ -45,10 +45,10 @@ record(seq, "$(INSTR)$(SPS_REGISTER_NAME):INIT-TRIGGER-DELAY") record(seq, "$(INSTR)$(SPS_REGISTER_NAME):RETRY-TRIGGER-DELAY") { - field(DESC, "Delays Internal Trigger as SPS too slow") + field(DESC, "Delay Retrying") field(DOL0, 1) field(LNK0, "$(INSTR)$(SPS_REGISTER_NAME):RETRYING-TRIGGER.PROC PP") - field(DLY0, 1) + field(DLY0, 5) # 5 seconds field(SELM, "All") field(PINI, "NO") } @@ -57,20 +57,23 @@ record(calcout, "$(INSTR)$(SPS_REGISTER_NAME):RETRYING-TRIGGER") { field(DESC, "Delays Internal Trigger and retries") field(INPA, "$(INSTR)$(SPS_REGISTER_NAME):RETRIES NPP") - field(INPB, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP NPP") - field(INPC, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP_RBV NPP") - field(INPD, "$(INSTR)$(SPS_REGISTER_NAME):MOVES NPP") - field(CALC, "(A < 3) && (H # I) && (D = 0) ? A + 1 : 0") + # field(INPB, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP NPP") + # field(INPC, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP_RBV NPP") + # field(INPD, "$(INSTR)$(SPS_REGISTER_NAME):MOVES NPP") + field(CALC, "A + 1") + # field(CALC, "(A <= 10) && (B # C) && (D = 0) ? A + 2 : 0") field(OUT, "$(INSTR)$(SPS_REGISTER_NAME):RETRIES PP") - field(OOPT, "When Non-zero") + # field(OOPT, "When Non-zero") field(DOPT, "Use CALC") + field(SCAN, "Passive") } record(longin, "$(INSTR)$(SPS_REGISTER_NAME):RETRIES") { field(DESC, "Total number of retries for current move") field(VAL, 0) - field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):TRIGGER PP") + # field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):TRIGGER PP") + field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):RETRY-TRIGGER-DELAY PP") } record(longout, "$(INSTR)$(SPS_REGISTER_NAME):TRIGGER") @@ -80,7 +83,7 @@ record(longout, "$(INSTR)$(SPS_REGISTER_NAME):TRIGGER") field(OMSL, "closed_loop") field(DOL, 1) field(PINI, "NO") - field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):RETRYING-TRIGGER PP") + field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):RETRY-TRIGGER-DELAY PP") } record(calc, "$(INSTR)$(SPS_REGISTER_NAME):MAP-STATUS")