Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-22 18:13:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Transition delay calculation. TBC...

Browse Source
This commit is contained in:
Florian Pose
2009-04-30 14:12:47 +00:00
parent 513cd4798c
commit 29eb2d7d06
12 changed files with 312 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/CommandGraph.cpp
+55 -23
View File
@@ -72,7 +72,6 @@ void CommandGraph::execute(MasterDevice &m, const StringVector &args)
SlaveVector slaves;
ec_ioctl_slave_t slave;
SlaveVector::const_iterator si;
string font("fontname=\"Helvetica\"");
map<int, string> portMedia;
map<int, string>::const_iterator mi;
map<int, int> mediaWeights;
@@ -102,51 +101,84 @@ void CommandGraph::execute(MasterDevice &m, const StringVector &args)
<< endl
<< "strict graph bus {" << endl
<< " rankdir=\"LR\"" << endl
<< " ranksep=0.8" << endl
<< " nodesep=0.8" << endl
<< " node [fontname=\"Helvetica\"]" << endl
<< " edge [fontname=\"Helvetica\",fontsize=\"10\"]" << endl
<< endl
<< " master [" << font << ",label=\"EtherCAT\\nMaster\"]" << endl;
<< " master [label=\"EtherCAT\\nMaster\"]" << endl;
if (slaves.size()) {
cout << " master -- slave0 [" << font;
mi = portMedia.find(slaves.front().port_descs[0]);
cout << " master -- slave0";
mi = portMedia.find(slaves.front().ports[0].desc);
if (mi != portMedia.end())
cout << ",label=\"" << mi->second << "\"";
cout << "[label=\"" << mi->second << "\"]";
cout << "]" << endl;
cout << endl;
}
cout << endl;
for (si = slaves.begin(); si != slaves.end(); si++) {
cout << " slave" << si->position << " [" << font <<
",shape=\"box\",label=\"" << si->position;
cout << " slave" << si->position << " [shape=\"box\""
<< ",label=\"" << si->position;
if (string(si->order).size())
cout << "\\n" << si->order;
if (si->dc_supported) {
cout << "\\nDC: ";
if (si->has_dc_system_time) {
switch (si->dc_range) {
case EC_DC_32:
cout << "32 bit";
break;
case EC_DC_64:
cout << "64 bit";
break;
default:
break;
}
} else {
cout << "Delay meas.";
}
cout << "\\nDelay: " << si->transition_delay << " ns";
}
cout << "\"]" << endl;
for (i = 1; i < EC_MAX_PORTS; i++) {
if (si->next_slave[i] == 0xffff)
uint16_t next_pos = si->ports[i].next_slave;
ec_ioctl_slave_t *next = NULL;
if (next_pos == 0xffff)
continue;
cout << " slave" << si->position << " -- "
<< "slave" << si->next_slave[i] << " [" << font << ","
<< "taillabel=\"" << i << "\"";
if (next_pos < slaves.size()) {
next = &slaves[next_pos];
} else {
cerr << "Invalid next slave pointer." << endl;
}
mi = portMedia.find(si->port_descs[i]);
if (mi == portMedia.end()) {
cout << " slave" << si->position << " -- "
<< "slave" << next_pos << " [taillabel=\"" << i;
if (si->dc_supported) {
cout << " [" << si->ports[i].delay_to_next_dc << "]";
}
cout << "\",headlabel=\"0";
if (next && next->dc_supported) {
cout << " [" << next->ports[0].delay_to_next_dc << "]";
}
cout << "\"";
mi = portMedia.find(si->ports[i].desc);
if (mi == portMedia.end() && next) {
/* Try medium of next-hop slave. */
unsigned int pos = si->next_slave[i];
if (pos < slaves.size()) {
ec_ioctl_slave_t *next = &slaves[pos];
mi = portMedia.find(next->port_descs[0]);
} else {
cerr << "Invalid next slave pointer." << endl;
}
mi = portMedia.find(next->ports[0].desc);
}
if (mi != portMedia.end())
cout << ",label=\"" << mi->second << "\"";
wi = mediaWeights.find(si->port_descs[i]);
wi = mediaWeights.find(si->ports[i].desc);
if (wi != mediaWeights.end())
cout << ",weight=\"" << wi->second << "\"";
tool/CommandSlaves.cpp
+20 -12
View File
@@ -262,18 +262,20 @@ void CommandSlaves::showSlaves(
} else {
cout << "yes, delay measurement only" << endl;
}
cout << " DC transition delay: "
<< si->transition_delay << " ns" << endl;
} else {
cout << "no" << endl;
}
cout << "Port Type Link Loop Signal NextSlave";
if (si->dc_supported)
cout << " RxTime Diff";
cout << " RxTime [ns] Diff [ns] NextDc [ns]";
cout << endl;
for (i = 0; i < EC_MAX_PORTS; i++) {
cout << " " << i << " " << setfill(' ') << left << setw(4);
switch (si->port_descs[i]) {
switch (si->ports[i].desc) {
case EC_PORT_NOT_IMPLEMENTED:
cout << "N/A";
break;
@@ -291,29 +293,35 @@ void CommandSlaves::showSlaves(
}
cout << " " << setw(4)
<< (si->ports[i].dl_link ? "up" : "down")
<< (si->ports[i].link.link_up ? "up" : "down")
<< " " << setw(6)
<< (si->ports[i].dl_loop ? "closed" : "open")
<< (si->ports[i].link.loop_closed ? "closed" : "open")
<< " " << setw(6)
<< (si->ports[i].dl_signal ? "yes" : "no")
<< (si->ports[i].link.signal_detected ? "yes" : "no")
<< " " << setw(9) << right;
if (si->next_slave[i] != 0xffff) {
cout << dec << si->next_slave[i];
if (si->ports[i].next_slave != 0xffff) {
cout << dec << si->ports[i].next_slave;
} else {
cout << "-";
}
if (si->dc_supported) {
cout << " " << setw(10) << right;
if (si->ports[i].dl_signal) {
cout << dec << si->dc_receive_times[i];
cout << " " << setw(11) << right;
if (!si->ports[i].link.loop_closed) {
cout << dec << si->ports[i].receive_time;
} else {
cout << "-";
}
cout << " " << setw(10);
if (si->ports[i].dl_signal) {
cout << si->dc_receive_times[i] - si->dc_receive_times[0];
if (!si->ports[i].link.loop_closed) {
cout << si->ports[i].receive_time - si->ports[0].receive_time;
} else {
cout << "-";
}
cout << " " << setw(10);
if (!si->ports[i].link.loop_closed) {
cout << si->ports[i].delay_to_next_dc;
} else {
cout << "-";
}