Skip to content

Commit b5f49a8

Browse files
aacuevasaacuevas
committed
Change Rhythm node to built-in processor
1 parent 070cd48 commit b5f49a8

31 files changed

Lines changed: 263 additions & 1374 deletions

‎Builds/Linux/Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ OBJECTS := \
7878
$(OBJDIR)/AudioEditor_3931be27.o \
7979
$(OBJDIR)/AudioNode_3db3557c.o \
8080
$(OBJDIR)/Channel_5cb2d4d2.o \
81+
$(OBJDIR)/RHD2000Editor_54b4b441.o \
82+
$(OBJDIR)/RHD2000Thread_6ad80a5e.o \
83+
$(OBJDIR)/okFrontPanelDLL_18d33583.o \
84+
$(OBJDIR)/rhd2000datablock_e1a710b.o \
85+
$(OBJDIR)/rhd2000evalboard_7ca0f632.o \
86+
$(OBJDIR)/rhd2000registers_6b59b998.o \
8187
$(OBJDIR)/DataBuffer_6ae4f549.o \
8288
$(OBJDIR)/DataThread_b2a47a13.o \
8389
$(OBJDIR)/ChannelSelector_c1430874.o \
@@ -290,6 +296,36 @@ $(OBJDIR)/Channel_5cb2d4d2.o: ../../Source/Processors/Channel/Channel.cpp
290296
@echo "Compiling Channel.cpp"
291297
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
292298

299+
$(OBJDIR)/RHD2000Editor_54b4b441.o: ../../Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
300+
-@mkdir -p $(OBJDIR)
301+
@echo "Compiling RHD2000Editor.cpp"
302+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
303+
304+
$(OBJDIR)/RHD2000Thread_6ad80a5e.o: ../../Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
305+
-@mkdir -p $(OBJDIR)
306+
@echo "Compiling RHD2000Thread.cpp"
307+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
308+
309+
$(OBJDIR)/okFrontPanelDLL_18d33583.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/okFrontPanelDLL.cpp
310+
-@mkdir -p $(OBJDIR)
311+
@echo "Compiling okFrontPanelDLL.cpp"
312+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
313+
314+
$(OBJDIR)/rhd2000datablock_e1a710b.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000datablock.cpp
315+
-@mkdir -p $(OBJDIR)
316+
@echo "Compiling rhd2000datablock.cpp"
317+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
318+
319+
$(OBJDIR)/rhd2000evalboard_7ca0f632.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000evalboard.cpp
320+
-@mkdir -p $(OBJDIR)
321+
@echo "Compiling rhd2000evalboard.cpp"
322+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
323+
324+
$(OBJDIR)/rhd2000registers_6b59b998.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000registers.cpp
325+
-@mkdir -p $(OBJDIR)
326+
@echo "Compiling rhd2000registers.cpp"
327+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
328+
293329
$(OBJDIR)/DataBuffer_6ae4f549.o: ../../Source/Processors/DataThreads/DataBuffer.cpp
294330
-@mkdir -p $(OBJDIR)
295331
@echo "Compiling DataBuffer.cpp"

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 49 additions & 9 deletions
Large diffs are not rendered by default.

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@
282282
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioEditor.cpp"/>
283283
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioNode.cpp"/>
284284
<ClCompile Include="..\..\Source\Processors\Channel\Channel.cpp"/>
285+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.cpp"/>
286+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.cpp"/>
287+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.cpp"/>
288+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.cpp"/>
289+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.cpp"/>
290+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp"/>
285291
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp"/>
286292
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp"/>
287293
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp"/>
@@ -1485,6 +1491,12 @@
14851491
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioEditor.h"/>
14861492
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioNode.h"/>
14871493
<ClInclude Include="..\..\Source\Processors\Channel\Channel.h"/>
1494+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.h"/>
1495+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.h"/>
1496+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.h"/>
1497+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.h"/>
1498+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.h"/>
1499+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h"/>
14881500
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h"/>
14891501
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h"/>
14901502
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<Filter Include="open-ephys\Source\Processors\DataThreads">
5454
<UniqueIdentifier>{AA123918-8642-2612-7B72-C63DA032271B}</UniqueIdentifier>
5555
</Filter>
56+
<Filter Include="open-ephys\Source\Processors\DataThreads\RhythmNode">
57+
<UniqueIdentifier>{ACBDC612-339C-4E74-75BC-3E75843FD61D}</UniqueIdentifier>
58+
</Filter>
59+
<Filter Include="open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api">
60+
<UniqueIdentifier>{2107D2E9-A134-3C5F-3DD6-867FA7172E43}</UniqueIdentifier>
61+
</Filter>
5662
<Filter Include="open-ephys\Source\Processors\Editors">
5763
<UniqueIdentifier>{E65874A6-23B2-9D76-B12A-15730E2192BC}</UniqueIdentifier>
5864
</Filter>
@@ -469,6 +475,24 @@
469475
<ClCompile Include="..\..\Source\Processors\Channel\Channel.cpp">
470476
<Filter>open-ephys\Source\Processors\Channel</Filter>
471477
</ClCompile>
478+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.cpp">
479+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
480+
</ClCompile>
481+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.cpp">
482+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
483+
</ClCompile>
484+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.cpp">
485+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
486+
</ClCompile>
487+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.cpp">
488+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
489+
</ClCompile>
490+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.cpp">
491+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
492+
</ClCompile>
493+
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp">
494+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
495+
</ClCompile>
472496
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp">
473497
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
474498
</ClCompile>
@@ -1935,6 +1959,24 @@
19351959
<ClInclude Include="..\..\Source\Processors\Channel\Channel.h">
19361960
<Filter>open-ephys\Source\Processors\Channel</Filter>
19371961
</ClInclude>
1962+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.h">
1963+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
1964+
</ClInclude>
1965+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.h">
1966+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
1967+
</ClInclude>
1968+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.h">
1969+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
1970+
</ClInclude>
1971+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.h">
1972+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
1973+
</ClInclude>
1974+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.h">
1975+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
1976+
</ClInclude>
1977+
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h">
1978+
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
1979+
</ClInclude>
19381980
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h">
19391981
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
19401982
</ClInclude>

‎Builds/VisualStudio2013/Plugins/Rhythm_FPGA/Rhythm_FPGA.vcxproj‎

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎Builds/VisualStudio2013/Plugins/Rhythm_FPGA/Rhythm_FPGA.vcxproj.filters‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)