Removed TODOx:y-Output.
--- a/TODO Fri Jun 27 09:31:20 2008 +0000
+++ b/TODO Fri Jun 27 09:37:53 2008 +0000
@@ -16,7 +16,6 @@
* 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
--- a/tools/Master.cpp Fri Jun 27 09:31:20 2008 +0000
+++ b/tools/Master.cpp Fri Jun 27 09:37:53 2008 +0000
@@ -1377,17 +1377,13 @@
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 @@
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 << " "