Skip to content

Commit

Permalink
Merge pull request pcdshub#126 from ZLLentz/enh_cc_temps
Browse files Browse the repository at this point in the history 
ENH: enable temperature ffos, update temp sensor link names
  • Loading branch information
@tongju12
tongju12 authored Aug 2, 2024
2 parents 725ae37 + 766cab1 commit dc03741
Show file tree
Hide file tree
Showing 22 changed files with 157,637 additions and 47,146 deletions.
2 changes: 1 addition & 1 deletion iocBoot/ioc-tmo-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.6.1
IOC_TOP = /reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.2

IOC_INSTANCE_PATH := $(shell pwd)

Expand Down
2 changes: 1 addition & 1 deletion iocBoot/ioc-tmo-motion/envPaths
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
epicsEnvSet("IOC","${IOC=ioc-tmo-motion}")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.0")
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")
Expand Down
129 changes: 102 additions & 27 deletions iocBoot/ioc-tmo-motion/st.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#!/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.0/bin/rhel7-x86_64/adsIoc
#!/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.2/bin/rhel7-x86_64/adsIoc
################### AUTO-GENERATED DO NOT EDIT ###################
#
# Project: plc-tmo-motion.tsproj
# PLC name: tmo_motion (tmo_motion Instance)
# Generated using: pytmc 2.14.0
# Project version: v0.1.0-166-g6cc5773
# Project hash: 6cc5773422d1938cb2f6e672c39a6fb193df8703
# PLC IP/host: 172.21.132.24
# PLC Net ID: 172.21.132.24.1.1
# Generated using: pytmc 2.16.0
# Project version: v0.1.0-329-g07f9851
# Project hash: 07f9851d1f2a05b49593291fedb412b8bc8d2e95
# PLC IP/host: 172.21.132.76
# PLC Net ID: 172.21.132.76.1.1
# ** Production mode IOC **
# Using /cds/data/iocData for autosave and archiver settings.
#
# Libraries:
#
# LCLS General: * -> 2.4.2 (SLAC)
# lcls-twincat-motion: * -> 1.7.0 (SLAC)
# lcls2-cc-lib: * -> 1.1.3 (SLAC)
# PMPS: * -> 2.2.3 (SLAC - LCLS)
# LCLS General: * -> 2.9.1 (SLAC)
# lcls-twincat-common-components: * -> 3.5.0 (SLAC)
# lcls-twincat-motion: * -> 4.1.1 (SLAC)
# PMPS: * -> 3.3.0 (SLAC - LCLS)
# Tc2_MC2: * -> 3.3.42.0 (Beckhoff Automation GmbH)
# Tc2_SerialCom: * -> 3.3.7.0 (Beckhoff Automation GmbH)
# Tc2_Standard: * -> 3.3.3.0 (Beckhoff Automation GmbH)
Expand All @@ -41,17 +41,17 @@ dbLoadDatabase("$(ADS_IOC_TOP)/dbd/adsIoc.dbd")
adsIoc_registerRecordDeviceDriver(pdbbase)

epicsEnvSet("ASYN_PORT", "ASYN_PLC")
epicsEnvSet("IPADDR", "172.21.132.24")
epicsEnvSet("AMSID", "172.21.132.24.1.1")
epicsEnvSet("IPADDR", "172.21.132.76")
epicsEnvSet("AMSID", "172.21.132.76.1.1")
epicsEnvSet("AMS_PORT", "851")
epicsEnvSet("ADS_MAX_PARAMS", "7741")
epicsEnvSet("ADS_MAX_PARAMS", "15615")
epicsEnvSet("ADS_SAMPLE_MS", "50")
epicsEnvSet("ADS_MAX_DELAY_MS", "100")
epicsEnvSet("ADS_TIMEOUT_MS", "1000")
epicsEnvSet("ADS_TIME_SOURCE", "0")

# Add a route to the PLC automatically:
system("${ADS_IOC_TOP}/scripts/add_route.sh 172.21.132.24 ^172.*")
system("${ADS_IOC_TOP}/scripts/add_route.sh 172.21.132.76 ^172.*")

# adsAsynPortDriverConfigure(portName, ipaddr, amsaddr, amsport,
# asynParamTableSize, priority, noAutoConnect, defaultSampleTimeMS,
Expand Down Expand Up @@ -83,7 +83,7 @@ cd "$(ADS_IOC_TOP)/db"

