Fixed scaling of the written motorVelocity value

commit d90869cbca
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 10 13:18:43 2026 +0100

    Added reminder comment

commit eadce0f594
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 10 12:31:01 2026 +0100

    Draft velocity mode

    See TODO in src/masterMacsAxis.cpp, line 552. The velocity readback is
    the only thing that doesn't work properly, everything else does work.
    Once a solution has been found here, this can be a new minor release.

commit 0e1f95a94b
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 10 09:04:04 2026 +0100

    Updated sinqMotor and use setLimits

commit b01f398533
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 10 09:00:58 2026 +0100

    Set move flag correctly in velocity / jog mode

commit 56d9d20c3a
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 3 17:57:00 2026 +0100

    Simplified handling of velocity mode using standard EPICS motor record fields

commit 4634609891
Author: smathis <stefan.mathis@psi.ch>
Date:   Tue Feb 3 13:35:24 2026 +0100

    Rolled back to sinqMotor 1.5.7

Makefile

@@ -7,9 +7,7 @@ EPICS_VERSIONS=7.0.7
 ARCH_FILTER=RHEL%
 
 # Specify the version of asynMotor we want to build against
-motorBase_VERSION=7.2.2
-
-LIBVERSION=homeerror
+motorBase_VERSION=7.3.2
 
 # These headers allow to depend on this library for derived drivers.
 HEADERS += src/masterMacsAxis.h

src/masterMacsAxis.cpp

@@ -11,6 +11,11 @@
 #include <string.h>
 #include <unistd.h>
 
