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

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
+4 -4
View File
@@ -10,10 +10,9 @@
#include <QDateTime>
/*************/
#include "canframemodel.h"
#include "canconnection.h"
#include "canconmanager.h"
namespace SERIALSTATE {
@@ -65,12 +64,12 @@ private:
void readSettings();
void procRXChar(unsigned char);
void sendCommValidation();
void rebuildLocalTimeBasis();
protected:
QTimer mTimer;
QThread mThread;
bool doValidation;
bool gotValidated;
bool isAutoRestart;
@@ -85,8 +84,9 @@ protected:
bool can0ListenOnly, can1ListenOnly;
int deviceBuildNum;
int deviceSingleWireMode;
uint64_t txTimestampBasis;
uint32_t buildTimeBasis;
int32_t timeBasis;
uint64_t lastSystemTimeBasis;
};
#endif // GVRETSERIAL_H