Removed C++ only flag from USR_CFLAGS

USR_CFLAGS only applies to .c files, which are compiled with a C
compiler, therefore the C++ flag is not applied, resulting in a warning
during compilation.

.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,58 +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 --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
-
-# clangtidy:
-#   stage: lint
-#   script:
-#     - curl https://docker.psi.ch:5000/v2/_catalog
-# #     - dnf update -y
-# #     - dnf install -y clang-tools-extra
-# #     - clang-tidy sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h -checks=cppcoreguidelines-*,cert-*
-# #   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/turboPmac/$(ls -U /ioc/modules/turboPmac/ | head -1)" "./turboPmac-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
-  artifacts:
-    name: "turboPmac-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
-    paths:
-      - "turboPmac-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}/*"
-    expire_in: 1 week
-  when: always
-  tags:
-    - sinq

Makefile

@@ -34,4 +34,4 @@ TEMPLATES += db/turboPmac.db
 DBDS += sinqMotor/src/sinqMotor.dbd
 DBDS += src/turboPmac.dbd
 
-USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Werror # -Wpedantic // Does not work because EPICS macros trigger warnings
+USR_CFLAGS += -Wall -Wextra -Wunused-result -Werror -fvisibility=hidden # -Wpedantic // Does not work because EPICS macros trigger warnings

src/pmacAsynIPPort.c

