Perform poll even if init fails

The expected version can now be set in the Makefile via USR_CXXFLAGS.
Additionally, the README.md has received documentation regarding the
version check. Lastly, the version check can now be disabled by omitting
the flags or setting one of them to a negative value.

.gitea/workflows/action.yaml

@@ -0,0 +1,24 @@
+name: Test And Build
+on: [push]
+
+jobs:
+  Lint:
+    runs-on: linepics
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+      - name: cppcheck
+        run: cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 src/*.cpp
+      - name: formatting
+        run: clang-format --style=file --Werror --dry-run src/*.cpp
+  Build:
+    runs-on: linepics
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+      - run: |
+          sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
+          echo -e "\nIGNORE_SUBMODULES += sinqmotor" >> Makefile
+          make install

.gitlab-ci.yml

@@ -1,48 +0,0 @@
-default:
-  image: docker.psi.ch:5000/sinqdev/sinqepics:latest
-
-stages:
-  - lint
-  - build
-  - test
-
-cppcheck:
-  stage: lint
-  script:
-    - cppcheck --std=c++17 --addon=cert --addon=misc --suppress=cert-STR07-C --error-exitcode=1 src/*.cpp
-  artifacts:
-    expire_in: 1 week
-  tags:
-    - sinq
-
-formatting:
-  stage: lint
-  script:
-    - clang-format --style=file --Werror --dry-run src/*.cpp
-  artifacts:
-    expire_in: 1 week
-  tags:
-    - sinq
-
-build_module:
-  stage: build
-  script:
-    - export SINQMOTOR_VERSION="$(grep 'sinqMotor_VERSION=' Makefile | cut -d= -f2)"
-    - git clone --depth 1 --branch "${SINQMOTOR_VERSION}" https://gitlab-ci-token:${CI_JOB_TOKEN}@git.psi.ch/sinq-epics-modules/sinqmotor.git
-    - pushd sinqmotor
-    - sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
-    - echo "LIBVERSION=${SINQMOTOR_VERSION}" >> Makefile
-    - make install
-    - popd
-    - sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile
-    - echo "LIBVERSION=${CI_COMMIT_TAG:-0.0.1}" >> Makefile
-    - make install
-    - cp -rT "/ioc/modules/masterMacs/$(ls -U /ioc/modules/masterMacs/ | head -1)" "./masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
-  artifacts:
-    name: "masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
-    paths:
-      - "masterMacs-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}/*"
-    expire_in: 1 week
-  when: always
-  tags:
-    - sinq

Makefile

@@ -4,7 +4,7 @@ include /ioc/tools/driver.makefile
 MODULE=masterMacs
 BUILDCLASSES=Linux
 EPICS_VERSIONS=7.0.7
-ARCH_FILTER=RHEL8%
+ARCH_FILTER=RHEL%
 
 # Specify the version of asynMotor we want to build against
 motorBase_VERSION=7.2.2
@@ -23,9 +23,14 @@ SOURCES += src/masterMacsController.cpp
 # Store the record files
 TEMPLATES += sinqMotor/db/asynRecord.db
 TEMPLATES += sinqMotor/db/sinqMotor.db
+TEMPLATES += db/masterMacs.db
 
 # This file registers the motor-specific functions in the IOC shell.
 DBDS += sinqMotor/src/sinqMotor.dbd
 DBDS += src/masterMacs.dbd
 
-USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Wextra -Werror
+USR_CFLAGS += -Wall -Wextra -Wunused-result -Wextra -Werror
+
+# These flags define the expected firmware version. See README.md, section
+# "Firmware version checking" for details.
+USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=2 -DFIRMWARE_MINOR_VERSION=2 -Wall -Wextra -Weffc++ -Wunused-result -Wextra

README.md

@@ -55,17 +55,43 @@ setMaxSubsequentTimeouts("$(NAME)", 20);
 setThresholdComTimeout("$(NAME)", 100, 1);
 
 # Parametrize the EPICS record database with the substitution file named after the MCU.
-epicsEnvSet("SINQDBPATH","$(sinqMotor_DB)/sinqMotor.db")
+epicsEnvSet("SINQDBPATH","$(masterMacs_DB)/sinqMotor.db")
 dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
 epicsEnvSet("SINQDBPATH","$(masterMacs_DB)/masterMacs.db")
 dbLoadTemplate("$(TOP)/$(NAME).substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$(NAME)")
-dbLoadRecords("$(sinqMotor_DB)/asynRecord.db","P=$(INSTR)$(NAME),PORT=$(ASYN_PORT)")
+dbLoadRecords("$(masterMacs_DB)/asynRecord.db","P=$(INSTR)$(NAME),PORT=$(ASYN_PORT)")
 ```
 
 ### Versioning
 
 Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.
 
+### Firmware version checking
+
+This driver expects a certain version of the firmware running on the controller itself.
+This is checked at IOC startup by reading the version directly from the hardware.
+If the firmware version is incompatible to the driver, the IOC will be shut down.
+If the firmware version cannot be read (e.g. because the variable used to do so
+does not exist yet on old firmware versions), the firmware is assumed to be compatible
+to the driver.
+
+The version check is separated into a check of the major and the minor firmware
+version against expected values. The firmware is seen as compatible if the following conditions hold:
+- Read-out major version == Expected major version
+- Read-out read major version >= Expected minor version
+
+The expected versions are defined via compiler flags in `Makefile`:
+
+```
+USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=1 -DFIRMWARE_MINOR_VERSION=0
+```
+Be aware that these flags are only used to compile C++-files (.cpp, .cxx) and not
+C-files (.c). For C-files, the Makefile variable `USR_CFLAGS` must be used.
+
+In order to disable the checks, the flags can be set to -1 or just be removed
+entirely. If one of the flags is not given, both the major and the minor version 
+checks are deactivated.
+
 ### How to build it
 
 Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.

db/masterMacs.db

@@ -0,0 +1,7 @@
+# Call the nodeReset function of the corresponding masterMacsAxis.
+# This record is coupled to the parameter library via nodeReset_ -> NODE_RESET.
+record(longout, "$(INSTR)$(M):NodeReset") {
+    field(DTYP, "asynInt32")
+    field(OUT, "@asyn($(CONTROLLER),$(AXIS),1) NODE_RESET")
+    field(PINI, "NO")
+}

src/masterMacsAxis.h

@@ -1,16 +1,12 @@
 #ifndef masterMacsAXIS_H
 #define masterMacsAXIS_H
+#include "masterMacsController.h"
 #include "sinqAxis.h"
 #include <memory>
 
-// Forward declaration of the controller class to resolve the cyclic dependency
-// between the controller and the axis .h-file. See
-// https://en.cppreference.com/w/cpp/language/class.
-class masterMacsController;
+struct HIDDEN masterMacsAxisImpl;
 
-struct masterMacsAxisImpl;
-
-class masterMacsAxis : public sinqAxis {
+class HIDDEN masterMacsAxis : public sinqAxis {
   public:
     /**
      * @brief Construct a new masterMacsAxis
@@ -20,6 +16,13 @@ class masterMacsAxis : public sinqAxis {
      */
     masterMacsAxis(masterMacsController *pController, int axisNo);
 
