Track connected status of probes in settings

Author: bparks13

Source/Devices/Neuropixels1e.cpp

@@ -135,6 +135,8 @@ int Neuropixels1e::configureDevice()
 
     LOGD ("Probe SN: ", probeMetadata.getProbeSerialNumber());
 
+    settings[0]->connected = probeMetadata.getProbeSerialNumber() != 0;
+
     return ONI_ESUCCESS;
 }
 

Source/Devices/Neuropixels1f.cpp

@@ -127,6 +127,8 @@ int Neuropixels1f::configureDevice()
 
     LOGD ("Probe SN: ", probeMetadata.getProbeSerialNumber());
 
+    settings[0]->connected = probeMetadata.getProbeSerialNumber() != 0;
+
     // Enable device streaming
     rc = deviceContext->writeRegister (deviceIdx, 0x8000, 1);
     if (rc != ONI_ESUCCESS)

Source/Devices/Neuropixels2e.cpp

@@ -316,18 +316,22 @@ int Neuropixels2e::configureDevice()
     LOGD ("Probe A SN: ", probeMetadata[0].getProbeSerialNumber());
     LOGD ("Probe B SN: ", probeMetadata[1].getProbeSerialNumber());
 
-    if (probeMetadata[0].getProbeSerialNumber() == 0 && probeMetadata[1].getProbeSerialNumber() == 0)
-    {
-        m_numProbes = 0;
-        throw error_str ("No probes were found connected at address " + std::to_string (getDeviceIdx()));
-    }
-    else if (probeMetadata[0].getProbeSerialNumber() != 0 && probeMetadata[1].getProbeSerialNumber() != 0)
+    m_numProbes = 0;
+
+    for(int i = 0; i < NumberOfProbes; i++)
     {
-        m_numProbes = 2;
+        if (probeMetadata[i].getProbeSerialNumber() != 0)
+        {
+            settings[i]->connected = true;
+            m_numProbes++;
+        }
+        else
+            settings[i]->connected = false;
     }
-    else
+
+    if (m_numProbes == 0)
     {
-        m_numProbes = 1;
+        throw error_str ("No probes were found connected at address " + std::to_string (getDeviceIdx()));
     }
 
     streamInfos.clear();
@@ -342,9 +346,9 @@ int Neuropixels2e::configureDevice()
 
 bool Neuropixels2e::updateSettings()
 {
-    for (int i = 0; i < 2; i++)
+    for (int i = 0; i < NumberOfProbes; i++)
     {
-        if (probeMetadata[i].getProbeSerialNumber() != 0)
+        if (settings[i]->connected)
         {
             if (! NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (settings[i]->probeType, probeMetadata[i]))
             {
@@ -416,7 +420,7 @@ bool Neuropixels2e::updateSettings()
 
     for (int i = 0; i < NumberOfProbes; i++)
     {
-        if (probeMetadata[i].getProbeSerialNumber() != 0)
+        if (settings[i]->connected)
         {
             selectProbe (serializer.get(), i == 0 ? ProbeASelected : ProbeBSelected);
             writeConfiguration (settings[i].get());
@@ -554,7 +558,7 @@ void Neuropixels2e::addSourceBuffers (OwnedArray<DataBuffer>& sourceBuffers)
     if (m_numProbes == 1)
     {
         sourceBuffers.add (new DataBuffer (streamInfos.getFirst().getNumChannels(), (int) streamInfos.getFirst().getSampleRate() * bufferSizeInSeconds));
-        auto bufferIndex = probeMetadata[0].getProbeSerialNumber() != 0 ? 0 : 1;
+        auto bufferIndex = settings[0]->connected ? 0 : 1;
         amplifierBuffer[bufferIndex] = sourceBuffers.getLast();
     }
     else

Source/NeuropixelsComponents.h

@@ -287,6 +287,7 @@ struct ProbeSettings
         lfpGainIndex = newSettings->lfpGainIndex;
         referenceIndex = newSettings->referenceIndex;
         apFilterState = newSettings->apFilterState;
+        connected = newSettings->connected;
 
         selectedBank = newSettings->selectedBank;
         selectedShank = newSettings->selectedShank;
@@ -344,6 +345,7 @@ struct ProbeSettings
     int lfpGainIndex = 0;
     int referenceIndex = 0;
     bool apFilterState = false;
+    bool connected = false;
 
     std::vector<Bank> selectedBank;
     std::vector<int> selectedShank;
@@ -576,6 +578,9 @@ static class NeuropixelsHelpers
         {
             ProbeSettings* probeSetting = it->get();
 
+            if (! probeSetting->connected)
+                continue;
+
             for (int i = probeSetting->numberOfChannels - 1; i >= 0; i--)
             {
                 auto channel = *channels--;