Specified new version for sinqMotor
This commit is contained in:
Submodule sinqMotor updated: 4d1c21fd74...5689402375
@@ -356,7 +356,6 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
|
||||
// poll. This is already part of the movement procedure.
|
||||
*moving = true;
|
||||
|
||||
setAxisParamChecked(this, motorStatusMoving, *moving);
|
||||
pl_status = setIntegerParam(pC_->motorStatusMoving(), *moving);
|
||||
if (pl_status != asynSuccess) {
|
||||
return pC_->paramLibAccessFailed(pl_status,
|
||||
|
||||
@@ -470,7 +470,8 @@ asynStatus masterMacsController::parseResponse(
|
||||
return asynError;
|
||||
}
|
||||
|
||||
asynStatus sinqController::readInt32(asynUser *pasynUser, epicsInt32 *value) {
|
||||
asynStatus masterMacsController::readInt32(asynUser *pasynUser,
|
||||
epicsInt32 *value) {
|
||||
// masterMacs can be disabled
|
||||
if (pasynUser->reason == motorCanDisable_) {
|
||||
*value = 1;
|
||||
|
||||
@@ -125,6 +125,8 @@ class masterMacsController : public sinqController {
|
||||
*/
|
||||
double comTimeout() { return comTimeout_; }
|
||||
|
||||
asynStatus readInt32(asynUser *pasynUser, epicsInt32 *value);
|
||||
|
||||
private:
|
||||
/*
|
||||
Stores the constructor input comTimeout
|
||||
|
||||
Reference in New Issue
Block a user