lin-epics-modules/sinqDAQ
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename from counterbox to daq

Browse Source
This commit is contained in:
wall_e
2025-04-29 17:22:31 +02:00
parent d81105551d
commit 5066cafc07
21 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/channels.db
View File

@@ -4,7 +4,7 @@
# INSTR - Prefix
# NAME - the device name, e.g. EL737
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to Counterbox
# ASYN_PORT - Low level Asyn IP Port to DAQ
# CHANNEL - the number associated with the measurment channel
################################################################################
@@ -25,12 +25,12 @@ record(bo, "$(INSTR)$(NAME):C$(CHANNEL)")
record(longin, "$(INSTR)$(NAME):M$(CHANNEL)")
{
field(DESC, "Counterbox CH$(CHANNEL)")
field(DESC, "DAQ CH$(CHANNEL)")
}
record(ai, "$(INSTR)$(NAME):R$(CHANNEL)")
{
field(DESC, "Counterbox Rate CH$(CHANNEL)")
field(DESC, "Rate of DAQ CH$(CHANNEL)")
field(INP, "@$(PROTO) readRate($(INSTR)$(NAME):, $(CHANNEL)) $(ASYN_PORT)")
field(DTYP, "stream")
field(SCAN, "1 second")

9
db/counterbox.proto → db/daq.proto
View File

@@ -1,5 +1,5 @@
#
# Counterbox Protocol File
# SinqDAQ Protocol File
#
OutTerminator = CR;
InTerminator = CR;
@@ -14,7 +14,7 @@ initialise {
out "ECHO 2"; # Ask for reponses
in "%(\$1MsgTxt)s"; # Clear MsgTxt on Init
@mismatch{
exec 'echo "Failed to configure counterbox" && exit(1)';
exec 'echo "Failed to configure DAQ" && exit(1)';
}
}
@@ -65,9 +65,8 @@ stopCount {
}
clearTimer{
# We first stop the count, as otherwise on the newest counterboxes
# it starts counting again if a time preset was set.
# Not a problem with the older boxes
# We first stop the count, as otherwise the 2nd Gen Data Acquisition starts
# counting again if a time preset was set. Not a problem with the older boxes
stopCount;
out "CT";
in;

2
db/counterbox_v2.db → db/daq_2nd_gen.db
View File

@@ -5,7 +5,7 @@
# INSTR - Prefix
# NAME - the device name, e.g. DAQV2
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to Counterbox
# ASYN_PORT - Low level Asyn IP Port to DAQ
################################################################################
# Status Variables

2
db/counterbox_v2_test.db → db/daq_2nd_gen_test.db
View File

@@ -5,7 +5,7 @@
# INSTR - Prefix
# NAME - the device name, e.g. DAQV2
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to Counterbox
# ASYN_PORT - Low level Asyn IP Port to DAQ
################################################################################
# Testing Commands

2
db/counterbox_4ch.db → db/daq_4ch.db
View File

@@ -4,7 +4,7 @@
# INSTR - Prefix
# NAME - the device name, e.g. EL737
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to Counterbox
# ASYN_PORT - Low level Asyn IP Port to DAQ
################################################################################
# Status Variables

2
db/counterbox_8ch.db → db/daq_8ch.db
View File

@@ -4,7 +4,7 @@
# INSTR - Prefix
# NAME - the device name, e.g. EL737
# PROTO - Stream device protocol file
# ASYN_PORT - Low level Asyn IP Port to Counterbox
# ASYN_PORT - Low level Asyn IP Port to DAQ
################################################################################
# Status Variables

16
db/counterbox_common.db → db/daq_common.db
View File

@@ -9,7 +9,7 @@
# Send initial initialisation commands
record(bo, "$(INSTR)$(NAME):INIT-CONF")
{
field(DESC, "Initialises the Counterbox")
field(DESC, "Initialises the DAQ")
field(OUT, "@$(PROTO) initialise($(INSTR)$(NAME):) $(ASYN_PORT)")
field(PINI, "YES") # Run at init
field(DTYP, "stream")
@@ -17,7 +17,7 @@ record(bo, "$(INSTR)$(NAME):INIT-CONF")
record(longout, "$(INSTR)$(NAME):FULL-RESET")
{
field(DESC, "Reset the Counterbox")
field(DESC, "Reset the DAQ")
field(OUT, "@$(PROTO) fullReset($(INSTR)$(NAME):) $(ASYN_PORT)")
field(DTYP, "stream")
}
@@ -28,16 +28,16 @@ record(longout, "$(INSTR)$(NAME):FULL-RESET")
record(stringin, "$(INSTR)$(NAME):MsgTxt")
{
field(DESC, "Unexpected received response")
field(DTYP, "devCounterBoxStringError")
field(DTYP, "devDAQStringError")
field(FLNK, "$(INSTR)$(NAME):INVALID-CONFIG")
}
# We want to recognise the invalid config error message, so that we can rerun
# the init if it occurs. This should only happen after turning the box off and
# the init if it occurs. This should only happen after turning the DAQ off and
# on again or running a full reset
record(scalcout, "$(INSTR)$(NAME):INVALID-CONFIG")
{
field(DESC, "Has the counterbox been configured?")
field(DESC, "Has the DAQ been configured?")
field(CALC, "AA[0,2] == '?OF'")
field(INAA, "$(INSTR)$(NAME):MsgTxt")
field(FLNK, "$(INSTR)$(NAME):REINIT-CONF")
@@ -76,7 +76,7 @@ record(calc, "$(INSTR)$(NAME):MAP-STATUS")
record(mbbi, "$(INSTR)$(NAME):STATUS")
{
field(DESC, "Counterbox Status")
field(DESC, "DAQ Status")
field(INP, "$(INSTR)$(NAME):MAP-STATUS NPP")
field(ZRVL, "0")
field(ZRST, "Idle")
@@ -86,7 +86,7 @@ record(mbbi, "$(INSTR)$(NAME):STATUS")
field(TWST, "Low rate")
field(THVL, "3")
field(THST, "Paused")
# 4 should never happen, if it does it means the counter box reports undocumented statusbits
# 4 should never happen, if it does it means the DAQ reports undocumented statusbits
field(FRVL, "4")
field(FRST, "INVALID")
}
@@ -207,6 +207,6 @@ record(ai, "$(INSTR)$(NAME):READALL")
record(ai,"$(INSTR)$(NAME):ELAPSED-TIME")
{
field(DESC, "Counterbox Measured Time")
field(DESC, "DAQ Measured Time")
field(EGU, "seconds")
}

2
db/counterbox_simcontrol.db → db/daq_simcontrol.db
View File

@@ -1,4 +1,4 @@
# Sinq Counterbox EPICS Database for StreamDevice Communication with Simulation
# Sinq DAQ EPICS Database for StreamDevice Communication with Simulation
# Macros
#
# INSTR - Prefix