+    /**
+     * @brief Delete the copy and copy assignment constructors, because this
+     * class should not be copied (it is tied to hardware!)
+     */
+    masterMacsAxis(const masterMacsAxis &) = delete;
+    masterMacsAxis &operator=(const masterMacsAxis &) = delete;
+
     /**
      * @brief Destroy the masterMacsAxis
      *
@@ -54,13 +57,13 @@ class masterMacsAxis : public sinqAxis {
      *
      * @param position
      * @param relative
-     * @param min_velocity
-     * @param max_velocity
+     * @param minVelocity
+     * @param maxVelocity
      * @param acceleration
      * @return asynStatus
      */
-    asynStatus doMove(double position, int relative, double min_velocity,
-                      double max_velocity, double acceleration);
+    asynStatus doMove(double position, int relative, double minVelocity,
+                      double maxVelocity, double acceleration);
 
     /**
      * @brief Implementation of the `stop` function from asynMotorAxis
@@ -79,12 +82,27 @@ class masterMacsAxis : public sinqAxis {
      */
     asynStatus doReset();
 
+    /**
+     * @brief Performs a "node reset" on the axis as defined in the CANopen
+     * standard
+     *
+     * A "node reset" is a factory reset on the axis which completely deletes
+     * all configured information (e.g. limits or speed) from the axis. The
+     * MasterMACS controller then reapplies the initial configuration to this
+     * axis. It can therefore be seen as a "hard" version of the normal error
+     * reset performed by the `doReset` method.
+     *
+     * @return asynStatus
+     */
+    asynStatus nodeReset();
+
     /**
      * @brief Readout of some values from the controller at IOC startup
      *
      * The following steps are performed:
-     * - Read out the motor status, motor position, velocity and acceleration
-     * from the MCU and store this information in the parameter library.
+     * - Read out the motor status, motor position, velocity and
+     * acceleration from the MCU and store this information in the parameter
+     * library.
      * - Set the enable PV accordint to the initial status of the axis.
      *
      * @return asynStatus
@@ -100,8 +118,8 @@ class masterMacsAxis : public sinqAxis {
     asynStatus enable(bool on);
 
     /**
-     * @brief Read the encoder type (incremental or absolute) for this axis from
-     * the MCU and store the information in the PV ENCODER_TYPE.
+     * @brief Read the encoder type (incremental or absolute) for this axis
+     * from the MCU and store the information in the PV ENCODER_TYPE.
      *
      * @return asynStatus
      */