+enum moveMode {
+    positionMode,
+    velocityMode,
+};
+
 struct masterMacsAxisImpl {
     /*
     The axis status and axis error of MasterMACS are given as an integer from
@@ -24,6 +29,7 @@ struct masterMacsAxisImpl {
     bool needInit = true;
     bool targetReachedUninitialized;
     bool dynamicLimits;
+    moveMode lastMoveCommand;
 };
 
 /*
@@ -94,6 +100,7 @@ masterMacsAxis::masterMacsAxis(masterMacsController *pC, int axisNo)
           .timeAtHandshake = 0,
           .targetReachedUninitialized = true,
           .dynamicLimits = false,
+          .lastMoveCommand = positionMode,
       })) {
 
     asynStatus status = asynSuccess;
@@ -190,9 +197,7 @@ asynStatus masterMacsAxis::init() {
     double motVelocity = 0.0;
     double motVmax = 0.0;
     double motAccel = 0.0;
-    int motMode = 0;
     int dynamicLimits = 0;
-    int motCanSetMode = 0;
 
     // =========================================================================
 
@@ -262,7 +267,7 @@ asynStatus masterMacsAxis::init() {
                                           __PRETTY_FUNCTION__, __LINE__);
     }
 
-    status = setVeloFields(motVelocity, 0.0, motVmax);
+    status = setVeloFields(abs(motVelocity), 0.0, motVmax);
     if (status != asynSuccess) {
         return status;
     }
@@ -306,37 +311,6 @@ asynStatus masterMacsAxis::init() {
     }
     pMasterMacsA_->dynamicLimits = bool(dynamicLimits);
 
-    // Check the current motor mode
-    status = pC_->read(axisNo_, 07, response);
-    if (status != asynSuccess) {
-        return status;
-    }
-    nvals = sscanf(response, "%d", &motMode);
-    if (nvals != 1) {
-        return pC_->couldNotParseResponse("R07", response, axisNo_,
-                                          __PRETTY_FUNCTION__, __LINE__);
-    }
-
-    // If the readback value from the controller is 3, it is in velocity mode,
-    // which sinqMotor encodes as a 1. Otherwise, it is in position mode.
-    setAxisParamChecked(this, motorMode, motMode == 3);
-
-    // Check if the motor can switch its mode
-    status = pC_->read(axisNo_, 31, response);
-    if (status != asynSuccess) {
-        return status;
-    }
-    nvals = sscanf(response, "%d", &motCanSetMode);
-    if (nvals != 1) {
-        return pC_->couldNotParseResponse("R31", response, axisNo_,
-                                          __PRETTY_FUNCTION__, __LINE__);
-    }
-
-    // If the readback value from the controller is 3, the motor supports both
-    // velocity and position mode, otherwise just one of them (the one read out
-    // with motMode).
-    setAxisParamChecked(this, motorCanSetMode, motCanSetMode == 3);
-
     status = readEncoderType();
     if (status != asynSuccess) {
         return status;
@@ -419,10 +393,7 @@ asynStatus masterMacsAxis::readLimits() {
     highLimit = highLimit - limitsOffset;
     lowLimit = lowLimit + limitsOffset;
 
-    setAxisParamChecked(this, motorHighLimitFromDriver, highLimit);
-    setAxisParamChecked(this, motorLowLimitFromDriver, lowLimit);
-
-    return status;
+    return setLimits(highLimit, lowLimit);
 }
 
 // Perform the actual poll
@@ -432,10 +403,10 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
     asynStatus poll_status = asynSuccess;
 
     // Status of read-write-operations of ASCII commands to the controller
-    asynStatus rw_status = asynSuccess;
+    asynStatus rwStatus = asynSuccess;
 
     // Status of parameter library operations
-    asynStatus pl_status = asynSuccess;
+    asynStatus plStatus = asynSuccess;
 
     char response[pC_->MAXBUF_] = {0};
     int nvals = 0;
@@ -484,8 +455,8 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
         }
 
         pC_->read(axisNo_, 86, response);
-        if (rw_status != asynSuccess) {
-            return rw_status;
+        if (rwStatus != asynSuccess) {
+            return rwStatus;
         }
 
         nvals = sscanf(response, "%lf", &handshakePerformed);
@@ -511,17 +482,56 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
     getAxisParamChecked(this, motorRecResolution, &motorRecResolution);
 
     // Read the previous motor position
-    pl_status = motorPosition(&previousPosition);
-    if (pl_status != asynSuccess) {
-        return pl_status;
+    plStatus = motorPosition(&previousPosition);
+    if (plStatus != asynSuccess) {
+        return plStatus;
     }
 
     // Update the axis status
-    rw_status = readAxisStatus();
-    if (rw_status != asynSuccess) {
-        return rw_status;
+    rwStatus = readAxisStatus();
+    if (rwStatus != asynSuccess) {
+        return rwStatus;
     }
 
+    rwStatus = pC_->read(axisNo_, 12, response);
+    if (rwStatus != asynSuccess) {
+        return rwStatus;
+    }
+    nvals = sscanf(response, "%lf", &currentPosition);
+    if (nvals != 1) {
+        return pC_->couldNotParseResponse("R12", response, axisNo_,
+                                          __PRETTY_FUNCTION__, __LINE__);
+    }
+
+    plStatus = setMotorPosition(currentPosition);
+    if (plStatus != asynSuccess) {
+        return plStatus;
+    }
+    setAxisParamChecked(this, motorEncoderPosition, currentPosition);
+
+    if (pMasterMacsA_->lastMoveCommand == velocityMode && !speedEqualZero()) {
+        double actualVelocity = 0.0;
+
+        rwStatus = pC_->read(axisNo_, 14, response);
+        if (rwStatus != asynSuccess) {
+            return rwStatus;
+        }
+        nvals = sscanf(response, "%lf", &actualVelocity);
+        if (nvals != 1) {
+            return pC_->couldNotParseResponse("R14", response, axisNo_,
+                                              __PRETTY_FUNCTION__, __LINE__);
+        }
+
+        // Writes the actual speed in steps per second to the paramLib. This
+        // value is then returned by the RVEL field of the motor record.
+        setAxisParamChecked(this, motorVelocity,
+                            actualVelocity / motorRecResolution);
+
+        // Motor is moving in velocity mode
+        *moving = true;
+
+    } else {
+
         // If we wait for a handshake, but the motor was moving in its last poll
         // cycle and has reached its target, it is not moving. Otherwise it is
         // considered moving, even if we're still waiting for the handshake.
@@ -538,24 +548,14 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
         if (targetReached()) {
             pMasterMacsA_->targetReachedUninitialized = false;
         }
-
-    // Read the current position
-    rw_status = pC_->read(axisNo_, 12, response);
-    if (rw_status != asynSuccess) {
-        return rw_status;
-    }
-    nvals = sscanf(response, "%lf", &currentPosition);
-    if (nvals != 1) {
-        return pC_->couldNotParseResponse("R12", response, axisNo_,
-                                          __PRETTY_FUNCTION__, __LINE__);
     }
 
     /*
-    Read out the error if either a fault condition status flag has been set or
-    if a movement has just ended.
+    Read out the error if either a fault condition status flag has been set
+    or if a movement has just ended.
      */
     if (faultConditionSet() || !(*moving)) {
-        rw_status = readAxisError();
+        rwStatus = readAxisError();
     }
 
     msgPrintControlKey keyError = msgPrintControlKey(
@@ -776,9 +776,9 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
     // Read out the limits, if the motor is not moving and if the limits are
     // dynamic
     if (pMasterMacsA_->dynamicLimits && !(*moving)) {
-        rw_status = readLimits();
-        if (rw_status != asynSuccess) {
-            return rw_status;
+        rwStatus = readLimits();
+        if (rwStatus != asynSuccess) {
+            return rwStatus;
         }
     }
 
@@ -803,15 +803,10 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
     setAxisParamChecked(this, motorStatusDone, !(*moving));
     setAxisParamChecked(this, motorStatusDirection, direction);
 
-    pl_status = setMotorPosition(currentPosition);
-    if (pl_status != asynSuccess) {
-        return pl_status;
-    }
     return poll_status;
 }
 
-asynStatus masterMacsAxis::doMoveVelocity(double minVelocity,
-                                          double maxVelocity,
+asynStatus masterMacsAxis::moveVelocity(double minVelocity, double maxVelocity,
                                         double acceleration) {
     // Suppress unused variable warning
     (void)minVelocity;
@@ -863,7 +858,14 @@ asynStatus masterMacsAxis::doMoveVelocity(double minVelocity,
 
     // Start the move. We do not use the MovTimeout watchdog here, because the
     // motor can move for any time in velocity mode.
-    return pC_->write(axisNo_, 00, "3", timeout);
+    status = pC_->write(axisNo_, 00, "3", timeout);
+    if (status != asynSuccess) {
+        return status;
+    }
+
+    // Cache the information that the current movement is in velocity mode
+    pMasterMacsA_->lastMoveCommand = velocityMode;
+    return status;
 }
 
 asynStatus masterMacsAxis::doMove(double position, int relative,
@@ -971,6 +973,8 @@ asynStatus masterMacsAxis::doMove(double position, int relative,
         return asynError;
     }
 
+    // Cache the information that the current movement is in position mode
+    pMasterMacsA_->lastMoveCommand = positionMode;
     return status;
 }
 
@@ -1271,8 +1275,8 @@ asynStatus masterMacsAxis::readAxisStatus() {
 
     // =========================================================================
 
-    asynStatus rw_status = pC_->read(axisNo_, 10, response);
-    if (rw_status == asynSuccess) {
+    asynStatus rwStatus = pC_->read(axisNo_, 10, response);
+    if (rwStatus == asynSuccess) {
 
         float axisStatus = 0;
         int nvals = sscanf(response, "%f", &axisStatus);
@@ -1284,7 +1288,7 @@ asynStatus masterMacsAxis::readAxisStatus() {
         pMasterMacsA_->axisStatus = toBitset(axisStatus);
     }
 
-    return rw_status;
+    return rwStatus;
 }
 
 asynStatus masterMacsAxis::readAxisError() {
@@ -1292,8 +1296,8 @@ asynStatus masterMacsAxis::readAxisError() {
 
     // =========================================================================
 
-    asynStatus rw_status = pC_->read(axisNo_, 11, response);
-    if (rw_status == asynSuccess) {
+    asynStatus rwStatus = pC_->read(axisNo_, 11, response);
+    if (rwStatus == asynSuccess) {
 
         float axisError = 0;
         int nvals = sscanf(response, "%f", &axisError);
@@ -1303,7 +1307,7 @@ asynStatus masterMacsAxis::readAxisError() {
         }
         pMasterMacsA_->axisError = toBitset(axisError);
     }
-    return rw_status;
+    return rwStatus;
 }
 
 bool masterMacsAxis::readyToBeSwitchedOn() {
@@ -1330,6 +1334,8 @@ bool masterMacsAxis::remoteMode() { return pMasterMacsA_->axisStatus[9]; }
 
 bool masterMacsAxis::targetReached() { return pMasterMacsA_->axisStatus[10]; }
 
+bool masterMacsAxis::speedEqualZero() { return pMasterMacsA_->axisStatus[12]; }
+
 bool masterMacsAxis::internalLimitActive() {
     return pMasterMacsA_->axisStatus[11];
 }

src/masterMacsAxis.h

@@ -52,16 +52,14 @@ class HIDDEN masterMacsAxis : public sinqAxis {
     asynStatus doPoll(bool *moving);
 
     /**
-     * @brief Implementation of the `doMoveVelocity` function from sinqAxis. The
-     * parameters are described in the documentation of
-     * `sinqAxis::doMoveVelocity`.
+     * @brief TODO
      *
      * @param minVelocity
      * @param maxVelocity
      * @param acceleration
      * @return asynStatus
      */
-    asynStatus doMoveVelocity(double minVelocity, double maxVelocity,
+    asynStatus moveVelocity(double minVelocity, double maxVelocity,
                             double acceleration);
 
     /**
@@ -252,6 +250,12 @@ class HIDDEN masterMacsAxis : public sinqAxis {
      */
     bool internalLimitActive();
 
+    /**
+     * @brief Read the property from axisStatus (see masterMacsAxisImpl
+     * redefinition in masterMacsAxis.cpp)
+     */
+    bool speedEqualZero();
+
     // Bits 12 and 13 are unused
 
     /**