Change some usb block settings

Author: aacuevas

Source/Plugins/IntanRecordingController/RHD2000Thread.cpp

@@ -566,7 +566,7 @@ void RHD2000Thread::scanPorts()
 		}
 		// Read the resulting single data block from the USB interface.
 		evalBoard->readDataBlock(dataBlock, INIT_STEP);
-
+		
 		// Read the Intan chip ID number from each RHD2000 chip found.
 		// Record delay settings that yield good communication with the chip.
 		for (hs = 0; hs < MAX_NUM_HEADSTAGES; ++hs)//MAX_NUM_DATA_STREAMS; ++stream)
@@ -626,6 +626,9 @@ void RHD2000Thread::scanPorts()
             enableHeadstage(hs, false);
         }
     }
+
+//	for (int i = 0; i < 16; i++)
+//		enableHeadstage(i, true, 2, 32);
 	updateBoardStreams();
 
 

Source/Plugins/IntanRecordingController/rhythm-api/rhd2000datablockusb3.cpp

@@ -165,13 +165,15 @@ int Rhd2000DataBlockUsb3::convertUsbWord(unsigned char usbBuffer[], int index)
 }
 
 // Fill data block with raw data from USB input buffer.
-void Rhd2000DataBlockUsb3::fillFromUsbBuffer(unsigned char usbBuffer[], int blockIndex, int numDataStreams)
+void Rhd2000DataBlockUsb3::fillFromUsbBuffer(unsigned char usbBuffer[], int blockIndex, int numDataStreams, int nSamples)
 {
     int index, t, channel, stream, i;
 
+	int samplesToRead = nSamples <= 0 ? SAMPLES_PER_DATA_BLOCK : nSamples;
+
     int ampIndex = 0;
     index = blockIndex * 2 * calculateDataBlockSizeInWords(numDataStreams);
-    for (t = 0; t < SAMPLES_PER_DATA_BLOCK; ++t) {
+	for (t = 0; t < samplesToRead; ++t) {
         if (!checkUsbHeader(usbBuffer, index)) {
             cout << "Error in Rhd2000DataBlockUsb3::fillFromUsbBuffer: Incorrect header." << endl;
         }

Source/Plugins/IntanRecordingController/rhythm-api/rhd2000datablockusb3.h

@@ -46,7 +46,7 @@ class Rhd2000DataBlockUsb3
 
     static unsigned int calculateDataBlockSizeInWords(int numDataStreams, int nSamples = -1);
     static unsigned int getSamplesPerDataBlock();
-    void fillFromUsbBuffer(unsigned char usbBuffer[], int blockIndex, int numDataStreams);
+    void fillFromUsbBuffer(unsigned char usbBuffer[], int blockIndex, int numDataStreams, int nSamples = -1);
     void print(int stream) const;
     void write(ofstream &saveOut, int numDataStreams) const;
     static bool checkUsbHeader(unsigned char usbBuffer[], int index);

Source/Plugins/IntanRecordingController/rhythm-api/rhd2000evalboardusb3.cpp

@@ -1471,16 +1471,17 @@ bool Rhd2000EvalBoardUsb3::readDataBlock(Rhd2000DataBlockUsb3 *dataBlock, int nS
                 "Increase value of MAX_NUM_BLOCKS." << endl;
         return false;
     }
-
+	std::cout << " Reading " << nSamples << " samples " << numBytesToRead << " bytes with block size " << USB3_BLOCK_SIZE << std::endl;
     result = dev->ReadFromBlockPipeOut(PipeOutData, USB3_BLOCK_SIZE, USB3_BLOCK_SIZE * max(numBytesToRead / USB3_BLOCK_SIZE, (unsigned int)1), usbBuffer);
+	std::cout << "Read " << result << std::endl;
 
     if (result == ok_Failed) {
         cerr << "CRITICAL (readDataBlock): Failure on pipe read.  Check block and buffer sizes." << endl;
     } else if (result == ok_Timeout) {
         cerr << "CRITICAL (readDataBlock): Timeout on pipe read.  Check block and buffer sizes." << endl;
     }
 
-    dataBlock->fillFromUsbBuffer(usbBuffer, 0, numDataStreams);
+    dataBlock->fillFromUsbBuffer(usbBuffer, 0, numDataStreams, nSamples);
 
     return true;
 }

Source/Plugins/IntanRecordingController/rhythm-api/rhd2000evalboardusb3.h

@@ -33,7 +33,7 @@
 
 #define FIFO_CAPACITY_WORDS 67108864
 
-#define USB3_BLOCK_SIZE	2048
+#define USB3_BLOCK_SIZE	1024
 #define RAM_BURST_SIZE 32
 
 #include <queue>