Skip to content

Commit

Permalink
Merge pull request #11 from jozamudi/update-master
Browse files Browse the repository at this point in the history 
Update master
  • Loading branch information
@jozamudi
jozamudi authored Jul 31, 2023
2 parents a178909 + e7b3ea6 commit 73227bd
Show file tree
Hide file tree
Showing 15 changed files with 41,221 additions and 3,012 deletions.
70 changes: 68 additions & 2 deletions CoE-Startup-Files/GJX-GNY-MotParams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,68 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>61569</Index><SubIndex>1</SubIndex><Data>00001900</Data></InitCmd><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>4339</Index><SubIndex>5</SubIndex><Data>0100</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Maximal current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>1</SubIndex><Data>6009</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Reduced current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>2</SubIndex><Data>6400</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Nominal voltage]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>3</SubIndex><Data>80bb</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Motor coil resistance]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>4</SubIndex><Data>9600</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>61569</Index>
<SubIndex>1</SubIndex>
<Data>00001900</Data>
</InitCmd>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4339</Index>
<SubIndex>5</SubIndex>
<Data>0100</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Maximal current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>1</SubIndex>
<Data>6009</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Reduced current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>2</SubIndex>
<Data>6400</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Nominal voltage</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>3</SubIndex>
<Data>80bb</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Motor coil resistance</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>4</SubIndex>
<Data>9600</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
70 changes: 68 additions & 2 deletions CoE-Startup-Files/GJY-GJZ-GNX-GNZ-MotParams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,68 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>61569</Index><SubIndex>1</SubIndex><Data>00001900</Data></InitCmd><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>4339</Index><SubIndex>5</SubIndex><Data>0100</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Maximal current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>1</SubIndex><Data>6009</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Reduced current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>2</SubIndex><Data>6400</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Nominal voltage]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>3</SubIndex><Data>80bb</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Motor coil resistance]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>4</SubIndex><Data>5f00</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>61569</Index>
<SubIndex>1</SubIndex>
<Data>00001900</Data>
</InitCmd>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4339</Index>
<SubIndex>5</SubIndex>
<Data>0100</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Maximal current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>1</SubIndex>
<Data>6009</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Reduced current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>2</SubIndex>
<Data>6400</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Nominal voltage</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>3</SubIndex>
<Data>80bb</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Motor coil resistance</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>4</SubIndex>
<Data>5f00</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
18 changes: 16 additions & 2 deletions CoE-Startup-Files/Microscope-Params.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
26 changes: 24 additions & 2 deletions CoE-Startup-Files/SPX-SPY-SPZ-EncParams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,24 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>PS</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>61570</Index><SubIndex>1</SubIndex><Data>00</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>PS</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>61570</Index>
<SubIndex>1</SubIndex>
<Data>00</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
70 changes: 68 additions & 2 deletions CoE-Startup-Files/SPX-SPZ-MotParams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,68 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>61569</Index><SubIndex>1</SubIndex><Data>00001900</Data></InitCmd><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>4339</Index><SubIndex>5</SubIndex><Data>0100</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Maximal current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>1</SubIndex><Data>3a02</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Reduced current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>2</SubIndex><Data>3200</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Nominal voltage]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>3</SubIndex><Data>80bb</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Motor coil resistance]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>4</SubIndex><Data>7003</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>61569</Index>
<SubIndex>1</SubIndex>
<Data>00001900</Data>
</InitCmd>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4339</Index>
<SubIndex>5</SubIndex>
<Data>0100</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Maximal current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>1</SubIndex>
<Data>3a02</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Reduced current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>2</SubIndex>
<Data>3200</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Nominal voltage</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>3</SubIndex>
<Data>80bb</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Motor coil resistance</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>4</SubIndex>
<Data>7003</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
70 changes: 68 additions & 2 deletions CoE-Startup-Files/SPY-MotParams.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,68 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<EtherCATMailbox><CoE><InitCmds><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>61569</Index><SubIndex>1</SubIndex><Data>00001900</Data></InitCmd><InitCmd><Transition>IP</Transition><Timeout>0</Timeout><Ccs>1</Ccs><Index>4339</Index><SubIndex>5</SubIndex><Data>0100</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[SubIndex 001]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>4113</Index><SubIndex>1</SubIndex><Data>6c6f6164</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Maximal current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>1</SubIndex><Data>f000</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Reduced current]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>2</SubIndex><Data>1800</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Nominal voltage]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>3</SubIndex><Data>80bb</Data></InitCmd><InitCmd><Transition>PS</Transition><Comment><![CDATA[Motor coil resistance]]></Comment><Timeout>0</Timeout><Ccs>1</Ccs><Index>32784</Index><SubIndex>4</SubIndex><Data>f807</Data></InitCmd></InitCmds></CoE></EtherCATMailbox>
<?xml version='1.0' encoding='ISO-8859-1'?>
<EtherCATMailbox>
<CoE>
<InitCmds>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>61569</Index>
<SubIndex>1</SubIndex>
<Data>00001900</Data>
</InitCmd>
<InitCmd>
<Transition>IP</Transition>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4339</Index>
<SubIndex>5</SubIndex>
<Data>0100</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>SubIndex 001</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>4113</Index>
<SubIndex>1</SubIndex>
<Data>6c6f6164</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Maximal current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>1</SubIndex>
<Data>f000</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Reduced current</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>2</SubIndex>
<Data>1800</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Nominal voltage</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>3</SubIndex>
<Data>80bb</Data>
</InitCmd>
<InitCmd>
<Transition>PS</Transition>
<Comment>Motor coil resistance</Comment>
<Timeout>0</Timeout>
<Ccs>1</Ccs>
<Index>32784</Index>
<SubIndex>4</SubIndex>
<Data>f807</Data>
</InitCmd>
</InitCmds>
</CoE>
</EtherCATMailbox>
2 changes: 1 addition & 1 deletion iocBoot/ioc-lamp-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.4.1
IOC_TOP = /reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.1

IOC_INSTANCE_PATH := $(shell pwd)

Expand Down
10 changes: 5 additions & 5 deletions iocBoot/ioc-lamp-motion/envPaths
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
epicsEnvSet("IOC","ioc-lamp-motion")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.4.1")
epicsEnvSet("IOC","${IOC=ioc-lamp-motion}")
epicsEnvSet("TOP","/cds/group/pcds/epics/ioc/common/ads-ioc/R0.6.1")
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.6")
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/adpai/lcls-plc-lamp-motion/iocBoot/ioc-lamp-motion")
epicsEnvSet("IOC_DATA", "/reg/d/iocData")
epicsEnvSet("IOC_TOP", "/reg/g/pcds/epics-dev/jozamudi/tmo/lcls-plc-lamp-motion/iocBoot/ioc-lamp-motion")
epicsEnvSet("IOC_DATA", "/cds/data/iocData")
Loading

0 comments on commit 73227bd

Please sign in to comment.