lin-epics-modules/sinqMotor
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CI pipeline issues.

Browse Source
This commit is contained in:
mathis_s
2024-11-15 16:20:57 +01:00
parent 2a95f82c47
commit 89bbbedaee
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sinqController.cpp
View File

@@ -124,6 +124,9 @@ const char *sinqController::stringifyAsynStatus(asynStatus status) {
// and
// https://github.com/epics-modules/asyn/blob/master/asyn/asynPortDriver/paramErrors.h
// for the definition of the error codes
// The pragma is necessary since the param lib error codes are "tacked on"
// the enum, which results in compiler warnings otherwise.
#pragma GCC diagnostic ignored "-Wswitch"
switch (status) {
case asynSuccess:
return asynSuccessStringified;
@@ -151,9 +154,12 @@ const char *sinqController::stringifyAsynStatus(asynStatus status) {
return asynParamInvalidListStringified;
}
errlogPrintf("%s => line %d:\nReached unreachable code.",
__PRETTY_FUNCTION__, __LINE__);
return "unreachable code reached";
asynPrint(
pasynUserSelf, ASYN_TRACE_ERROR,
"%s => line %d:\nInput did not match any variant of asynStatus.\n",
__PRETTY_FUNCTION__, __LINE__);
return "Input did not match any variant of asynStatus";
}
// =============================================================================
@@ -174,9 +180,9 @@ asynStatus setOffsetMovTimeout(const char *portName, int axisNo,
asynMotorAxis *asynAxis = pC->getAxis(axisNo);
sinqAxis *axis = dynamic_cast<sinqAxis *>(asynAxis);
if (axis == nullptr) {
errlogPrintf("%s => line %d:\nPAxis %d does not exist or is not an "
errlogPrintf("%s => line %d:\nAxis %d does not exist or is not an "
"instance of sinqAxis.",
__PRETTY_FUNCTION__, __LINE__, portName, axisNo);
__PRETTY_FUNCTION__, __LINE__, axisNo);
}
return axis->setOffsetMovTimeout(offsetMovTimeout);
@@ -213,9 +219,9 @@ asynStatus setScaleMovTimeout(const char *portName, int axisNo,
asynMotorAxis *asynAxis = pC->getAxis(axisNo);
sinqAxis *axis = dynamic_cast<sinqAxis *>(asynAxis);
if (axis == nullptr) {
errlogPrintf("%s => line %d:\nPAxis %d does not exist or is not an "
errlogPrintf("%s => line %d:\nAxis %d does not exist or is not an "
"instance of sinqAxis.",
__PRETTY_FUNCTION__, __LINE__, portName, axisNo);
__PRETTY_FUNCTION__, __LINE__, axisNo);
}
return axis->setScaleMovTimeout(scaleMovTimeout);
@@ -237,7 +243,7 @@ static void setScaleMovTimeoutCallFunc(const iocshArgBuf *args) {
static void sinqControllerRegister(void) {
iocshRegister(&setOffsetMovTimeoutDef, setOffsetMovTimeoutCallFunc);
iocshRegister(&setOffsetMovTimeoutDef, setOffsetMovTimeoutCallFunc);
iocshRegister(&setScaleMovTimeoutDef, setScaleMovTimeoutCallFunc);
}
epicsExportRegistrar(sinqControllerRegister);