Merge remote-tracking branch 'drebbe-intrepid/master' into timestamp

api/icsneoc/icsneoc.cpp

@@ -597,4 +597,15 @@ bool icsneo_getSupportedDevices(devicetype_t* devices, size_t* count) {
 	*count = len;
 
 	return true;
-}
+}
+
+extern bool DLLExport icsneo_getTimestampMultiplier(const neodevice_t* device, int* multiplier)
+{
+	if (!icsneo_isValidNeoDevice(device)) {
+		ErrorManager::GetInstance().add(APIError::InvalidNeoDevice);
+		return false;
+	}
+
+	*multiplier = device->device->getTimestampMultiplier();
+	return true;
+}

api/icsneolegacy/icsneolegacy.cpp

@@ -59,6 +59,12 @@ static void NeoMessageToSpyMessage(const neomessage_t& newmsg, icsSpyMessage& ol
 			oldmsg.Protocol = SPY_PROTOCOL_ETHERNET;
 			break;
 	}
+	// Timestamp - epoch = 1/1/2007 - 25ns per tick most of the time
+	uint64_t t = newmsg.timestamp;
+	if (newmsg.timestampMultiplier)
+		t /= newmsg.timestampMultiplier;
+	oldmsg.TimeHardware2 = (unsigned long)(t >> 32);
+	oldmsg.TimeHardware = (unsigned long)(t & 0xFFFFFFFF);
 }
 
 //Basic Functions
@@ -226,8 +232,26 @@ int icsneoEnableNetworkRXQueue(void* hObject, int iEnable) {
 }
 
 int icsneoGetTimeStampForMsg(void* hObject, icsSpyMessage* pMsg, double* pTimeStamp) {
-	// TODO Implement
-	return false;
+	if(!icsneoValidateHObject(hObject))
+		return false;
+	neodevice_t* device = (neodevice_t*)hObject;
+
+	int multiplier = 0;
+	if (!icsneo_getTimestampMultiplier(device, &multiplier))
+		return false;
+
+	// Convert back to ticks
+	uint64_t ticks = pMsg->TimeHardware2;
+	ticks <<= 32;
+	ticks += pMsg->TimeHardware;
+
+	// convert to ns
+	ticks *= multiplier;
+
+	// icsneoGetTimeStampForMsg() expects pTimeStamp to be in seconds
+	*pTimeStamp = ticks / (double)1000000000;
+
+	return true;
 }
 
 void icsneoGetISO15765Status(void* hObject, int lNetwork, int lClearTxStatus, int lClearRxStatus, int*lTxStatus, int*lRxStatus) {