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

Conflicts:
	Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp

Source/Processors/DataThreads/rhythm-api/rhd2000datablock.cpp

@@ -189,7 +189,7 @@ void Rhd2000DataBlock::fillFromUsbBuffer(unsigned char usbBuffer[], int blockInd
         ttlOut[t] = convertUsbWord(usbBuffer, index);
         index += 2;
     }
-	cout << "Read " << num << " valid samples with " << numDataStreams << " streams. Usb mode status: " << usb3 << endl;
+	//cout << "Read " << num << " valid samples with " << numDataStreams << " streams. Usb mode status: " << usb3 << endl;
 }
 
 // Print the contents of RHD2000 registers from a selected USB data stream (0-7)

Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp

@@ -1424,19 +1424,18 @@ bool Rhd2000EvalBoard::readDataBlock(Rhd2000DataBlock *dataBlock, int nSamples)
 	
 	if (usb3)
 	{
-	//	std::cout << "usb3 read : " << numBytesToRead << " in " << USB3_BLOCK_SIZE << " blocks" << std::endl;
+		//std::cout << "usb3 read : " << numBytesToRead << " in " << USB3_BLOCK_SIZE << " blocks" << std::endl;
 		res = dev->ReadFromBlockPipeOut(PipeOutData, USB3_BLOCK_SIZE, numBytesToRead, usbBuffer);
 	}
 	else
 	{
-	//	std::cout << "usb2 read: " << numBytesToRead << std::endl;
+		//std::cout << "usb2 read: " << numBytesToRead << std::endl;
 		res = dev->ReadFromPipeOut(PipeOutData, numBytesToRead, usbBuffer);
 	}
 	if (res == ok_Timeout)
 	{
 		cerr << "CRITICAL: Timeout on pipe read. Check block and buffer sizes." << endl;
 	}
-	//std::cout << "read result: " << res << std::endl;
     dataBlock->fillFromUsbBuffer(usbBuffer, 0, numDataStreams, nSamples);
 
     return true;