Merge branch 'master' into cc_targets

pcdshub · Oct 9, 2024 · 30f884c · 30f884c
2 parents 1a1944c + 0d119ab
commit 30f884c
Show file tree

Hide file tree

Showing 17 changed files with 8,693 additions and 3,986 deletions.
diff --git a/iocBoot/ioc-kfe-rix-motion/envPaths b/iocBoot/ioc-kfe-rix-motion/envPaths
@@ -1,14 +1,2 @@
-epicsEnvSet("IOC","${IOC=ioc-kfe-rix-motion}")
-epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.2")
-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("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/jjoshi/bsd_rix_motion/lcls-plc-kfe-rix-motion/iocBoot/ioc-kfe-rix-motion")
+epicsEnvSet("IOC_TOP", "/c/Users/kaushikm/Documents/TcXaeShell/lcls-plc-kfe-rix-motion/iocBoot/ioc-kfe-rix-motion")
 epicsEnvSet("IOC_DATA", "/cds/data/iocData")
diff --git a/iocBoot/ioc-kfe-rix-motion/kfe_rix_motion.archive b/iocBoot/ioc-kfe-rix-motion/kfe_rix_motion.archive