t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified time base now so both GVRET and Socketcan devices yield timestamps in microseconds since the program started or clear was pressed, fixed frames per second display, fixed timestamps for sent frames

Browse Source
This commit is contained in:
Collin Kidder
2016-12-18 21:40:56 -05:00
parent 71a039ec64
commit 0f3f9e0fad
7 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/socketcan.cpp
+3 -1
View File
@@ -155,6 +155,8 @@ void SocketCan::framesReceived()
/* test */
bool sndNotif = false;
uint64_t timeBasis = CANConManager::getInstance()->getTimeBasis();
/* sanity checks */
if(!mDev_p)
return;
@@ -185,7 +187,7 @@ void SocketCan::framesReceived()
frame_p->extended = false;
frame_p->ID = recFrame.frameId();
frame_p->isReceived = true;
frame_p->timestamp = recFrame.timeStamp().seconds()*1000000 + recFrame.timeStamp().microSeconds();
frame_p->timestamp = (recFrame.timeStamp().seconds()*1000000 + recFrame.timeStamp().microSeconds()) - timeBasis;
/* enqueue frame */
getQueue().queue();