lin-epics-modules/sinqepicsapp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'errtxt'

Browse Source 
Also made sinqepicsApp work with the module based build system now being operational at PSI
Conflicts:
	iocBoot/iocsinqEPICS/envPaths
	iocBoot/iocsinqEPICS/st.cmd
	sinqEPICSApp/src/Makefile
This commit is contained in:
koennecke
2017-07-04 08:38:40 +02:00
parent dc966bc976 af4d16d25f
commit 9c507a05ba
14 changed files with 241 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iocBoot/iocsinqEPICS/envPaths
View File

@ -1,10 +0,0 @@
epicsEnvSet("ARCH","centos7-x86_64")
epicsEnvSet("IOC","sinqEPICS")
epicsEnvSet("TOP","/afs/psi.ch/project/sinqdev/sinqepicsapp")
epicsEnvSet("EPICS_BASE","/opt/epics/bases/base-3.14.12.5")
epicsEnvSet("ASYN","/opt/epics/modules/asyn/4.27.0")
epicsEnvSet("MOTOR","/opt/amor/epics")
epicsEnvSet("SYNAPPSSTD","/opt/epics/modules/synAppsStd/3.4.1")
#epicsEnvSet("LAKESHORE336","/usr/local/epics/support/lakeshore336")
epicsEnvSet("STREAM","/opt/epics/modules/streamdevice/2.7.1")

13
iocBoot/iocsinqEPICS/motor.substitutions.el734
View File

@ -1,10 +1,21 @@
file "$(MOTOR)/db/basic_asyn_motor.db"
{
pattern
{P, N, M, DTYP, PORT, ADDR, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
{P, N, M, DTYP, PORT, ADDR, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
{NZ:mota:, 1, "m$(N)", "asynMotor", mota, 1, "sgu", degree, Pos, 2.0, 0.1, .2, 0, 1, .2, 1., 3, 20, -20, ""}
{NZ:mota:, 2, "m$(N)", "asynMotor", mota, 2, "sgl", degree, Pos, 2.0, 0.1, .2, 0, 1, .2, 1., 3, 20, -20, ""}
{NZ:mota:, 3, "m$(N)", "asynMotor", mota, 3, "sgd", degree, Pos, 2.0, 0.1, .2, 0, 1, .2, 1., 3, 20, -20, ""}
{NZ:mota:, 4, "m$(N)", "asynMotor", mota, 4, "som", degree, Pos, 2.0, 0.1, .2, 0, 1, .2, 0.001, 3, 37, -37, ""}
{NZ:mota:, 5, "m$(N)", "asynMotor", mota, 5, "sty", degree, Pos, 2.0, 0.1, .2, 0, 1, .2, 0.001, 3, 150, -149, ""}
}
file "$(SINQ)/Db/motorMessage.db"
{
pattern
{P,N, M,PORT}
{NZ:mota:, 1, "m$(N)",mota}
{NZ:mota:, 2, "m$(N)",mota}
{NZ:mota:, 3, "m$(N)",mota}
{NZ:mota:, 4, "m$(N)",mota}
{NZ:mota:, 5, "m$(N)",mota}
}

2
iocBoot/iocsinqEPICS/st.cmd
View File

@ -1,4 +1,4 @@
#!/opt/amor/epics/sinqEPICS
#!../../bin/linux-x86-debug/sinqEPICS
cd /opt/amor/epics