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

Change to single parameter version of callParamCallbacks, other version is an historical artifact, should not be used

Browse Source
This commit is contained in:
MarkRivers
2011-03-08 15:13:20 +00:00
parent c2728c01cc
commit 6e9ffc1b47
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/asynMotorDriver.cpp
+4 -4
View File
@@ -103,13 +103,13 @@ asynStatus asynMotorDriver::setDoubleParam(int axis, int function, double value)
return asynPortDriver::setDoubleParam(axis, function, value);
}
asynStatus asynMotorDriver::callParamCallbacks(int axis, int addr)
asynStatus asynMotorDriver::callParamCallbacks(int axis)
{
if (this->axisStatusChanged[axis]) {
this->axisStatusChanged[axis] = 0;
doCallbacksGenericPointer((void *)&this->axisStatus[axis], motorStatus, axis);
}
return asynPortDriver::callParamCallbacks(axis, addr);
return asynPortDriver::callParamCallbacks(axis);
}
asynStatus asynMotorDriver::writeInt32(asynUser *pasynUser, epicsInt32 value)
@@ -136,7 +136,7 @@ asynStatus asynMotorDriver::writeInt32(asynUser *pasynUser, epicsInt32 value)
}
/* Do callbacks so higher layers see any changes */
callParamCallbacks(axis, axis);
callParamCallbacks(axis);
if (status)
asynPrint(pasynUser, ASYN_TRACE_ERROR,
"%s:%s error, status=%d axis=%d, function=%d, value=%d\n",
@@ -184,7 +184,7 @@ asynStatus asynMotorDriver::writeFloat64(asynUser *pasynUser, epicsFloat64 value
}
/* Do callbacks so higher layers see any changes */
callParamCallbacks(axis, axis);
callParamCallbacks(axis);
if (status)
asynPrint(pasynUser, ASYN_TRACE_ERROR,
"%s:%s error, status=%d axis=%d, function=%d, value=%f\n",
motorApp/MotorSrc/asynMotorDriver.h
+1 -1
View File
@@ -70,7 +70,7 @@ public:
virtual asynStatus readGenericPointer(asynUser *pasynUser, void *pointer);
virtual asynStatus setIntegerParam(int list, int index, int value);
virtual asynStatus setDoubleParam(int list, int index, double value);
virtual asynStatus callParamCallbacks(int list, int addr);
virtual asynStatus callParamCallbacks(int addr);
/* These are the methods that are new to this class */
virtual asynStatus moveAxis(asynUser *pasynUser, double position, int relative, double min_velocity, double max_velocity, double acceleration);