@@ -116,17 +134,21 @@ class masterMacsAxis : public sinqAxis {
     bool needInit();
 
     /**
-     * @brief Instruct the axis to run its init() function during the next poll
+     * @brief Instruct the axis to run its init() function during the next
+     * poll
      *
      * @param needInit
      */
     void setNeedInit(bool needInit);
 
-    asynStatus readConfig();
+    /**
+     * @brief Return a pointer to the axis controller
+     */
+    virtual masterMacsController *pController() override { return pC_; };
 
     /**
-     * @brief Read the Master MACS status with the xR10 command and store the
-     * result in axisStatus_
+     * @brief Read the Master MACS status with the xR10 command and store
+     * the result in axisStatus_
      *
      */
     asynStatus readAxisStatus();
@@ -204,8 +226,8 @@ class masterMacsAxis : public sinqAxis {
     bool powerEnabled();
 
     /**
-     * @brief Read the Master MACS status with the xR10 command and store the
-     * result in axisStatus_
+     * @brief Read the Master MACS status with the xR10 command and store
+     * the result in axisStatus_
      *
      */
     asynStatus readAxisError();

src/masterMacsController.cpp

@@ -12,8 +12,33 @@
 #include <string>
 #include <unistd.h>
 
+/*
+These functions are used to read out the compiler flags defining the major and
+minor versions. See README.md, section "Firmware version checking" for
+details. If these flags are not given, a default value of -1 is used, which
+disables the version checks (it suffices to have one of these at -1 to disable
+both major and minor version check)
+ */
+constexpr int firmware_major_version() {
+#ifdef FIRMWARE_MAJOR_VERSION
+    return FIRMWARE_MAJOR_VERSION;
+#else
+    return -1;
+#endif
+}
+constexpr int firmware_minor_version() {
+#ifdef FIRMWARE_MINOR_VERSION
+    return FIRMWARE_MINOR_VERSION;
+#else
+    return -1;
+#endif
+}
+
 struct masterMacsControllerImpl {
     double comTimeout;
+
+    // Indices of additional ParamLib entries
+    int nodeReset;
 };
 
 /**
@@ -56,17 +81,32 @@ masterMacsController::masterMacsController(const char *portName,
     : sinqController(portName, ipPortConfigName, numAxes, movingPollPeriod,
                      idlePollPeriod,
                      // No additional parameter library entries
-                     0)
+                     0),
+      pMasterMacsC_(
+          std::make_unique<masterMacsControllerImpl>((masterMacsControllerImpl){
+              .comTimeout = comTimeout,
+              .nodeReset = 0, // Overwritten later
+          }))
 
 {
 
     // Initialization of local variables
     asynStatus status = asynSuccess;
+    char response[MAXBUF_] = {0};
 
-    pMasterMacsC_ =
-        std::make_unique<masterMacsControllerImpl>((masterMacsControllerImpl){
-            .comTimeout = comTimeout,
-        });
+    // =========================================================================
+    // Create additional parameter library entries
+
+    status =
+        createParam("NODE_RESET", asynParamInt32, &pMasterMacsC_->nodeReset);
+    if (status != asynSuccess) {
+        asynPrint(this->pasynUser(), ASYN_TRACE_ERROR,
+                  "Controller \"%s\" => %s, line %d\nFATAL ERROR (creating a "
+                  "parameter failed with %s).\nTerminating IOC",
+                  portName, __PRETTY_FUNCTION__, __LINE__,
+                  stringifyAsynStatus(status));
+        exit(-1);
+    }
 
     // =========================================================================
 
@@ -99,6 +139,60 @@ masterMacsController::masterMacsController(const char *portName,
         pasynOctetSyncIO->disconnect(pasynOctetSyncIOipPort());
         exit(-1);
     }
+
+    // =========================================================================
+
+    if (firmware_major_version() >= 0 && firmware_minor_version() >= 0) {
+        // Check the firmware version according to the conditions outlined in
+        // README.md
+        status = read(0, 99, response);
+
+        if (status == asynSuccess) {
+
+            // Just interpret the version if the variable already exists
+            double versionRaw = 0.0;
+            int nvals = sscanf(response, "%lf", &versionRaw);
+            if (nvals == 1 && versionRaw != 0.0) {
+                // Discard decimal part
+                long long versionInt = (long long)versionRaw;
+
+                // Extract bugfix (last 3 digits)
+                // Currently not used, just here for completions sake
+                // int bugfix = versionInt % 1000;
+                versionInt /= 1000;
+
+                // Extract minor (next 3 digits)
+                int minor = versionInt % 1000;
+                versionInt /= 1000;
+
+                // Remaining is major
+                int major = (int)versionInt;
+
+                // Compare to target values
+                if (firmware_major_version() != major ||
+                    firmware_minor_version() > minor) {
+                    asynPrint(this->pasynUser(), ASYN_TRACE_ERROR,
+                              "Controller \"%s\" => %s, line %d\nFATAL ERROR "
+                              "(Incorrect "
+                              "version number of firmware: Expected major "
+                              "version equal "
+                              "to %d, got %d. Expected minor version equal to "
+                              "or larger "
+                              "than %d, got %d).\nTerminating IOC",
+                              portName, __PRETTY_FUNCTION__, __LINE__,
+                              firmware_major_version(), major,
+                              firmware_minor_version(), minor);
+                    exit(-1);
+                }
+            }
+        } else {
+            asynPrint(
+                this->pasynUser(), ASYN_TRACE_ERROR,
+                "Controller \"%s\" => %s, line %d\nCould not read firmware "
+                "version\n",
+                portName, __PRETTY_FUNCTION__, __LINE__);
+        }
+    }
 }
 
 /*
@@ -120,8 +214,24 @@ masterMacsAxis *masterMacsController::getMasterMacsAxis(int axisNo) {
     return dynamic_cast<masterMacsAxis *>(asynAxis);
 }
 
+asynStatus masterMacsController::writeInt32(asynUser *pasynUser,
+                                            epicsInt32 value) {
+    int function = pasynUser->reason;
+
+    // =====================================================================
+
+    masterMacsAxis *axis = getMasterMacsAxis(pasynUser);
+
+    // Handle custom PVs
+    if (function == nodeReset()) {
+        return axis->nodeReset();
+    } else {
+        return sinqController::writeInt32(pasynUser, value);
+    }
+}
+
 asynStatus masterMacsController::read(int axisNo, int tcpCmd, char *response,
-                                      double comTimeout) {
+                                      double /*comTimeout*/) {
     return writeRead(axisNo, tcpCmd, NULL, response);
 }
 
@@ -136,7 +246,6 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
 
     // Definition of local variables.
     asynStatus status = asynSuccess;
-    asynStatus pl_status = asynSuccess;
     char fullCommand[MAXBUF_] = {0};
     char fullResponse[MAXBUF_] = {0};
     char drvMessageText[MAXBUF_] = {0};
@@ -167,12 +276,6 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
         comTimeout = pMasterMacsC_->comTimeout;
     }
 
