Updated dependency turboPmac to 0.15.1
This commit is contained in:
@ -98,6 +98,8 @@ class detectorTowerAngleAxis : public turboPmacAxis {
|
|||||||
* @brief Overwrite the `reset` function so it doesn't do fast polls
|
* @brief Overwrite the `reset` function so it doesn't do fast polls
|
||||||
* afterwards.
|
* afterwards.
|
||||||
*
|
*
|
||||||
|
* The
|
||||||
|
*
|
||||||
* @return asynStatus
|
* @return asynStatus
|
||||||
*/
|
*/
|
||||||
asynStatus reset() { return doReset(); }
|
asynStatus reset() { return doReset(); }
|
||||||
|
@ -149,6 +149,27 @@ asynStatus detectorTowerController::writeInt32(asynUser *pasynUser,
|
|||||||
return sAxis->angleAxis()->toggleWorkingChangerState(value);
|
return sAxis->angleAxis()->toggleWorkingChangerState(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Due to a bug which is currently not understood, the reset has to be handled
|
||||||
|
here rather than in sinqController.
|
||||||
|
*/
|
||||||
|
if (pasynUser->reason == motorReset_) {
|
||||||
|
detectorTowerAngleAxis *aAxis = getDetectorTowerAngleAxis(pasynUser);
|
||||||
|
if (aAxis != nullptr) {
|
||||||
|
return aAxis->reset();
|
||||||
|
}
|
||||||
|
detectorTowerLiftAxis *lAxis = getDetectorTowerLiftAxis(pasynUser);
|
||||||
|
if (lAxis != nullptr) {
|
||||||
|
return lAxis->reset();
|
||||||
|
}
|
||||||
|
detectorTowerSupportAxis *sAxis =
|
||||||
|
getDetectorTowerSupportAxis(pasynUser);
|
||||||
|
if (sAxis != nullptr) {
|
||||||
|
return sAxis->reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return turboPmacController::writeInt32(pasynUser, value);
|
return turboPmacController::writeInt32(pasynUser, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Submodule turboPmac updated: 75292a6a9c...55b523ddaa
Reference in New Issue
Block a user