@@ -230,8 +230,7 @@ static asynStatus sendPmacGetBuffer(pmacPvt *pPmacPvt, asynUser *pasynUser,
 
 // =============================================================================
 
-epicsShareFunc int pmacAsynIPPortConfigure(const char *portName,
+int pmacAsynIPPortConfigure(const char *portName, const char *hostInfo) {
-                                           const char *hostInfo) {
     asynStatus status = asynSuccess;
     asynInterface *int32LowerLevelInterface = NULL;
     asynInterface *octetLowerLevelInterface = NULL;

src/pmacAsynIPPort.h

@@ -2,6 +2,7 @@
 #define asynInterposePmac_H
 
 #include <epicsExport.h>
+#include <macros.h>
 #include <shareLib.h>
 
 /*
@@ -25,8 +26,7 @@ extern "C" {
  * 172.23.243.156:1025)
  * @return status
  */
-epicsShareFunc int pmacAsynIPPortConfigure(const char *portName,
+int HIDDEN pmacAsynIPPortConfigure(const char *portName, const char *hostInfo);
-                                           const char *hostInfo);
 
 #ifdef __cplusplus
 }

src/turboPmacAxis.cpp

@@ -553,11 +553,6 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
                                       int sizeUserMessage) {
     asynStatus status = asynError;
 
-    // Create the unique callsite identifier manually so it can be used later in
-    // the shouldBePrinted calls.
-    msgPrintControlKey keyError = msgPrintControlKey(
-        pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__);
-
     switch (error) {
     case 0:
         status = asynSuccess;
@@ -566,8 +561,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
     case 1:
         // EPICS should already prevent this issue in the first place,
         // since it contains the user limits
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
                       "Controller \"%s\", axis %d  => %s, line %d\nTarget "
                       "position would exceed user limits.%s\n",
@@ -579,8 +575,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         break;
     case 5:
         // Command not possible
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(
                 pC_->pasynUser(), ASYN_TRACE_ERROR,
                 "Controller \"%s\", axis %d  => %s, line %d\nAxis is "
@@ -594,8 +591,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
                             "moving. Please call the support.");
         break;
     case 8:
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
                       "Controller \"%s\", axis %d  => %s, line %d\nAir cushion "
                       "feedback stopped during movement (P%2.2d01 = %d).%s\n",
@@ -609,8 +607,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         setAxisParamChecked(this, motorMessageText, userMessage);
         break;
     case 9:
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(
                 pC_->pasynUser(), ASYN_TRACE_ERROR,
                 "Controller \"%s\", axis %d  => %s, line %d\nNo air cushion "
@@ -633,8 +632,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         which is not properly homed or if a bug occured.
         */
 
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(
                 pC_->pasynUser(), ASYN_TRACE_ERROR,
                 "Controller \"%s\", axis %d  => %s, line %d\nAxis hit the "
@@ -653,8 +653,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
     case 11:
         // Following error
 
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(
                 pC_->pasynUser(), ASYN_TRACE_ERROR,
                 "Controller \"%s\", axis %d  => %s, line %d\nMaximum allowed "
@@ -671,8 +672,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         break;
 
     case 12:
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
                       "Controller \"%s\", axis %d  => %s, line %d\nSecurity "
                       "input is triggered (P%2.2d01 = %d).%s\n",
@@ -690,8 +692,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
     case 13:
         // Driver hardware error triggered
 
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
                       "Controller \"%s\", axis %d  => %s, line %d\nDriver "
                       "hardware error triggered.%s\n",
@@ -707,8 +710,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
     case 14:
         // EPICS should already prevent this issue in the first place,
         // since it contains the user limits
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
                       "Controller \"%s\", axis %d  => %s, line %d\nMove "
                       "command exceeds hardware limits (P%2.2d01 = %d).%s\n",
@@ -723,8 +727,9 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         break;
     default:
 
-        if (pC_->getMsgPrintControl().shouldBePrinted(keyError, true,
+        if (pC_->getMsgPrintControl().shouldBePrinted(
-                                                      pC_->pasynUser())) {
+                pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
+                pC_->pasynUser())) {
             asynPrint(
                 pC_->pasynUser(), ASYN_TRACE_ERROR,
                 "Controller \"%s\", axis %d  => %s, line %d\nUnknown error "
@@ -735,10 +740,6 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
         setAxisParamChecked(this, motorMessageText, userMessage);
         break;
     }
-
-    if (status == asynSuccess) {
-        pC_->getMsgPrintControl().resetCount(keyError, pC_->pasynUser());
-    }
     return status;
 }
 

src/turboPmacAxis.h

@@ -4,9 +4,9 @@
 #include "turboPmacController.h"
 #include <memory>
 
-struct turboPmacAxisImpl;
+struct HIDDEN turboPmacAxisImpl;
 
-class turboPmacAxis : public sinqAxis {
+class HIDDEN turboPmacAxis : public sinqAxis {
   public:
     /**
      * @brief Construct a new turboPmacAxis

src/turboPmacController.cpp

@@ -41,7 +41,7 @@ struct turboPmacControllerImpl {
     // User for writing int32 values to the port driver.
     asynUser *pasynInt32SyncIOipPort;
 
-    // Indices of additional PVs
+    // Indices of additional ParamLib entries
     int rereadEncoderPosition;
     int readConfig;
     int flushHardware;
@@ -254,9 +254,21 @@ asynStatus turboPmacController::writeRead(int axisNo, const char *command,
         pasynOctetSyncIOipPort(), command, commandLength, response, MAXBUF_,
         pTurboPmacC_->comTimeout, &nbytesOut, &nbytesIn, &eomReason);
 
-    // if (strchr(command, '=')) {
+    /*
-    //     usleep(20000);
+    If sth. is written to the controller, it needs some time to process the
-    // }
+    command. However, the controller returns the acknowledgment via
+    pasynOctetSyncIO->writeRead immediately, signalling to the driver that it is
+    ready to receive the next command. In practice, this can result in commands
+    getting discarded on the driver side or in bringing the driver in undefined
+    states (e.g. stuck in status 1).
+
+    To prevent this, we wait for 20 ms after a write command to give the
+    controller enough time to process everything. A write command can be
+    identified by looking for the equal sign.
+    */
+    if (strchr(command, '=')) {
+        usleep(20000);
+    }
 
     msgPrintControlKey comKey =
         msgPrintControlKey(portName, axisNo, __PRETTY_FUNCTION__, __LINE__);

src/turboPmacController.h

@@ -15,11 +15,11 @@
 // 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 turboPmacAxis;
+class HIDDEN turboPmacAxis;
 
-struct turboPmacControllerImpl;
+struct HIDDEN turboPmacControllerImpl;
 
-class turboPmacController : public sinqController {
+class HIDDEN turboPmacController : public sinqController {
   public:
     /**
      * @brief Construct a new turboPmacController object. This function is meant
@@ -93,7 +93,8 @@ class turboPmacController : public sinqController {
      * @return asynStatus
      */
     asynStatus writeRead(int axisNo, const char *command, char *response,
-                         int numExpectedResponses);
+                         int numExpectedResponses)
+        __attribute__((visibility("hidden")));
 
     /**
      * @brief Specialized version of sinqController::couldNotParseResponse