epicsEnvSet("MOTOR_PORT", "PLC_ADS")
epicsEnvSet("PREFIX", "PLC:TMO:MOTION:")
epicsEnvSet("NUMAXES", "42")
epicsEnvSet("NUMAXES", "47")
epicsEnvSet("MOVE_POLL_RATE", "200")
epicsEnvSet("IDLE_POLL_RATE", "1000")

Expand Down Expand Up @@ -624,25 +624,100 @@ dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")

epicsEnvSet("AXIS_NO", "43")
epicsEnvSet("MOTOR_PREFIX", "TMO:SPEC:MMS:")
epicsEnvSet("MOTOR_NAME", "12")
epicsEnvSet("DESC", "Main.M43 / Thorlab-LenX")
epicsEnvSet("EGU", "mm")
epicsEnvSet("PREC", "3")
epicsEnvSet("AXISCONFIG", "")
epicsEnvSet("ECAXISFIELDINIT", "")
epicsEnvSet("AMPLIFIER_FLAGS", "")

EthercatMCCreateAxis("$(MOTOR_PORT)", "$(AXIS_NO)", "$(AMPLIFIER_FLAGS)", "$(AXISCONFIG)")
dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC), EGU=$(EGU) $(ECAXISFIELDINIT)")
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")

epicsEnvSet("AXIS_NO", "44")
epicsEnvSet("MOTOR_PREFIX", "TMO:SPEC:MMS:")
epicsEnvSet("MOTOR_NAME", "13")
epicsEnvSet("DESC", "Main.M44 / FoilY")
epicsEnvSet("EGU", "mm")
epicsEnvSet("PREC", "3")
epicsEnvSet("AXISCONFIG", "")
epicsEnvSet("ECAXISFIELDINIT", "")
epicsEnvSet("AMPLIFIER_FLAGS", "")

EthercatMCCreateAxis("$(MOTOR_PORT)", "$(AXIS_NO)", "$(AMPLIFIER_FLAGS)", "$(AXISCONFIG)")
dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC), EGU=$(EGU) $(ECAXISFIELDINIT)")
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")

epicsEnvSet("AXIS_NO", "45")
epicsEnvSet("MOTOR_PREFIX", "LI2K4:IP1:MMS:")
epicsEnvSet("MOTOR_NAME", "Y")
epicsEnvSet("DESC", "Main.M45 / Axis 45 LI2K4-MMS-Y")
epicsEnvSet("EGU", "mm")
epicsEnvSet("PREC", "3")
epicsEnvSet("AXISCONFIG", "")
epicsEnvSet("ECAXISFIELDINIT", "")
epicsEnvSet("AMPLIFIER_FLAGS", "")

EthercatMCCreateAxis("$(MOTOR_PORT)", "$(AXIS_NO)", "$(AMPLIFIER_FLAGS)", "$(AXISCONFIG)")
dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC), EGU=$(EGU) $(ECAXISFIELDINIT)")
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")

epicsEnvSet("AXIS_NO", "46")
epicsEnvSet("MOTOR_PREFIX", "LI2K4:IP1:MMS:")
epicsEnvSet("MOTOR_NAME", "X")
epicsEnvSet("DESC", "Main.M46 / Axis 46 LI2K4-MMS-X")
epicsEnvSet("EGU", "mm")
epicsEnvSet("PREC", "3")
epicsEnvSet("AXISCONFIG", "")
epicsEnvSet("ECAXISFIELDINIT", "")
epicsEnvSet("AMPLIFIER_FLAGS", "")

EthercatMCCreateAxis("$(MOTOR_PORT)", "$(AXIS_NO)", "$(AMPLIFIER_FLAGS)", "$(AXISCONFIG)")
dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC), EGU=$(EGU) $(ECAXISFIELDINIT)")
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")

epicsEnvSet("AXIS_NO", "47")
epicsEnvSet("MOTOR_PREFIX", "AT2K4:IP1:")
epicsEnvSet("MOTOR_NAME", "MMS")
epicsEnvSet("DESC", "Main.M47 / Axis 47 AT2K4-MMS-FILT")
epicsEnvSet("EGU", "mm")
epicsEnvSet("PREC", "3")
epicsEnvSet("AXISCONFIG", "")
epicsEnvSet("ECAXISFIELDINIT", "")
epicsEnvSet("AMPLIFIER_FLAGS", "")

