Fix issues with usb transfer

Author: aacuevas

Builds/VisualStudio2013/Plugins/IntanRecordingController/IntanRecordingController.vcxproj

@@ -37,14 +37,14 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -134,6 +134,7 @@
     <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000datablockusb3.cpp" />
     <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000evalboardusb3.cpp" />
     <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000registersusb3.cpp" />
+    <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\USBThread.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\RHD2000Editor.h" />
@@ -142,6 +143,7 @@
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000datablockusb3.h" />
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000evalboardusb3.h" />
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000registersusb3.h" />
+    <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\USBThread.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Builds/VisualStudio2013/Plugins/IntanRecordingController/IntanRecordingController.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000registersusb3.cpp">
       <Filter>Source Files\rhythm-api</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\Plugins\IntanRecordingController\USBThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\RHD2000Editor.h">
@@ -56,5 +59,8 @@
     <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\rhythm-api\rhd2000registersusb3.h">
       <Filter>Source Files\rhythm-api</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\Plugins\IntanRecordingController\USBThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Source/Plugins/IntanRecordingController/RHD2000Thread.cpp

@@ -23,6 +23,7 @@
 
 #include "RHD2000Thread.h"
 #include "RHD2000Editor.h"
+#include "USBThread.h"
 
 #if defined(_WIN32)
 #define okLIB_NAME "okFrontPanel.dll"
@@ -367,6 +368,10 @@ void RHD2000Thread::initializeBoard()
     {
         return;
     }
+
+	//Instantiate usb thread
+	usbThread = new USBThread(evalBoard);
+
     // Initialize the board
     std::cout << "Initializing acquisition board." << std::endl;
     evalBoard->initialize();
@@ -1403,24 +1408,31 @@ bool RHD2000Thread::startAcquisition()
     //std::cout << "Setting max timestep." << std::endl;
     //evalBoard->setMaxTimeStep(100);
 
+	blockSize = dataBlock->calculateDataBlockSizeInWords(evalBoard->getNumEnabledDataStreams());
+	std::cout << "Expecting blocksize of " << blockSize << " for " << evalBoard->getNumEnabledDataStreams() << " streams" << std::endl;
 
-    std::cout << "Starting acquisition." << std::endl;
-    if (1)
-    {
-        // evalBoard->setContinuousRunMode(false);
-        //  evalBoard->setMaxTimeStep(0);
-        std::cout << "Flushing FIFO." << std::endl;
-        evalBoard->flush();
-        evalBoard->setContinuousRunMode(true);
-		//evalBoard->printFIFOmetrics();
-        evalBoard->run();
-		//evalBoard->printFIFOmetrics();
-    }
+	//evalBoard->printFIFOmetrics();
 
-    blockSize = dataBlock->calculateDataBlockSizeInWords(evalBoard->getNumEnabledDataStreams());
-	std::cout << "Expecting blocksize of " << blockSize << " for " << evalBoard->getNumEnabledDataStreams() << " streams" << std::endl;
+	// evalBoard->setContinuousRunMode(false);
+	//  evalBoard->setMaxTimeStep(0);
+	std::cout << "Flushing FIFO." << std::endl;
+	evalBoard->flush();
+	std::cout << "FIFO count " << evalBoard->getNumWordsInFifo() << std::endl;
+
+	std::cout << "Starting usb thread with buffer of " << blockSize * 2 << " bytes" << std::endl;
+	usbThread->startAcquisition(blockSize * 2);
+
+	std::cout << "Starting acquisition." << std::endl;
+	evalBoard->setContinuousRunMode(true);
+	//evalBoard->printFIFOmetrics();
+	evalBoard->run();
 	//evalBoard->printFIFOmetrics();
-    startThread();
+	startThread();
+	
+
+
+    
+    
 
 
     isTransmitting = true;
@@ -1433,6 +1445,7 @@ bool RHD2000Thread::stopAcquisition()
 
     //  isTransmitting = false;
     std::cout << "RHD2000 data thread stopping acquisition." << std::endl;
