Cleanup
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -65,7 +65,6 @@ class ecmcSS1SafetyGroup : public asynPortDriver {
|
||||
private:
|
||||
void validateCfgs();
|
||||
void validateAxes();
|
||||
void stripBits();
|
||||
void connectToDataSources();
|
||||
void setAxesSafetyInterlocks(int stop);
|
||||
void setAxesDisable();
|
||||
|
||||
Reference in New Issue
Block a user