Minor changes to SINQ drivers:
- Fixed enable/disable at MasterMACS
This commit is contained in:
@ -279,6 +279,7 @@ EuroMoveAxis::EuroMoveAxis(EuroMoveController *pC, int axisNo)
|
||||
pC_(pC)
|
||||
{
|
||||
motNo = axisNo;
|
||||
next_poll = -1;
|
||||
}
|
||||
|
||||
|
||||
|
@ -191,13 +191,13 @@ asynStatus
|
||||
startTime = DoubleTime();
|
||||
status =
|
||||
pasynOctetSyncIO->writeRead(pasynUserController_, mmacsData,
|
||||
len - 1, mmacsResponse, 35, 10., &out,
|
||||
len - 1, mmacsResponse, 35, 20., &out,
|
||||
&in, &reason);
|
||||
|
||||
if(timeDebug) {
|
||||
now = DoubleTime();
|
||||
if((now - startTime) > 1.) {
|
||||
errlogSevPrintf(errlogMajor, "Unusual response time %lf to command %s\n", (now - startTime), command);
|
||||
errlogSevPrintf(errlogMajor, "Unusual long response time %lf to command %s\n", (now - startTime), command);
|
||||
}
|
||||
}
|
||||
|
||||
@ -399,6 +399,7 @@ pC_(pC)
|
||||
int devStatus = readStatus();
|
||||
setIntegerParam(pC_->enableAxis_, isOn(devStatus));
|
||||
setIntegerParam(pC_->axisEnabled_, isOn(devStatus));
|
||||
lastPoll = -1;
|
||||
}
|
||||
|
||||
/** Reports on status of the axis
|
||||
@ -657,6 +658,9 @@ asynStatus MasterMACSAxis::poll(bool * moving)
|
||||
}
|
||||
} else {
|
||||
errlogPrintf("MMACS: communication problem reading axis %d position\n", axisNo_);
|
||||
*moving = false;
|
||||
comStatus = asynError;
|
||||
goto skip;
|
||||
}
|
||||
|
||||
// Read the overall status of this motor */
|
||||
|
@ -138,7 +138,7 @@ NanotecAxis::NanotecAxis(NanotecController *pC, int axisNo, int busAddress)
|
||||
pC_(pC)
|
||||
{
|
||||
this->busAddress = busAddress;
|
||||
|
||||
next_poll = -1;
|
||||
}
|
||||
|
||||
|
||||
|
@ -185,7 +185,7 @@ asynStatus PhytronController::transactController(int axisNo,char command[COMLEN]
|
||||
SINQAxis *axis = getAxis(axisNo);
|
||||
|
||||
|
||||
pasynOctetSyncIO->flush(pasynUserController_);
|
||||
/* pasynOctetSyncIO->flush(pasynUserController_); */
|
||||
|
||||
|
||||
memset(myCommand,0,sizeof(myCommand));
|
||||
@ -249,6 +249,7 @@ PhytronAxis::PhytronAxis(PhytronController *pC, int axisNo, int enc)
|
||||
}
|
||||
haveBrake = 0;
|
||||
brakeIO = -1;
|
||||
next_poll = -1;
|
||||
}
|
||||
|
||||
int PhytronAxis::setBrake(int brakeNO)
|
||||
|
@ -631,7 +631,7 @@ asynStatus pmacAxis::enable(int on) {
|
||||
* ======================================================*/
|
||||
SeleneAxis::SeleneAxis(SeleneController *pC, int axisNo, double limitTarget)
|
||||
: pmacAxis(pC, axisNo, false) {
|
||||
static const char *functionName = "pmacAxis::pmacAxis";
|
||||
static const char *functionName = "SeleneAxis::SeleneAxis";
|
||||
|
||||
pC_->debugFlow(functionName);
|
||||
|
||||
|
@ -788,7 +788,7 @@ asynStatus SeleneController::writeFloat64(asynUser *pasynUser, epicsFloat64 valu
|
||||
int function = pasynUser->reason;
|
||||
asynStatus status = asynError;
|
||||
SeleneAxis *pAxis = NULL;
|
||||
char command[64] = {0};
|
||||
cchar command[64] = {0};
|
||||
char response[64] = {0};
|
||||
char message[132];
|
||||
|
||||
|
Reference in New Issue
Block a user