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

Minor changes to avoid compiler warnings

Browse Source
This commit is contained in:
MarkRivers
2012-12-06 22:22:51 +00:00
parent 4a756a11f5
commit 10b8775a06
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/SMC100Driver.cpp
+2 -6
View File
@@ -44,7 +44,6 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
{
int axis;
asynStatus status;
SMC100Axis *pAxis;
static const char *functionName = "SMC100Controller::SMC100Controller";
/* Connect to SMC100 controller */
@@ -55,8 +54,7 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
functionName);
}
for (axis=0; axis<numAxes; axis++) {
//for (axis=1; axis < (numAxes + 1); axis++) {
pAxis = new SMC100Axis(this, axis);
new SMC100Axis(this, axis);
}
startPoller(movingPollPeriod, idlePollPeriod, 2);
@@ -74,9 +72,7 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
extern "C" int SMC100CreateController(const char *portName, const char *SMC100PortName, int numAxes,
int movingPollPeriod, int idlePollPeriod)
{
SMC100Controller *pSMC100Controller
= new SMC100Controller(portName, SMC100PortName, numAxes, movingPollPeriod/1000., idlePollPeriod/1000.);
pSMC100Controller = NULL;
new SMC100Controller(portName, SMC100PortName, numAxes, movingPollPeriod/1000., idlePollPeriod/1000.);
return(asynSuccess);
}
motorApp/NewportSrc/XPSAxis.cpp
+6 -7
View File
@@ -142,7 +142,6 @@ XPSAxis::XPSAxis(XPSController *pC, int axisNo, const char *positionerName, doub
{
static const char *functionName = "XPSAxis";
char *index;
int status;
double minJerkTime, maxJerkTime;
moveSocket_ = TCP_ConnectToServer(pC_->IPAddress_, pC->IPPort_, XPS_POLL_TIMEOUT);
@@ -186,12 +185,12 @@ XPSAxis::XPSAxis(XPSController *pC, int axisNo, const char *positionerName, doub
stepSize_ = stepSize;
/* Read some information from the controller for this axis */
status = PositionerSGammaParametersGet(pollSocket_,
positionerName_,
&velocity_,
&accel_,
&minJerkTime,
&maxJerkTime);
PositionerSGammaParametersGet(pollSocket_,
positionerName_,
&velocity_,
&accel_,
&minJerkTime,
&maxJerkTime);
setDoubleParam(pC_->XPSMinJerk_, minJerkTime);
setDoubleParam(pC_->XPSMaxJerk_, maxJerkTime);