Stop acquisition gracefully when port communication is lost

- Correctly parses the data frame from a Port Controller
- Run startAcquisition for the port control devices
- Modified language when unable  to acquire the communication lock

Author: bparks13

Source/Devices/PortController.cpp

@@ -67,21 +67,19 @@ void PortController::processFrames()
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
-		int16_t* dataPtr = (int16_t*)frame->data;
+		int8_t* dataPtr = (int8_t*)frame->data;
 
-		int dataOffset = 4;
+		int dataOffset = 8;
 
-		PortStatusCode code = (PortStatusCode) *(int8_t*)(dataPtr + dataOffset);
+		uint32_t code = (uint32_t) *(dataPtr + dataOffset);
+		uint32_t data = (uint32_t) *(dataPtr + dataOffset + 1);
 
-		errorFlag = ((uint32_t)code & LINKSTATE_SL) == 0;
+		if (code & (uint32_t)PortStatusCode::SerdesLock)
+			errorFlag = ((uint32_t)data & LINKSTATE_SL) == 0;
 
 		oni_destroy_frame(frame);
 
-		if (errorFlag)
-		{
-			LOGE("Port status changed and indicated an error occurred. Port status code is " + String((uint32_t)code))
-			return;
-		}
+		LOGE("Port status changed for " + getName() + ". Port status code is " + String((uint32_t)code));
 	}
 }
 
@@ -100,7 +98,7 @@ DiscoveryParameters PortController::getHeadstageDiscoveryParameters(String heads
 	return DiscoveryParameters();
 }
 
-bool PortController::configureVoltage(float voltage) const
+bool PortController::configureVoltage(float voltage)
 {
 	if (ctx == NULL) return false;
 
@@ -129,15 +127,15 @@ bool PortController::configureVoltage(float voltage) const
 	return false;
 }
 
-void PortController::setVoltageOverride(float voltage, bool waitToSettle) const
+void PortController::setVoltageOverride(float voltage, bool waitToSettle)
 {
 	if (ctx == NULL) return;
 
 	ONI_OK(oni_write_reg(ctx, (oni_dev_idx_t)port, (oni_reg_addr_t)PortControllerRegister::PORTVOLTAGE, (oni_reg_val_t)(voltage * 10)));
 	if (waitToSettle) sleep_for(std::chrono::milliseconds(500));
 }
 
-void PortController::setVoltage(float voltage) const
+void PortController::setVoltage(float voltage)
 {
 	if (ctx == NULL) return;
 

Source/Devices/PortController.h

@@ -102,13 +102,13 @@ class PortController : public OnixDevice
 
 	void updateDiscoveryParameters(DiscoveryParameters parameters);
 
-	bool configureVoltage(float voltage = defaultVoltage) const;
+	bool configureVoltage(float voltage = defaultVoltage);
 
 	/** Sets the voltage to the given value, after setting the voltage to zero */
-	void setVoltage(float voltage) const;
+	void setVoltage(float voltage);
 
 	/** Overrides the voltage setting and directly sets it to the given voltage */
-	void setVoltageOverride(float voltage, bool waitToSettle = true) const;
+	void setVoltageOverride(float voltage, bool waitToSettle = true);
 
 	bool checkLinkState() const;
 

Source/OnixSource.cpp

@@ -461,8 +461,6 @@ bool OnixSource::isReady()
 
 bool OnixSource::startAcquisition()
 {
-	startThread();
-
 	frameReader.reset();
 
 	Array<OnixDevice*> devices;
@@ -475,16 +473,18 @@ bool OnixSource::startAcquisition()
 	devices.add(portA.get());
 	devices.add(portB.get());
 
-	frameReader = std::make_unique<FrameReader>(devices, context.get());
-	frameReader->startThread();
-
-	for (auto source : sources)
+	for (auto source : devices)
 	{
 		if (!source->isEnabled()) continue;
 
 		source->startAcquisition();
 	}
 
+	frameReader = std::make_unique<FrameReader>(devices, context.get());
+	frameReader->startThread();
+
+	startThread();
+
 	return true;
 }
 
@@ -496,8 +496,8 @@ bool OnixSource::stopAcquisition()
 	if (frameReader->isThreadRunning())
 		frameReader->signalThreadShouldExit();
 
-	waitForThreadToExit(2000);
-	frameReader->waitForThreadToExit(1000);
+	if (!portA->getErrorFlag() && !portB->getErrorFlag())
+		waitForThreadToExit(2000);
 
 	if (devicesFound)
 	{

Source/OnixSourceEditor.cpp

@@ -127,21 +127,29 @@ void OnixSourceEditor::buttonClicked(Button* b)
 			{
 				if (!thread->configurePortVoltage(PortName::PortA, portVoltageValueA->getText()))
 				{
-					CoreServices::sendStatusMessage("Unable to set port voltage for Port A.");
+					CoreServices::sendStatusMessage("Unable to acquire communication lock on Port A.");
 					connectButton->setToggleState(false, true);
 					return;
 				}
 			}
+			else
+			{
+				thread->setPortVoltage(PortName::PortA, 0);
+			}
 
 			if (isHeadstageSelected(PortName::PortB))
 			{
 				if (!thread->configurePortVoltage(PortName::PortB, portVoltageValueB->getText()))
 				{
-					CoreServices::sendStatusMessage("Unable to set port voltage for Port B.");
+					CoreServices::sendStatusMessage("Unable to acquire communication lock on Port B.");
 					connectButton->setToggleState(false, true);
 					return;
 				}
 			}
+			else
+			{
+				thread->setPortVoltage(PortName::PortB, 0);
+			}
 
 			thread->initializeDevices(true);
 			canvas->refreshTabs();