Skip to content

Commit

Permalink
Merge pull request #103 from ZLLentz/enh_pmpsdb
Browse files Browse the repository at this point in the history 
ENH: Update KFE motion PLC for PMPS DB + SC
  • Loading branch information
@ZLLentz
ZLLentz authored Feb 9, 2023
2 parents 4fc526a + 1228f19 commit 18e92aa
Show file tree
Hide file tree
Showing 23 changed files with 210,825 additions and 36,029 deletions.
158 changes: 158 additions & 0 deletions TwinCAT Measurement Project1/VSSettings/.vsm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<Node>
<Title>TwinCAT Measurement Project1</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>Scope YT NC Project</Title>
<Expanded>True</Expanded>
<FileName>C:\Users\zlentz\Documents\TcXaeShell\lcls-plc-kfe-motion\TwinCAT Measurement Project1\Scope YT NC Project.tcscopex</FileName>
<Children>
<Node>
<Title>DataPool</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:01 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:01 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:04 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:04 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4-SOLID</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 SOLID MMS:01 Position </Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:01 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:01 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 SOLID MMS:02 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:02 SetPos </Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 ActPos </Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 SOLID MMS:03 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:03 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 MMS:04 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:04 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4:MMS:04 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
</Children>
</Node>
<Node>
<Title>Trigger</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
</Children>
</Node>
2 changes: 1 addition & 1 deletion iocBoot/ioc-kfe-motion/Makefile
View file
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.6.0
IOC_INSTANCE_PATH := $(shell pwd)

# Set PRODUCTION_IOC to 1 to move from a testing to a production IOC:
Expand Down
8 changes: 4 additions & 4 deletions iocBoot/ioc-kfe-motion/envPaths
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
epicsEnvSet("IOC","ioc-kfe-motion")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.5.0")
epicsEnvSet("IOC","${IOC=ioc-kfe-motion}")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.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")
Expand All @@ -10,5 +10,5 @@ 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", "/reg/g/pcds/epics-dev/zlentz/lcls-plc-kfe-motion/iocBoot/ioc-kfe-motion")
epicsEnvSet("IOC_DATA", "/reg/d/iocData")
epicsEnvSet("IOC_TOP", "/cds/home/z/zlentz/github/lcls-plc-kfe-motion/iocBoot/ioc-kfe-motion")
epicsEnvSet("IOC_DATA", "/cds/data/iocData")
Loading

0 comments on commit 18e92aa

Please sign in to comment.