diff --git a/iocsh/cfg/el7201_mod.ax b/iocsh/cfg/spindle.ax similarity index 99% rename from iocsh/cfg/el7201_mod.ax rename to iocsh/cfg/spindle.ax index 7b4c11e..ddbff24 100644 --- a/iocsh/cfg/el7201_mod.ax +++ b/iocsh/cfg/spindle.ax @@ -42,7 +42,7 @@ epicsEnvSet("ECMC_EC_DRV_ALARM_2", "") epicsEnvSet("ECMC_EC_DRV_WARNING", "") # Warning (handled by ds402 statemachine, but this bit can be used anyway if needed) #Trajectory -epicsEnvSet("ECMC_TRAJ_TYPE", "1") # Trapetz: 0, S-Curve: 1 +epicsEnvSet("ECMC_TRAJ_TYPE", "0") # Trapetz: 0, S-Curve: 1 epicsEnvSet("ECMC_VELO", "1000.0") epicsEnvSet("ECMC_JOG_VEL", "3600") epicsEnvSet("ECMC_JAR", "0.0") # JAR defaults to VELO/ACCL diff --git a/iocsh/cfg/linear_1.ax b/iocsh/cfg/x.ax similarity index 100% rename from iocsh/cfg/linear_1.ax rename to iocsh/cfg/x.ax diff --git a/iocsh/cfg/linear_1.sax b/iocsh/cfg/x.sax similarity index 100% rename from iocsh/cfg/linear_1.sax rename to iocsh/cfg/x.sax diff --git a/iocsh/cfg/linear_2.ax b/iocsh/cfg/y.ax similarity index 100% rename from iocsh/cfg/linear_2.ax rename to iocsh/cfg/y.ax diff --git a/iocsh/cfg/linear_2.sax b/iocsh/cfg/y.sax similarity index 100% rename from iocsh/cfg/linear_2.sax rename to iocsh/cfg/y.sax diff --git a/iocsh/test.script b/iocsh/test.script index d8ed902..59ea7af 100644 --- a/iocsh/test.script +++ b/iocsh/test.script @@ -58,23 +58,23 @@ ecmcConfigOrDie "Cfg.WriteEcEntryIDString(${ECMC_EC_SLAVE_NUM_DIG_OUT},binaryOut ## AXIS 1: X-axis # epicsEnvSet("DEV", "$(IOC)") -$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/linear_1.ax) +$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/x.ax) # Set external setpoints -$(SCRIPTEXEC) ($(ecmccfg_DIR)applyAxisSynchronization.cmd, CONFIG=./cfg/linear_1.sax) +$(SCRIPTEXEC) ($(ecmccfg_DIR)applyAxisSynchronization.cmd, CONFIG=./cfg/x.sax) ############################################################################## ## AXIS 2: Y-axis # #epicsEnvSet("DEV", "$(IOC)") -$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/linear_2.ax) +$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/y.ax) # Set external setpoints -$(SCRIPTEXEC) ($(ecmccfg_DIR)applyAxisSynchronization.cmd, CONFIG=./cfg/linear_2.sax) +$(SCRIPTEXEC) ($(ecmccfg_DIR)applyAxisSynchronization.cmd, CONFIG=./cfg/y.sax) ############################################################################## ## AXIS 3: Spindle # epicsEnvSet("DEV", "$(IOC)") -$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/el7201_mod.ax) +$(SCRIPTEXEC) ($(ecmccfg_DIR)configureAxis.cmd, CONFIG=./cfg/spindle.ax) ############################################################################## ## Load plugin: