Force hardware reconnect when communication lock is lost

Author: bparks13

Source/OnixSource.cpp

@@ -314,8 +314,6 @@ void OnixSource::setPortVoltage(PortName port, float voltage) const
 {
 	if (!context.isInitialized()) return;
 
-	oni_ctx ctx = context.get();
-
 	switch (port)
 	{
 	case PortName::PortA:
@@ -514,6 +512,23 @@ bool OnixSource::stopAcquisition()
 		oni_set_opt(context.get(), ONI_OPT_BLOCKREADSIZE, &block_read_size, sizeof(block_read_size));
 	}
 
+	if (portA->getErrorFlag() || portB->getErrorFlag())
+	{
+		if (portA->getErrorFlag())
+		{
+			LOGE("Port A lost communication lock. Reconnect hardware to continue.");
+			CoreServices::sendStatusMessage("Port A lost communication lock");
+		}
+
+		if (portB->getErrorFlag())
+		{
+			LOGE("Port B lost communication lock. Reconnect hardware to continue.");
+			CoreServices::sendStatusMessage("Port B lost communication lock");
+		}
+
+		editor->updateConnectedStatus(false);
+	}
+
 	for (auto source : sources)
 	{
 		if (!source->isEnabled()) continue;

Source/OnixSourceEditor.cpp

@@ -111,67 +111,98 @@ OnixSourceEditor::OnixSourceEditor(GenericProcessor* parentNode, OnixSource* oni
 
 void OnixSourceEditor::labelTextChanged(Label* l)
 {
+	// TODO: Add headstage specific parameters to limit voltage within safe levels
 	if (l == portVoltageValueA.get())
 	{
+		float input = l->getText().getFloatValue();
+
+		if (input < 0.0f)
+		{
+			l->setText("0.0", dontSendNotification);
+		}
+		else if (input > 7.0f)
+		{
+			l->setText("7.0", dontSendNotification);
+		}
+	}
+	else if (l == portVoltageValueB.get())
+	{
+		float input = l->getText().getFloatValue();
+
+		if (input < 0.0f)
+		{
+			l->setText("0.0", dontSendNotification);
+		}
+		else if (input > 7.0f)
+		{
+			l->setText("7.0", dontSendNotification);
+		}
 	}
 }
 
 void OnixSourceEditor::buttonClicked(Button* b)
 {
 	if (b == connectButton.get())
 	{
-		if (connectButton->getToggleState() == true)
+		updateConnectedStatus(connectButton->getToggleState());
+	}
+}
+
+void OnixSourceEditor::updateConnectedStatus(bool connected)
+{
+	connectButton->setToggleState(connected, dontSendNotification);
+
+	if (connected)
+	{
+		// NB: Configure port voltages, using either the automated voltage discovery algorithm, or the explicit voltage value given
+		if (isHeadstageSelected(PortName::PortA))
 		{
-			// NB: Configure port voltages, using either the automated voltage discovery algorithm, or the explicit voltage value given
-			if (isHeadstageSelected(PortName::PortA))
-			{
-				if (!thread->configurePortVoltage(PortName::PortA, portVoltageValueA->getText()))
-				{
-					CoreServices::sendStatusMessage("Unable to acquire communication lock on Port A.");
-					connectButton->setToggleState(false, true);
-					return;
-				}
-			}
-			else
+			if (!thread->configurePortVoltage(PortName::PortA, portVoltageValueA->getText()))
 			{
-				thread->setPortVoltage(PortName::PortA, 0);
+				CoreServices::sendStatusMessage("Unable to acquire communication lock on Port A.");
+				connectButton->setToggleState(false, dontSendNotification);
+				return;
 			}
-			
-			if (isHeadstageSelected(PortName::PortB))
-			{
-				if (!thread->configurePortVoltage(PortName::PortB, portVoltageValueB->getText()))
-				{
-					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();
-
-			connectButton->setLabel("DISCONNECT");
+		}
+		else
+		{
+			thread->setPortVoltage(PortName::PortA, 0);
+		}
 
-			if (!thread->foundInputSource())
+		if (isHeadstageSelected(PortName::PortB))
+		{
+			if (!thread->configurePortVoltage(PortName::PortB, portVoltageValueB->getText()))
 			{
-				CoreServices::sendStatusMessage("No Onix hardware found.");
-				connectButton->setToggleState(false, true);
+				CoreServices::sendStatusMessage("Unable to acquire communication lock on Port B.");
+				connectButton->setToggleState(false, dontSendNotification);
+				return;
 			}
 		}
 		else
 		{
-			thread->setPortVoltage(PortName::PortA, 0);
 			thread->setPortVoltage(PortName::PortB, 0);
+		}
+
+		thread->initializeDevices(true);
+		canvas->refreshTabs();
 
-			canvas->removeTabs();
-			thread->disconnectDevices(true);
-			connectButton->setLabel("CONNECT");
+		connectButton->setLabel("DISCONNECT");
+
+		if (!thread->foundInputSource())
+		{
+			CoreServices::sendStatusMessage("No Onix hardware found.");
+			connectButton->setToggleState(false, sendNotification);
 		}
 	}
+	else
+	{
+		thread->setPortVoltage(PortName::PortA, 0);
+		thread->setPortVoltage(PortName::PortB, 0);
+
+		canvas->removeTabs();
+		thread->disconnectDevices(true);
+		connectButton->setLabel("CONNECT");
+	}
 }
 
 void OnixSourceEditor::comboBoxChanged(ComboBox* cb)

Source/OnixSourceEditor.h

@@ -76,6 +76,8 @@ class OnixSourceEditor : public VisualizerEditor,
 
     bool isHeadstageSelected(PortName port);
 
+    void updateConnectedStatus(bool);
+
     OnixSourceCanvas* canvas;
 
 private: