Skip to content

Commit dff7817

Browse files
committed
Merge branch 'usb3'
Conflicts: Source/Processors/DataThreads/RHD2000Thread.cpp
2 parents adb49a6 + c63fc6f commit dff7817

24 files changed

Lines changed: 2265 additions & 1812 deletions

Builds/VisualStudio2013/open-ephys.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
<AdditionalLibraryDirectories>../../Resources/windows-libs/HDF5/lib/x64;../../Resources/windows-libs/ZeroMQ/lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
209209
<LargeAddressAware>true</LargeAddressAware>
210210
<AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;hdf5.lib;hdf5_cpp.lib;libzmq-v120-mt-4_0_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
211+
<Profile>true</Profile>
211212
</Link>
212213
<Bscmake>
213214
<SuppressStartupBanner>true</SuppressStartupBanner>

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
<Filter Include="open-ephys\Source\Processors\EventDetector">
6565
<UniqueIdentifier>{FDD5B79A-1AA4-7745-BB6E-E09A6DFC328E}</UniqueIdentifier>
6666
</Filter>
67-
<Filter Include="open-ephys\Source\Processors\EventNode">
68-
<UniqueIdentifier>{3BDCC6CD-7B1F-ED1C-7442-F2B0CD1A86C8}</UniqueIdentifier>
69-
</Filter>
7067
<Filter Include="open-ephys\Source\Processors\FileReader">
7168
<UniqueIdentifier>{59F490B2-F5D9-601B-01AE-368632E3C9D7}</UniqueIdentifier>
7269
</Filter>
@@ -439,6 +436,9 @@
439436
<Filter Include="Juce Library Code">
440437
<UniqueIdentifier>{8B4D1BAA-6DB4-CAEC-A0FA-271F354D5C61}</UniqueIdentifier>
441438
</Filter>
439+
<Filter Include="open-ephys\Source\Processors\EventDetector\EventNode">
440+
<UniqueIdentifier>{3BDCC6CD-7B1F-ED1C-7442-F2B0CD1A86C8}</UniqueIdentifier>
441+
</Filter>
442442
</ItemGroup>
443443
<ItemGroup>
444444
<ClCompile Include="..\..\Source\CoreServices.cpp">
@@ -583,10 +583,10 @@
583583
<Filter>open-ephys\Source\Processors\EventDetector</Filter>
584584
</ClCompile>
585585
<ClCompile Include="..\..\Source\Processors\EventNode\EventNode.cpp">
586-
<Filter>open-ephys\Source\Processors\EventNode</Filter>
586+
<Filter>open-ephys\Source\Processors\EventDetector\EventNode</Filter>
587587
</ClCompile>
588588
<ClCompile Include="..\..\Source\Processors\EventNode\EventNodeEditor.cpp">
589-
<Filter>open-ephys\Source\Processors\EventNode</Filter>
589+
<Filter>open-ephys\Source\Processors\EventDetector\EventNode</Filter>
590590
</ClCompile>
591591
<ClCompile Include="..\..\Source\Processors\FileReader\KwikFileSource.cpp">
592592
<Filter>open-ephys\Source\Processors\FileReader</Filter>
@@ -2124,10 +2124,10 @@
21242124
<Filter>open-ephys\Source\Processors\EventDetector</Filter>
21252125
</ClInclude>
21262126
<ClInclude Include="..\..\Source\Processors\EventNode\EventNode.h">
2127-
<Filter>open-ephys\Source\Processors\EventNode</Filter>
2127+
<Filter>open-ephys\Source\Processors\EventDetector\EventNode</Filter>
21282128
</ClInclude>
21292129
<ClInclude Include="..\..\Source\Processors\EventNode\EventNodeEditor.h">
2130-
<Filter>open-ephys\Source\Processors\EventNode</Filter>
2130+
<Filter>open-ephys\Source\Processors\EventDetector\EventNode</Filter>
21312131
</ClInclude>
21322132
<ClInclude Include="..\..\Source\Processors\FileReader\KwikFileSource.h">
21332133
<Filter>open-ephys\Source\Processors\FileReader</Filter>
1.42 MB
Binary file not shown.
289 KB
Binary file not shown.
321 KB
Binary file not shown.
41.5 KB
Binary file not shown.
31 KB
Binary file not shown.
41.5 KB
Binary file not shown.
-212 KB
Binary file not shown.

Resources/DLLs/okFrontPanel.dll

31 KB
Binary file not shown.

0 commit comments

Comments
 (0)