Skip to content
This repository was archived by the owner on Nov 29, 2021. It is now read-only.

Commit cf82aab

Browse files
author
Will Smith
committed
changed names and modified start scripts to get IOC to generate reg map and start
1 parent 6137068 commit cf82aab

14 files changed

+68
-194
lines changed

‎find_usb_bus_id.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ declare -gr SC_TOP="${SC_SCRIPT%/*}"
88
declare -gr WR_PATH="/tmp"
99

1010

11-
USB_BUS_NUM="$(readlink /dev/serial/by-id/usb-Silicon_Labs_CP2*_USB_to_UART_Bridge_Controller_*if00*| awk '{print substr($0,7,7)}' )"
11+
USB_BUS_NUM="$(readlink /dev/serial/by-id/usb-Silicon_Labs_CP2*_USB_to_UART_Bridge_Controller_*if01*| awk '{print substr($0,7,7)}' )"
1212

1313
echo ${USB_BUS_NUM}
1414

‎registers/reg_map_ctl.json

-18
This file was deleted.

‎registers/reg_map_eng.json

-25
This file was deleted.

‎registers/reg_map_mst.json

-37
This file was deleted.

‎registers/reg_map_slv.json

-29
This file was deleted.

‎registers/reg_map_usr.json

-16
This file was deleted.

‎req/settings.req

Whitespace-only changes.

‎req/values_pass0.req

Whitespace-only changes.

‎req/values_pass1.req

Whitespace-only changes.

‎st.pkt-mux.cmd

-55
This file was deleted.

‎st.ring-dev-01.cmd

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
2+
3+
require dmsc_detector_interface,master
4+
require stream,2.8.10
5+
require autosave,5.10.0
6+
7+
epicsEnvSet("TOP", "$(E3_CMD_TOP)/..")
8+
epicsEnvSet("IOCNAME", "ring-dev-01")
9+
10+
11+
12+
epicsEnvSet("SYS", "RNG-DEV")
13+
epicsEnvSet("DEV", "01")
14+
epicsEnvSet("E3_MODULES", "/epics/iocs")
15+
epicsEnvSet("EPICS_CMDS", "/epics/iocs/cmds")
16+
epicsEnvSet("TMP", "/tmp")
17+
epicsEnvSet("VIVADO_PROJ", "$(EPICS_CMDS)/$(IOCNAME)/dgro_master")
18+
epicsEnvSet("DET_PARAM_GEN", "$(VIVADO_PROJ)/det_param_gen")
19+
20+
21+
# iocshLoad("$(autosave_DIR)/autosave.iocsh", "AS_TOP=$(TOP),IOCNAME=$(IOCNAME)")
22+
23+
24+
############# -------- Detector Readout Interface ----------------- ##################
25+
26+
epicsEnvSet("STREAM_PROTOCOL_PATH","/epics/base-7.0.3.1/require/3.1.2/siteApps/dmsc_detector_interface/master/db")
27+
epicsEnvSet("PROTO", "ics-dg.proto")
28+
# Determine the USB bus enumeration and connect port
29+
system "/bin/bash $(EPICS_CMDS)/$(IOCNAME)/find_usb_bus_id.bash"
30+
< "/tmp/usb_bus_id"
31+
32+
epicsEnvSet("COM", "COM1")
33+
drvAsynSerialPortConfigure ("$(COM)", "/dev/$(USB_BUS_NUMA)")
34+
asynOctetSetInputEos ("$(COM)",0,"\r\n")
35+
asynOctetSetOutputEos ("$(COM)",0,"\r\n")
36+
asynSetOption ("$(COM)", 0, "baud", "230400")
37+
asynSetOption ("$(COM)", 0, "bits", "8")
38+
asynSetOption ("$(COM)", 0, "parity", "none")
39+
asynSetOption ("$(COM)", 0, "stop", "1")
40+
41+
#var streamDebug 1
42+
43+
44+
## Run the db generate script
45+
system "/usr/bin/python3 $(DET_PARAM_GEN)/src/param_parse.py $(VIVADO_PROJ)/param_def/"
46+
47+
iocshLoad("$(DET_PARAM_GEN)/output/EPICS/ctl_regs_mst.cmd", "DEV=$(DEV), COM=$(COM), SYS=$(SYS), PROTO=$(PROTO)")
48+
#iocshLoad("$(DET_PARAM_GEN)/output/EPICS/eng_regs_mst.cmd", "DEV=$(DEV), COM=$(COM), SYS=$(SYS), PROTO=$(PROTO)")
49+
#iocshLoad("$(DET_PARAM_GEN)/output/EPICS/ring_regs_mst.cmd", "DEV=$(DEV), COM=$(COM), SYS=$(SYS), PROTO=$(PROTO)")
50+
#iocshLoad("$(DET_PARAM_GEN)/output/EPICS/ring_regs_slv.cmd", "DEV=$(DEV), COM=$(COM), SYS=$(SYS), PROTO=$(PROTO)")
51+
#iocshLoad("$(DET_PARAM_GEN)/output/EPICS/usr_regs_slv.cmd", "DEV=$(DEV), COM=$(COM), SYS=$(SYS), PROTO=$(PROTO)")
52+
53+
iocInit()
54+

