diff --git a/src/detectorTowerController.cpp b/src/detectorTowerController.cpp index 4efa924..65be765 100644 --- a/src/detectorTowerController.cpp +++ b/src/detectorTowerController.cpp @@ -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; diff --git a/turboPmac b/turboPmac index 4bc3388..1703542 160000 --- a/turboPmac +++ b/turboPmac @@ -1 +1 @@ -Subproject commit 4bc3388bc60fdb7b10494093d264c742aa1ccd42 +Subproject commit 1703542770aecbb752801f7812c47e4054b78f1a