From 7e020130c3ecd75d4f26837f86f3f487d07cab96 Mon Sep 17 00:00:00 2001 From: Edward Wall Date: Wed, 23 Oct 2024 09:12:26 +0200 Subject: [PATCH] Makefile bugfix and hopefully fix readme --- Makefile | 3 ++- README.md | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e3aa45d..53166fa 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ DBDS += src/counterbox.dbd # Source files to build SOURCES += src/counterbox.cpp -SCRIPTS += scripts/counterbox.cmd +SCRIPTS += scripts/counterbox_4ch.cmd +SCRIPTS += scripts/counterbox_8ch.cmd SCRIPTS += scripts/counterbox_v2.cmd CXXFLAGS += -std=c++17 diff --git a/README.md b/README.md index 38440cd..b5564e5 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ runScript "$(sinq_DIR)counterbox_v2.cmd" "NAME=COUNTERBOX, ASYN_PORT=CBOXV2, CNT | PV | Description | |---------------------------------------|----------------------------------------------------------------------| -| "$(PREFIX):$(NAME):MsgTxt" | Contains unexpected response to executed command | -| "$(PREFIX):$(NAME):STATUS" | 0: Idle, 1: Counting, 2: Low rate, 3: Paused, 4: Error | -| "$(PREFIX):$(NAME):PRESET-COUNT" | Run count until specified pv value reached | -| "$(PREFIX):$(NAME):PRESET-TIME" | Run count until specified pv value in seconds reached | -| "$(PREFIX):$(NAME):THRESHOLD" | Minimum rate for counting to preceed. (has RBV) | -| "$(PREFIX):$(NAME):THRESHOLD-MONITOR" | Channel monitored for minimum rate (has RBV) | -| "$(PREFIX):$(NAME):ELAPSED-TIME" | Time Counterbox has been measuring for | -| "$(PREFIX):$(NAME):M_" | Current count on channel. (1-10 depending on box) | -| "$(PREFIX):$(NAME):MONITOR-CHANNEL" | Channel that PRESET-COUNT monitors (has RBV, only v2 can be changed) | +| \$(PREFIX):\$(NAME):MsgTxt | Contains unexpected response to executed command | +| \$(PREFIX):\$(NAME):STATUS | 0: Idle, 1: Counting, 2: Low rate, 3: Paused, 4: Error | +| \$(PREFIX):\$(NAME):PRESET-COUNT | Run count until specified pv value reached | +| \$(PREFIX):\$(NAME):PRESET-TIME | Run count until specified pv value in seconds reached | +| \$(PREFIX):\$(NAME):THRESHOLD | Minimum rate for counting to preceed. (has RBV) | +| \$(PREFIX):\$(NAME):THRESHOLD-MONITOR | Channel monitored for minimum rate (has RBV) | +| \$(PREFIX):\$(NAME):ELAPSED-TIME | Time Counterbox has been measuring for | +| \$(PREFIX):\$(NAME):M_ | Current count on channel. (1-10 depending on box) | +| \$(PREFIX):\$(NAME):MONITOR-CHANNEL | Channel that PRESET-COUNT monitors (has RBV, only v2 can be changed) |