Remove call to ADC_readComparators in acquisition loop

open-ephys-plugins · Sep 3, 2024 · 78a8035 · 78a8035
1 parent 46ad07c
commit 78a8035
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Source/Basestations/OneBox.cpp b/Source/Basestations/OneBox.cpp
@@ -258,7 +258,9 @@ void OneBox::initialize (bool signalChainIsLoading)
 
     adcSource->initialize (signalChainIsLoading);
 
+    errorCode = Neuropixels::setSWTrigger (slot);
     errorCode = Neuropixels::arm (slot);
+
     if (errorCode != Neuropixels::SUCCESS)
     {
         LOGC ("Failed to arm OneBox on slot ", slot, ", error code = ", errorCode);

diff --git a/Source/Probes/OneBoxADC.cpp b/Source/Probes/OneBoxADC.cpp
@@ -31,7 +31,7 @@ OneBoxADC::OneBoxADC (Basestation* bs) : DataSource (bs)
     ui = nullptr;
 
     channel_count = NUM_ADCS;
-    sample_rate = 9500.0f;
+    sample_rate = 30300.5;
 
     sourceType = DataSourceType::ADC;
     status = SourceStatus::CONNECTED;
@@ -54,6 +54,13 @@ OneBoxADC::OneBoxADC (Basestation* bs) : DataSource (bs)
 void OneBoxADC::initialize (bool signalChainIsLoading)
 {
     LOGD ("Initializing OneBoxADC");
+
+    errorCode = Neuropixels::ADC_enableProbe (basestation->slot, true);
+
+    if (errorCode != Neuropixels::SUCCESS)
+    {
+		LOGD ("Error enabling ADCs: ", errorCode);
+	}
 }
 
 void OneBoxADC::startAcquisition()
@@ -239,7 +246,6 @@ void OneBoxADC::run()
 
         if (errorCode == Neuropixels::SUCCESS && count > 0)
         {
-
 
             for (int packetNum = 0; packetNum < count; packetNum++)
             {
@@ -253,8 +259,6 @@ void OneBoxADC::run()
                     adcSamples[j * count + packetNum] = float (data[packetNum * NUM_ADCS + j]) * bitVolts; // convert to volts
                 }
 
-                Neuropixels::ADC_readComparators (basestation->slot, &adcThresholdStates);
-
                 sample_numbers[packetNum] = sample_number++;
 
             }

diff --git a/Source/Probes/OneBoxADC.h b/Source/Probes/OneBoxADC.h
@@ -27,7 +27,7 @@
 #include "../NeuropixComponents.h"
 
 #define MAXPACKETS 64
-#define NUM_ADCS 12
+#define NUM_ADCS 24
 
 class OneBoxInterface;