-    masterMacsAxis *axis = getMasterMacsAxis(axisNo);
-    if (axis == nullptr) {
-        // We already did the error logging directly in getAxis
-        return asynError;
-    }
-
     // Build the full command depending on the inputs to this function
     if (isRead) {
         snprintf(fullCommand, MAXBUF_ - 1, "%dR%02d\x0D", axisNo, tcpCmd);
@@ -254,54 +357,38 @@ asynStatus masterMacsController::writeRead(int axisNo, int tcpCmd,
     }
 
     // Log the overall status (communication successfull or not)
-    if (status == asynSuccess) {
-        pl_status = axis->setIntegerParam(this->motorStatusCommsError_, 0);
-    } else {
-
-        /*
-        Since the communication failed, there is the possibility that the
-        controller is not connected at all to the network. In that case, we
-        cannot be sure that the information read out in the init method of the
-        axis is still up-to-date the next time we get a connection. Therefore,
-        an info flag is set which the axis object can use at the start of its
-        poll method to try to initialize itself.
-        */
-        axis->setNeedInit(true);
-
-        /*
-        Check if the axis already is in an error communication mode. If
-        it is not, upstream the error. This is done to avoid "flooding"
-        the user with different error messages if more than one error
-        ocurred before an error-free communication
-        */
-        pl_status =
-            getIntegerParam(axisNo, motorStatusProblem_, &motorStatusProblem);
-        if (pl_status != asynSuccess) {
-            return paramLibAccessFailed(pl_status, "motorStatusProblem", axisNo,
-                                        __PRETTY_FUNCTION__, __LINE__);
+    if (axisNo != 0) {
+        masterMacsAxis *axis = getMasterMacsAxis(axisNo);
+        if (axis == nullptr) {
+            // We already did the error logging directly in getAxis
+            return asynError;
         }
 
-        if (motorStatusProblem == 0) {
-            pl_status =
-                axis->setStringParam(motorMessageText(), drvMessageText);
-            if (pl_status != asynSuccess) {
-                return paramLibAccessFailed(pl_status, "motorMessageText",
-                                            axisNo, __PRETTY_FUNCTION__,
-                                            __LINE__);
-            }
+        if (status == asynSuccess) {
+            setAxisParamChecked(axis, motorStatusCommsError, false);
+        } else {
+            /*
+            Since the communication failed, there is the possibility that the
+            controller is not connected at all to the network. In that case, we
+            cannot be sure that the information read out in the init method of
+            the axis is still up-to-date the next time we get a connection.
+            Therefore, an info flag is set which the axis object can use at the
+            start of its poll method to try to initialize itself.
+            */
+            axis->setNeedInit(true);
 
-            pl_status = axis->setIntegerParam(motorStatusProblem_, 1);
-            if (pl_status != asynSuccess) {
-                return paramLibAccessFailed(pl_status, "motorStatusProblem",
-                                            axisNo, __PRETTY_FUNCTION__,
-                                            __LINE__);
-            }
+            /*
+            Check if the axis already is in an error communication mode. If
+            it is not, upstream the error. This is done to avoid "flooding"
+            the user with different error messages if more than one error
+            ocurred before an error-free communication
+            */
+            getAxisParamChecked(axis, motorStatusProblem, &motorStatusProblem);
 
-            pl_status = axis->setIntegerParam(motorStatusProblem_, 1);
-            if (pl_status != asynSuccess) {
-                return paramLibAccessFailed(pl_status, "motorStatusCommsError_",
-                                            axisNo, __PRETTY_FUNCTION__,
-                                            __LINE__);
+            if (motorStatusProblem == 0) {
+                setAxisParamChecked(axis, motorMessageText, drvMessageText);
+                setAxisParamChecked(axis, motorStatusProblem, true);
+                setAxisParamChecked(axis, motorStatusCommsError, false);
             }
         }
     }
@@ -325,18 +412,21 @@ asynStatus masterMacsController::parseResponse(
     bool responseValid = false;
     int responseStart = 0;
     asynStatus status = asynSuccess;
-    int prevConnected = 0;
+    int prevConnected = 1;
     char printableCommand[MAXBUF_] = {0};
     char printableResponse[MAXBUF_] = {0};
 
     msgPrintControlKey parseKey =
         msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
 
+    masterMacsAxis *axis = getMasterMacsAxis(axisNo);
+    if (axisNo != 0 && axis == nullptr) {
+        return asynError;
+    }
+
     // Was the motor previously connected?
-    status = getIntegerParam(axisNo, motorConnected(), &prevConnected);
-    if (status != asynSuccess) {
-        return paramLibAccessFailed(status, "motorConnected", axisNo,
-                                    __PRETTY_FUNCTION__, __LINE__);
+    if (axis != nullptr) {
+        getAxisParamChecked(axis, motorConnected, &prevConnected);
     }
 
     // We don't use strlen here since the C string terminator 0x00
@@ -361,23 +451,17 @@ asynStatus masterMacsController::parseResponse(
                           "connected.\n",
                           portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
 
-                masterMacsAxis *axis = getMasterMacsAxis(axisNo);
-                if (axis == nullptr) {
-                    return asynError;
-                }
-                status = axis->setIntegerParam(motorConnected(), 1);
-                if (status != asynSuccess) {
-                    return paramLibAccessFailed(status, "motorConnected",
-                                                axisNo, __PRETTY_FUNCTION__,
-                                                __LINE__);
-                }
-                status = callParamCallbacks();
-                if (status != asynSuccess) {
-                    asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
-                              "Controller \"%s\", axis %d => %s, line "
-                              "%d:\nCould not update parameter library\n",
-                              portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
-                    return status;
+                if (axis != nullptr) {
+                    setAxisParamChecked(axis, motorConnected, true);
+                    status = callParamCallbacks();
+                    if (status != asynSuccess) {
+                        asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
+                                  "Controller \"%s\", axis %d => %s, line "
+                                  "%d:\nCould not update parameter library\n",
+                                  portName, axisNo, __PRETTY_FUNCTION__,
+                                  __LINE__);
+                        return status;
+                    }
                 }
             }
 
@@ -398,23 +482,17 @@ asynStatus masterMacsController::parseResponse(
                           "disconnected.\n",
                           portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
 
-                masterMacsAxis *axis = getMasterMacsAxis(axisNo);
-                if (axis == nullptr) {
-                    return asynError;
-                }
-                status = axis->setIntegerParam(motorConnected(), 0);
-                if (status != asynSuccess) {
-                    return paramLibAccessFailed(status, "motorConnected",
-                                                axisNo, __PRETTY_FUNCTION__,
-                                                __LINE__);
-                }
-                status = callParamCallbacks();
-                if (status != asynSuccess) {
-                    asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
-                              "Controller \"%s\", axis %d => %s, line "
-                              "%d:\nCould not update parameter library\n",
-                              portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
-                    return status;
+                if (axis != nullptr) {
+                    setAxisParamChecked(axis, motorConnected, false);
+                    status = callParamCallbacks();
+                    if (status != asynSuccess) {
+                        asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
+                                  "Controller \"%s\", axis %d => %s, line "
+                                  "%d:\nCould not update parameter library\n",
+                                  portName, axisNo, __PRETTY_FUNCTION__,
+                                  __LINE__);
+                        return status;
+                    }
                 }
             }
             break;
@@ -500,6 +578,8 @@ asynStatus masterMacsController::readInt32(asynUser *pasynUser,
 
 double masterMacsController::comTimeout() { return pMasterMacsC_->comTimeout; }
 
+int masterMacsController::nodeReset() { return pMasterMacsC_->nodeReset; }
+
 /***************************************************************************/
 /** The following functions are C-wrappers, and can be called directly from
  * iocsh */
@@ -559,7 +639,8 @@ static const iocshArg *const CreateControllerArgs[] = {
     &CreateControllerArg0, &CreateControllerArg1, &CreateControllerArg2,
     &CreateControllerArg3, &CreateControllerArg4, &CreateControllerArg5};
 static const iocshFuncDef configMasterMacsCreateController = {
-    "masterMacsController", 6, CreateControllerArgs};
+    "masterMacsController", 6, CreateControllerArgs,
+    "Create a new instance of a MasterMACS controller."};
 static void configMasterMacsCreateControllerCallFunc(const iocshArgBuf *args) {
     masterMacsCreateController(args[0].sval, args[1].sval, args[2].ival,
                                args[3].dval, args[4].dval, args[5].dval);

src/masterMacsController.h

@@ -8,14 +8,18 @@
 
 #ifndef masterMacsController_H
 #define masterMacsController_H
-#include "masterMacsAxis.h"
 #include "sinqAxis.h"
 #include "sinqController.h"
 #include <memory>
 
-struct masterMacsControllerImpl;
+// Forward declaration of the controller class to resolve the cyclic dependency
+// between the controller and the axis .h-file. See
+// https://en.cppreference.com/w/cpp/language/class.
+class HIDDEN masterMacsAxis;
 
-class masterMacsController : public sinqController {
+struct HIDDEN masterMacsControllerImpl;
+
+class HIDDEN masterMacsController : public sinqController {
 
   public:
     /**
@@ -34,6 +38,13 @@ class masterMacsController : public sinqController {
                          int numAxes, double movingPollPeriod,
                          double idlePollPeriod, double comTimeout);
 
+    /**
+     * @brief Delete the copy and copy assignment constructors, because this
+     * class should not be copied (it is tied to hardware!)
+     */
+    masterMacsController(const masterMacsController &) = delete;
+    masterMacsController &operator=(const masterMacsController &) = delete;
+
     /**
      * @brief Overloaded version of the sinqController version
      *
@@ -61,6 +72,17 @@ class masterMacsController : public sinqController {
      */
     masterMacsAxis *getMasterMacsAxis(int axisNo);
 
+    /**
+     * @brief Overloaded function of sinqController
+     *
+     * The function is overloaded to allow resetting the node
+     *
+     * @param pasynUser           Specify the axis via the asynUser
+     * @param value               New value
+     * @return asynStatus
+     */
+    virtual asynStatus writeInt32(asynUser *pasynUser, epicsInt32 value);
+
     /**
      * @brief Send a command to the hardware (S mode)
      *
@@ -137,6 +159,9 @@ class masterMacsController : public sinqController {
      */
     double comTimeout();
 
+    // Accessors for additional PVs
+    int nodeReset();
+
   private:
     std::unique_ptr<masterMacsControllerImpl> pMasterMacsC_;
 };