Skip to content

Commit 445740d

Browse files
authored
Merge pull request #151 from jwlodek/fix-minor-phantom-role-issues
Fix minor issues found with ADPhantom role during deployment at HEX
2 parents 90438f0 + 136c14b commit 445740d

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

roles/deploy_ioc/vars/adphantom.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,15 @@ deploy_ioc_use_ad_common: true
55
deploy_ioc_required_module: adphantom_afefafc
66
deploy_ioc_template_root_path:
77
"{{ deploy_ioc_required_module_path }}/iocs/phantomIOC"
8+
deploy_ioc_device_specific_env:
9+
QSIZE: 20
10+
XSIZE: 1280
11+
YSIZE: 960
12+
NCHANS: 1280
13+
CBUFFS: 100
14+
MAX_THREADS: 8
15+
EPICS_DB_INCLUDE_PATH: "$(ADCORE)/db"
16+
NELEMENTS: 5000000
17+
PORT: "PH1"
18+
CTRL_PORT: 7115
19+
DATA_PORT: 7116

roles/device_roles/adphantom/example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ADPhantom:
44
type: "adphantom"
55
environment:
66
PREFIX: "XF:31ID1-ES{VEO:Cam-1}"
7-
ENGINEER: "K. Barry"
7+
ENGINEER: "J. Wlodek"
88
MAC_ADDR: "1423f21fdeb0"
99
INTF: "eno5"
1010
CAMERA_IP: "100.100.214.107"

roles/device_roles/adphantom/schema.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ type: enum("adphantom")
33
environment:
44
ENGINEER: str()
55
PREFIX: str()
6-
CAMERA_IP: str()
6+
CAMERA_IP: any(ip(), hostname())
77
NUM_CINES: int()
88
MAC_ADDR: str()
99
INTF: str()
10+
XSIZE: int(required=False)
11+
YSIZE: int(required=False)
12+
CTRL_PORT: int(required=False)
13+
DATA_PORT: int(required=False)
14+
PORT: str(required=False)

0 commit comments

Comments
 (0)