Compare commits

..

4 Commits
1.5.1 ... 1.5.4

Author SHA1 Message Date
902b18d038 Excempt EPICS libraries from -Weffc++
All checks were successful
Test And Build / Lint (push) Successful in 6s
Test And Build / Build (push) Successful in 7s
2025-09-17 12:18:06 +02:00
0e10bcf69d Fixed some more warnings
All checks were successful
Test And Build / Lint (push) Successful in 5s
Test And Build / Build (push) Successful in 6s
2025-09-17 11:28:12 +02:00
cb4adb068c Fixed some warnings
All checks were successful
Test And Build / Lint (push) Successful in 6s
Test And Build / Build (push) Successful in 5s
2025-09-17 11:24:15 +02:00
d7c9d009ee Better solution for suppressing unused variable warning
All checks were successful
Test And Build / Lint (push) Successful in 5s
Test And Build / Build (push) Successful in 5s
2025-09-17 11:08:24 +02:00
6 changed files with 92 additions and 29 deletions

View File

@@ -5,17 +5,13 @@
msgPrintControlKey::msgPrintControlKey(char *controller, int axisNo,
const char *functionName, int line,
size_t maxRepetitions) {
controller_ = controller;
axisNo_ = axisNo;
line_ = line;
functionName_ = functionName;
maxRepetitions_ = maxRepetitions;
}
size_t maxRepetitions)
: controller_(controller), axisNo_(axisNo), functionName_(functionName),
line_(line), maxRepetitions_(maxRepetitions) {}
void msgPrintControlKey::format(char *buffer, size_t bufferSize) {
snprintf(buffer, bufferSize, "controller %s, axis %d, function %s, line %d",
controller_.c_str(), axisNo_, functionName_, line_);
controller_.c_str(), axisNo_, functionName_.c_str(), line_);
}
// =============================================================================
@@ -78,8 +74,8 @@ bool msgPrintControl::shouldBePrinted(msgPrintControlKey &key, bool wantToPrint,
pasynUser, ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nError "
"associated with key \"%s\" has been resolved.\n",
key.controller_.c_str(), key.axisNo_, key.functionName_,
key.line_, formattedKey);
key.controller_.c_str(), key.axisNo_,
key.functionName_.c_str(), key.line_, formattedKey);
}
map_[key] = 0;
}
@@ -107,7 +103,7 @@ void msgPrintControl::resetCount(msgPrintControlKey &key, asynUser *pasynUser) {
"Controller \"%s\", axis %d => %s, line %d\nError "
"associated with key \"%s\" has been resolved.\n",
key.controller_.c_str(), key.axisNo_,
key.functionName_, key.line_, formattedKey);
key.functionName_.c_str(), key.line_, formattedKey);
}
map_[key] = 0;
}

View File

