Use hub clock instead of frame clock for hub 0 devices

Author: bparks13

Source/Devices/AnalogIO.cpp

@@ -231,7 +231,9 @@ void AnalogIO::processFrame(uint64_t eventWord)
 
 		currentAverageFrame = 0;
 
-		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(frame->time);
+		auto hubClock = (uint64_t*)frame->data;
+
+		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(*hubClock);
 		sampleNumbers[currentFrame] = sampleNumber++;
 		eventCodes[currentFrame] = eventWord;
 

Source/Devices/DigitalIO.cpp

@@ -133,14 +133,16 @@ void DigitalIO::processFrames()
 	{
 		size_t offset = 0;
 
-		uint16_t* dataPtr = (uint16_t*)frame->data;
+		auto hubClock = (uint64_t*)frame->data;
 
-		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(frame->time);
+		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(*hubClock);
 		sampleNumbers[currentFrame] = sampleNumber++;
 
 		constexpr int inputDataOffset = 4;
 		constexpr int buttonDataOffset = inputDataOffset + 1;
 
+		uint16_t* dataPtr = (uint16_t*)frame->data;
+
 		uint64_t inputState = *(dataPtr + inputDataOffset);
 		uint64_t buttonState = *(dataPtr + buttonDataOffset);
 

Source/Devices/HarpSyncInput.cpp

@@ -83,10 +83,11 @@ void HarpSyncInput::processFrames()
 	oni_frame_t* frame;
 	while (frameQueue.try_dequeue(frame))
 	{
+		auto hubClock = (uint64_t*)frame->data;
 
-		uint32_t* dataPtr = (uint32_t*)frame->data;
+		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(*hubClock);
 
-		timestamps[currentFrame] = deviceContext->convertTimestampToSeconds(frame->time);
+		uint32_t* dataPtr = (uint32_t*)frame->data;
 
 		harpTimeSamples[currentFrame] = *(dataPtr + 2) + 1;
 

Source/Devices/MemoryMonitor.cpp

@@ -153,8 +153,9 @@ void MemoryMonitor::processFrames()
 
 	while (frameQueue.try_dequeue(frame))
 	{
+		auto hubClock = (uint64_t*)frame->data;
+		auto t = deviceContext->convertTimestampToSeconds(*hubClock);
 		uint32_t* dataPtr = (uint32_t*)frame->data;
-		auto t = deviceContext->convertTimestampToSeconds(frame->time);
 		auto p = 100.0f * float(*(dataPtr + 2)) / totalMemory;
 		lastPercentUsedValue = p;
 		oni_destroy_frame(frame);