From 4f7f2e2255baf864592d2cf7489ba3298771b63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Fri, 16 Feb 2024 12:21:43 +0100 Subject: [PATCH] Cleanup --- src/ecmcSS1SafetyGroup.cpp | 69 -------------------------------------- src/ecmcSS1SafetyGroup.h | 1 - 2 files changed, 70 deletions(-) diff --git a/src/ecmcSS1SafetyGroup.cpp b/src/ecmcSS1SafetyGroup.cpp index 302df03..c1d4eaa 100644 --- a/src/ecmcSS1SafetyGroup.cpp +++ b/src/ecmcSS1SafetyGroup.cpp @@ -179,75 +179,6 @@ void ecmcSS1SafetyGroup::validateCfgs() { if(bitStandStill_ < 0) { throw std::runtime_error( "Safety: Parse error: Standstill status, bit invalid."); } - - //if(cfgDbgMode_) { - // printf("Safety %s: I/O link parsed:\n" - // " type: SS1\n" - // " name: %s\n" - // " masterid: %d\n" - // " slaveid: %d\n" - // " alias: %s\n" - // " bit: %d\n", - // sName_, - // sEcRampDownCmdNameOrg_, - // masterIdRampDown, - // slaveIdRampDown_, - // aliasRampDown_, - // bitRampDown_); -// - // printf("Safety %s: I/O link parsed:\n" - // " type: SS1\n" - // " name: %s\n" - // " masterid: %d\n" - // " slaveid: %d\n" - // " alias: %s\n" - // " bit: %d\n", - // sName_, - // sEcAxesStandStillStatOrg_, - // masterIdStandStill, - // slaveIdStandStill_, - // aliasStandStill_, - // bitStandStill_); - //} - - // Now bits are idenfied. Now bits need to be removed in order to find data item. - //stripBits(); -} - -void ecmcSS1SafetyGroup::stripBits() { - char * lastdot = strrchr(sEcRampDownCmdNameStrip_,'.'); - if(lastdot) { - lastdot[0] = 0; - } - else { - throw std::runtime_error( "Safety: Failed trim bit from ramp down I/O link."); - } - - if(cfgDbgMode_) { - printf("Safety %s: I/O bit removed:\n" - " before: %s\n" - " after: %s\n", - sName_, - sEcRampDownCmdNameOrg_, - sEcRampDownCmdNameStrip_); - } - - lastdot = strrchr(sEcAxesStandStillStatStrip_,'.'); - if(lastdot) { - lastdot[0] = 0; - } - else { - throw std::runtime_error( "Safety: Failed trim bit from stand still I/O link."); - } - - if(cfgDbgMode_) { - printf("Safety %s: I/O bit removed:\n" - " before: %s\n" - " after: %s\n", - sName_, - sEcAxesStandStillStatOrg_, - sEcAxesStandStillStatStrip_); - } } void ecmcSS1SafetyGroup::validateAxes() { diff --git a/src/ecmcSS1SafetyGroup.h b/src/ecmcSS1SafetyGroup.h index 3e8dfae..04b35c0 100644 --- a/src/ecmcSS1SafetyGroup.h +++ b/src/ecmcSS1SafetyGroup.h @@ -65,7 +65,6 @@ class ecmcSS1SafetyGroup : public asynPortDriver { private: void validateCfgs(); void validateAxes(); - void stripBits(); void connectToDataSources(); void setAxesSafetyInterlocks(int stop); void setAxesDisable();