Merge pull request #182 from mac-kan/temp_fork

Updates from ESS

db/Beckhoff_3XXX/ecmcEL3311.substitutions

@@ -0,0 +1,11 @@
+file "ecmc_analogInput-chX.template"
+{
+  pattern {CH_ID, ESLO, EGU,  PREC}
+          {01,    0.1,  DegC, 2   }
+}
+
+file "ecmc_status_analog-chX.template"
+{
+  pattern {CH_ID}
+          {01   }
+}

db/Beckhoff_3XXX/ecmcEL3312.substitutions

@@ -1,8 +1,8 @@
 file "ecmc_analogInput-chX.template"
 {
-  pattern {CH_ID, ESLO, EGU,    PREC}
-          {01,    0.1,  "DegC", 2   }
-          {02,    0.1,  "DegC", 2   }
+  pattern {CH_ID, ESLO, EGU,  PREC}
+          {01,    0.1,  DegC, 2   }
+          {02,    0.1,  DegC, 2   }
 }
 
 file "ecmc_status_analog-chX.template"

db/Beckhoff_3XXX/ecmcEL3314-0002.substitutions

@@ -0,0 +1,17 @@
+file "ecmc_analogInput-chX.template"
+{
+  pattern {CH_ID, ESLO, EGU,  PREC}
+          {01,    0.01, DegC, 3   }
+          {02,    0.01, DegC, 3   }
+          {03,    0.01, DegC, 3   }
+          {04,    0.01, DegC, 3   }
+}
+
+file "ecmc_status_analog-chX.template"
+{
+  pattern {CH_ID}
+          {01   }
+          {02   }
+          {03   }
+          {04   }
+}

db/Beckhoff_3XXX/ecmcEL3314-0010.substitutions

@@ -0,0 +1 @@
+ecmcEL3314-0002.substitutions

db/Beckhoff_3XXX/ecmcEL3314-0020.substitutions

@@ -0,0 +1 @@
+ecmcEL3314-0002.substitutions

db/Beckhoff_3XXX/ecmcEL3314-0030.substitutions

@@ -0,0 +1 @@
+ecmcEL3314-0002.substitutions

db/Beckhoff_3XXX/ecmcEL3314.substitutions

@@ -1,17 +1,17 @@
 file "ecmc_analogInput-chX.template"
 {
-  pattern {CH_ID, ESLO, EOFF, EGU,    PREC}
-          {01,    0.1,  0,    "DegC", 2   }
-          {02,    0.1,  0,    "DegC", 2   }
-          {03,    0.1,  0,    "DegC", 2   }
-          {04,    0.1,  0,    "DegC", 2   }
+  pattern {CH_ID, ESLO, EGU,  PREC}
+          {01,    0.1,  DegC, 2   }
+          {02,    0.1,  DegC, 2   }
+          {03,    0.1,  DegC, 2   }
+          {04,    0.1,  DegC, 2   }
 }
 
 file "ecmc_status_analog-chX.template"
 {
-  pattern {CH_ID, KEY }
-          {01,    "AI"}
-          {02,    "AI"}
-          {03,    "AI"}
-          {04,    "AI"}
+  pattern {CH_ID}
+          {01   }
+          {02   }
+          {03   }
+          {04   }
 }

db/Beckhoff_3XXX/ecmcEL3318.substitutions

@@ -0,0 +1,25 @@
+file "ecmc_analogInput-chX.template"
+{
+  pattern {CH_ID, ESLO, EGU,  PREC}
+          {01,    0.1,  DegC, 2   }
+          {02,    0.1,  DegC, 2   }
+          {03,    0.1,  DegC, 2   }
+          {04,    0.1,  DegC, 2   }
+          {05,    0.1,  DegC, 2   }
+          {06,    0.1,  DegC, 2   }
+          {07,    0.1,  DegC, 2   }
+          {08,    0.1,  DegC, 2   }
+}
+
+file "ecmc_status_analog-chX.template"
+{
+  pattern {CH_ID}
+          {01   }
+          {02   }
+          {03   }
+          {04   }
+          {05   }
+          {06   }
+          {07   }
+          {08   }
+}

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

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, Carlos Doro Neto
+#-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"

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

hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd

@@ -0,0 +1,15 @@
+#-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, Carlos Doro Neto
+#-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")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd

hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd

@@ -0,0 +1,15 @@
+#-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, Carlos Doro Neto
+#-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")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd

hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd

@@ -0,0 +1,15 @@
+#-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, Carlos Doro Neto
+#-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")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd

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"

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, Carlos Doro Neto
+#-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"