From e1731b713eeed92059e419670fc522afdaecb9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Thu, 15 Feb 2024 13:45:04 +0100 Subject: [PATCH] WIP --- iocsh/el7042-0052.script | 2 +- src/ecmcSafetyGroup.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iocsh/el7042-0052.script b/iocsh/el7042-0052.script index 9759faf..7d6cfc6 100644 --- a/iocsh/el7042-0052.script +++ b/iocsh/el7042-0052.script @@ -1,7 +1,7 @@ ############################################################################## ## Example config for el7031 -require ecmccfg v9.0.1_RC4,"ECMC_VER=safety,ENG_MODE=1" +require ecmccfg v9.0.1_RC4,"ECMC_VER=sandst_a,ENG_MODE=1" epicsEnvSet(IOC,c6025a) # Load components lib diff --git a/src/ecmcSafetyGroup.cpp b/src/ecmcSafetyGroup.cpp index ce6c855..f8e8d83 100644 --- a/src/ecmcSafetyGroup.cpp +++ b/src/ecmcSafetyGroup.cpp @@ -348,15 +348,15 @@ void ecmcSafetyGroup::execute() { /* //Needed functions in motion.h int getAxisBusy(int axisIndex, - int *value); + int *value); int getAxisEncVelo(int axisIndex, - double *velo); + double *velo); int getAxisTrajVelo(int axisIndex, - double *velo); + double *velo); int getAxisEnabled(int axisIndex, - int *value); + int *value); int setAxisEnable(int axisIndex, - int value); + int value); int setAxisClearEmergencyInterlock(int axisIndex); int setAxisEmergencyStopInterlock(int axisIndex, double deceleration);