Only in motor-R6-8-RC1_1-4/motorApp/ImsSrc/: CVS diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.cpp motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.cpp --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.cpp 2013-07-08 06:54:20.000000002 -0700 +++ motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.cpp 2014-12-15 16:24:01.000000002 -0800 @@ -17,11 +17,11 @@ #include #include #include -#include #include #include #include "ImsMDrivePlusMotorController.h" +#include //////////////////////////////////////////////////////// //! ImsMDrivePlusMotorAxis() @@ -132,7 +132,7 @@ // set accceleration if (acceleration != 0) { - sprintf(cmd, "A=%ld", (long)maxVelocity); + sprintf(cmd, "A=%ld", (long)acceleration); status = pController->writeController(cmd, IMS_TIMEOUT); if (status) goto bail; } @@ -311,15 +311,7 @@ direction = 3; } asynPrint(pController->pasynUserSelf, ASYN_TRACEIO_DRIVER, "%s:%s: VBASE=%f, VELO=%f, ACCL=%f, forwards=%d\n", DRIVER_NAME, functionName, minVelocity, maxVelocity, acceleration, forwards); - - // home to home switch or home to index - if (pController->homeSwIn == HOME_TO_INDEX) - sprintf(cmd, "HI %d", direction); - else - sprintf(cmd, "HM %d", direction); -// Debug line -//printf("\n\nDebug output: writing command\t%s\t to output\n\n", cmd); - + sprintf(cmd, "HM %d", direction); status = pController->writeController(cmd, IMS_TIMEOUT); if (status) goto bail; @@ -585,7 +577,7 @@ case 82: strcpy(errCodeString, "Went to both limits and did not find home"); break; case 83: strcpy(errCodeString, "Reached plus limit switch"); break; case 84: strcpy(errCodeString, "Reached minus limit switch"); break; - case 85: strcpy(errCodeString, "MA or MR isn't allowed during home and home isn't allowed while device is in motion"); break; + case 85: strcpy(errCodeString, "MA or MR isn't allowed during home and home isn't allowed while moving"); break; case 86: strcpy(errCodeString, "Stall detected"); break; case 87: strcpy(errCodeString, "In clock mode"); break; case 88: strcpy(errCodeString, "Following error"); break; diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.h motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.h --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.h 2013-07-08 06:54:49.000000002 -0700 +++ motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorAxis.h 2012-09-12 10:16:54.000000002 -0700 @@ -19,7 +19,6 @@ #define MAX_CMD_LEN MAX_BUFF_LEN-10 // leave room for line feeds surrounding command #define MAX_NAME_LEN 10 #define LOCAL_LINE_LEN 256 -#define HOME_TO_INDEX 1 class ImsMDrivePlusMotorController; diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorController.cpp motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorController.cpp --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorController.cpp 2013-07-08 06:55:23.000000002 -0700 +++ motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorController.cpp 2013-02-18 13:03:48.000000002 -0800 @@ -24,11 +24,11 @@ #include #include #include -#include #include #include #include "ImsMDrivePlusMotorController.h" +#include //////////////////////////////////////////////////////// //! @ImsMDrivePlusMotorController() @@ -41,9 +41,8 @@ //! set to empty string "" if no device name needed/not using Party Mode //! @param[in] movingPollPeriod Moving polling period in milliseconds //! @param[in] idlePollPeriod Idle polling period in milliseconds -//! @param[in] homeSwitchIndex Defines if homing to home switch or homing to index //////////////////////////////////////////////////////// -ImsMDrivePlusMotorController::ImsMDrivePlusMotorController(const char *motorPortName, const char *IOPortName, const char *devName, double movingPollPeriod, double idlePollPeriod, int homeSwitchIndex) +ImsMDrivePlusMotorController::ImsMDrivePlusMotorController(const char *motorPortName, const char *IOPortName, const char *devName, double movingPollPeriod, double idlePollPeriod) : asynMotorController(motorPortName, NUM_AXES, NUM_IMS_PARAMS, asynInt32Mask | asynFloat64Mask | asynUInt32DigitalMask, asynInt32Mask | asynFloat64Mask | asynUInt32DigitalMask, @@ -83,7 +82,7 @@ createParam(ImsMDrivePlusClearMCodeControlString, asynParamOctet, &this->ImsMDrivePlusClearMCode_); // Check the validity of the arguments and init controller object - initController(devName, movingPollPeriod, idlePollPeriod, homeSwitchIndex); + initController(devName, movingPollPeriod, idlePollPeriod); // Create axis // Assuming single axis per controller the way drvAsynIPPortConfigure( "M06", "ts-b34-nw08:2101", 0, 0 0 ) is called in st.cmd script @@ -104,9 +103,8 @@ //! @param[in] devName Name of device (DN) used to identify axis within controller for Party Mode //! @param[in] movingPollPeriod Moving polling period in milliseconds //! @param[in] idlePollPeriod Idle polling period in milliseconds -//! @param[in] homeSwitchIndex Defines if homing to home switch or homing to index //////////////////////////////////////// -void ImsMDrivePlusMotorController::initController(const char *devName, double movingPollPeriod, double idlePollPeriod, int homeSwitchIndex) +void ImsMDrivePlusMotorController::initController(const char *devName, double movingPollPeriod, double idlePollPeriod) { strcpy(this->deviceName, devName); @@ -114,7 +112,6 @@ this->numAxes_ = NUM_AXES; // only support single axis this->movingPollPeriod_ = movingPollPeriod; this->idlePollPeriod_ = idlePollPeriod; - this->homeSwIn = homeSwitchIndex; // initialize switch inputs this->homeSwitchInput=-1; @@ -313,12 +310,11 @@ // If not using party mode, config ImsMDrivePlusCreateController() with empty string "" for deviceName //! @param[in] movingPollPeriod time in ms between polls when any axis is moving //! @param[in] idlePollPeriod time in ms between polls when no axis is moving -//! @param[in] homeSwitchIndex Defines if homing to home switch or to set index //////////////////////////////////////////////////////// -extern "C" int ImsMDrivePlusCreateController(const char *motorPortName, const char *IOPortName, char *devName, double movingPollPeriod, double idlePollPeriod, int homeSwitchIndex) +extern "C" int ImsMDrivePlusCreateController(const char *motorPortName, const char *IOPortName, char *devName, double movingPollPeriod, double idlePollPeriod) { ImsMDrivePlusMotorController *pImsController; - pImsController = new ImsMDrivePlusMotorController(motorPortName, IOPortName, devName, movingPollPeriod/1000., idlePollPeriod/1000., homeSwitchIndex); + pImsController = new ImsMDrivePlusMotorController(motorPortName, IOPortName, devName, movingPollPeriod/1000., idlePollPeriod/1000.); pImsController = NULL; return(asynSuccess); } @@ -333,24 +329,21 @@ // : if not using party mode, config ImsMDrivePlusCreateController() with empty string "" for deviceName // Moving poll period : time in ms between polls when any axis is moving // Idle poll period : time in ms between polls when no axis is moving -// Home Switch or Home Index : homing to home switch or homing to set index //////////////////////////////////////////////////////// static const iocshArg ImsMDrivePlusCreateControllerArg0 = {"Motor port name", iocshArgString}; static const iocshArg ImsMDrivePlusCreateControllerArg1 = {"IO port name", iocshArgString}; static const iocshArg ImsMDrivePlusCreateControllerArg2 = {"Device name", iocshArgString}; static const iocshArg ImsMDrivePlusCreateControllerArg3 = {"Moving poll period (ms)", iocshArgDouble}; static const iocshArg ImsMDrivePlusCreateControllerArg4 = {"Idle poll period (ms)", iocshArgDouble}; -static const iocshArg ImsMDrivePlusCreateControllerArg5 = {"Home Switch or Home Index", iocshArgInt}; static const iocshArg * const ImsMDrivePlusCreateControllerArgs[] = {&ImsMDrivePlusCreateControllerArg0, &ImsMDrivePlusCreateControllerArg1, &ImsMDrivePlusCreateControllerArg2, &ImsMDrivePlusCreateControllerArg3, - &ImsMDrivePlusCreateControllerArg4, - &ImsMDrivePlusCreateControllerArg5}; -static const iocshFuncDef ImsMDrivePlusCreateControllerDef = {"ImsMDrivePlusCreateController", 6, ImsMDrivePlusCreateControllerArgs}; + &ImsMDrivePlusCreateControllerArg4}; +static const iocshFuncDef ImsMDrivePlusCreateControllerDef = {"ImsMDrivePlusCreateController", 5, ImsMDrivePlusCreateControllerArgs}; static void ImsMDrivePlusCreateControllerCallFunc(const iocshArgBuf *args) { - ImsMDrivePlusCreateController(args[0].sval, args[1].sval, args[2].sval, args[3].dval, args[4].dval, args[5].ival); + ImsMDrivePlusCreateController(args[0].sval, args[1].sval, args[2].sval, args[3].dval, args[4].dval); } static void ImsMDrivePlusMotorRegister(void) diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorController.h motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorController.h --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsMDrivePlusMotorController.h 2013-07-08 06:55:53.000000002 -0700 +++ motorR6-8/motorApp/ImsSrc/ImsMDrivePlusMotorController.h 2012-09-12 10:16:54.000000002 -0700 @@ -19,7 +19,7 @@ ///////////////////////////////////////// // Override asynMotorController functions ///////////////////////////////////////// - ImsMDrivePlusMotorController(const char *motorPortName, const char *IOPortName, const char *deviceName, double movingPollPeriod, double idlePollPeriod, int homeSwitchIndex); + ImsMDrivePlusMotorController(const char *motorPortName, const char *IOPortName, const char *deviceName, double movingPollPeriod, double idlePollPeriod); ImsMDrivePlusMotorAxis* getAxis(asynUser *pasynUser); ImsMDrivePlusMotorAxis* getAxis(int axisNo); //void report(FILE *fp, int level); @@ -61,10 +61,7 @@ int posLimitSwitchInput; int negLimitSwitchInput; - // added for defining Home Switch or Index - int homeSwIn; - - void initController(const char *devName, double movingPollPeriod, double idlePollPeriod, int homeSwitchIndex); + void initController(const char *devName, double movingPollPeriod, double idlePollPeriod); int readHomeAndLimitConfig(); // read home, positive limit, and neg limit switch configuration from controller (S1-S4 settings) friend class ImsMDrivePlusMotorAxis; diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsRegister.cc motorR6-8/motorApp/ImsSrc/ImsRegister.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/ImsRegister.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/ImsRegister.cc 2009-12-09 08:21:24.000000002 -0800 @@ -2,9 +2,9 @@ FILENAME... ImsRegister.cc USAGE... Register IMS motor device driver shell commands. -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ +Version: $Revision: 1.3 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2004-07-16 19:10:15 $ */ /***************************************************************** Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/ImsMDrivePlusMotorAxis.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/ImsMDrivePlusMotorAxis.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/ImsMDrivePlusMotorController.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/ImsMDrivePlusMotorController.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/ImsRegister.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/ImsRegister.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/devIM483PL.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/devIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/devIM483SM.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/devIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/devMDrive.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/devMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/drvIM483PL.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/drvIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/drvIM483SM.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/drvIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/drvMDrive.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/drvMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-beatnik/libIms.a and motorR6-8/motorApp/ImsSrc/O.RTEMS-beatnik/libIms.a differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsMDrivePlusMotorAxis.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsMDrivePlusMotorAxis.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsMDrivePlusMotorController.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsMDrivePlusMotorController.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsRegister.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/ImsRegister.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/devIM483PL.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/devIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/devIM483SM.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/devIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/devMDrive.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/devMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/drvIM483PL.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/drvIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/drvIM483SM.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/drvIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/drvMDrive.o and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/drvMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.RTEMS-mvme3100/libIms.a and motorR6-8/motorApp/ImsSrc/O.RTEMS-mvme3100/libIms.a differ diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.d motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.d --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.d 2014-03-07 17:13:19.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.d 2014-03-06 09:06:21.000000002 -0800 @@ -9,10 +9,9 @@ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/os/Linux/osdMutex.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/os/Linux/osdThread.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ - /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsExport.h \ - /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/iocsh.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynOctetSyncIO.h \ + /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynDriver.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsStdio.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsTime.h \ @@ -43,4 +42,5 @@ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/paramVal.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynParamType.h \ ../../../include/asynMotorAxis.h ../../../include/asynMotorController.h \ - ../ImsMDrivePlusMotorAxis.h + ../ImsMDrivePlusMotorAxis.h \ + /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsExport.h Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorAxis.o differ diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.d motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.d --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.d 2014-03-07 17:13:18.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.d 2014-03-06 09:06:20.000000002 -0800 @@ -9,10 +9,9 @@ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/os/Linux/osdMutex.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/os/Linux/osdThread.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ - /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsExport.h \ - /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/iocsh.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynOctetSyncIO.h \ + /afs/slac/g/lcls/epics/base/base-R3-14-12/include/shareLib.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynDriver.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsStdio.h \ /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsTime.h \ @@ -43,4 +42,5 @@ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/paramVal.h \ /afs/slac/g/lcls/epics/modules/R3-14-12/asyn/asyn-R4-21_1-0/include/asynParamType.h \ ../../../include/asynMotorAxis.h ../../../include/asynMotorController.h \ - ../ImsMDrivePlusMotorAxis.h + ../ImsMDrivePlusMotorAxis.h \ + /afs/slac/g/lcls/epics/base/base-R3-14-12/include/epicsExport.h Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsMDrivePlusMotorController.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/ImsRegister.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/ImsRegister.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/devIM483PL.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/devIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/devIM483SM.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/devIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/devMDrive.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/devMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/drvIM483PL.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/drvIM483PL.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/drvIM483SM.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/drvIM483SM.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/drvMDrive.o and motorR6-8/motorApp/ImsSrc/O.linux-x86/drvMDrive.o differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/libIms.a and motorR6-8/motorApp/ImsSrc/O.linux-x86/libIms.a differ Binary files motor-R6-8-RC1_1-4/motorApp/ImsSrc/O.linux-x86/libIms.so and motorR6-8/motorApp/ImsSrc/O.linux-x86/libIms.so differ diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/README.ImsMDrivePlusMotor motorR6-8/motorApp/ImsSrc/README.ImsMDrivePlusMotor --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/README.ImsMDrivePlusMotor 2013-07-08 06:56:16.000000002 -0700 +++ motorR6-8/motorApp/ImsSrc/README.ImsMDrivePlusMotor 2012-09-12 10:17:24.000000002 -0700 @@ -9,11 +9,6 @@ The driver assumes: 1) each controller is configured for a single axis 2) the motor is set up for Party Mode (PY=1) and Echo Mode 2 (EM=2) - -Additional features: - -- 07/03/2013: Added input parameter to iocsh config function to set homing type [home to HOME_SWITCH | home to HOME_INDEX] - ======================================= ======================= @@ -78,7 +73,6 @@ See README file for more information. movingPollPeriod: time in milliseconds between polls when axis is moving idlePollPeriod: time in milliseconds between polls when axis is not moving - homeSwitchIndex Defines if homing to home switch [0] or to set index [1] ========================= Example iocsh st.cmd file @@ -96,7 +90,7 @@ drvAsynIPPortConfigure("M06", "ts-b34-nw08:2101", 0, 0, 0 ) # Configure one controller per motor, each controller just has 1 axis -ImsMDrivePlusCreateController("IMS1", "M06", "1", 200, 5000, 0) +ImsMDrivePlusCreateController("IMS1", "M06", "1", 200, 5000) # Optional: Enable tracing asynSetTraceIOMask("IMS1",0,2) diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/devIM483PL.cc motorR6-8/motorApp/ImsSrc/devIM483PL.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/devIM483PL.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/devIM483PL.cc 2013-06-17 07:20:08.000000002 -0700 @@ -3,9 +3,10 @@ USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ +Version: $Revision: 16590 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2013-06-17 09:20:08 -0500 (Mon, 17 Jun 2013) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/devIM483PL.cc $ */ /* diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/devIM483SM.cc motorR6-8/motorApp/ImsSrc/devIM483SM.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/devIM483SM.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/devIM483SM.cc 2013-06-17 07:20:08.000000002 -0700 @@ -3,9 +3,10 @@ USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ +Version: $Revision: 16590 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2013-06-17 09:20:08 -0500 (Mon, 17 Jun 2013) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/devIM483SM.cc $ */ /* diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/devMDrive.cc motorR6-8/motorApp/ImsSrc/devMDrive.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/devMDrive.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/devMDrive.cc 2013-06-17 07:20:08.000000002 -0700 @@ -3,9 +3,10 @@ USAGE... Motor record device level support for Intelligent Motion Systems, Inc. MDrive series of controllers. -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ +Version: $Revision: 16590 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2013-06-17 09:20:08 -0500 (Mon, 17 Jun 2013) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/devMDrive.cc $ */ /* diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483.h motorR6-8/motorApp/ImsSrc/drvIM483.h --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483.h 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/drvIM483.h 2013-06-17 07:20:08.000000002 -0700 @@ -3,9 +3,10 @@ USAGE... This file contains driver "include" information that is specific to Intelligent Motion Systems, Inc. IM483(I/IE) and MDrive controllers. -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ +Version: $Revision: 16590 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2013-06-17 09:20:08 -0500 (Mon, 17 Jun 2013) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/drvIM483.h $ */ /* diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483PL.cc motorR6-8/motorApp/ImsSrc/drvIM483PL.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483PL.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/drvIM483PL.cc 2011-11-29 12:50:00.000000002 -0800 @@ -3,10 +3,10 @@ USAGE... Motor record driver level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ -HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/trunk/motorApp/ImsSrc/drvIM483PL.cc $ +Version: $Revision: 14155 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2011-11-29 14:50:00 -0600 (Tue, 29 Nov 2011) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/drvIM483PL.cc $ */ /***************************************************************** diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483SM.cc motorR6-8/motorApp/ImsSrc/drvIM483SM.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvIM483SM.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/drvIM483SM.cc 2011-11-29 12:50:00.000000002 -0800 @@ -3,10 +3,10 @@ USAGE... Motor record driver level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ -HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/trunk/motorApp/ImsSrc/drvIM483SM.cc $ +Version: $Revision: 14155 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2011-11-29 14:50:00 -0600 (Tue, 29 Nov 2011) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/drvIM483SM.cc $ */ /***************************************************************** diff -ru motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvMDrive.cc motorR6-8/motorApp/ImsSrc/drvMDrive.cc --- motor-R6-8-RC1_1-4/motorApp/ImsSrc/drvMDrive.cc 2012-12-04 08:34:12.000000002 -0800 +++ motorR6-8/motorApp/ImsSrc/drvMDrive.cc 2013-04-24 09:01:47.000000002 -0700 @@ -3,10 +3,10 @@ USAGE... Motor record driver level support for Intelligent Motion Systems, Inc. MDrive series; M17, M23, M34. -Version: $Revision: 1.5 $ -Modified By: $Author: ernesto $ -Last Modified: $Date: 2012/12/04 16:34:12 $ -HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/trunk/motorApp/ImsSrc/drvMDrive.cc $ +Version: $Revision: 16385 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2013-04-24 11:01:47 -0500 (Wed, 24 Apr 2013) $ +HeadURL: $URL: https://subversion.xor.aps.anl.gov/synApps/motor/tags/R6-8/motorApp/ImsSrc/drvMDrive.cc $ */ /* @@ -39,7 +39,7 @@ * Verified with firmware: * * - 1.071 E - * - 3.003 (MDI1FRD17B4-EQ + * - 3.003 (MDI1FRD17B4-EQ) * - 3.010 * * Modification Log: