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

Removed TODOx:y-Output.

This commit is contained in:
Florian Pose 2008-06-27 09:37:53 +00:00
parent 00d5bfb06b
commit 22ec9f6a45
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -16,7 +16,6 @@ Version 1.4.0:
* READMEs for examples.
* Update documentation.
* Overthink display style of hex numbers.
* Remove #x:y alias output.
* Add -a and -p switches for 'ethercat config' command.
* Race in jiffies frame timeout.
* FoE

23
tools/Master.cpp
View File

@ -1377,17 +1377,13 @@ void Master::listSlaves(int slavePosition)
str.clear();
str.str("");
if (lastAlias) {
str << "#" << hex << lastAlias;
slaveInfo.alias = str.str();
str.str("");
str << ":" << dec << aliasIndex;
slaveInfo.relPos = str.str();
str.str("");
} else {
slaveInfo.alias = "";
slaveInfo.relPos = "";
}
str << lastAlias;
slaveInfo.alias = str.str();
str.str("");
str << aliasIndex;
slaveInfo.relPos = str.str();
str.str("");
slaveInfo.state = slaveState(slave.state);
slaveInfo.flag = (slave.error_flag ? 'E' : '+');
@ -1415,15 +1411,14 @@ void Master::listSlaves(int slavePosition)
maxStateWidth = slaveInfo.state.length();
}
if (lastAlias)
aliasIndex++;
aliasIndex++;
}
for (iter = slaveInfoList.begin(); iter != slaveInfoList.end(); iter++) {
cout << setfill(' ') << right
<< setw(maxPosWidth) << iter->pos << " "
<< setw(maxAliasWidth) << iter->alias
<< left
<< ":" << left
<< setw(maxRelPosWidth) << iter->relPos << " "
<< setw(maxStateWidth) << iter->state << " "
<< iter->flag << " "