bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved slaveState() to Command::alStateString().

This commit is contained in:
Florian Pose 2008-07-25 08:52:45 +00:00
parent e3caba45ab
commit 884f83e29d
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/Command.cpp
View File

@ -79,3 +79,16 @@ void Command::throwCommandException(const stringstream &s)
}
/****************************************************************************/
string Command::alStateString(uint8_t state)
{
switch (state) {
case 1: return "INIT";
case 2: return "PREOP";
case 4: return "SAFEOP";
case 8: return "OP";
default: return "???";
}
}
/****************************************************************************/

2
tool/Command.h
View File

@ -83,6 +83,8 @@ class Command
void throwCommandException(const stringstream &);
enum {BreakAfterBytes = 16};
static string alStateString(uint8_t);
private:
string name;

17
tool/CommandSlaves.cpp
View File

@ -126,7 +126,7 @@ void CommandSlaves::listSlaves(
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 @@ void CommandSlaves::showSlave(
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 @@ void CommandSlaves::showSlave(
}
}
/****************************************************************************/
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 "???";
}
}
/*****************************************************************************/

2
tool/CommandSlaves.h
View File

@ -32,8 +32,6 @@ class CommandSlaves:
void listSlaves(MasterDevice &, int);
void showSlave(MasterDevice &, uint16_t);
static string slaveState(uint8_t);
};
/****************************************************************************/