From 691cc4d7c32cddfb49fae05cd908d698ae5f8d16 Mon Sep 17 00:00:00 2001 From: Markus Kristensson Date: Tue, 18 Jul 2023 10:49:54 +0200 Subject: [PATCH 1/5] Add hardware scripts Adds hardware scripts for EL3311, EL3314-0010, EL3314-0020, EL3314-0030 and EL3318. --- hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd | 19 +++++++++++ hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd | 25 ++++++++++++++ hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd | 25 ++++++++++++++ hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd | 25 ++++++++++++++ hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd | 33 +++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd new file mode 100644 index 000000000..26015f26d --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd @@ -0,0 +1,19 @@ +#-d /** +#-d \brief hardware script for EL3311 +#-d \details EL3311 | 1-channel thermocouple input terminal with open-circuit recognition +#-d \author Markus Kristensson +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +epicsEnvSet("ECMC_EC_HWTYPE" "EL3311") +epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") +epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cef3052") + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd new file mode 100644 index 000000000..7e9376cb9 --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd @@ -0,0 +1,25 @@ +#-d /** +#-d \brief hardware script for EL3314-0010 +#-d \details EL3314-0010 | 4-channel (24 bits) thermocouple, high precision, input terminal with open-circuit recognition +#-d \author Markus Kristensson +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0010") +epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") +epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" +#- analog input Ch2 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" +#- analog input Ch3 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" +#- analog input Ch4 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd new file mode 100644 index 000000000..befd06220 --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd @@ -0,0 +1,25 @@ +#-d /** +#-d \brief hardware script for EL3314-0020 +#-d \details EL3314-0020 | 4-channel (24 bits) thermocouple, high precision, factory calibrated, input terminal with open-circuit recognition +#-d \author Markus Kristensson +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0020") +epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") +epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" +#- analog input Ch2 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" +#- analog input Ch3 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" +#- analog input Ch4 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd new file mode 100644 index 000000000..86fb40edb --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd @@ -0,0 +1,25 @@ +#-d /** +#-d \brief hardware script for EL3314-0030 +#-d \details EL3314-0030 | 4-channel (24 bits) thermocouple, high precision, externally calibrated, input terminal with open-circuit recognition +#-d \author Markus Kristensson +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0030") +epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") +epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" +#- analog input Ch2 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" +#- analog input Ch3 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" +#- analog input Ch4 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd new file mode 100644 index 000000000..ecbcb0f58 --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd @@ -0,0 +1,33 @@ +#-d /** +#-d \brief hardware script for EL3318 +#-d \details EL3318 | 8-channel (16 bits) thermocouple input terminal with open-circuit recognition +#-d \author Markus Kristensson +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +epicsEnvSet("ECMC_EC_HWTYPE" "EL3318") +epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") +epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf63052") + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" +#- analog input Ch2 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" +#- analog input Ch3 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" +#- analog input Ch4 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" +#- analog input Ch5 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=05,ECMC_PDO=0x1a04,ECMC_ENTRY=0x6040" +#- analog input Ch6 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=06,ECMC_PDO=0x1a05,ECMC_ENTRY=0x6050" +#- analog input Ch7 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=07,ECMC_PDO=0x1a06,ECMC_ENTRY=0x6060" +#- analog input Ch8 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=08,ECMC_PDO=0x1a07,ECMC_ENTRY=0x6070" \ No newline at end of file From 562305503ec8affa02ea6f856c8905280bce61f4 Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Wed, 19 Jul 2023 13:58:12 +0200 Subject: [PATCH 2/5] Remove initialization of ECMC_EGU, ECMC_PREC, ECMC_AXISFIELDINIT and ECMC_AXISCONFIG from init.cmd This could lead to a maclib error from the second axis onwards which prevents the motor record PVs from being loaded. The reason is ecmc_axis_unset.cmd unsets all 4 variables after the first axis is loaded. Removing them from init.cmd allows us to have consistent behavior (explicit definition in axis.ax) for all axes. --- general/init.cmd | 6 ------ 1 file changed, 6 deletions(-) diff --git a/general/init.cmd b/general/init.cmd index 7a97cd6ba..170908ab0 100644 --- a/general/init.cmd +++ b/general/init.cmd @@ -46,9 +46,3 @@ epicsEnvSet("ECMC_TSE", 0) #- Init all axis related variables ${ECMC_SUPPORT_MOTION=""}ecmcFileExist("${ECMC_CONFIG_ROOT}initAxis.cmd",1) ${ECMC_SUPPORT_MOTION=""}${SCRIPTEXEC} "${ECMC_CONFIG_ROOT}initAxis.cmd" - -#- Additional parameters when motor Records are loaded -${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_EGU", "mm") -${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_PREC", 3) -${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_AXISFIELDINIT", "") # Extra field init to motor record -${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_AXISCONFIG", "") # Extra parameters to driver From 554c9e421d50c7f6ca5c17c8569de5fae0921330 Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Wed, 19 Jul 2023 14:07:15 +0200 Subject: [PATCH 3/5] Remove ecmcEL3314-0090.substitutions --- db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions | 1 - 1 file changed, 1 deletion(-) delete mode 120000 db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions diff --git a/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions b/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions deleted file mode 120000 index 6f9a0e71d..000000000 --- a/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions +++ /dev/null @@ -1 +0,0 @@ -ecmcEL3314.substitutions \ No newline at end of file From 303b3a1179d235a507c583bdf2e57c45657670cc Mon Sep 17 00:00:00 2001 From: Carlos Doro Neto Date: Wed, 19 Jul 2023 14:12:06 +0200 Subject: [PATCH 4/5] Add newline at EOF --- hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd index ecbcb0f58..b7eff4fdc 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd @@ -30,4 +30,4 @@ ${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=06,ECMC_PDO=0x1a05, #- analog input Ch7 ${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=07,ECMC_PDO=0x1a06,ECMC_ENTRY=0x6060" #- analog input Ch8 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=08,ECMC_PDO=0x1a07,ECMC_ENTRY=0x6070" \ No newline at end of file +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=08,ECMC_PDO=0x1a07,ECMC_ENTRY=0x6070" From 145879e5553f0b4a23413e830cd1ac3c1f71301c Mon Sep 17 00:00:00 2001 From: Markus Kristensson Date: Thu, 20 Jul 2023 11:07:20 +0200 Subject: [PATCH 5/5] Add generic script Adds a generic hardware script for EL3314-XXXX and moves the execution of the slaveVerify.cmd and ecmcANalogInput_32bit.cmd of all such terminals to the ecmcEL3314-XXXX_generic.cmd. Also adds Carlos as author for all the updated hardware scripts. --- hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd | 2 +- hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd | 14 ++----------- hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd | 14 ++----------- hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd | 14 ++----------- hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd | 14 ++----------- .../EL/ecmcEL3314-XXXX_generic.cmd | 21 +++++++++++++++++++ hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd | 2 +- 7 files changed, 31 insertions(+), 50 deletions(-) create mode 100644 hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd index 26015f26d..b0a8f17c0 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3311 #-d \details EL3311 | 1-channel thermocouple input terminal with open-circuit recognition -#-d \author Markus Kristensson +#-d \author Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd index 6214cb22b..3b902954b 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3314-0002 #-d \details EL3314-0002 | 4-channel (24 bits) thermocouple input terminal with open-circuit recognition -#-d \author Anders Sandstroem +#-d \author Anders Sandstroem, Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset @@ -12,14 +12,4 @@ epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0002") epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") -#- verify slave, including reset -${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" - -#- analog input Ch1 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" -#- analog input Ch2 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" -#- analog input Ch3 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" -#- analog input Ch4 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd index 7e9376cb9..5166388be 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3314-0010 #-d \details EL3314-0010 | 4-channel (24 bits) thermocouple, high precision, input terminal with open-circuit recognition -#-d \author Markus Kristensson +#-d \author Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset @@ -12,14 +12,4 @@ epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0010") epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") -#- verify slave, including reset -${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" - -#- analog input Ch1 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" -#- analog input Ch2 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" -#- analog input Ch3 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" -#- analog input Ch4 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd index befd06220..708805b87 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3314-0020 #-d \details EL3314-0020 | 4-channel (24 bits) thermocouple, high precision, factory calibrated, input terminal with open-circuit recognition -#-d \author Markus Kristensson +#-d \author Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset @@ -12,14 +12,4 @@ epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0020") epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") -#- verify slave, including reset -${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" - -#- analog input Ch1 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" -#- analog input Ch2 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" -#- analog input Ch3 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" -#- analog input Ch4 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd index 86fb40edb..fdfe7c61f 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3314-0030 #-d \details EL3314-0030 | 4-channel (24 bits) thermocouple, high precision, externally calibrated, input terminal with open-circuit recognition -#-d \author Markus Kristensson +#-d \author Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset @@ -12,14 +12,4 @@ epicsEnvSet("ECMC_EC_HWTYPE" "EL3314-0030") epicsEnvSet("ECMC_EC_VENDOR_ID" "0x2") epicsEnvSet("ECMC_EC_PRODUCT_ID" "0x0cf23052") -#- verify slave, including reset -${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" - -#- analog input Ch1 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" -#- analog input Ch2 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" -#- analog input Ch3 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" -#- analog input Ch4 -${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd new file mode 100644 index 000000000..3b949109d --- /dev/null +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd @@ -0,0 +1,21 @@ +#-d /** +#-d \brief hardware script for EL3314-XXXX +#-d \details EL3314-XXXX | Generic script for EL3314-XXXX modules. +#-d \author Markus Kristensson, Carlos Doro Netos +#-d \file +#-d \note SDOS +#-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset +#-d */ + + +#- verify slave, including reset +${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true" + +#- analog input Ch1 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000" +#- analog input Ch2 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010" +#- analog input Ch3 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020" +#- analog input Ch4 +${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030" diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd index b7eff4fdc..a90ffdcba 100644 --- a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd +++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd @@ -1,7 +1,7 @@ #-d /** #-d \brief hardware script for EL3318 #-d \details EL3318 | 8-channel (16 bits) thermocouple input terminal with open-circuit recognition -#-d \author Markus Kristensson +#-d \author Markus Kristensson, Carlos Doro Neto #-d \file #-d \note SDOS #-d \param [out] SDO 0x1011:01 --> 1684107116 \b reset