Added files for RHD2000 DataThread

open-ephys · Mar 12, 2013 · 94fb069 · 94fb069
1 parent 1b42057
commit 94fb069
Show file tree

Hide file tree

Showing 22 changed files with 5,850 additions and 2,090 deletions.
diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile
@@ -114,8 +114,12 @@ OBJECTS := \
   $(OBJDIR)/AudioEditor_fb2c6555.o \
   $(OBJDIR)/FilterEditor_dfe1f39d.o \
   $(OBJDIR)/GenericEditor_becb2ad6.o \
+  $(OBJDIR)/okFrontPanelDLL_87687880.o \
+  $(OBJDIR)/rhd2000datablock_722d8dae.o \
+  $(OBJDIR)/rhd2000evalboard_e0b412d5.o \
+  $(OBJDIR)/rhd2000registers_cf6cd63b.o \
+  $(OBJDIR)/RHD2000Thread_23e0b041.o \
   $(OBJDIR)/FileReaderThread_933ea08.o \
-  $(OBJDIR)/okFrontPanelDLL_158af498.o \
   $(OBJDIR)/FPGAThread_a8dc34ed.o \
   $(OBJDIR)/DataBuffer_6ae4f549.o \
   $(OBJDIR)/IntanThread_32126b71.o \
@@ -515,14 +519,34 @@ $(OBJDIR)/GenericEditor_becb2ad6.o: ../../Source/Processors/Editors/GenericEdito
 	@echo "Compiling GenericEditor.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/FileReaderThread_933ea08.o: ../../Source/Processors/DataThreads/FileReaderThread.cpp
+$(OBJDIR)/okFrontPanelDLL_87687880.o: ../../Source/Processors/DataThreads/rhythm-api/okFrontPanelDLL.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling FileReaderThread.cpp"
+	@echo "Compiling okFrontPanelDLL.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/okFrontPanelDLL_158af498.o: ../../Source/Processors/DataThreads/okFrontPanelDLL.cpp
+$(OBJDIR)/rhd2000datablock_722d8dae.o: ../../Source/Processors/DataThreads/rhythm-api/rhd2000datablock.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling okFrontPanelDLL.cpp"
+	@echo "Compiling rhd2000datablock.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/rhd2000evalboard_e0b412d5.o: ../../Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling rhd2000evalboard.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/rhd2000registers_cf6cd63b.o: ../../Source/Processors/DataThreads/rhythm-api/rhd2000registers.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling rhd2000registers.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/RHD2000Thread_23e0b041.o: ../../Source/Processors/DataThreads/RHD2000Thread.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling RHD2000Thread.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/FileReaderThread_933ea08.o: ../../Source/Processors/DataThreads/FileReaderThread.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling FileReaderThread.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/FPGAThread_a8dc34ed.o: ../../Source/Processors/DataThreads/FPGAThread.cpp

diff --git a/Builds/Linux/build/rhd2000.bit b/Builds/Linux/build/rhd2000.bit
diff --git a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
@@ -88,8 +88,12 @@
 		B092C479F4C92AF2FEBE5A11 = { isa = PBXBuildFile; fileRef = 5DDBEE64DC706CE804E5F0AA; };
 		3B146B8898CEE9965A9A0FB8 = { isa = PBXBuildFile; fileRef = 35AFD01064BF29D90EEDF413; };
 		CFE62980E342BE2875BB3586 = { isa = PBXBuildFile; fileRef = 22FD0613BADE6C36A6A7A25C; };
