Merge branch 'usb3' of github.com:open-ephys/GUI into usb3

Author: aacuevas

Source/Processors/DataThreads/RHD2000Thread.cpp

@@ -1471,8 +1471,8 @@ bool RHD2000Thread::updateBuffer()
     //cout << "Block size: " << blockSize << endl;
 
     bool return_code;
-	std::cout << "Current number of words: " << evalBoard->numWordsInFifo() << " for " << blockSize << std::endl;
-    if (evalBoard->numWordsInFifo() >= blockSize)
+	//std::cout << "Current number of words: " <<  evalBoard->numWordsInFifo() << " for " << blockSize << std::endl;
+    if (evalBoard->numWordsInFifo() >= 189440)
     {
         return_code = evalBoard->readDataBlock(dataBlock);
 

Source/Processors/DataThreads/RHD2000Thread.h

@@ -149,7 +149,7 @@ class RHD2000Thread : public DataThread, public Timer
     float thisSample[256];
     float auxBuffer[256]; // aux inputs are only sampled every 4th sample, so use this to buffer the samples so they can be handles just like the regular neural channels later
 
-    int blockSize;
+    unsigned int blockSize;
 
     bool isTransmitting;