From 6ecc3e8e86c15f2c86f344f1f14f0ff66cf9ec79 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Fri, 8 May 2026 17:26:12 +0200 Subject: [PATCH] make status of channels busy for nicos... --- db/channels.db | 19 ++++++++++++++----- db/daq_common.db | 17 +++++++++++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/db/channels.db b/db/channels.db index bf95320..c45c220 100644 --- a/db/channels.db +++ b/db/channels.db @@ -15,22 +15,21 @@ record(bo, "$(INSTR)$(NAME):T$(CHANNEL)") { field(DESC, "Trigger Clearing Status") field(VAL, 1) - field(OUT, "$(INSTR)$(NAME):S$(CHANNEL) PP") + field(OUT, "$(INSTR)$(NAME):M$(CHANNEL)_CLEARED PP") } # Trigger a change in status as value returned to 0 record(seq, "$(INSTR)$(NAME):O$(CHANNEL)") { field(DESC, "Trigger Returned to 0 Status") - field(LNK0, "$(INSTR)$(NAME):S$(CHANNEL) PP") field(DO0, 0) + field(LNK0, "$(INSTR)$(NAME):M$(CHANNEL)_CLEARED PP") field(SELM, "Specified") field(SELL, "$(INSTR)$(NAME):M$(CHANNEL).VAL") - field(FLNK, "$(INSTR)$(NAME):MTS$(CHANNEL)") + field(FLNK, "$(INSTR)$(NAME):S$(CHANNEL)") } -# Current Status of Channel, i.e. is it ready to count? -record(bi, "$(INSTR)$(NAME):S$(CHANNEL)") +record(bi, "$(INSTR)$(NAME):M$(CHANNEL)_CLEARED") { field(DESC, "Channel Status") field(VAL, 0) @@ -38,6 +37,16 @@ record(bi, "$(INSTR)$(NAME):S$(CHANNEL)") field(ONAM, "CLEARING") } +# Current Status of Channel, i.e. is it ready to count? +record(calc, "$(INSTR)$(NAME):S$(CHANNEL)") +{ + field(DESC, "Stupid Nicos Stuff") + field(INPA, "$(INSTR)$(NAME):STATUS NPP") + field(INPB, "$(INSTR)$(NAME):M$(CHANNEL)_CLEARED NPP") + field(CALC, "A == 1 || B") + field(FLNK, "$(INSTR)$(NAME):MTS$(CHANNEL)") +} + # If set, stop count once threshold reached record(int64in, "$(INSTR)$(NAME):MT$(CHANNEL)") { diff --git a/db/daq_common.db b/db/daq_common.db index c3aea46..2c8f3e8 100644 --- a/db/daq_common.db +++ b/db/daq_common.db @@ -203,28 +203,37 @@ record(bo, "$(INSTR)$(NAME):ETT") { field(DESC, "Trigger Clearing Status") field(VAL, 1) - field(OUT, "$(INSTR)$(NAME):ETS PP") + field(OUT, "$(INSTR)$(NAME):ET_CLEARED PP") } # Trigger a change in status as value returned to 0 record(seq, "$(INSTR)$(NAME):ETO") { field(DESC, "Trigger Returned to 0 Status") - field(LNK0, "$(INSTR)$(NAME):ETS PP") + field(LNK0, "$(INSTR)$(NAME):ET_CLEARED PP") field(DO0, 0) field(SELM, "Specified") field(SELL, "$(INSTR)$(NAME):ELAPSED-TIME.VAL") + field(FLNK, "$(INSTR)$(NAME):ETS") } # Current Status of Channel, i.e. is it ready to count? -record(bi, "$(INSTR)$(NAME):ETS") +record(bi, "$(INSTR)$(NAME):ET_CLEARED") { field(DESC, "Channel Status") field(VAL, 0) - field(ZNAM, "OK") + field(ZNAM, "CLEARED") field(ONAM, "CLEARING") } +record(calc, "$(INSTR)$(NAME):ETS") +{ + field(DESC, "Stupid Nicos Stuff") + field(INPA, "$(INSTR)$(NAME):STATUS NPP") + field(INPB, "$(INSTR)$(NAME):ET_CLEARED NPP") + field(CALC, "A == 1 || B") +} + # Time Threshold record(int64in, "$(INSTR)$(NAME):HW_ETT") {