Progress window on refresh, error checking

Source/Basestations/OneBox.cpp

@@ -26,6 +26,7 @@
 #include "../Headstages/Headstage2.h"
 #include "../Headstages/Headstage_Analog128.h"
 #include "../Headstages/Headstage_Custom384.h"
+#include "../Headstages/Headstage_QuadBase.h"
 #include "../Probes/Neuropixels1.h"
 #include "../Probes/OneBoxADC.h"
 #include "../Probes/OneBoxDAC.h"
@@ -133,6 +134,7 @@ bool OneBox::open()
         return false;
     }
 
+
     if (errorCode == Neuropixels::SUCCESS)
     {
         getInfo();
@@ -149,13 +151,17 @@ bool OneBox::open()
         dacSource = std::make_unique<OneBoxDAC> (this);
     }
 
+    syncFrequencies.clear();
     syncFrequencies.add (1);
 
     return true;
 }
 
 void OneBox::searchForProbes() {
 
+    probes.clear();
+    headstages.clear();
+
     for (int port = 1; port <= 2; port++)
     {
         bool detected = false;
@@ -197,6 +203,11 @@ void OneBox::searchForProbes() {
                 LOGD ("      Found 2.0 dual-dock headstage on port: ", port);
                 headstage = new Headstage2 (this, port);
             }
+            else if (hsPartNumber == "NPM_HS_32") //QuadBase headstage
+            {
+                LOGC ("      Found 2.0 Phase 2C dual-dock headstage on port: ", port);
+                headstage = new Headstage_QuadBase (this, port);
+            }
             else
             {
                 headstage = nullptr;
@@ -262,10 +273,8 @@ void OneBox::initialize (bool signalChainIsLoading)
     LOGD ("Initializing ADC source on slot ", slot);
     adcSource->initialize (signalChainIsLoading);
 
-    LOGD ("Neuropixels::setSWTrigger ", slot);
-    errorCode = Neuropixels::setSWTrigger (slot);
-    LOGD ("Neuropixels::arm ", slot);
-    errorCode = Neuropixels::arm (slot);
+    checkError(Neuropixels::setSWTrigger (slot), "setSWTrigger slot " + String(slot));
+    errorCode = checkError(Neuropixels::arm (slot), "arm slot " + String(slot));
 
     if (errorCode != Neuropixels::SUCCESS)
     {
@@ -282,12 +291,11 @@ void OneBox::close()
     LOGD ("Closing OneBox on slot: ", slot);
     for (auto probe : probes)
     {
-        errorCode = Neuropixels::closeProbe (slot, probe->headstage->port, probe->dock);
+        checkError (Neuropixels::closeProbe (slot, probe->headstage->port, probe->dock), "closeProbe");
     }
 
-    errorCode = Neuropixels::closeBS (slot);
+    checkError(Neuropixels::closeBS (slot), "closeBS slot " + String(slot));
 
-    LOGD ("Closed OneBox on slot: ", slot, " w/ error code: ", errorCode);
 }
 
 void OneBox::setSyncAsInput()

Source/Basestations/OneBox.h

@@ -89,8 +89,6 @@ class OneBox : public Basestation
     /** Triggers the Waveplayer output */
     void triggerWaveplayer (bool shouldStart);
 
-    Neuropixels::NP_ErrorCode errorCode;
-
     static Array<int> existing_oneboxes;
     int serial_number = -1;
 

Source/Basestations/PxiBasestation.h

@@ -162,8 +162,6 @@ class PxiBasestation : public Basestation
 
     std::unique_ptr<ArmBasestation> armBasestation;
 
-    Neuropixels::NP_ErrorCode errorCode;
-
     bool invertOutput;
 };
 

Source/Headstages/Headstage1.h

@@ -26,26 +26,43 @@
 
 #include "../NeuropixComponents.h"
 
+/** 
+    
+    Connects to a Neuropixels 1.0 probe
+
+*/
 class Headstage1 : public Headstage
 {
 public:
+    /** Constructor */
     Headstage1::Headstage1 (Basestation*, int port);
+
+    /** Reads headstage part number and serial number */
     void getInfo() override;
+
+    /** Returns true if headstage tester is connected */
     bool hasTestModule() override;
-    void runTestModule() override;
 
-    Neuropixels::NP_ErrorCode errorCode;
+    /** Runs the headstage tests */
+    void runTestModule() override;
 };
 
+/** 
+	
+    Represents a Neuropixels 1.0 flex cable
+        
+*/
 class Flex1 : public Flex
 {
 public:
+    /** Constructor */
     Flex1::Flex1 (Headstage*);
-    void getInfo() override;
 
-    Neuropixels::NP_ErrorCode errorCode;
+    /** Reads flex part number */
+    void getInfo() override;
 };
 
+/** Test module status codes */
 typedef struct HST_Status
 {
     Neuropixels::NP_ErrorCode VDD_A1V2;
@@ -61,14 +78,25 @@ typedef struct HST_Status
     Neuropixels::NP_ErrorCode SIGNAL;
 };
 
+/** 
+
+    Interface to headstage test module
+
+*/
 class HeadstageTestModule_v3 : public HeadstageTestModule
 {
 public:
+
+    /** Constructor */
     HeadstageTestModule_v3::HeadstageTestModule_v3 (Basestation* bs, Headstage* hs);
 
+    /** Gets part info */
     void getInfo() override;
 
+    /** Runs all tests */
     void runAll() override;
+
+    /** Shows test results */
     void showResults() override;
 
 private:
@@ -90,8 +118,6 @@ class HeadstageTestModule_v3 : public HeadstageTestModule
 
     std::vector<std::string> tests;
 
-    Neuropixels::NP_ErrorCode errorCode;
-
     std::unique_ptr<HST_Status> status;
 };
 

Source/Headstages/Headstage2.h

@@ -34,24 +34,42 @@ Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
 
 #include "../NeuropixComponents.h"
 
+/** 
+
+	Connects to a Neuropixels 2.0 probe
+
+*/
 class Headstage2 : public Headstage
 {
 public:
+
+    /** Constructor */
     Headstage2::Headstage2 (Basestation*, int port);
+
+    /** Gets headstage info */
     void getInfo() override;
+
+    /** No test module available for 2.0 probes, so this is always false */
     bool hasTestModule() override { return false; }
-    void runTestModule() override {}
 
-    Neuropixels::NP_ErrorCode errorCode;
+    /** No tests can be run */
+    void runTestModule() override {}
 };
 
+/** 
+
+	Represents a Neuropixels 2.0 probe flex cable
+
+*/
 class Flex2 : public Flex
 {
 public:
+
+    /** Constructor */
     Flex2::Flex2 (Headstage*, int dock);
-    void getInfo() override;
 
-    Neuropixels::NP_ErrorCode errorCode;
+    /** Gets flex info */
+    void getInfo() override;
 };
 
 #endif // __NEUROPIXHS2_H_2C4C2D67__

Source/Headstages/Headstage_Analog128.h

@@ -33,17 +33,13 @@ class Headstage_Analog128 : public Headstage
     void getInfo() override;
     bool hasTestModule() override { return false; }
     void runTestModule() override {}
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 class Flex1_NHP : public Flex
 {
 public:
     Flex1_NHP::Flex1_NHP (Headstage*);
     void getInfo() override;
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 #endif // __NEUROPIXHSNP1V1_H_2C4C2D67__

Source/Headstages/Headstage_Custom384.h

@@ -45,8 +45,6 @@ class Headstage_Custom384 : public Headstage
 
     /** No test module available*/
     void runTestModule() override {}
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 /** 
@@ -61,8 +59,6 @@ class Flex1_Custom : public Flex
 
     /** Get part number */
     void getInfo() override;
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 #endif // __NEUROPIXHSNP1V1_H_2C4C2D67__

Source/Headstages/Headstage_QuadBase.h

@@ -33,17 +33,13 @@ class Headstage_QuadBase : public Headstage
     void getInfo() override;
     bool hasTestModule() override { return false; }
     void runTestModule() override {}
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 class Flex_QuadBase : public Flex
 {
 public:
     Flex_QuadBase::Flex_QuadBase (Headstage*, int dock);
     void getInfo() override;
-
-    Neuropixels::NP_ErrorCode errorCode;
 };
 
 #endif // __NEUROPIXHSP2C_H_2C4C2D67__

Source/NeuropixComponents.h

@@ -265,11 +265,30 @@ struct ProbeSettings
 class NeuropixComponent
 {
 public:
+
+    /** Constructor */
     NeuropixComponent() {}
 
+    /** Pure virtual method for getting component info */
+    virtual void getInfo() = 0;
+
+    /** Holds component info */
     ComponentInfo info;
 
-    virtual void getInfo() = 0;
+    /** Checks error messages */
+    Neuropixels::NP_ErrorCode checkError (Neuropixels::NP_ErrorCode error, const String& function = "")
+    {
+        if (error != Neuropixels::SUCCESS)
+        {
+            LOGE (function, " Error: ", Neuropixels::getErrorMessage (error));
+		}
+
+        return error;
+	}
+
+    /** Holds error codes*/
+    Neuropixels::NP_ErrorCode errorCode;
+
 };
 
 /** Holds info about APIv3, as well as a boolean value to indicate whether or not it is being used*/