diff --git a/master/fsm_master.c b/master/fsm_master.c index a60b4dc9..4132f2a0 100644 --- a/master/fsm_master.c +++ b/master/fsm_master.c @@ -1001,7 +1001,7 @@ void ec_fsm_master_state_dc_read_offset( and the app_time set time */ #ifdef EC_HAVE_CYCLES correction = - (datagram->cycles_sent - slave->master->dc_cycles_app_time) + (datagram->cycles_sent - slave->master->dc_cycles_app_start_time) * 1000000LL; do_div(correction,cpu_khz); #else diff --git a/master/master.c b/master/master.c index 11b814d5..c6f25145 100644 --- a/master/master.c +++ b/master/master.c @@ -150,9 +150,9 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */ master->app_time = 0ULL; #ifdef EC_HAVE_CYCLES - master->dc_cycles_app_time = 0; + master->dc_cycles_app_start_time = 0; #endif - master->dc_jiffies_app_time = 0; + master->dc_jiffies_app_start_time = 0; master->app_start_time = 0ULL; master->has_app_time = 0; @@ -2381,9 +2381,9 @@ void ecrt_master_application_time(ec_master_t *master, uint64_t app_time) EC_MASTER_DBG(master, 1, "set application start time = %llu\n",app_time); master->app_start_time = app_time; #ifdef EC_HAVE_CYCLES - master->dc_cycles_app_time = get_cycles(); + master->dc_cycles_app_start_time = get_cycles(); #endif - master->dc_jiffies_app_time = jiffies; + master->dc_jiffies_app_start_time = jiffies; master->has_app_time = 1; } } diff --git a/master/master.h b/master/master.h index ada84b51..e98bc86a 100644 --- a/master/master.h +++ b/master/master.h @@ -188,9 +188,9 @@ struct ec_master { monitoring. */ ec_slave_t *dc_ref_clock; /**< DC reference clock slave. */ #ifdef EC_HAVE_CYCLES - cycles_t dc_cycles_app_time; /** cycles at last ecrt_master_sync() call.*/ + cycles_t dc_cycles_app_start_time; /** cycles at last ecrt_master_sync() call.*/ #endif - unsigned long dc_jiffies_app_time;/** jiffies at last + unsigned long dc_jiffies_app_start_time;/** jiffies at last ecrt_master_sync() call.*/ unsigned int scan_busy; /**< Current scan state. */ unsigned int allow_scan; /**< \a True, if slave scanning is allowed. */