From ab0b34f55697d86985bc26c8774a719e71580113 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 14 Sep 2018 14:35:51 +0200 Subject: [PATCH] new networks for SwissFEL and HIPA and bugfix for beacons --- startup.script_linux | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/startup.script_linux b/startup.script_linux index 6d63ea7..312e915 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -21,9 +21,13 @@ epicsEnvSet CA_172.21.13,"172.21.10.255 172.21.11.255 172.21.12.255" #epicsEnvSet CA_BEACON_172.26,"172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255" #epicsEnvSet CA_AUTO_BEACON_172.26,"NO" # with directed broadcasts -epicsEnvSet CA_172.26,"172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255" +epicsEnvSet CA_172.26,"172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.110.255 172.26.111.255 172.26.120.255 129.129.242.255 129.129.243.255" epicsEnvSet CA_AUTO_172.26,"NO" +# HIPA +epicsEnvSet CA_172.19,"172.19.10.255 172.19.30.255" +epicsEnvSet CA_AUTO_172.19,"NO" + # PROSCAN epicsEnvSet CA_172.25,"172.25.60.255 172.25.11.255" epicsEnvSet CA_AUTO_172.25,"NO" @@ -37,7 +41,7 @@ system ("rm /tmp/$(IOC).net") epicsEnvSet EPICS_CA_ADDR_LIST,"$(CA_$(NET1=).$(NET2=).$(NET3=)=$(CA_$(NET1=).$(NET2=)=))" epicsEnvSet EPICS_CA_AUTO_ADDR_LIST,"$(CA_AUTO_$(NET1=).$(NET2=).$(NET3=)=$(CA_AUTO_$(NET1=).$(NET2=)=YES))" epicsEnvSet EPICS_CAS_BEACON_ADDR_LIST,"$(CA_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_BEACON_$(NET1=).$(NET2=)=$(EPICS_CA_ADDR_LIST)))" -epicsEnvSet EPICS_CAS_BEACON_AUTO_ADDR_LIST,"$(CA_AUTO_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_AUTO_BEACON_$(NET1=).$(NET2=)=$(EPICS_CA_AUTO_ADDR_LIST)))" +epicsEnvSet EPICS_CAS_AUTO_BEACON_ADDR_LIST,"$(CA_AUTO_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_AUTO_BEACON_$(NET1=).$(NET2=)=$(EPICS_CA_AUTO_ADDR_LIST)))" # set some search paths epicsEnvSet EPICS_DRIVER_PATH "bin/R$(EPICS_RELEASE)_$(EPICS_HOST_ARCH):bin:snl:$(EPICS_MODULES=/ioc/modules):$(INSTBASE)/iocBoot/R$(EPICS_RELEASE)/$(EPICS_HOST_ARCH)"