From 7a51e8ecb721de9ec816202af6f74cd4d5a0aea7 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Tue, 4 Aug 2026 15:44:28 +0200 Subject: [PATCH] adds control flow overview --- db/channels.db | 15 ---------- db/daq_common.db | 75 +++++++++++++++++++++++++++++------------------- db/time.db | 14 --------- 3 files changed, 45 insertions(+), 59 deletions(-) diff --git a/db/channels.db b/db/channels.db index d2075e5..4dcd6e4 100644 --- a/db/channels.db +++ b/db/channels.db @@ -15,7 +15,6 @@ record(int64in, "$(INSTR)$(NAME):CH$(CHANNEL)") { field(DESC, "DAQ CH$(CHANNEL) Counts") field(EGU, "cts") - # field(FLNK, "$(INSTR)$(NAME):CH$(CHANNEL)_POLL") field(FLNK, "$(INSTR)$(NAME):CH$(CHANNEL)_HWCS") } @@ -40,20 +39,6 @@ record(ao, "$(INSTR)$(NAME):CH$(CHANNEL)_THRESH") field(EGU, "cts/sec") } -################################################################################ -# Poll Loop - -# record(dfanout, "$(INSTR)$(NAME):CH$(CHANNEL)_POLL") -# { -# field(DESC, "Channel $(CHANNEL) poll sequence") -# field(SELM, "All") -# field(OMSL, "closed_loop") -# field(DOL, 1) -# field(OUTA, "$(INSTR)$(NAME):CH$(CHANNEL)_HWCS.PROC") -# field(OUTB, "$(INSTR)$(NAME):CH$(CHANNEL)_STS_RAW.PROC") -# field(OUTC, "$(INSTR)$(NAME):CH$(CHANNEL)_REACHED.PROC") -# } - ################################################################################ # Clearing Channel Counts diff --git a/db/daq_common.db b/db/daq_common.db index c196cf1..677a9af 100644 --- a/db/daq_common.db +++ b/db/daq_common.db @@ -6,8 +6,51 @@ # PROTO - Stream device protocol file # ASYN_PORT - Low level Asyn IP Port to EL737 # POLL_FREQ - Scan string defining main status-loop polling frequency (default .5 second) - -################################################################################ +# +# PV Control Flow +# --------------- +# +# ┌───────────────────────────────────────────────────────────────────────────────────────┐ +# │ │ +# │ START │ +# │ │ │ +# │ ▼ │ +# │ TRIGGER │ +# │ │ │ +# │ PRESET_SOFT ◄──┼───────┐ │ +# │ │ ┌───┘ │ │ +# ▼ ▼ ▼ ▼ │ +# HW_POLL PAUSE CONTINUE STOP PRESET_TIME PRESET_COUNT │ +# o o o o │ │ │ +# └────────┴────────┼────────┴──────────┴──────────────┘ │ +# │ CHx_CLEAR o────┐ │ +# T_CLEAR o───────┐ ▼ o ▼ │ +# o ▼ RAW_STATUS │ CHx_HWC │ +# │ T_HWC │ │ │ +# │ ▼ └──────────┐ │ +# │ T ◄────────── READALL ───────────────────────────────────────────────────────────────────► CHx │ │ +# │ │ │ ┌───────────────────────────────────────────────────────┐ │ │ │ +# ▼ ▼ ▼ │ T_PRESET ◄────┐ ┌► CHx_PRESET │ ▼ ▼ │ +# T_CLEARED ◄─── T_HWCS MAP_STATUS │ o │ │ o │ CHx_HWCS ──► CHx_CLEARED │ +# │ │ │ │ │ │ │ │ │ │ +# ▼ ▼ │ ▼ │ │ ▼ │ ▼ │ +# T_STS_RAW STATUS │ TIME_SET_PTYPE │ │ CHx_SETTING ─► CHx_SET │ CHx_STS_RAW │ +# │ │ │ │ │ │ │ │ │ │ +# ▼ ▼ │ ▼ │ │ ▼ │ ▼ │ +# T_STS PRESET_TYPE_CLEAR ─┴─► PRESET_TYPE │ │ CHx_IN_HW │ CHx_STS │ +# │ │ │ │ │ │ │ │ +# ▼ ▼ │ │ ▼ │ ▼ │ +# TIME_REACHED T_PRESET_CLEAR ──────────────────────┘ │ CHx_HW_CONF ─► MONITOR_CHANNEL │ CHx_REACHED ──────────────┤ +# │ │ │ │ │ │ +# │ ▼ │ ▼ │ │ +# │ PRESET_CLEAR ────► CH_PRESET_CLEAR ───┘ CHx_SET_PTYPE ─────────────────┘ │ +# │ │ │ +# │ ▼ │ +# │ CLEAR_WAIT_HW ────► WAIT_HW │ +# │ │ +# └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ +# +####################################################################################################################################### # Hardware Initialisation # Send initial initialisation commands @@ -172,7 +215,6 @@ record(bo,"$(INSTR)$(NAME):PAUSE") field(DTYP, "stream") field(OUT, "@$(PROTO) pauseCount($(INSTR)$(NAME):) $(ASYN_PORT)") field(VAL, "0") - # field(FLNK, "$(INSTR)$(NAME):HW_POLL_SEQ") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") } @@ -182,7 +224,6 @@ record(bo,"$(INSTR)$(NAME):CONTINUE") field(DTYP, "stream") field(OUT, "@$(PROTO) continueCount($(INSTR)$(NAME):) $(ASYN_PORT)") field(VAL, "0") - # field(FLNK, "$(INSTR)$(NAME):HW_POLL_SEQ") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") } @@ -191,41 +232,17 @@ record(longout, "$(INSTR)$(NAME):STOP") field(DESC, "Stop the current counting operation") field(DTYP, "stream") field(OUT, "@$(PROTO) stopCount($(INSTR)$(NAME):) $(ASYN_PORT)") - # field(FLNK, "$(INSTR)$(NAME):HW_POLL_SEQ") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") } ################################################################################ -# Poll Loop record(bi, "$(INSTR)$(NAME):HW_POLL") { - # field(OMSL, "closed_loop") - # field(DOL, 1) field(SCAN, "$(POLL_FREQ=.5 second)") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") - # field(OUT, "$(INSTR)$(NAME):HW_POLL_SEQ.PROC") } -# record(dfanout, "$(INSTR)$(NAME):HW_POLL_SEQ") -# { -# field(DESC, "Time channel poll sequence") -# field(SELM, "All") -# field(OMSL, "closed_loop") -# field(DOL, 1) -# # This order is important, to ensure that the status -# # can't change whichout having first updated the time -# # and count records to their final values -# field(OUTA, "$(INSTR)$(NAME):RAW_STATUS.PROC") -# field(OUTB, "$(INSTR)$(NAME):READALL.PROC") -# field(OUTC, "$(INSTR)$(NAME):MAP_STATUS.PROC") -# field(OUTD, "$(INSTR)$(NAME):STATUS.PROC") -# field(OUTE, "$(INSTR)$(NAME):PRESET_TYPE_CLEAR.PROC") -# field(OUTF, "$(INSTR)$(NAME):T_PRESET_CLEAR.PROC") -# field(OUTG, "$(INSTR)$(NAME):PRESET_CLEAR.PROC") -# field(OUTH, "$(INSTR)$(NAME):CLEAR_WAIT_HW.PROC") -# } - # The status can be interpreted as follows # # Bit 0: NC_STAT_P_TIME_C @@ -335,7 +352,6 @@ record(ao,"$(INSTR)$(NAME):PRESET_TIME") field(OUT, "@$(PROTO) startWithTimePreset$(CHANNELS)($(INSTR)$(NAME):) $(ASYN_PORT)") field(PREC, 2) field(EGU, "seconds") - # field(FLNK, "$(INSTR)$(NAME):HW_POLL_SEQ") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") } @@ -347,7 +363,6 @@ record(ao,"$(INSTR)$(NAME):PRESET_COUNT") field(DOL, "$(INSTR)$(NAME):CH_PRESET PP") field(OUT, "@$(PROTO) startWithCountPreset$(CHANNELS)($(INSTR)$(NAME):) $(ASYN_PORT)") field(PREC, 0) - # field(FLNK, "$(INSTR)$(NAME):HW_POLL_SEQ") field(FLNK, "$(INSTR)$(NAME):RAW_STATUS") } diff --git a/db/time.db b/db/time.db index d8e8499..4e4bd55 100644 --- a/db/time.db +++ b/db/time.db @@ -17,20 +17,6 @@ record(ai,"$(INSTR)$(NAME):T") field(FLNK, "$(INSTR)$(NAME):T_HWCS") } -################################################################################ -# Poll Loop - -record(dfanout, "$(INSTR)$(NAME):T_POLL") -{ - field(DESC, "Time channel poll sequence") - field(SELM, "All") - field(OMSL, "closed_loop") - field(DOL, 1) - field(OUTA, "$(INSTR)$(NAME):T_HWCS.PROC") - field(OUTB, "$(INSTR)$(NAME):T_STS_RAW.PROC") - field(OUTC, "$(INSTR)$(NAME):TIME_REACHED.PROC") -} - ################################################################################ # Clearing Time