From f97d06ab0fd2304c6e2572ab7af989c7ed920b0e Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 28 Aug 2013 16:15:21 +0000 Subject: [PATCH] Removed motorVersion.h, does not exist; fixed names of 2 parameters; moved epicsExport.h to compile on Windows dynamically --- motorApp/PIGCS2Src/PIasynController.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/motorApp/PIGCS2Src/PIasynController.cpp b/motorApp/PIGCS2Src/PIasynController.cpp index c32f914c..f1c03509 100644 --- a/motorApp/PIGCS2Src/PIasynController.cpp +++ b/motorApp/PIGCS2Src/PIasynController.cpp @@ -33,15 +33,15 @@ Based on drvMotorSim.c, Mark Rivers, December 13, 2009 #include #include #include -#include #include -#include +//#include #include #include #include "PIasynController.h" #include "PIGCSController.h" #include "PIasynAxis.h" +#include //#undef asynPrint @@ -262,7 +262,7 @@ asynStatus PIasynController::writeInt32(asynUser *pasynUser, epicsInt32 value) * status at the end, but that's OK */ status = pAxis->setIntegerParam(function, value); - if (function == motorSetClosedLoop_) + if (function == motorClosedLoop_) { asynPrint(pasynUser, ASYN_TRACE_FLOW, "%s:%s: %sing Closed-Loop Control flag on driver %s\n", @@ -347,7 +347,7 @@ asynStatus PIasynController::writeFloat64(asynUser *pasynUser, epicsFloat64 valu /* Call base class call its method (if we have our parameters check this here) */ status = asynMotorController::writeFloat64(pasynUser, value); } - else if (function == motorEncRatio_) + else if (function == motorEncoderRatio_) { /* Call base class call its method (if we have our parameters check this here) */ status = asynMotorController::writeFloat64(pasynUser, value);