From 509d40614dc325d9833da13be75b072b05cc85a7 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 28 May 2003 14:53:50 +0000 Subject: [PATCH] - Converted to serialIO C++ interface. - Merged PM600 model support from 1.1.4.1 --- motorApp/MclennanSrc/drvPM304.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/motorApp/MclennanSrc/drvPM304.h b/motorApp/MclennanSrc/drvPM304.h index ed3b7997..c2c39053 100644 --- a/motorApp/MclennanSrc/drvPM304.h +++ b/motorApp/MclennanSrc/drvPM304.h @@ -13,26 +13,34 @@ * ----------------- * .01 11/20/98 mlr initialized from drvMM4000.h * .02 09/29/99 mlr re-wrote for new version of motor software (V4) + * .03 02/11/03 mlr Added support for PM600 model */ #ifndef INCdrvPM304h #define INCdrvPM304h 1 #include "motordrvCom.h" +#include "serialIO.h" /* PM304 default profile. */ #define PM304_NUM_CARDS 4 -#define PM304_NUM_CHANNELS 1 +#define PM304_MAX_CHANNELS 10 + +#define MODEL_PM304 0 +#define MODEL_PM600 1 #define OUTPUT_TERMINATOR "\r" -#define INPUT_TERMINATOR '\n' +#define INPUT_TERMINATOR (char *) "\n" struct PM304controller { - void *serialInfo; /* For RS-232 */ + serialIO *serialInfo; /* For RS-232 */ int serial_card; /* Card on which Hideos/MPF is running */ char serial_task[20]; /* Hideos/MPF task/server name for serial port */ + int n_axes; /* Number of axes on this controller */ + int model; /* Model = MODEL_PM304 or MODEL_PM600 */ + int use_encoder[PM304_MAX_CHANNELS]; /* Does axis have an encoder? */ }; #endif /* INCdrvPM304h */