+		BB92144D41AB711844E84E3E = { isa = PBXBuildFile; fileRef = BD06293151CB70BC834983AC; };
+		F9A698544CD0BFDB1F2E8128 = { isa = PBXBuildFile; fileRef = C7D4484D63F43B106CBD93DF; };
+		8E998FF66A1510C56BA4133D = { isa = PBXBuildFile; fileRef = 8FC080821C6B386F1590814D; };
+		BDF10750E644DD9E7D486BA9 = { isa = PBXBuildFile; fileRef = 4AF996EEDFC99C39D23D8746; };
+		2CA0CD915B9E89A255EB07F0 = { isa = PBXBuildFile; fileRef = 5D839BD252EAE88B62A2D5C1; };
 		A1B4D286AC7ED372742C41B2 = { isa = PBXBuildFile; fileRef = 0D2903C450AE862C2C0060AA; };
-		25D4C87F4C7C842B0522DA5F = { isa = PBXBuildFile; fileRef = 24616D6D2297C87D371B0363; };
 		2F21546229BEF148C74ECA45 = { isa = PBXBuildFile; fileRef = A9142BFEFE7EB34D919ED0A0; };
 		9549DA2D2FF0614B155990A0 = { isa = PBXBuildFile; fileRef = F20726FD9F586FDE2CB42901; };
 		DF15E1683A3722FE88EE5C7F = { isa = PBXBuildFile; fileRef = 6D94C2733E967EC6A91B719A; };
@@ -344,10 +348,18 @@
 		AD4BF1BC602902B20AEBF49C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FilterEditor.h; path = ../../Source/Processors/Editors/FilterEditor.h; sourceTree = SOURCE_ROOT; };
 		22FD0613BADE6C36A6A7A25C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = GenericEditor.cpp; path = ../../Source/Processors/Editors/GenericEditor.cpp; sourceTree = SOURCE_ROOT; };
 		F0B8C75B1AA6E8D1BC620653 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GenericEditor.h; path = ../../Source/Processors/Editors/GenericEditor.h; sourceTree = SOURCE_ROOT; };
+		BD06293151CB70BC834983AC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = okFrontPanelDLL.cpp; path = "../../Source/Processors/DataThreads/rhythm-api/okFrontPanelDLL.cpp"; sourceTree = SOURCE_ROOT; };
+		62DAF98EBA731D7F6B726C8A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = okFrontPanelDLL.h; path = "../../Source/Processors/DataThreads/rhythm-api/okFrontPanelDLL.h"; sourceTree = SOURCE_ROOT; };
+		C7D4484D63F43B106CBD93DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000datablock.cpp; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000datablock.cpp"; sourceTree = SOURCE_ROOT; };
+		CAE710D11E61A35AA3446AD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhd2000datablock.h; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000datablock.h"; sourceTree = SOURCE_ROOT; };
+		8FC080821C6B386F1590814D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000evalboard.cpp; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp"; sourceTree = SOURCE_ROOT; };
+		7000035B6C15B43D11C8CC2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhd2000evalboard.h; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.h"; sourceTree = SOURCE_ROOT; };
+		4AF996EEDFC99C39D23D8746 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000registers.cpp; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000registers.cpp"; sourceTree = SOURCE_ROOT; };
+		D13AE18F4129523B195625E3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhd2000registers.h; path = "../../Source/Processors/DataThreads/rhythm-api/rhd2000registers.h"; sourceTree = SOURCE_ROOT; };
+		5D839BD252EAE88B62A2D5C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Thread.cpp; path = ../../Source/Processors/DataThreads/RHD2000Thread.cpp; sourceTree = SOURCE_ROOT; };
+		CD2C458BFA00E7D509F069CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RHD2000Thread.h; path = ../../Source/Processors/DataThreads/RHD2000Thread.h; sourceTree = SOURCE_ROOT; };
 		0D2903C450AE862C2C0060AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FileReaderThread.cpp; path = ../../Source/Processors/DataThreads/FileReaderThread.cpp; sourceTree = SOURCE_ROOT; };
 		BD07C36AC2ECF10942F0A229 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FileReaderThread.h; path = ../../Source/Processors/DataThreads/FileReaderThread.h; sourceTree = SOURCE_ROOT; };
