From bbf0c1d07370190830a6f14b8458e29544062c1b Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 18 Feb 2019 11:57:54 +0100 Subject: Apply UTCO in odr-zmq2edi wait time calculation --- src/zmq2edi/EDISender.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/zmq2edi') diff --git a/src/zmq2edi/EDISender.cpp b/src/zmq2edi/EDISender.cpp index 236222c..b3a89ff 100644 --- a/src/zmq2edi/EDISender.cpp +++ b/src/zmq2edi/EDISender.cpp @@ -229,20 +229,13 @@ void EDISender::send_eti_frame(uint8_t* p, metadata_t metadata) using namespace std::chrono; - const auto seconds = metadata.edi_time; const auto pps_offset = milliseconds(std::lrint((tist & 0xFFFFFF) / 16384.0)); const auto t_frame = system_clock::from_time_t( - seconds + posix_timestamp_1_jan_2000) + pps_offset; + metadata.edi_time + posix_timestamp_1_jan_2000 - metadata.utc_offset) + pps_offset; const auto t_release = t_frame + milliseconds(tist_delay_ms); const auto t_now = system_clock::now(); - /* - etiLog.level(debug) << "seconds " << seconds + posix_timestamp_1_jan_2000; - etiLog.level(debug) << "now " << system_clock::to_time_t(t_now); - etiLog.level(debug) << "wait " << wait_time.count(); - */ - const auto wait_time = t_release - t_now; wait_times.push_back(duration_cast(wait_time).count()); -- cgit v1.2.3