lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

- Added math.h for fabs() declaration.

Browse Source 
- Removed unused macros.
- Removed initialization string from motor_start_trans_com() arguments.
- Removed command line terminator argument from motor_end_trans_com().
This commit is contained in:
Ron Sluiter
2000-07-17 17:13:46 +00:00
parent 1dc0652a6e
commit dfe84dc17a
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/devMM4000.c
+6 -10
View File
@@ -2,9 +2,9 @@
FILENAME... devMM4000.c
USAGE... Motor record device level support for Newport MM4000.
Version: $Revision: 1.2 $
Version: $Revision: 1.3 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2000-06-14 14:58:03 $
Last Modified: $Date: 2000-07-17 17:13:46 $
*/
/*
@@ -45,6 +45,7 @@ Last Modified: $Date: 2000-06-14 14:58:03 $
#include <vxWorks.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <semLib.h> /* jps: include for init_record wait */
#include <logLib.h>
@@ -74,11 +75,6 @@ extern "C" {
#define STATIC static
#define ABS(f) ((f)>0 ? (f) : -(f))
#define SIGN(f) (long)((f)>0 ? 1 : -1)
#define MAX(a,b) ((a)>(b) ? (a) : (b))
#define MIN(a,b) ((a)<(b) ? (a) : (b))
/* ----------------Create the dsets for devMM4000----------------- */
STATIC struct driver_table *drvtabptr;
STATIC long MM4000_init(int);
@@ -167,14 +163,14 @@ STATIC long MM4000_init_record(struct motorRecord *mr)
/* start building a transaction */
STATIC long MM4000_start_trans(struct motorRecord *mr)
{
return(motor_start_trans_com(mr, MM4000_cards, NULL));
return(motor_start_trans_com(mr, MM4000_cards));
}
/* end building a transaction */
STATIC long MM4000_end_trans(struct motorRecord *mr)
{
return(motor_end_trans_com(mr, drvtabptr, "\r"));
return(motor_end_trans_com(mr, drvtabptr));
}
@@ -306,7 +302,7 @@ STATIC long MM4000_build_trans(motor_cmnd command, double *parms, struct motorRe
* If the record soft limits are set tighter than the MM4000 limits
* the record will prevent JOG motion beyond its soft limits
*/
sprintf(buff, "%dVA%.*f;", axis, maxdigits, ABS(cntrl_units));
sprintf(buff, "%dVA%.*f;", axis, maxdigits, fabs(cntrl_units));
strcat(motor_call->message, buff);
if (dval > 0.)
sprintf(buff, "%dPA%.*f;", axis, maxdigits, mr->dhlm);