Transition->Transmission.
--- a/master/cdev.c Thu Apr 30 14:12:47 2009 +0000
+++ b/master/cdev.c Thu Apr 30 14:37:02 2009 +0000
@@ -273,7 +273,7 @@
data.dc_supported = slave->base_dc_supported;
data.dc_range = slave->base_dc_range;
data.has_dc_system_time = slave->has_dc_system_time;
- data.transition_delay = slave->transition_delay;
+ data.transmission_delay = slave->transmission_delay;
data.al_state = slave->current_state;
data.error_flag = slave->error_flag;
--- a/master/ioctl.h Thu Apr 30 14:12:47 2009 +0000
+++ b/master/ioctl.h Thu Apr 30 14:37:02 2009 +0000
@@ -176,7 +176,7 @@
uint8_t dc_supported;
ec_slave_dc_range_t dc_range;
uint8_t has_dc_system_time;
- uint32_t transition_delay;
+ uint32_t transmission_delay;
uint8_t al_state;
uint8_t error_flag;
uint8_t sync_count;
--- a/master/master.c Thu Apr 30 14:12:47 2009 +0000
+++ b/master/master.c Thu Apr 30 14:37:02 2009 +0000
@@ -1431,9 +1431,9 @@
/*****************************************************************************/
-/** Calculates the bus transition delays.
- */
-void ec_master_calc_transition_delays(
+/** Calculates the bus transmission delays.
+ */
+void ec_master_calc_transmission_delays(
ec_master_t *master /**< EtherCAT master. */
)
{
@@ -1447,7 +1447,7 @@
if (master->dc_ref_clock) {
uint32_t delay = 0;
- ec_slave_calc_transition_delays_rec(master->dc_ref_clock, &delay);
+ ec_slave_calc_transmission_delays_rec(master->dc_ref_clock, &delay);
}
}
@@ -1465,7 +1465,7 @@
// calculate bus topology
ec_master_calc_topology(master);
- ec_master_calc_transition_delays(master);
+ ec_master_calc_transmission_delays(master);
}
/******************************************************************************
--- a/master/slave.c Thu Apr 30 14:12:47 2009 +0000
+++ b/master/slave.c Thu Apr 30 14:37:02 2009 +0000
@@ -106,7 +106,7 @@
slave->base_dc_supported = 0;
slave->base_dc_range = EC_DC_32;
slave->has_dc_system_time = 0;
- slave->transition_delay = 0U;
+ slave->transmission_delay = 0U;
slave->sii_words = NULL;
slave->sii_nwords = 0;
@@ -792,7 +792,7 @@
/*****************************************************************************/
-/** Calculates the port transition delays.
+/** Calculates the port transmission delays.
*/
void ec_slave_calc_port_delays(
ec_slave_t *slave /**< EtherCAT slave. */
@@ -829,9 +829,9 @@
/*****************************************************************************/
-/** Calculates the bus topology; recursion function.
- */
-void ec_slave_calc_transition_delays_rec(
+/** Recursively calculates transmission delays.
+ */
+void ec_slave_calc_transmission_delays_rec(
ec_slave_t *slave, /**< Current slave. */
uint32_t *delay /**< Sum of delays. */
)
@@ -843,7 +843,7 @@
EC_DBG("%u: %u\n", slave->ring_position, *delay);
#endif
- slave->transition_delay = *delay;
+ slave->transmission_delay = *delay;
for (i = 1; i < EC_MAX_PORTS; i++) {
ec_slave_port_t *port = &slave->ports[i];
@@ -858,7 +858,7 @@
#if 0
EC_DBG("%u:%u %u\n", slave->ring_position, i, *delay);
#endif
- ec_slave_calc_transition_delays_rec(next_dc, delay);
+ ec_slave_calc_transmission_delays_rec(next_dc, delay);
}
*delay = *delay + slave->ports[0].delay_to_next_dc;
--- a/master/slave.h Thu Apr 30 14:12:47 2009 +0000
+++ b/master/slave.h Thu Apr 30 14:37:02 2009 +0000
@@ -141,8 +141,8 @@
uint8_t has_dc_system_time; /**< The slave supports the DC system time
register. Otherwise it can only be used for
delay measurement. */
- uint32_t transition_delay; /**< DC transition delay (from reference
- clock). */
+ uint32_t transmission_delay; /**< DC system time transmission delay
+ (offset from reference clock). */
// SII
uint16_t *sii_words; /**< Complete SII image. */
@@ -187,7 +187,7 @@
void ec_slave_attach_pdo_names(ec_slave_t *);
void ec_slave_calc_port_delays(ec_slave_t *);
-void ec_slave_calc_transition_delays_rec(ec_slave_t *, uint32_t *);
+void ec_slave_calc_transmission_delays_rec(ec_slave_t *, uint32_t *);
/*****************************************************************************/
--- a/tool/CommandGraph.cpp Thu Apr 30 14:12:47 2009 +0000
+++ b/tool/CommandGraph.cpp Thu Apr 30 14:37:02 2009 +0000
@@ -139,7 +139,7 @@
} else {
cout << "Delay meas.";
}
- cout << "\\nDelay: " << si->transition_delay << " ns";
+ cout << "\\nDelay: " << si->transmission_delay << " ns";
}
cout << "\"]" << endl;
--- a/tool/CommandSlaves.cpp Thu Apr 30 14:12:47 2009 +0000
+++ b/tool/CommandSlaves.cpp Thu Apr 30 14:37:02 2009 +0000
@@ -262,8 +262,8 @@
} else {
cout << "yes, delay measurement only" << endl;
}
- cout << " DC transition delay: "
- << si->transition_delay << " ns" << endl;
+ cout << " DC system time transmission delay: "
+ << si->transmission_delay << " ns" << endl;
} else {
cout << "no" << endl;
}