+	usbThread->stopAcquisition();
 
     if (isThreadRunning())
     {
@@ -1482,14 +1495,15 @@ bool RHD2000Thread::stopAcquisition()
 bool RHD2000Thread::updateBuffer()
 {
 	//int chOffset;
-	unsigned char* bufferPtr;
     //cout << "Number of 16-bit words in FIFO: " << evalBoard->numWordsInFifo() << endl;
 	//cout << "Block size: " << blockSize << endl;
-
+	unsigned char* bufferPtr;
 	//std::cout << "Current number of words: " <<  evalBoard->numWordsInFifo() << " for " << blockSize << std::endl;
-	bool return_code;
+	long return_code;
 
-	return_code = evalBoard->readDataBlocksRaw(1,bufferPtr);
+	return_code = usbThread->usbRead(bufferPtr);
+	if (return_code == 0)
+		return true;
 
 	int index = 0;
 	int auxIndex, chanIndex;
@@ -1504,6 +1518,7 @@ bool RHD2000Thread::updateBuffer()
 		if (!Rhd2000DataBlockUsb3::checkUsbHeader(bufferPtr, index))
 		{
 			cerr << "Error in Rhd2000EvalBoard::readDataBlock: Incorrect header." << endl;
+			cerr << "Read code: " << return_code << endl;
 			break;
 		}
 
@@ -1584,7 +1599,6 @@ bool RHD2000Thread::updateBuffer()
 
 	if (dacOutputShouldChange)
 	{
-		std::cout << "DAC" << std::endl;
         for (int k=0; k<8; k++)
         {
             if (dacChannelsToUpdate[k])

Source/Plugins/IntanRecordingController/RHD2000Thread.h

@@ -41,6 +41,7 @@
 class SourceNode;
 class RHDHeadstage;
 class RHDImpedanceMeasure;
+class USBThread;
 
 struct ImpedanceData
 {
@@ -212,6 +213,7 @@ class RHD2000Thread : public DataThread
     Array<float> adcBitVolts;
     bool newScan;
     ScopedPointer<RHDImpedanceMeasure> impedanceThread;
+	ScopedPointer<USBThread> usbThread;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(RHD2000Thread);
 };

Source/Plugins/IntanRecordingController/USBThread.cpp

@@ -0,0 +1,101 @@
+/*
+------------------------------------------------------------------
+
+This file is part of the Open Ephys GUI
+Copyright (C) 2016 Open Ephys
+
+------------------------------------------------------------------
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "USBThread.h"
+#include "rhythm-api/rhd2000evalboardusb3.h"
+
+USBThread::USBThread(Rhd2000EvalBoardUsb3* b)
+	: m_board(b), Thread("USBThread")
+{
+}
+
+
+USBThread::~USBThread()
+{
+}
+
+void USBThread::startAcquisition(int nBytes)
+{
+	ScopedLock lock(m_lock);
+	for (int i = 0; i < 2; i++)
+	{
+		m_lastRead[i] = 0;
+		m_buffers[i].malloc(nBytes);
+	}
+	m_curBuffer = 0;
+	m_readBuffer = 0;
+	m_canRead = true;
+	startThread();
+}
+
+void USBThread::stopAcquisition()
+{
+	std::cout << "Stopping usb thread" << std::endl;
+	if (!stopThread(1000))
+	{
+		std::cerr << "USB Thread could not stop cleanly. Force quitting it" << std::endl;
+	}
+}
+
+long USBThread::usbRead(unsigned char*& buffer)
+{
+	ScopedLock lock(m_lock);
+	if (m_readBuffer == m_curBuffer)
+		return 0;
+	buffer = m_buffers[m_readBuffer].getData();
+	long read = m_lastRead[m_readBuffer];
+	m_readBuffer = ++m_readBuffer % 2;
+	m_canRead = true;
+	notify();
+	return read;
+}
+
+void USBThread::run()
+{
+	while (!threadShouldExit())
+	{
+		m_lock.enter();
+		if (m_canRead)
+		{
+			m_lock.exit();
+			long read;
+			do
+			{
+				if (threadShouldExit())
+					break;
+				read = m_board->readDataBlocksRaw(1, m_buffers[m_curBuffer].getData());
+			} while (read <= 0);
+			{
+				ScopedLock lock(m_lock);
+				m_lastRead[m_curBuffer] = read;
+				m_curBuffer = ++m_curBuffer % 2;
+				m_canRead = false;
+			}
+		}
+		else
+			m_lock.exit();
+
+		if (!threadShouldExit())
+			wait(100);
+	}
+}

Source/Plugins/IntanRecordingController/USBThread.h

@@ -0,0 +1,49 @@
+/*
+------------------------------------------------------------------
+
+This file is part of the Open Ephys GUI
+Copyright (C) 2016 Open Ephys
+
+------------------------------------------------------------------
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef USBTHREAD_H
+#define USBTHREAD_H
+
+#include <BasicJuceHeader.h>
+#include <atomic>
+class Rhd2000EvalBoardUsb3;
+
+class USBThread : Thread
+{
+public:
+	USBThread(Rhd2000EvalBoardUsb3*);
+	~USBThread();
+	void run() override;
+	void startAcquisition(int nBytes);
+	void stopAcquisition();
+	long usbRead(unsigned char*&);
+private:
+	Rhd2000EvalBoardUsb3* const m_board;
+	HeapBlock<unsigned char> m_buffers[2];
+	long m_lastRead[2];
+	unsigned short m_curBuffer{ 0 };
+	unsigned short m_readBuffer{ 0 };
+	bool m_canRead{ false };
+	CriticalSection m_lock;
+};
+
+#endif

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

@@ -21,7 +21,7 @@
 #ifndef RHD2000DATABLOCKUSB3_H
 #define RHD2000DATABLOCKUSB3_H
 
-#define SAMPLES_PER_DATA_BLOCK 128
+#define SAMPLES_PER_DATA_BLOCK 256
 #define CHANNELS_PER_STREAM 32
 #define RHD2000_HEADER_MAGIC_NUMBER 0xd7a22aaa38132a53
 

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

@@ -1494,8 +1494,7 @@ long Rhd2000EvalBoardUsb3::readDataBlocksRaw(int numBlocks, unsigned char* buffe
     unsigned int numWordsToRead = numBlocks * Rhd2000DataBlockUsb3::calculateDataBlockSizeInWords(numDataStreams, nSamples);
 
     if (numWordsInFifo() < numWordsToRead)
-        return 0;
-
+	   return 0;
     long result = dev->ReadFromBlockPipeOut(PipeOutData, USB3_BLOCK_SIZE, 2 * numWordsToRead, buffer);
 
     if (result == ok_Failed) {

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

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