lin-epics-modules/detectortower
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated turboPmac version

Browse Source
This commit is contained in:
mathis_s
2025-06-17 13:26:13 +02:00
parent f745af48fe
commit 6e99b37ed2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/detectorTowerController.cpp
View File

@ -286,7 +286,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
int error = 0; int error = 0;
int positionState = 0; int positionState = 0;
int inPosition = 0; int notInPosition = 0;
double angle = 0.0; double angle = 0.0;
double prevAngle = 0.0; double prevAngle = 0.0;
@ -403,7 +403,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
nvals = nvals =
sscanf(response, sscanf(response,
"%d %d %d %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf", "%d %d %d %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
&inPosition, &positionState, &error, &angle, &angleHighLimit, &notInPosition, &positionState, &error, &angle, &angleHighLimit,
&angleLowLimit, &angleOrigin, &angleAdjustOriginHighLimit, &angleLowLimit, &angleOrigin, &angleAdjustOriginHighLimit,
&angleAdjustOriginLowLimit, &lift, &liftHighLimit, &liftLowLimit, &angleAdjustOriginLowLimit, &lift, &liftHighLimit, &liftLowLimit,
&liftOrigin, &liftAdjustOriginHighLimit, &liftOrigin, &liftAdjustOriginHighLimit,
@ -448,7 +448,7 @@ asynStatus detectorTowerController::pollDetectorAxes(
angleAxis->error_ = error; angleAxis->error_ = error;
// Check if the tower is moving // 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 // By now, the controller has actually started the movement
angleAxis->startingDeferredMovement_ = false; angleAxis->startingDeferredMovement_ = false;
*moving = true; *moving = true;

2
turboPmac

Submodule turboPmac updated: 4bc3388bc6...1703542770