From 2d46405cea630405e2b7be2d1ec68e094424b3ff Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Tue, 29 Mar 2011 22:58:32 +0000 Subject: [PATCH] Change poll times to doubles in constructor, but still int in C linkage for vxWorks --- motorApp/ACRSrc/ACRMotorDriver.cpp | 8 +++++--- motorApp/ACRSrc/ACRMotorDriver.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/motorApp/ACRSrc/ACRMotorDriver.cpp b/motorApp/ACRSrc/ACRMotorDriver.cpp index 4de73500..a6b5db2b 100644 --- a/motorApp/ACRSrc/ACRMotorDriver.cpp +++ b/motorApp/ACRSrc/ACRMotorDriver.cpp @@ -27,7 +27,8 @@ March 4, 2011 static const char *driverName = "ACRMotorDriver"; -ACRController::ACRController(const char *portName, const char *ACRPortName, int numAxes, int movingPollPeriod, int idlePollPeriod) +ACRController::ACRController(const char *portName, const char *ACRPortName, int numAxes, + double movingPollPeriod, double idlePollPeriod) : asynMotorController(portName, numAxes, NUM_ACR_PARAMS, asynInt32Mask | asynFloat64Mask | asynUInt32DigitalMask, asynInt32Mask | asynFloat64Mask | asynUInt32DigitalMask, @@ -93,10 +94,11 @@ ACRController::ACRController(const char *portName, const char *ACRPortName, int /** Configuration command, called directly or from iocsh */ -extern "C" int ACRCreateController(const char *portName, const char *ACRPortName, int numAxes, int movingPollPeriod, int idlePollPeriod) +extern "C" int ACRCreateController(const char *portName, const char *ACRPortName, int numAxes, + int movingPollPeriod, int idlePollPeriod) { ACRController *pACRController - = new ACRController(portName, ACRPortName, numAxes, movingPollPeriod, idlePollPeriod); + = new ACRController(portName, ACRPortName, numAxes, movingPollPeriod/1000., idlePollPeriod/1000.); pACRController = NULL; return(asynSuccess); } diff --git a/motorApp/ACRSrc/ACRMotorDriver.h b/motorApp/ACRSrc/ACRMotorDriver.h index d77f7271..53f9e561 100644 --- a/motorApp/ACRSrc/ACRMotorDriver.h +++ b/motorApp/ACRSrc/ACRMotorDriver.h @@ -50,7 +50,7 @@ friend class ACRController; class ACRController : public asynMotorController { public: - ACRController(const char *portName, const char *ACRPortName, int numAxes, int movingPollPeriod, int idlePollPeriod); + ACRController(const char *portName, const char *ACRPortName, int numAxes, double movingPollPeriod, double idlePollPeriod); /* These are the methods that we override from asynMotorDriver */ asynStatus writeInt32(asynUser *pasynUser, epicsInt32 value);