Updated turboPmac version
This commit is contained in:
@ -286,7 +286,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
|
||||
|
||||
int error = 0;
|
||||
int positionState = 0;
|
||||
int inPosition = 0;
|
||||
int notInPosition = 0;
|
||||
|
||||
double angle = 0.0;
|
||||
double prevAngle = 0.0;
|
||||
@ -403,7 +403,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
|
||||
nvals =
|
||||
sscanf(response,
|
||||
"%d %d %d %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
|
||||
&inPosition, &positionState, &error, &angle, &angleHighLimit,
|
||||
¬InPosition, &positionState, &error, &angle, &angleHighLimit,
|
||||
&angleLowLimit, &angleOrigin, &angleAdjustOriginHighLimit,
|
||||
&angleAdjustOriginLowLimit, &lift, &liftHighLimit, &liftLowLimit,
|
||||
&liftOrigin, &liftAdjustOriginHighLimit,
|
||||
@ -448,7 +448,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
|
||||
angleAxis->error_ = error;
|
||||
|
||||
// Check if the tower is moving
|
||||
if (inPosition == 1 || positionState > 2) {
|
||||
if (notInPosition == 1 || positionState > 2) {
|
||||
// By now, the controller has actually started the movement
|
||||
angleAxis->startingDeferredMovement_ = false;
|
||||
*moving = true;
|
||||
|
Submodule turboPmac updated: 4bc3388bc6...1703542770
Reference in New Issue
Block a user