diff --git a/EC-GN-JA-PCF-IN/pom.xml b/EC-GN-JA-PCF-IN/pom.xml index 3bf6f75..1def719 100755 --- a/EC-GN-JA-PCF-IN/pom.xml +++ b/EC-GN-JA-PCF-IN/pom.xml @@ -21,7 +21,7 @@ of the distribution package.. 4.0.0 org.iter.codac.units - EC-GN-JA-PCF + EC-GN-P01-PCF codac 1.0.0 CODAC Core System EC-GN subsystem @@ -70,12 +70,9 @@ of the distribution package.. ${project.version} ${project.description} - + ${rpm.vcs.url} - - - - + ${rpm.vcs.url} @@ -182,8 +179,8 @@ of the distribution package.. target="%{_unitdir}/%{codac_service_prefix}-ec-gn-ja-pcf-gya.service.d/override.conf" rpmeval="true"> +Wants=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service +After=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service]]> @@ -202,8 +199,8 @@ KillSignal=SIGINT]]> target="%{_unitdir}/%{codac_service_prefix}-ec-gn-ja-pcf-gyb.service.d/override.conf" rpmeval="true"> +Wants=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service +After=%{codac_service_prefix}-EC-GN-P01-PCF0CORE-ioc.service]]> diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/JASTEC-SCMPS.proto b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/JASTEC-SCMPS.proto deleted file mode 100644 index 5ef8f49..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/JASTEC-SCMPS.proto +++ /dev/null @@ -1,97 +0,0 @@ -#+====================================================================== -# $HeadURL$ -# $Id$ -# -# Project : JCSL-JAEA-GYRO-2012 -# -# Description : StreamDevice protocol file for JASTEC SCM PS -# superconducting magnet power supply controller. -# -#RS232C protocol : Baudrate 38400 bps -# Data length 8 bit -# Stop bit 1 bit -# Parity None -# -# -# Author : Takashi Nakamoto, Cosylab -# Jack Oda, JAEA -# Kazuhide Uchida, Cosylab Japan -# -# Copyright (c) : 2013 Cosylab d.d. -# 2015 JAEA -# 2017 Cosylab Japan Inc. -# -#-====================================================================== - -Terminator = CR; -LockTimeout = 1000; -ReplyTimeout = 200; - -### set commands ###################################################### - -# set target current [A] -setCurrent { - out ":I%#+09.4f"; - in ":I%f"; -} - -# set sweep rate [A/min] -setSweep { - out ":S%#05.2f"; - in ":S%f"; -} - -# set operation state -# L0 hold current state, L1 restart ramping current, L2 move to 0 A -setActivity { - out ":L%d"; - in ":L%d"; -} - - -### Read commands ################################################## - -# read operation state -# 0:remote hold, 1:remote set, 2:remote down, 3:remote F.T. 4:remote zero -# 5:local hold, 6: local set, 7:local down, 8:local F.T., 9:local zero -readActivity { - out ":L?"; - in ":L%d"; -} - -# read target current [A] -readTargCurrent { - out ":I?"; - in ":%f"; -} - -# read output current [A] -readMeasCurrent { - out ":A?"; - in ":%f"; -} - -# read current voltage [V] -readMeasVoltage { - out ":V?"; - in ":%f"; -} - -# read target sweep rate [A/min] -readTargSweep { - out ":S?"; - in ":%f"; -} - -# read sweep rate upper limit[A/min] -readSweepLim { - out ":R?"; - in ":%f"; -} - -# read error status -readErrStat { - Separator = ","; - out ":E?"; - in ":%39c" -} diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6259-module.substitution b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6259-module.substitution deleted file mode 100644 index dfc5850..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6259-module.substitution +++ /dev/null @@ -1,59 +0,0 @@ -file "$(EPICS_ROOT)/db/pxi6259-module.template" { - -pattern -{ - AI_CONF, - ALARM_PATH, - BOARDTYPEIDX, - BOY_LEVEL, - CBS1, - CBS2, - DAQ_MODE, - MODULEIDX, - NUMSAMPLES, - POSTTRIG_SAMPLES, - PRETRIG_SAMPLES, - SAMPLERATE, - SRCCLK_CHAN, - SRCCLK_TYPE, - SWITCH_ACQ -} - - -{ - "1", - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "0", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "1", - "1", - "5000", - "4000", - "2000", - "1000000", - "0", - "0", - "1" -} - -{ - "1", - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "1", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "1", - "0", - "5000", - "4000", - "2000", - "1000000", - "0", - "0", - "1" -} - -} \ No newline at end of file diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6368-module.substitution b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6368-module.substitution deleted file mode 100644 index cc0f57f..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-NI6368-module.substitution +++ /dev/null @@ -1,80 +0,0 @@ -file "$(EPICS_ROOT)/db/pxie6368-module.template" { - -pattern -{ - AIPU, - AISR, - AISTSP, - AITB, - ALARM_PATH, - AOPU, - AOSTSP, - AOTB, - BOARDTYPEIDX, - BOY_LEVEL, - CBS1, - CBS2, - CHAIMO, - CHAOMO, - LDAICF, - LDAOCF, - MODULEIDX, - NO_SAMPLES, - POSTTRIG_SAMPLES, - PRETRIG_SAMPLES, - SRCCLK_CHAN, - SRCCLK_TYPE -} - - -{ - "2", - "1000000", - "0", - "0", - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "2", - "0", - "0", - "0", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "2", - "2", - "0", - "0", - "1", - "1", - "1", - "0", - "0", - "0" -} - -{ - "2", - "1000000", - "0", - "0", - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "2", - "0", - "0", - "1", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "2", - "2", - "0", - "0", - "0", - "1", - "1", - "0", - "0", - "0" -} - -} \ No newline at end of file diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-nisync-device-info.substitution b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-nisync-device-info.substitution deleted file mode 100644 index cda9ed3..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-nisync-device-info.substitution +++ /dev/null @@ -1,27 +0,0 @@ -file "$(EPICS_ROOT)/db/nisync_device_info.template" { - -pattern -{ - ALARM_PATH, - BOARDTYPEIDX, - BOY_LEVEL, - CBS1, - CBS2, - MODULEIDX, - PREFIXBOARDTYPE, - SHORTBOARDTYPE -} - - -{ - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "0", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "0", - "ni6683h_", - "6683" -} - -} \ No newline at end of file diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-pxi6528-module.substitution b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-pxi6528-module.substitution deleted file mode 100644 index 699ef7b..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCF0-pxi6528-module.substitution +++ /dev/null @@ -1,62 +0,0 @@ -file "$(EPICS_ROOT)/db/pxi6528-module.template" { - -pattern -{ - ALARM_PATH, - BOARDTYPEIDX, - BOY_LEVEL, - CBS1, - CBS2, - FILINT_VAL, - MODULEIDX, - POWUPSTAT3, - POWUPSTAT4, - POWUPSTAT5, - RTSIINPROUT_VAL, - RTSIOUTROUT_VAL, - RTSIPCHANGE_VAL, - RTSIPWDG_VAL, - RTSIWDGTRIG_VAL, - WDGTOUT_VAL -} - - -{ - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "0", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "0", - "1", - "255", - "255", - "255", - "0", - "0", - "0", - "0", - "0", - "0" -} - -{ - "/CODAC_AlarmHandler/EC/EC-GN/EC-GN-HWCF", - "1", - "ITER-EC-GN-HWCF", - "EC", - "GN", - "0", - "0", - "255", - "255", - "255", - "0", - "0", - "0", - "0", - "0", - "0" -} - -} \ No newline at end of file diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCR500LE.proto b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCR500LE.proto deleted file mode 100644 index 64f1d65..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PCR500LE.proto +++ /dev/null @@ -1,249 +0,0 @@ -#+====================================================================== -# $HeadURL$ -# $Id$ -# -# Project : C-QST-ITERGyrotron -# -# Description : StreamDevice protocol file for PCR500LE -# (Heater Power Supply) -# PSU manual is "http://www.kikusui.co.jp/kiku_manuals/P/PCR_LE/manual_LE_i.html". -# -#RS232C protocol : Baudrate 9600bps / (19200 bps) / 38400 bps -# Data length (8bit) / 7bit -# Stop bit (1bit) / 2bit -# Parity (None) -# Flow Ctrl OFF / (RTS-CTS) -# -# Author : Kazuhide Uchida (Cosylab Japan) -# -# Copyright (c) : 2017 Cosylab Japan Inc. -# -#-====================================================================== - -#InTerminator = LF; -#OutTerminator = LF; -Terminator = LF; -LockTimeout = 5000; -ReplyTimeout = 2000; - -# Device status query ########################## -readDeviceID { - ExtraInput = Ignore; - out "*IDN?"; - in "%s"; -} - -resetDevice { - out "*RST"; - in "%s"; -} - -# Operation command ############################# - -setCoupling { - out "OUTP:COUP %{DC|AC|ACDC|EAC|EDC}"; - in "%s"; -} -getCoupling { - out "OUTP:COUP?"; - in "%s"; -} - -### set output on/off -setOut { - out "OUTP %{ON|OFF|1|0}"; - in "%d"; -} -getOut { - out "OUTP?"; - in "%d"; -} - -### set control source type (internal or external) -setSource { - out "FUNC:SOUR %{INT|EXT|SUM}"; -} -getSource { - out "FUNC:SOUR?"; - in "%s"; -} - -### Command to descide AC voltage control by external voltage. -setSourceON { - out "VOLT:EXT:SOUR %{NONE|VOLT}"; -} -getSourceON { - out "VOLT:EXT:SOUR?"; - in "%{NONE|VOLT}"; -} - -# DC output protocol set ######################## -### output range -setVoltRange { - out "VOLT:RANG %d"; - in "%d"; -} -getVoltageRange { - out "VOLT:RANG?"; - in "%d"; -} -### DC voltage setpoint -setVOffs { - out "VOLTAGE:OFFS %f"; - in "%f"; -} -getVOffs { - out "VOLTAGE:OFFS?"; - in "%f"; -} -### DC voltage offset upper limit -setVOffsUL { - out "VOLTAGE:OFFS:LIM %f"; - in "%f"; -} -getVOffsUL { - out "VOLTAGE:OFFS:LIM?"; - in "%f"; -} -### DC voltage offset lower limit -setVOffsLL { - out "VOLTAGE:OFFS:LIM:LOW %f"; - in "%f"; -} -getVOffsLL { - out "VOLTAGE:OFFS:LIM:LOW?"; - in "%f"; -} - - -# AC output protocol set ######################## -### AC frequency -setFreq { - out "FREQ %f"; - in "%f"; -} -getFreq { - out "FREQ?"; - in "%f"; -} -### AC voltage amp. -setVolt { - out "VOLT %f"; - in "%f"; -} -getVolt { - out "VOLT?"; - in "%f"; -} -setCurr { - out "CURR %f"; -} -getCurr { - out "CURR?"; - in "%f"; -} - -### Upper voltage limit -setUpVoltUL { - out "VOLTage:OFFS:LIM %f"; - in "%f"; -} -getUpVoltUL { - out "VOLT:OFFS:LIM?"; - in "%f"; -} - -### Lower offset voltage limit -setLowVoltLL { - out "VOLT:OFFS:LIM:LOW %f"; - in "%f"; -} -getLowVoltLL { - out "VOLT:OFFS:LIM:LOW?"; - in "%f"; -} - -# Query measured values########################## -getMeasDCV { - out "MEAS:VOLT:DC?"; - in "%f"; -} - -getMeasDCI { - out "MEAS:CURR:DC?"; - in "%f"; -} - -getMeasDCP { - out "MEAS:POW:DC?"; - in "%f"; -} - -getMeasACV{ - out "MEAS:VOLT:AC?"; - in "%f"; -} -getMeasACI{ - out "MEAS:CURR:AC?"; - in "%f"; -} -getMeasACP{ - out "MEAS:POW:AC?"; - in "%f"; -} -getMeasACF{ - out "MEAS:FREQ?"; - in "%f"; -} - -################################################# - -# Enable Local operation -setLoc { - out "SYST:LOC"; -} - -setRem { - out "SYST:REM"; -} - - -# Sequencial operation ########################## -# Set program -setProg { - out "PROGram:EDIT %d %{ON|OFF|0|1} %f 0 0 1 %f %f 0 1 0 0 1"; - -} -getProg { - out "PROGram:EDIT?"; - in "%d %f %d %f %d %f %f %d %d %d %d %d"; -} - -# set sequence operation -setSeqStat { - out ":PROGram:STATe %{STOP|RUN|PAUSe|CONTinue}"; -} - -# get program state -getSeqStat { - out ":PROGram:EXEC?"; - in "%s"; -} - -# set trigger source -setTrgSource { - out "TRIGer:PROGram:SOURce %{IMMediate|BUS}"; - in "%s"; -} - -# Query system error ########################## -getError { - ExtraInput = Ignore; - out "SYST:ERR?"; - in "%39c"; -} - -################################################# - - - diff --git a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PWX1500ML.proto b/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PWX1500ML.proto deleted file mode 100644 index 8904b96..0000000 --- a/EC-GN-JA-PCF-IN/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/PWX1500ML.proto +++ /dev/null @@ -1,154 +0,0 @@ -#+====================================================================== -# $HeadURL$ -# $Id$ -# -# Project : C-QST-ITERGyrotron -# -# Description : StreamDevice protocol file for PWX1500ML -# (Heater Power Supply) -# PSU manual is "https://www.kikusui.co.jp/kiku_manuals/P/PWX/i_f_manual/japanese/00-intro.html". -# Ethernet Connection. -# -# Author : Kazuhide Uchida (Cosylab Japan) -# -# Copyright (c) : 2019 Cosylab Japan Inc. -# -#-====================================================================== - -#InTerminator = LF; -#OutTerminator = LF; -Terminator = LF; -LockTimeout = 1000; -ReplyTimeout = 100; - -# Device status query ########################## -readDeviceID { - ExtraInput = Ignore; - out "*IDN?"; - in "%s"; -} - -resetDevice { - out "*RST"; - in "%s"; -} - -# Operation command ############################# - -### set output on/off -setOut { - out "OUTP %{ON|OFF|1|0}"; - in "%d"; -} -getOut { - out "OUTP?"; - in "%d"; -} - -### set source on/off -setSourceON { - out "VOLT:EXT:SOUR %{NONE|VOLT}"; -} -getSourceON { - out "VOLT:EXT:SOUR?"; - in "%{NONE|VOLT}"; -} - -# DC output protocol set ######################## -### OVP setpoint -setOVP { - out "VOLT:PROT %f"; - in "%d"; -} -getOVP { - out "VOLT:PROT?"; - in "%f"; -} -### DC voltage setpoint -setVolt { - out "VOLT %f"; -} -getVolt { - out "VOLT?"; - in "%f"; -} -setCurr { - out "CURR %f"; -} -getCurr { - out "CURR?"; - in "%f"; -} - -# Query measured values########################## -getMeasDCV { - out "FETC:VOLT:DC?"; - in "%f"; -} - -getMeasDCI { - out "FETC:CURR:DC?"; - in "%f"; -} - -#getMeasV { -# out "MEAS:VOLT?" -# in "%f" -#} -#getMeasI { -# out "MEAS:VOLT?" -# in "%f" -#} - -################################################# - -# Enable Local operation -setRem { - out "SYST:COMM:RLST %{LOC|REM|RWL}"; -} - -getRem { - out "SYST:COMM:RLST?"; - in "%{LOC|REM|RWL}"; -} - - -# Sequencial operation ########################## -# Set program -setProg { - out "PROGram:EDIT %d %{ON|OFF|0|1} %f 0 0 1 %f %f 0 1 0 0 1"; - -} -getProg { - out "PROGram:EDIT?"; - in "%d %f %d %f %d %f %f %d %d %d %d %d"; -} - -# set sequence operation -setSeqStat { - out ":PROGram:STATe %{STOP|RUN|PAUSe|CONTinue}"; -} - -# get program state -getSeqStat { - out ":PROGram:EXEC?"; - in "%s"; -} - -# set trigger source -setTrgSource { - out "TRIGer:PROGram:SOURce %{IMMediate|BUS}"; - in "%s"; -} - -# Query system error ########################## -getError { - ExtraInput = Ignore; - out "SYST:ERR?"; - in "%39c"; -} - -################################################# - - - diff --git a/ec-gn-ja-pcf-sdd-in b/ec-gn-ja-pcf-sdd-in index 47c27a9..67a4562 160000 --- a/ec-gn-ja-pcf-sdd-in +++ b/ec-gn-ja-pcf-sdd-in @@ -1 +1 @@ -Subproject commit 47c27a96e854c50f69952eaa650e166c74959f48 +Subproject commit 67a4562224a1d525324116406b39dc0769271538 diff --git a/generate.sh b/generate.sh index f58eef2..61629c6 100755 --- a/generate.sh +++ b/generate.sh @@ -68,8 +68,8 @@ if [[ ${ok} != "0" ]]; then cp -rf ${project_name}-IN/.[^.]* ${project_name}/ # cp -rf tmp_resources/* ${project_name}/src/main/resources # rm -rf tmp_resources - /bin/cp -rf /opt/codac/marte2-extensions/templates ${project_name,,}-sdd-in/SDD_IN/ - /bin/cp -f templates/* ${project_name,,}-sdd-in/SDD_IN/templates +# /bin/cp -rf /opt/codac/marte2-extensions/templates ${project_name,,}-sdd-in/SDD_IN/ +# /bin/cp -f templates/* ${project_name,,}-sdd-in/SDD_IN/templates cd ${project_name,,}-sdd-in/SDD_IN ./sdd-generate.sh @@ -93,10 +93,6 @@ if [[ ${ok} != "0" ]]; then cat patches/EC-GN-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd - - sed -i "s/#__patch/$(cat patches/EC-GN-PCF0CORE_dbToLoad.patch | sed ':a;N;$!ba;s/\n/__nl__/g')/g" ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/dbToLoad.cmd - sed -i "s/__nl__/\n/g" ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/dbToLoad.cmd - fi diff --git a/templates/epics-dbToLoad.cmd b/templates/epics-dbToLoad.cmd deleted file mode 100644 index c2701be..0000000 --- a/templates/epics-dbToLoad.cmd +++ /dev/null @@ -1,26 +0,0 @@ -#====================================================================== -# Loading DBs -#====================================================================== -cd $(TOP)/db -@DBxx - -#====================================================================== -# Loading Substitution Files -#====================================================================== -cd $(TOP)/iocBoot/$(IOC) -@SUBx -#__patch - -#====================================================================== -# PLC Communication Monitoring PVs DB Loading -#====================================================================== -cd $(EPICS_ROOT)/db -@PLCM - -#====================================================================== -# IOC Monitor -#====================================================================== -cd $(EPICS_ROOT)/db -#dbLoadRecords("iocmon.db","CBS=@CBS1-@CBS2-SYSM, CTRLTYPE=@CTRT, IDX=@IDNx, IOCTYPE=@IOCT, PP=@PBS2, PPPP=@PBS1, NNNN=@PBS4, TTT=@PBS3") - -#- End-of-file marker - do not delete or add lines below!