diff -r 133cf4631fcc -r f18d124d7fbc tool/CommandSlaves.cpp --- a/tool/CommandSlaves.cpp Thu Jul 24 15:06:47 2008 +0000 +++ b/tool/CommandSlaves.cpp Fri Jul 25 08:52:45 2008 +0000 @@ -126,7 +126,7 @@ info.relPos = str.str(); str.str(""); - info.state = slaveState(slave.state); + info.state = alStateString(slave.state); info.flag = (slave.error_flag ? 'E' : '+'); if (strlen(slave.name)) { @@ -186,7 +186,7 @@ cout << "Alias: " << slave.alias << endl; cout - << "State: " << slaveState(slave.state) << endl + << "State: " << alStateString(slave.state) << endl << "Flag: " << (slave.error_flag ? 'E' : '+') << endl << "Identity:" << endl << " Vendor Id: 0x" @@ -274,17 +274,4 @@ } } -/****************************************************************************/ - -string CommandSlaves::slaveState(uint8_t state) -{ - switch (state) { - case 1: return "INIT"; - case 2: return "PREOP"; - case 4: return "SAFEOP"; - case 8: return "OP"; - default: return "???"; - } -} - /*****************************************************************************/