Add probe serial number when warning about mismatched probe types

Author: bparks13

Source/Devices/Neuropixels1.cpp

@@ -183,20 +183,20 @@ void Neuropixels1::defineMetadata (ProbeSettings* settings, ProbeType probeType)
     settings->probeMetadata.name = "Neuropixels 1.0";
 
     std::vector<std::array<float, 2>> shankOutline {
-        {     27,  31},
-        {     27, 514},
-        { 27 + 5, 522},
-        {27 + 10, 514},
-        {27 + 10,  31}
+        {      27,  31 },
+        {      27, 514 },
+        {  27 + 5, 522 },
+        { 27 + 10, 514 },
+        { 27 + 10,  31 }
     };
 
     std::vector<std::array<float, 2>> probeContour {
-        { 0,  155},
-        {35,    0},
-        {70,  155},
-        {70, 9770},
-        { 0, 9770},
-        { 0,  155}
+        {  0,  155 },
+        { 35,    0 },
+        { 70,  155 },
+        { 70, 9770 },
+        {  0, 9770 },
+        {  0,  155 }
     };
 
     settings->probeMetadata.shank_count = 1;
@@ -531,9 +531,13 @@ void Neuropixels1::setGainCalibrationFilePath (std::string filepath)
 
 bool Neuropixels1::validateProbeTypeAndPartNumber()
 {
-    if (! NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (settings[0]->probeType, probeMetadata.getProbePartNumber()))
+    if (! NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (settings[0]->probeType, probeMetadata))
     {
-        Onix1::showWarningMessageBoxAsync ("Probe Type / Number Mismatch", "The selected probe type is " + ProbeTypeString.at (settings[0]->probeType) + ", but the probe part number is " + probeMetadata.getProbePartNumber() + ".");
+        Onix1::showWarningMessageBoxAsync ("Probe Type / Number Mismatch",
+                                           "The selected probe type is " + ProbeTypeString.at (settings[0]->probeType)
+                                               + "', but the connected probe is '" + NeuropixelsProbeMetadata::getProbeTypeString (probeMetadata.getProbePartNumber())
+                                               + "'. Please select the correct probe type to match the connected probe."
+                                               + ".\n\nProbe serial number: " + std::to_string (probeMetadata.getProbeSerialNumber()));
         return false;
     }
 

Source/Devices/Neuropixels2e.cpp

@@ -229,7 +229,7 @@ std::vector<int> Neuropixels2e::selectElectrodeConfiguration (int electrodeConfi
     }
     else
     {
-        LOGE ("Invalid probe type given for a Neuropixels 2.0 device: ", ProbeTypeString.at(probeType));
+        LOGE ("Invalid probe type given for a Neuropixels 2.0 device: ", ProbeTypeString.at (probeType));
     }
 
     return selection;
@@ -346,9 +346,13 @@ bool Neuropixels2e::updateSettings()
     {
         if (probeMetadata[i].getProbeSerialNumber() != 0)
         {
-            if (! NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (settings[i]->probeType, probeMetadata[i].getProbePartNumber()))
+            if (! NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (settings[i]->probeType, probeMetadata[i]))
             {
-                Onix1::showWarningMessageBoxAsync ("Probe Type Mismatch", "The selected probe type is '" + ProbeTypeString.at (settings[i]->probeType) + "', but the connected probe is '" + NeuropixelsProbeMetadata::getProbeTypeString (probeMetadata[i].getProbePartNumber()) + "'. Please select the correct probe type to match the connected probe.");
+                Onix1::showWarningMessageBoxAsync ("Probe Type Mismatch",
+                                                   "The selected probe type is '" + ProbeTypeString.at (settings[i]->probeType)
+                                                       + "', but the connected probe is '" + NeuropixelsProbeMetadata::getProbeTypeString (probeMetadata[i].getProbePartNumber())
+                                                       + "'. Please select the correct probe type to match the connected probe."
+                                                       + ".\n\nProbe serial number: " + std::to_string (probeMetadata[i].getProbeSerialNumber()));
                 return false;
             }
 
@@ -798,8 +802,8 @@ void Neuropixels2e::defineMetadata (ProbeSettings* settings, ProbeType probeType
     constexpr float shankPitchX = 250.0f;
 
     std::vector<std::array<float, 2>> probeContour {
-        {0, probeLengthY},
-        {0, shankLengthY},
+        { 0, probeLengthY },
+        { 0, shankLengthY },
     };
 
     for (int i = 0; i < shankCount; i++)
@@ -816,11 +820,11 @@ void Neuropixels2e::defineMetadata (ProbeSettings* settings, ProbeType probeType
     probeContour.emplace_back (std::array<float, 2> { 0.0f, probeLengthY });
 
     std::vector<std::array<float, 2>> shankOutline {
-        {     27,  31},
-        {     27, 514},
-        { 27 + 5, 522},
-        {27 + 10, 514},
-        {27 + 10,  31}
+        {      27,  31 },
+        {      27, 514 },
+        {  27 + 5, 522 },
+        { 27 + 10, 514 },
+        { 27 + 10,  31 }
     };
 
     settings->probeMetadata.shank_count = shankCount;

Source/Devices/NeuropixelsProbeMetadata.cpp

@@ -86,8 +86,10 @@ NeuropixelsProbeMetadata::NeuropixelsProbeMetadata (I2CRegisterContext* flex, On
     }
 }
 
-bool NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (ProbeType probeType, std::string partNumber)
+bool NeuropixelsProbeMetadata::validateProbeTypeAndPartNumber (ProbeType probeType, NeuropixelsProbeMetadata probeMetadata)
 {
+    std::string partNumber = probeMetadata.getProbePartNumber();
+
     if (probeType == ProbeType::NONE)
         return false;
 

Source/Devices/NeuropixelsProbeMetadata.h

@@ -39,7 +39,7 @@ class NeuropixelsProbeMetadata
     const std::string getFlexPartNumber() const;
     const std::string getFlexVersion() const;
 
-    static bool validateProbeTypeAndPartNumber (ProbeType probeType, std::string partNumber);
+    static bool validateProbeTypeAndPartNumber (ProbeType probeType, NeuropixelsProbeMetadata probeMetadata);
     static std::string getProbeTypeString (std::string partNumber);
 
 private: