Removed node reset from doReset and moved it into dedicated function
A "normal" error reset should not trigger a node reset. However, this option is still available via a dedicated PV xx:NodeReset and a corresponding function in masterMacsAxis.
This commit is contained in:
@@ -811,6 +811,17 @@ asynStatus masterMacsAxis::doReset() {
|
||||
setAxisParamChecked(this, motorStatusProblem, true);
|
||||
}
|
||||
|
||||
// Move out of the handshake wait loop, if we're currently inside it.
|
||||
pMasterMacsA_->waitForHandshake = false;
|
||||
|
||||
// Disable the axis
|
||||
return enable(false);
|
||||
}
|
||||
|
||||
asynStatus masterMacsAxis::nodeReset() {
|
||||
|
||||
asynStatus status = asynSuccess;
|
||||
|
||||
// Reset any errors in the controller. Since the node reset results in a
|
||||
// power cycle, we use the corresponding timeout.
|
||||
status = pC_->write(axisNo_, 17, "", PowerCycleTimeout);
|
||||
|
||||
Reference in New Issue
Block a user