EthercatMCCreateAxis("$(MOTOR_PORT)", "$(AXIS_NO)", "$(AMPLIFIER_FLAGS)", "$(AXISCONFIG)")
dbLoadRecords("EthercatMC.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC), EGU=$(EGU) $(ECAXISFIELDINIT)")
dbLoadRecords("EthercatMCreadback.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), R=$(MOTOR_NAME)-, MOTOR_PORT=$(MOTOR_PORT), ASYN_PORT=$(ASYN_PORT), AXIS_NO=$(AXIS_NO), DESC=$(DESC), PREC=$(PREC) ")
dbLoadRecords("EthercatMCdebug.template", "PREFIX=$(MOTOR_PREFIX), MOTOR_NAME=$(MOTOR_NAME), MOTOR_PORT=$(MOTOR_PORT), AXIS_NO=$(AXIS_NO), PREC=3")


dbLoadRecords("iocSoft.db", "IOC=PLC:TMO:MOTION")
dbLoadRecords("save_restoreStatus.db", "P=PLC:TMO:MOTION:")
dbLoadRecords("caPutLog.db", "IOC=$(IOC)")

## TwinCAT task, application, and project information databases ##
dbLoadRecords("TwinCAT_TaskInfo.db", "PORT=$(ASYN_PORT),PREFIX=PLC:TMO:MOTION,IDX=1")
dbLoadRecords("TwinCAT_TaskInfo.db", "PORT=$(ASYN_PORT),PREFIX=PLC:TMO:MOTION,IDX=1,TASK_PORT=350")
dbLoadRecords("TwinCAT_AppInfo.db", "PORT=$(ASYN_PORT), PREFIX=PLC:TMO:MOTION")

dbLoadRecords("TwinCAT_Project.db", "PREFIX=PLC:TMO:MOTION,PROJECT=plc-tmo-motion.tsproj,HASH=6cc5773,VERSION=v0.1.0-166-g6cc5773,PYTMC=2.14.0,PLC_HOST=172.21.132.24")
dbLoadRecords("TwinCAT_Project.db", "PREFIX=PLC:TMO:MOTION,PROJECT=plc-tmo-motion.tsproj,HASH=07f9851,VERSION=v0.1.0-329-g07f9851,PYTMC=2.16.0,PLC_HOST=172.21.132.76")

# LCLS General: * -> 2.4.2 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=LCLS_General,VERSION=2.4.2,VENDOR=SLAC")
# lcls-twincat-motion: * -> 1.7.0 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=lcls-twincat-motion,VERSION=1.7.0,VENDOR=SLAC")
# lcls2-cc-lib: * -> 1.1.3 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=lcls2-cc-lib,VERSION=1.1.3,VENDOR=SLAC")
# PMPS: * -> 2.2.3 (SLAC - LCLS)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=PMPS,VERSION=2.2.3,VENDOR=SLAC - LCLS")
# LCLS General: * -> 2.9.1 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=LCLS_General,VERSION=2.9.1,VENDOR=SLAC")
# lcls-twincat-common-components: * -> 3.5.0 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=lcls-twincat-common-components,VERSION=3.5.0,VENDOR=SLAC")
# lcls-twincat-motion: * -> 4.1.1 (SLAC)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=lcls-twincat-motion,VERSION=4.1.1,VENDOR=SLAC")
# PMPS: * -> 3.3.0 (SLAC - LCLS)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=PMPS,VERSION=3.3.0,VENDOR=SLAC - LCLS")
# Tc2_MC2: * -> 3.3.42.0 (Beckhoff Automation GmbH)
dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:TMO:MOTION,DEPENDENCY=Tc2_MC2,VERSION=3.3.42.0,VENDOR=Beckhoff Automation GmbH")
# Tc2_SerialCom: * -> 3.3.7.0 (Beckhoff Automation GmbH)
Expand All @@ -659,8 +734,8 @@ cd "$(IOC_TOP)"
## PLC Project Database files ##
dbLoadRecords("tmo_motion.db", "PORT=$(ASYN_PORT),PREFIX=PLC:TMO:MOTION:,IOCNAME=$(IOC),IOC=$(IOC)")

# Total records: 6741
callbackSetQueueSize(15482)
# Total records: 14615
callbackSetQueueSize(31230)

# Autosave and archive settings:
save_restoreSet_status_prefix("PLC:TMO:MOTION:")
Expand Down
Loading

0 comments on commit dc03741

Please sign in to comment.