@@ -23,7 +23,7 @@ class HIDDEN msgPrintControlKey {
// -1 indicates a non-axis specific message
int axisNo_;
const char *functionName_;
std::string functionName_;
int line_;
/**
@@ -38,7 +38,7 @@ class HIDDEN msgPrintControlKey {
bool operator==(const msgPrintControlKey &other) const {
return axisNo_ == other.axisNo_ && line_ == other.line_ &&
strcmp(functionName_, other.functionName_) == 0 &&
functionName_ == other.functionName_ &&
controller_ == other.controller_;
}
@@ -55,7 +55,7 @@ template <> struct hash<msgPrintControlKey> {
// Combine the hashes of the members (x and y)
size_t h1 = std::hash<std::string>{}(obj.controller_);
size_t h2 = hash<int>{}(obj.axisNo_);
size_t h3 = std::hash<const char *>{}(obj.functionName_);
size_t h3 = std::hash<std::string>{}(obj.functionName_);
size_t h4 = hash<int>{}(obj.line_);
// Combine the hashes (simple XOR and shifting technique)
return h1 ^ (h2 << 1) ^ (h3 << 2) ^ (h4 << 3);

View File

@@ -1,12 +1,20 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "sinqAxis.h"
// The EPICS libaries do not follow -Weffc++
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "epicsExport.h"
#include "iocsh.h"
#include "msgPrintControl.h"
#include "sinqController.h"
#include <epicsTime.h>
#include <errlog.h>
#pragma GCC diagnostic pop
#include "sinqAxis.h"
#include "msgPrintControl.h"
#include "sinqController.h"
#include <math.h>
#include <unistd.h>
@@ -318,7 +326,12 @@ asynStatus sinqAxis::forcedPoll(bool *moving) {
return poll_status;
}
asynStatus sinqAxis::doPoll(bool * /*moving*/) { return asynSuccess; }
asynStatus sinqAxis::doPoll(bool *moving) {
// Suppress unused variable warning - this is just a default fallback
// function.
(void)moving;
return asynSuccess;
}
asynStatus sinqAxis::move(double position, int relative, double minVelocity,
double maxVelocity, double acceleration) {
@@ -354,9 +367,15 @@ asynStatus sinqAxis::move(double position, int relative, double minVelocity,
return pC_->callParamCallbacks();
}
asynStatus sinqAxis::doMove(double /*position*/, int /*relative*/,
double /*minVelocity*/, double /*maxVelocity*/,
double /*acceleration*/) {
asynStatus sinqAxis::doMove(double position, int relative, double minVelocity,
double maxVelocity, double acceleration) {
// Suppress unused variable warning - this is just a default fallback
// function.
(void)position;
(void)relative;
(void)minVelocity;
(void)maxVelocity;
(void)acceleration;
return asynSuccess;
}
@@ -398,8 +417,14 @@ asynStatus sinqAxis::home(double minVelocity, double maxVelocity,
}
}
asynStatus sinqAxis::doHome(double /*minVelocity*/, double /*maxVelocity*/,
double /*acceleration*/, int /*forwards*/) {
asynStatus sinqAxis::doHome(double minVelocity, double maxVelocity,
double acceleration, int forwards) {
// Suppress unused variable warning - this is just a default fallback
// function.
(void)minVelocity;
(void)maxVelocity;
(void)acceleration;
(void)forwards;
return asynSuccess;
}
@@ -421,7 +446,12 @@ asynStatus sinqAxis::reset() {
asynStatus sinqAxis::doReset() { return asynError; }
asynStatus sinqAxis::enable(bool /*on*/) { return asynSuccess; }
asynStatus sinqAxis::enable(bool on) {
// Suppress unused variable warning - this is just a default fallback
// function.
(void)on;
return asynSuccess;
}
asynStatus sinqAxis::motorPosition(double *motorPos) {
asynStatus status = asynSuccess;

View File

@@ -8,8 +8,16 @@ Stefan Mathis, November 2024
#ifndef sinqAxis_H
#define sinqAxis_H
// The EPICS libaries do not follow -Weffc++
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "asynMotorAxis.h"
#include <macros.h>
#include "macros.h"
#pragma GCC diagnostic pop
#include <memory>
#include <type_traits>
@@ -32,6 +40,13 @@ class HIDDEN sinqAxis : public asynMotorAxis {
*/
~sinqAxis();
/**
* @brief Delete the copy and copy assignment constructors, because this
* class should not be copied (it is tied to hardware!)
*/
sinqAxis(const sinqAxis &) = delete;
sinqAxis &operator=(const sinqAxis &) = delete;
/**
* @brief Check if a poll should be performed. If yes, call `forcedPoll`.
*

View File

@@ -1,15 +1,22 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "sinqController.h"
// The EPICS libaries do not follow -Weffc++
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "asynMotorController.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#include "iocsh.h"
#include "msgPrintControl.h"
#include "sinqAxis.h"
#include <deque>
#include <errlog.h>
#include <initHooks.h>
#pragma GCC diagnostic pop
#include "msgPrintControl.h"
#include "sinqAxis.h"
#include "sinqController.h"
#include <deque>
#include <unordered_map>
#include <vector>

View File

@@ -9,10 +9,18 @@ Stefan Mathis, November 2024
#ifndef sinqController_H
#define sinqController_H
// The EPICS libaries do not follow -Weffc++
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
#include "asynMotorController.h"
#include "msgPrintControl.h"
#include <initHooks.h>
#include <macros.h>
#pragma GCC diagnostic pop
#include <memory>
#define motorMessageIsFromDriverString "MOTOR_MESSAGE_DRIVER"
@@ -58,6 +66,13 @@ class HIDDEN sinqController : public asynMotorController {
*/
virtual ~sinqController(void);
/**
* @brief Delete the copy and copy assignment constructors, because this
* class should not be copied (it is tied to hardware!)
*/
sinqController(const sinqController &) = delete;
sinqController &operator=(const sinqController &) = delete;
/**
* @brief Overloaded function of asynMotorController
*