‎start.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
33
export VAR_DIR="/var"
4-
export BASE_VER="7.0.3"
5-
export REQUIRE_VER="3.1.0"
4+
export BASE_VER="7.0.3.1"
5+
export REQUIRE_VER="3.1.2"
66
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
7-
export IOC_ST_CMD=st.hzb-v20-evr-02.cmd
7+
export IOC_ST_CMD=st.ring-dev-01.cmd
88
source "$E3_BIN_DIR/setE3Env.bash"
99
$E3_BIN_DIR/iocsh.bash $IOC_EXEC_DIR/$IOC_ST_CMD &

‎start_background.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#/bin/bash
22
export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
33
export VAR_DIR="/var"
4-
export BASE_VER="7.0.3"
5-
export REQUIRE_VER="3.1.0"
4+
export BASE_VER="7.0.3.1"
5+
export REQUIRE_VER="3.1.2"
66
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
77
export PROCSERV="/usr/bin/procServ"
8-
export PROCSERV_PORT=2003
9-
export PROCSERV_RUN_DIR=hzb-v20-evr-02
10-
export PROCSERV_LOG_FILE=out-HZB-V20-EVR-02
8+
export PROCSERV_PORT=2007
9+
export PROCSERV_RUN_DIR=ring-dev-01
10+
export PROCSERV_LOG_FILE=out-RNG-DEV-01
1111

12-
export IOC_ST_CMD=st.hzb-v20-evr-02.cmd
12+
export IOC_ST_CMD=st.ring-dev-01.cmd
1313
source "$E3_BIN_DIR/setE3Env.bash"
1414

1515
# Ensure log and run directories exist

‎start_systemd.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
22
#export IOC_EXEC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
3-
export IOC_NAME=hzb-v20-evr-02
3+
export IOC_NAME=ring-dev-01
44
export IOC_EXEC_DIR=/epics/iocs/cmds/$IOC_NAME
55
export VAR_DIR="/var"
6-
export BASE_VER="7.0.3"
7-
export REQUIRE_VER="3.1.0"
6+
export BASE_VER="7.0.3.1"
7+
export REQUIRE_VER="3.1.2"
88
export E3_BIN_DIR="/epics/base-$BASE_VER/require/$REQUIRE_VER/bin"
99
export PROCSERV="/usr/bin/procServ"
1010
export PROCSERV_PORT=2003
1111
export PROCSERV_RUN_DIR=$IOC_NAME
12-
export PROCSERV_LOG_FILE=out-HZB-V20-EVR-02
12+
export PROCSERV_LOG_FILE=out-RNG-DEV-01
1313

1414
export IOC_ST_CMD=st.$IOC_NAME.cmd
1515
source "$E3_BIN_DIR/setE3Env.bash"

0 commit comments

Comments
 (0)