-		24616D6D2297C87D371B0363 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = okFrontPanelDLL.cpp; path = ../../Source/Processors/DataThreads/okFrontPanelDLL.cpp; sourceTree = SOURCE_ROOT; };
-		AA7B88F969CE43331035DE98 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = okFrontPanelDLL.h; path = ../../Source/Processors/DataThreads/okFrontPanelDLL.h; sourceTree = SOURCE_ROOT; };
 		A9142BFEFE7EB34D919ED0A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FPGAThread.cpp; path = ../../Source/Processors/DataThreads/FPGAThread.cpp; sourceTree = SOURCE_ROOT; };
 		46E436D1B9538DB8487F0D8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FPGAThread.h; path = ../../Source/Processors/DataThreads/FPGAThread.h; sourceTree = SOURCE_ROOT; };
 		F20726FD9F586FDE2CB42901 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DataBuffer.cpp; path = ../../Source/Processors/DataThreads/DataBuffer.cpp; sourceTree = SOURCE_ROOT; };
@@ -603,11 +615,21 @@
 				AD4BF1BC602902B20AEBF49C,
 				22FD0613BADE6C36A6A7A25C,
 				F0B8C75B1AA6E8D1BC620653 ); name = Editors; sourceTree = "<group>"; };
+		E2390E6D1C74A15E2EE87686 = { isa = PBXGroup; children = (
+				BD06293151CB70BC834983AC,
+				62DAF98EBA731D7F6B726C8A,
+				C7D4484D63F43B106CBD93DF,
+				CAE710D11E61A35AA3446AD6,
+				8FC080821C6B386F1590814D,
+				7000035B6C15B43D11C8CC2B,
+				4AF996EEDFC99C39D23D8746,
+				D13AE18F4129523B195625E3 ); name = "rhythm-api"; sourceTree = "<group>"; };
 		A1AD89D398583E71F6ED8A6E = { isa = PBXGroup; children = (
+				E2390E6D1C74A15E2EE87686,
+				5D839BD252EAE88B62A2D5C1,
+				CD2C458BFA00E7D509F069CA,
 				0D2903C450AE862C2C0060AA,
 				BD07C36AC2ECF10942F0A229,
-				24616D6D2297C87D371B0363,
-				AA7B88F969CE43331035DE98,
 				A9142BFEFE7EB34D919ED0A0,
 				46E436D1B9538DB8487F0D8D,
 				F20726FD9F586FDE2CB42901,
@@ -872,8 +894,12 @@
 				B092C479F4C92AF2FEBE5A11,
 				3B146B8898CEE9965A9A0FB8,
 				CFE62980E342BE2875BB3586,
+				BB92144D41AB711844E84E3E,
+				F9A698544CD0BFDB1F2E8128,
+				8E998FF66A1510C56BA4133D,
+				BDF10750E644DD9E7D486BA9,
+				2CA0CD915B9E89A255EB07F0,
 				A1B4D286AC7ED372742C41B2,
-				25D4C87F4C7C842B0522DA5F,
 				2F21546229BEF148C74ECA45,
 				9549DA2D2FF0614B155990A0,
 				DF15E1683A3722FE88EE5C7F,
@@ -922,4 +948,3 @@
 	};
 	rootObject = CC82D4D2B9F0219708ACBEB3;
 }
-
diff --git a/Builds/VisualStudio2010/open-ephys.vcxproj b/Builds/VisualStudio2010/open-ephys.vcxproj
@@ -193,8 +193,12 @@
     <ClCompile Include="..\..\Source\Processors\Editors\AudioEditor.cpp"/>
     <ClCompile Include="..\..\Source\Processors\Editors\FilterEditor.cpp"/>
     <ClCompile Include="..\..\Source\Processors\Editors\GenericEditor.cpp"/>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\okFrontPanelDLL.cpp"/>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000datablock.cpp"/>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000evalboard.cpp"/>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000registers.cpp"/>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\RHD2000Thread.cpp"/>
     <ClCompile Include="..\..\Source\Processors\DataThreads\FileReaderThread.cpp"/>
