Skip to content

Commit

Permalink
Merge pull request #23 from janezg-SLAC/FIX_CVMI
Browse files Browse the repository at this point in the history
CVMI Vacuum PLC, Fixing project files after error when logging in
  • Loading branch information
tongju12 authored Nov 20, 2024
2 parents cd57af1 + 1feb406 commit 1aefc0f
Show file tree
Hide file tree
Showing 58 changed files with 51,513 additions and 8,718 deletions.
2 changes: 1 addition & 1 deletion CoE Startup/EP_3174-002.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox/>
2 changes: 1 addition & 1 deletion plc-cvmi-vac/iocBoot/ioc-plc-cvmi-vac/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IOC_TOP=/reg/g/pcds/epics/ioc/common/ads-ioc/R0.5.0
IOC_TOP=/reg/g/pcds/epics/ioc/common/ads-ioc/R0.7.0
IOC_INSTANCE_PATH := $(shell pwd)

# Set PRODUCTION_IOC to 1 to move from a testing to a production IOC:
Expand Down
10 changes: 5 additions & 5 deletions plc-cvmi-vac/iocBoot/ioc-plc-cvmi-vac/envPaths
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
epicsEnvSet("IOC","ioc-plc-cvmi-vac")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.5.0")
epicsEnvSet("IOC","${IOC=ioc-plc-cvmi-vac}")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.7.0")
epicsEnvSet("EPICS_SITE_TOP","/reg/g/pcds/epics/")
epicsEnvSet("EPICS_MODULES","/reg/g/pcds/epics//R7.0.2-2.0/modules")
epicsEnvSet("AUTOSAVE","/reg/g/pcds/epics//R7.0.2-2.0/modules/autosave/R5.8-2.1.0")
epicsEnvSet("IOCADMIN","/reg/g/pcds/epics//R7.0.2-2.0/modules/iocAdmin/R3.1.15-1.10.0")
epicsEnvSet("ETHERCATMC","/reg/g/pcds/epics//R7.0.2-2.0/modules/ethercatmc/R2.1.0-0.1.2")
epicsEnvSet("MOTOR","/reg/g/pcds/epics//R7.0.2-2.0/modules/motor/R6.9-ess-0.0.1")
epicsEnvSet("ASYN","/reg/g/pcds/epics//R7.0.2-2.0/modules/asyn/R4.35-0.0.1")
epicsEnvSet("ADS","/reg/g/pcds/epics//R7.0.2-2.0/modules/twincat-ads/R2.0.0-0.0.7")
epicsEnvSet("ADS","/reg/g/pcds/epics//R7.0.2-2.0/modules/twincat-ads/R2.0.0-0.0.8")
epicsEnvSet("CAPUTLOG","/reg/g/pcds/epics//R7.0.2-2.0/modules/caPutLog/R3.7-1.0.0")
epicsEnvSet("EPICS_BASE","/reg/g/pcds/epics//base/R7.0.2-2.0")
epicsEnvSet("IOC_TOP", "/cds/group/pcds/epics-dev/adpai/lcls-plc-cvmi-vac/plc-cvmi-vac/iocBoot/ioc-plc-cvmi-vac")
epicsEnvSet("IOC_DATA", "/reg/d/iocData")
epicsEnvSet("IOC_TOP", "/reg/g/pcds/epics-dev/janezg/plc_iocs/lcls-plc-cvmi-vac/plc-cvmi-vac/iocBoot/ioc-plc-cvmi-vac")
epicsEnvSet("IOC_DATA", "/cds/data/iocData")
Loading

0 comments on commit 1aefc0f

Please sign in to comment.