From bc136e9e38459f13c9a78220f14657b794d7f7ce Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Sat, 21 Apr 2001 18:29:31 +0000 Subject: [PATCH] Added Jog Velocity motor command. --- motorApp/NewportSrc/devMM3000.c | 8 +++++--- motorApp/NewportSrc/devMM4000.c | 9 ++++++--- motorApp/NewportSrc/devPM500.c | 9 +++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/motorApp/NewportSrc/devMM3000.c b/motorApp/NewportSrc/devMM3000.c index 4bf00533..b82a92da 100644 --- a/motorApp/NewportSrc/devMM3000.c +++ b/motorApp/NewportSrc/devMM3000.c @@ -2,9 +2,9 @@ FILENAME... devMM3000.c USAGE... Motor record device level support for Newport MM3000. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2000-07-17 17:11:36 $ +Last Modified: $Date: 2001-04-21 18:27:38 $ */ /* @@ -37,7 +37,7 @@ Last Modified: $Date: 2000-07-17 17:11:36 $ * ----------------- * .00 10-16-97 mlr initialized from devOms58 * .01 07-19-99 rls initialized from drvMM4000 - * ... + * .02 04-21-01 rls Added jog velocity motor command. */ #include @@ -94,6 +94,7 @@ struct motor_dset devMM3000 = /* --------------------------- program data --------------------- */ /* This table is used to define the command types */ +/* WARNING! this must match "motor_cmnd" in motor.h */ static int MM3000_table[] = { MOTION, /* MOVE_ABS */ @@ -117,6 +118,7 @@ static int MM3000_table[] = { IMMEDIATE, /* PRIMITIVE */ IMMEDIATE, /* SET_HIGH_LIMIT */ IMMEDIATE, /* SET_LOW_LIMIT */ + VELOCITY /* JOG_VELOCITY */ }; diff --git a/motorApp/NewportSrc/devMM4000.c b/motorApp/NewportSrc/devMM4000.c index 603fb16d..35cc1050 100644 --- a/motorApp/NewportSrc/devMM4000.c +++ b/motorApp/NewportSrc/devMM4000.c @@ -2,9 +2,9 @@ FILENAME... devMM4000.c USAGE... Motor record device level support for Newport MM4000. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2000-07-17 17:13:46 $ +Last Modified: $Date: 2001-04-21 18:28:53 $ */ /* @@ -39,6 +39,7 @@ Last Modified: $Date: 2000-07-17 17:13:46 $ * .03 10-30-98 mlr Minor code cleanup, improved formatting * .04 02-01-99 mlr Added temporary fix to delay reading motor * positions at the end of a move. + * .05 04-21-01 rls Added jog velocity motor command. */ @@ -96,6 +97,7 @@ struct motor_dset devMM4000 = /* --------------------------- program data --------------------- */ /* This table is used to define the command types */ +/* WARNING! this must match "motor_cmnd" in motor.h */ static int MM4000_table[] = { MOTION, /* MOVE_ABS */ @@ -118,7 +120,8 @@ static int MM4000_table[] = { IMMEDIATE, /* DISABL_TORQUE */ IMMEDIATE, /* PRIMITIVE */ IMMEDIATE, /* SET_HIGH_LIMIT */ - IMMEDIATE /* SET_LOW_LIMIT */ + IMMEDIATE, /* SET_LOW_LIMIT */ + VELOCITY /* JOG_VELOCITY */ }; diff --git a/motorApp/NewportSrc/devPM500.c b/motorApp/NewportSrc/devPM500.c index db7e27a4..912e278a 100644 --- a/motorApp/NewportSrc/devPM500.c +++ b/motorApp/NewportSrc/devPM500.c @@ -3,9 +3,9 @@ FILENAME... devPM500.c USAGE... Motor record device level support for the Newport PM500 motor controller. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2000-11-08 20:41:33 $ +Last Modified: $Date: 2001-04-21 18:29:31 $ */ /* @@ -37,7 +37,7 @@ Last Modified: $Date: 2000-11-08 20:41:33 $ * ----------------- * .00 10-25-98 mlr initialized from devPM500 * .01 06-02-00 rls integrated into standard motor record - * ... + * .05 04-21-01 rls Added jog velocity motor command. */ @@ -119,7 +119,8 @@ static int PM500_table[] = { IMMEDIATE, /* DISABL_TORQUE */ IMMEDIATE, /* PRIMITIVE */ IMMEDIATE, /* SET_HIGH_LIMIT */ - IMMEDIATE /* SET_LOW_LIMIT */ + IMMEDIATE, /* SET_LOW_LIMIT */ + VELOCITY /* JOG_VELOCITY */ };