-    <ClCompile Include="..\..\Source\Processors\DataThreads\okFrontPanelDLL.cpp"/>
     <ClCompile Include="..\..\Source\Processors\DataThreads\FPGAThread.cpp"/>
     <ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp"/>
     <ClCompile Include="..\..\Source\Processors\DataThreads\IntanThread.cpp"/>
@@ -305,8 +309,12 @@
     <ClInclude Include="..\..\Source\Processors\Editors\AudioEditor.h"/>
     <ClInclude Include="..\..\Source\Processors\Editors\FilterEditor.h"/>
     <ClInclude Include="..\..\Source\Processors\Editors\GenericEditor.h"/>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\okFrontPanelDLL.h"/>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000datablock.h"/>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000evalboard.h"/>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000registers.h"/>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\RHD2000Thread.h"/>
     <ClInclude Include="..\..\Source\Processors\DataThreads\FileReaderThread.h"/>
-    <ClInclude Include="..\..\Source\Processors\DataThreads\okFrontPanelDLL.h"/>
     <ClInclude Include="..\..\Source\Processors\DataThreads\FPGAThread.h"/>
     <ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h"/>
     <ClInclude Include="..\..\Source\Processors\DataThreads\IntanThread.h"/>

diff --git a/Builds/VisualStudio2010/open-ephys.vcxproj.filters b/Builds/VisualStudio2010/open-ephys.vcxproj.filters
@@ -56,6 +56,9 @@
     <Filter Include="open-ephys\Source\Processors\DataThreads">
       <UniqueIdentifier>{9504915A-A697-5C7F-E059-D7DAD23F3320}</UniqueIdentifier>
     </Filter>
+    <Filter Include="open-ephys\Source\Processors\DataThreads\rhythm-api">
+      <UniqueIdentifier>{0C158EE2-A789-92FB-0D02-9976FE111265}</UniqueIdentifier>
+    </Filter>
     <Filter Include="open-ephys\Source\UI">
       <UniqueIdentifier>{3AB2454E-6609-8229-51CB-D99A79A068ED}</UniqueIdentifier>
     </Filter>
@@ -463,10 +466,22 @@
     <ClCompile Include="..\..\Source\Processors\Editors\GenericEditor.cpp">
       <Filter>open-ephys\Source\Processors\Editors</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Processors\DataThreads\FileReaderThread.cpp">
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\okFrontPanelDLL.cpp">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000datablock.cpp">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000evalboard.cpp">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000registers.cpp">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Processors\DataThreads\RHD2000Thread.cpp">
       <Filter>open-ephys\Source\Processors\DataThreads</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Processors\DataThreads\okFrontPanelDLL.cpp">
+    <ClCompile Include="..\..\Source\Processors\DataThreads\FileReaderThread.cpp">
       <Filter>open-ephys\Source\Processors\DataThreads</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Processors\DataThreads\FPGAThread.cpp">
@@ -795,10 +810,22 @@
     <ClInclude Include="..\..\Source\Processors\Editors\GenericEditor.h">
       <Filter>open-ephys\Source\Processors\Editors</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Processors\DataThreads\FileReaderThread.h">
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\okFrontPanelDLL.h">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000datablock.h">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000evalboard.h">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\rhythm-api\rhd2000registers.h">
+      <Filter>open-ephys\Source\Processors\DataThreads\rhythm-api</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Processors\DataThreads\RHD2000Thread.h">
       <Filter>open-ephys\Source\Processors\DataThreads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Processors\DataThreads\okFrontPanelDLL.h">
+    <ClInclude Include="..\..\Source\Processors\DataThreads\FileReaderThread.h">
       <Filter>open-ephys\Source\Processors\DataThreads</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Processors\DataThreads\FPGAThread.h">