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.
Fixed bug with errorprint to ioc console
2025-08-22 15:27:28 +02:00 · 2025-08-22 15:25:31 +02:00 · 2025-08-14 17:21:58 +02:00 · 2025-08-12 15:42:43 +02:00
4 changed files with 33 additions and 32 deletions
--- a/2
+++ b/2
@@ -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 -fvisibility=hidden # -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
--- a/2
+++ b/2
--- a/src/turboPmacAxis.cpp
+++ b/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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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,
-                                                      pC_->pasynUser())) {
+        if (pC_->getMsgPrintControl().shouldBePrinted(
+                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;
 }

--- a/src/turboPmacController.cpp
+++ b/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;
Author	SHA1	Message	Date
smathis	1ee483f8e9	Removed C++ only flag from USR_CFLAGS Some checks failed Test And Build / Lint (push) Failing after 3s Details Test And Build / Build (push) Successful in 7s Details 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.	2025-08-22 15:27:28 +02:00
smathis	002b5d2616	Fixed bug with errorprint to ioc console The previous setup created one print key for all error types. The problem with that is that if an error directly followed another error (without an error = 0 in between), the MsgPrintControl prevented printing of the new error. Now every error has its own key.	2025-08-22 15:25:31 +02:00
smathis	ce80426790	Updated sinqMotor to fix bug in forcedPoll Some checks failed Test And Build / Lint (push) Failing after 4s Details Test And Build / Build (push) Successful in 7s Details	2025-08-14 17:21:58 +02:00
smathis	72f3965881	Fixed imprecise comment Some checks failed Test And Build / Lint (push) Failing after 3s Details Test And Build / Build (push) Successful in 8s Details	2025-08-12 15:42:43 +02:00