Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update ofSerial library

  • Loading branch information...
commit 91a41531956b596c11001879e826e84f26772abe 1 parent 28ec88e
jsiegle authored
View
48 Builds/Linux/Makefile
@@ -19,8 +19,8 @@ ifeq ($(CONFIG),Debug)
OUTDIR := build
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3
- CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext
+ CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg -std=c++0x
+ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lzmq -lprotobuf -lGLU
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
TARGET := open-ephys
@@ -34,8 +34,8 @@ ifeq ($(CONFIG),Release)
OUTDIR := build
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
- CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext
+ CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg -std=c++0x
+ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lzmq -lprotobuf -lGLU
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
TARGET := open-ephys-release
@@ -64,7 +64,6 @@ OBJECTS := \
$(OBJDIR)/State_22979684.o \
$(OBJDIR)/AudioComponent_521bd9c9.o \
$(OBJDIR)/SerialInput_855a46b1.o \
- $(OBJDIR)/LfpTriggeredAverageNode_ff52d7b9.o \
$(OBJDIR)/FileReader_18023b0e.o \
$(OBJDIR)/ChannelMappingNode_d9219b9c.o \
$(OBJDIR)/PulsePalOutput_9f4ef492.o \
@@ -85,18 +84,16 @@ OBJECTS := \
$(OBJDIR)/RecordControl_3e1c6062.o \
$(OBJDIR)/Merger_2f90542e.o \
$(OBJDIR)/Splitter_6e27a57b.o \
- $(OBJDIR)/LfpTriggeredAverageCanvas_50148944.o \
$(OBJDIR)/SpikeObject_24e8c655.o \
$(OBJDIR)/SpikeDisplayCanvas_b208ff6e.o \
$(OBJDIR)/DataWindow_83ce6754.o \
$(OBJDIR)/LfpDisplayCanvas_4a58e87e.o \
- $(OBJDIR)/OpenGLCanvas_3c775a41.o \
$(OBJDIR)/SpikeDetector_300d85e7.o \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
+ $(OBJDIR)/LfpTriggeredAverageEditor_101d75b.o \
$(OBJDIR)/SerialInputEditor_c00f31f5.o \
$(OBJDIR)/ElectrodeButtons_a6064cc.o \
- $(OBJDIR)/LfpTriggeredAverageEditor_101d75b.o \
$(OBJDIR)/ChannelMappingEditor_dd803b0.o \
$(OBJDIR)/FileReaderEditor_16fd7744.o \
$(OBJDIR)/PhaseDetectorEditor_f53aa520.o \
@@ -139,8 +136,8 @@ OBJECTS := \
$(OBJDIR)/SourceNode_c2d6336c.o \
$(OBJDIR)/GenericProcessor_733760aa.o \
$(OBJDIR)/ProcessorGraph_68b34a0b.o \
- $(OBJDIR)/GraphViewer_e43fd2ce.o \
$(OBJDIR)/CustomArrowButton_206e4278.o \
+ $(OBJDIR)/GraphViewer_e43fd2ce.o \
$(OBJDIR)/EditorViewportButtons_29af2a5c.o \
$(OBJDIR)/SignalChainManager_d2b643f0.o \
$(OBJDIR)/EditorViewport_1d991caf.o \
@@ -293,11 +290,6 @@ $(OBJDIR)/SerialInput_855a46b1.o: ../../Source/Processors/SerialInput.cpp
@echo "Compiling SerialInput.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/LfpTriggeredAverageNode_ff52d7b9.o: ../../Source/Processors/LfpTriggeredAverageNode.cpp
- -@mkdir -p $(OBJDIR)
- @echo "Compiling LfpTriggeredAverageNode.cpp"
- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
$(OBJDIR)/FileReader_18023b0e.o: ../../Source/Processors/FileReader.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling FileReader.cpp"
@@ -398,11 +390,6 @@ $(OBJDIR)/Splitter_6e27a57b.o: ../../Source/Processors/Utilities/Splitter.cpp
@echo "Compiling Splitter.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/LfpTriggeredAverageCanvas_50148944.o: ../../Source/Processors/Visualization/LfpTriggeredAverageCanvas.cpp
- -@mkdir -p $(OBJDIR)
- @echo "Compiling LfpTriggeredAverageCanvas.cpp"
- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
$(OBJDIR)/SpikeObject_24e8c655.o: ../../Source/Processors/Visualization/SpikeObject.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling SpikeObject.cpp"
@@ -423,11 +410,6 @@ $(OBJDIR)/LfpDisplayCanvas_4a58e87e.o: ../../Source/Processors/Visualization/Lfp
@echo "Compiling LfpDisplayCanvas.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/OpenGLCanvas_3c775a41.o: ../../Source/Processors/Visualization/OpenGLCanvas.cpp
- -@mkdir -p $(OBJDIR)
- @echo "Compiling OpenGLCanvas.cpp"
- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
$(OBJDIR)/SpikeDetector_300d85e7.o: ../../Source/Processors/SpikeDetector.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling SpikeDetector.cpp"
@@ -443,6 +425,11 @@ $(OBJDIR)/EventNode_95c842b7.o: ../../Source/Processors/EventNode.cpp
@echo "Compiling EventNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/LfpTriggeredAverageEditor_101d75b.o: ../../Source/Processors/Editors/LfpTriggeredAverageEditor.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling LfpTriggeredAverageEditor.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/SerialInputEditor_c00f31f5.o: ../../Source/Processors/Editors/SerialInputEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling SerialInputEditor.cpp"
@@ -453,11 +440,6 @@ $(OBJDIR)/ElectrodeButtons_a6064cc.o: ../../Source/Processors/Editors/ElectrodeB
@echo "Compiling ElectrodeButtons.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/LfpTriggeredAverageEditor_101d75b.o: ../../Source/Processors/Editors/LfpTriggeredAverageEditor.cpp
- -@mkdir -p $(OBJDIR)
- @echo "Compiling LfpTriggeredAverageEditor.cpp"
- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
$(OBJDIR)/ChannelMappingEditor_dd803b0.o: ../../Source/Processors/Editors/ChannelMappingEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ChannelMappingEditor.cpp"
@@ -668,14 +650,14 @@ $(OBJDIR)/ProcessorGraph_68b34a0b.o: ../../Source/Processors/ProcessorGraph.cpp
@echo "Compiling ProcessorGraph.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/GraphViewer_e43fd2ce.o: ../../Source/UI/GraphViewer.cpp
+$(OBJDIR)/CustomArrowButton_206e4278.o: ../../Source/UI/CustomArrowButton.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling GraphViewer.cpp"
+ @echo "Compiling CustomArrowButton.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/CustomArrowButton_206e4278.o: ../../Source/UI/CustomArrowButton.cpp
+$(OBJDIR)/GraphViewer_e43fd2ce.o: ../../Source/UI/GraphViewer.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling CustomArrowButton.cpp"
+ @echo "Compiling GraphViewer.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/EditorViewportButtons_29af2a5c.o: ../../Source/UI/EditorViewportButtons.cpp
View
4 Builds/MacOSX/Info.plist
@@ -16,9 +16,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
- <string>0.2.4</string>
+ <string>0.2.5</string>
<key>CFBundleVersion</key>
- <string>0.2.4</string>
+ <string>0.2.5</string>
<key>NSHumanReadableCopyright</key>
<string>Open Ephys</string>
<key>NSHighResolutionCapable</key>
View
6,575 Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
2,856 additions, 3,719 deletions not shown
View
57 Builds/VisualStudio2012/open-ephys.vcxproj
@@ -66,15 +66,19 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);../../Resources/ZeroMQ/lib_x86;../../Resources/Google Protocols/vsprojects/Debug</LibraryPath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath);../../Resources/ZeroMQ/lib_x86;../../Resources/Google Protocols/vsprojects/Release</LibraryPath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">.\Debug64\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">true</GenerateManifest>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">$(LibraryPath);../../Resources/ZeroMQ/lib_x64;../../Resources/Google Protocols/vsprojects/x64/Debug</LibraryPath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">.\Release64\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">true</GenerateManifest>
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">$(LibraryPath);../../Resources/ZeroMQ/lib_x64;../../Resources/Google Protocols/vsprojects/x64/Release</LibraryPath>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -86,8 +90,9 @@
<HeaderFileName/>
</Midl>
<ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <Optimization>Disabled</Optimization>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\JuceLibraryCode;../../Resources/Google Protocols/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -110,8 +115,10 @@
<ProgramDatabaseFile>$(IntDir)\open-ephys.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalLibraryDirectories>../../Resources/ZeroMQ/lib_x86;../../Resources/Google Protocols/vsprojects/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;libzmq-v110-mt-3_2_2.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -130,8 +137,8 @@
<HeaderFileName/>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <Optimization>Full</Optimization>
+ <AdditionalIncludeDirectories>..\..\JuceLibraryCode;../../Resources/Google Protocols/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -156,8 +163,9 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <AdditionalLibraryDirectories>../../Resources/ZeroMQ/lib_x86;../../Resources/Google Protocols/vsprojects/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;libzmq-v110-mt-3_2_2.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -176,8 +184,9 @@
<HeaderFileName/>
</Midl>
<ClCompile>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <Optimization>Disabled</Optimization>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <AdditionalIncludeDirectories>..\..\JuceLibraryCode;../../Resources/Google Protocols/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -185,7 +194,7 @@
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)\</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>Level2</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
@@ -199,15 +208,16 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)\open-ephys.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>../../Resources/ZeroMQ/lib_x64;../../Resources/Google Protocols/vsprojects/x64/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;libzmq-v110-mt-3_2_2.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
- <Command>copy ..\..\Resources\DLLs\Win64\okFrontPanel.dll .\Debug64\bin</Command>
+ <Command>post_build_commands_x64debug.bat</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
@@ -219,8 +229,8 @@
<HeaderFileName/>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <Optimization>Full</Optimization>
+ <AdditionalIncludeDirectories>..\..\JuceLibraryCode;../../Resources/Google Protocols/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -228,7 +238,7 @@
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)\</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
- <WarningLevel>Level4</WarningLevel>
+ <WarningLevel>Level2</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
@@ -244,15 +254,16 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <AdditionalLibraryDirectories>../../Resources/ZeroMQ/lib_x64;../../Resources/Google Protocols/vsprojects/x64/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;libzmq-v110-mt-3_2_2.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
- <Command>copy ..\..\Resources\DLLs\Win64\okFrontPanel.dll .\Release64\bin</Command>
+ <Command>post_build_commands_x64release.bat</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@@ -277,7 +288,6 @@
<ClCompile Include="..\..\Source\Dsp\State.cpp"/>
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp"/>
<ClCompile Include="..\..\Source\Processors\SerialInput.cpp"/>
- <ClCompile Include="..\..\Source\Processors\LfpTriggeredAverageNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\FileReader.cpp"/>
<ClCompile Include="..\..\Source\Processors\ChannelMappingNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\PulsePalOutput.cpp"/>
@@ -298,18 +308,16 @@
<ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp"/>
- <ClCompile Include="..\..\Source\Processors\Visualization\LfpTriggeredAverageCanvas.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeDisplayCanvas.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\LfpDisplayCanvas.cpp"/>
- <ClCompile Include="..\..\Source\Processors\Visualization\OpenGLCanvas.cpp"/>
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\EventNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\SerialInputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ElectrodeButtons.cpp"/>
- <ClCompile Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ChannelMappingEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\FileReaderEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\PhaseDetectorEditor.cpp"/>
@@ -352,8 +360,8 @@
<ClCompile Include="..\..\Source\Processors\SourceNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\GenericProcessor.cpp"/>
<ClCompile Include="..\..\Source\Processors\ProcessorGraph.cpp"/>
- <ClCompile Include="..\..\Source\UI\GraphViewer.cpp"/>
<ClCompile Include="..\..\Source\UI\CustomArrowButton.cpp"/>
+ <ClCompile Include="..\..\Source\UI\GraphViewer.cpp"/>
<ClCompile Include="..\..\Source\UI\EditorViewportButtons.cpp"/>
<ClCompile Include="..\..\Source\UI\SignalChainManager.cpp"/>
<ClCompile Include="..\..\Source\UI\EditorViewport.cpp"/>
@@ -1478,7 +1486,6 @@
<ClInclude Include="..\..\Source\Dsp\Utilities.h"/>
<ClInclude Include="..\..\Source\Audio\AudioComponent.h"/>
<ClInclude Include="..\..\Source\Processors\SerialInput.h"/>
- <ClInclude Include="..\..\Source\Processors\LfpTriggeredAverageNode.h"/>
<ClInclude Include="..\..\Source\Processors\FileReader.h"/>
<ClInclude Include="..\..\Source\Processors\ChannelMappingNode.h"/>
<ClInclude Include="..\..\Source\Processors\PulsePalOutput.h"/>
@@ -1500,19 +1507,17 @@
<ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h"/>
- <ClInclude Include="..\..\Source\Processors\Visualization\LfpTriggeredAverageCanvas.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeDisplayCanvas.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\DataWindow.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\LfpDisplayCanvas.h"/>
- <ClInclude Include="..\..\Source\Processors\Visualization\OpenGLCanvas.h"/>
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode.h"/>
<ClInclude Include="..\..\Source\Processors\EventNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\SerialInputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ElectrodeButtons.h"/>
- <ClInclude Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ChannelMappingEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\FileReaderEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\PhaseDetectorEditor.h"/>
@@ -1555,8 +1560,8 @@
<ClInclude Include="..\..\Source\Processors\SourceNode.h"/>
<ClInclude Include="..\..\Source\Processors\GenericProcessor.h"/>
<ClInclude Include="..\..\Source\Processors\ProcessorGraph.h"/>
- <ClInclude Include="..\..\Source\UI\GraphViewer.h"/>
<ClInclude Include="..\..\Source\UI\CustomArrowButton.h"/>
+ <ClInclude Include="..\..\Source\UI\GraphViewer.h"/>
<ClInclude Include="..\..\Source\UI\EditorViewportButtons.h"/>
<ClInclude Include="..\..\Source\UI\SignalChainManager.h"/>
<ClInclude Include="..\..\Source\UI\EditorViewport.h"/>
View
38 Builds/VisualStudio2012/open-ephys.vcxproj.filters
@@ -418,9 +418,6 @@
<ClCompile Include="..\..\Source\Processors\SerialInput.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\LfpTriggeredAverageNode.cpp">
- <Filter>open-ephys\Source\Processors</Filter>
- </ClCompile>
<ClCompile Include="..\..\Source\Processors\FileReader.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
@@ -481,9 +478,6 @@
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\Visualization\LfpTriggeredAverageCanvas.cpp">
- <Filter>open-ephys\Source\Processors\Visualization</Filter>
- </ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp">
<Filter>open-ephys\Source\Processors\Visualization</Filter>
</ClCompile>
@@ -496,9 +490,6 @@
<ClCompile Include="..\..\Source\Processors\Visualization\LfpDisplayCanvas.cpp">
<Filter>open-ephys\Source\Processors\Visualization</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\Visualization\OpenGLCanvas.cpp">
- <Filter>open-ephys\Source\Processors\Visualization</Filter>
- </ClCompile>
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
@@ -508,13 +499,13 @@
<ClCompile Include="..\..\Source\Processors\EventNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\Editors\SerialInputEditor.cpp">
+ <ClCompile Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\Editors\ElectrodeButtons.cpp">
+ <ClCompile Include="..\..\Source\Processors\Editors\SerialInputEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.cpp">
+ <ClCompile Include="..\..\Source\Processors\Editors\ElectrodeButtons.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ChannelMappingEditor.cpp">
@@ -643,10 +634,10 @@
<ClCompile Include="..\..\Source\Processors\ProcessorGraph.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\UI\GraphViewer.cpp">
+ <ClCompile Include="..\..\Source\UI\CustomArrowButton.cpp">
<Filter>open-ephys\Source\UI</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\UI\CustomArrowButton.cpp">
+ <ClCompile Include="..\..\Source\UI\GraphViewer.cpp">
<Filter>open-ephys\Source\UI</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\UI\EditorViewportButtons.cpp">
@@ -1956,9 +1947,6 @@
<ClInclude Include="..\..\Source\Processors\SerialInput.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\LfpTriggeredAverageNode.h">
- <Filter>open-ephys\Source\Processors</Filter>
- </ClInclude>
<ClInclude Include="..\..\Source\Processors\FileReader.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
@@ -2022,9 +2010,6 @@
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\Visualization\LfpTriggeredAverageCanvas.h">
- <Filter>open-ephys\Source\Processors\Visualization</Filter>
- </ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h">
<Filter>open-ephys\Source\Processors\Visualization</Filter>
</ClInclude>
@@ -2040,9 +2025,6 @@
<ClInclude Include="..\..\Source\Processors\Visualization\LfpDisplayCanvas.h">
<Filter>open-ephys\Source\Processors\Visualization</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\Visualization\OpenGLCanvas.h">
- <Filter>open-ephys\Source\Processors\Visualization</Filter>
- </ClInclude>
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
@@ -2052,13 +2034,13 @@
<ClInclude Include="..\..\Source\Processors\EventNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\Editors\SerialInputEditor.h">
+ <ClInclude Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\Editors\ElectrodeButtons.h">
+ <ClInclude Include="..\..\Source\Processors\Editors\SerialInputEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Processors\Editors\LfpTriggeredAverageEditor.h">
+ <ClInclude Include="..\..\Source\Processors\Editors\ElectrodeButtons.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ChannelMappingEditor.h">
@@ -2187,10 +2169,10 @@
<ClInclude Include="..\..\Source\Processors\ProcessorGraph.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\UI\GraphViewer.h">
+ <ClInclude Include="..\..\Source\UI\CustomArrowButton.h">
<Filter>open-ephys\Source\UI</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\UI\CustomArrowButton.h">
+ <ClInclude Include="..\..\Source\UI\GraphViewer.h">
<Filter>open-ephys\Source\UI</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\UI\EditorViewportButtons.h">
View
6 Builds/VisualStudio2012/resources.rc
@@ -7,7 +7,7 @@
#include <windows.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 0,2,4,0
+FILEVERSION 0,2,5,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -15,9 +15,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Ephys\0"
VALUE "FileDescription", "open-ephys\0"
- VALUE "FileVersion", "0.2.4\0"
+ VALUE "FileVersion", "0.2.5\0"
VALUE "ProductName", "open-ephys\0"
- VALUE "ProductVersion", "0.2.4\0"
+ VALUE "ProductVersion", "0.2.5\0"
END
END
View
101 JuceLibraryCode/BinaryData.cpp
@@ -11377,6 +11377,106 @@ static const unsigned char temp_ab4bb26[] =
const char* PipelineB02_png = (const char*) temp_ab4bb26;
+//================== FPGAOutputEditor.cpp ==================
+static const unsigned char temp_86d96cc9[] =
+"/*\r\n"
+" ------------------------------------------------------------------\r\n"
+"\r\n"
+" This file is part of the Open Ephys GUI\r\n"
+" Copyright (C) 2013 Open Ephys\r\n"
+"\r\n"
+" ------------------------------------------------------------------\r\n"
+"\r\n"
+" This program is free software: you can redistribute it and/or modify\r\n"
+" it under the terms of the GNU General Public License as published by\r\n"
+" the Free Software Foundation, either version 3 of the License, or\r\n"
+" (at your option) any later version.\r\n"
+"\r\n"
+" This program is distributed in the hope that it will be useful,\r\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n"
+" GNU General Public License for more details.\r\n"
+"\r\n"
+" You should have received a copy of the GNU General Public License\r\n"
+" along with this program. If not, see <http://www.gnu.org/licenses/>.\r\n"
+"\r\n"
+"*/\r\n"
+"\r\n"
+"\r\n"
+"#include \"FPGAOutputEditor.h\"\r\n"
+"#include <stdio.h>\r\n"
+"\r\n"
+"\r\n"
+"FPGAOutputEditor::FPGAOutputEditor(GenericProcessor* parentNode, bool useDefaultParameterEditors=true)\r\n"
+" : GenericEditor(parentNode, useDefaultParameterEditors)\r\n"
+"\r\n"
+"{\r\n"
+"\r\n"
+" accumulator = 0;\r\n"
+"\r\n"
+" desiredWidth = 180;\r\n"
+"\r\n"
+" // Image im;\r\n"
+" // im = ImageCache::getFromMemory (BinaryData::OpenEphysBoardLogoBlack_png,\r\n"
+" // \t\t\t\t\t\t\t\tBinaryData::OpenEphysBoardLogoBlack_pngSize);\r\n"
+"\r\n"
+" // icon = new ImageIcon(im);\r\n"
+" // addAndMakeVisible(icon);\r\n"
+" // icon->setBounds(15,15,120,120);\r\n"
+"\r\n"
+" // icon->setOpacity(0.3f);\r\n"
+"\r\n"
+"}\r\n"
+"\r\n"
+"FPGAOutputEditor::~FPGAOutputEditor()\r\n"
+"{\r\n"
+" deleteAllChildren();\r\n"
+"}\r\n"
+"\r\n"
+"void FPGAOutputEditor::receivedEvent()\r\n"
+"{\r\n"
+"\r\n"
+" //icon->setOpacity(0.8f);\r\n"
+" //startTimer(50);\r\n"
+"\r\n"
+"}\r\n"
+"\r\n"
+"void FPGAOutputEditor::timerCallback()\r\n"
+"{\r\n"
+"\r\n"
+" repaint();\r\n"
+"\r\n"
+" accumulator++;\r\n"
+"\r\n"
+" if (isFading)\r\n"
+" {\r\n"
+"\r\n"
+" if (accumulator > 15.0)\r\n"
+" {\r\n"
+" stopTimer();\r\n"
+" isFading = false;\r\n"
+" }\r\n"
+"\r\n"
+" }\r\n"
+" else\r\n"
+" {\r\n"
+"\r\n"
+" if (accumulator < 10.0)\r\n"
+" {\r\n"
+" icon->setOpacity(0.8f-(0.05*float(accumulator)));\r\n"
+" accumulator++;\r\n"
+" }\r\n"
+" else\r\n"
+" {\r\n"
+" icon->setOpacity(0.3f);\r\n"
+" stopTimer();\r\n"
+" accumulator = 0;\r\n"
+" }\r\n"
+" }\r\n"
+"}";
+
+const char* FPGAOutputEditor_cpp = (const char*) temp_86d96cc9;
+
const char* getNamedResource (const char*, int&) throw();
const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw()
@@ -11449,6 +11549,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
case 0x921654eb: numBytes = 6533; return PipelineA02_png;
case 0xc6ee78ab: numBytes = 6205; return PipelineB01_png;
case 0xc6fc902c: numBytes = 5390; return PipelineB02_png;
+ case 0x10173ef6: numBytes = 2213; return FPGAOutputEditor_cpp;
default: break;
}
View
3  JuceLibraryCode/BinaryData.h
@@ -189,6 +189,9 @@ namespace BinaryData
extern const char* PipelineB02_png;
const int PipelineB02_pngSize = 5390;
+ extern const char* FPGAOutputEditor_cpp;
+ const int FPGAOutputEditor_cppSize = 2213;
+
// If you provide the name of one of the binary resource variables above, this function will
// return the corresponding data and its size (or a null pointer if the name isn't found).
const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw();
View
4 JuceLibraryCode/JuceHeader.h
@@ -39,8 +39,8 @@
namespace ProjectInfo
{
const char* const projectName = "open-ephys";
- const char* const versionString = "0.2.4";
- const int versionNumber = 0x204;
+ const char* const versionString = "0.2.5";
+ const int versionNumber = 0x205;
}
#endif // __APPHEADERFILE_YNSYIRR__
View
4 Source/Processors/Editors/LfpTriggeredAverageEditor.cpp
@@ -42,8 +42,8 @@ LfpTriggeredAverageEditor::~LfpTriggeredAverageEditor()
Visualizer* LfpTriggeredAverageEditor::createNewCanvas()
{
- LfpTriggeredAverageNode* processor = (LfpTriggeredAverageNode*) getProcessor();
- return new LfpTriggeredAverageCanvas(processor);
+ //LfpTriggeredAverageNode* processor = (LfpTriggeredAverageNode*) getProcessor();
+ //return new LfpTriggeredAverageCanvas(processor);
}
View
2  Source/Processors/Serial/ofConstants.h
@@ -171,4 +171,4 @@
#include <iomanip> //for setprecision
#include <fstream>
#include <algorithm>
-using namespace std;
+using namespace std;
View
22 Source/Processors/Serial/ofSerial.cpp
@@ -13,14 +13,13 @@
#endif
-
+#pragma comment(lib, "setupapi.lib")
#include <fcntl.h>
#include <errno.h>
#include <ctype.h>
#include <algorithm>
#include <stdio.h>
-
//---------------------------------------------
#ifdef TARGET_WIN32
//---------------------------------------------
@@ -114,8 +113,8 @@ ofSerial::ofSerial()
//---------------------------------------------
#ifdef TARGET_WIN32
//---------------------------------------------
- nPorts = 0;
- bPortsEnumerated = false;
+ nPorts = 0;
+ bPortsEnumerated = false;
portNamesShort = new char * [MAX_SERIAL_PORTS];
portNamesFriendly = new char * [MAX_SERIAL_PORTS];
@@ -141,8 +140,8 @@ ofSerial::~ofSerial()
//---------------------------------------------
#ifdef TARGET_WIN32
//---------------------------------------------
- nPorts = 0;
- bPortsEnumerated = false;
+ nPorts = 0;
+ bPortsEnumerated = false;
for (int i = 0; i < MAX_SERIAL_PORTS; i++)
{
@@ -193,8 +192,8 @@ void ofSerial::buildDeviceList()
struct dirent* entry;
dir = opendir("/dev");
- string deviceName = "";
- int deviceCount = 0;
+ string deviceName = "";
+ int deviceCount = 0;
if (dir == NULL)
{
@@ -288,8 +287,8 @@ void ofSerial::close()
{
SetCommTimeouts(hComm,&oldTimeout);
CloseHandle(hComm);
- hComm = INVALID_HANDLE_VALUE;
- bInited = false;
+ hComm = INVALID_HANDLE_VALUE;
+ bInited = false;
}
//---------------------------------------------
#else
@@ -309,7 +308,7 @@ void ofSerial::close()
//----------------------------------------------------------------
bool ofSerial::setup()
{
- return setup(0,9600); // the first one, at 9600 is a good choice...
+ return setup(0,9600); // the first one, at 9600 is a good choice...
}
//----------------------------------------------------------------
@@ -765,4 +764,3 @@ int ofSerial::available()
return numBytes;
}
-
View
65 Source/Processors/Serial/ofSerial.h
@@ -24,8 +24,8 @@
#endif
#endif
-#define OF_SERIAL_NO_DATA -2
-#define OF_SERIAL_ERROR -1
+#define OF_SERIAL_NO_DATA -2
+#define OF_SERIAL_ERROR -1
// notes below
class ofSerialDeviceInfo
@@ -80,53 +80,53 @@ class ofSerial
ofSerial();
virtual ~ofSerial();
- void listDevices();
+ void listDevices();
//old method - deprecated
- void enumerateDevices();
+ void enumerateDevices();
vector <ofSerialDeviceInfo> getDeviceList();
- void close();
- bool setup(); // use default port, baud (0,9600)
- bool setup(string portName, int baudrate);
- bool setup(int deviceNumber, int baudrate);
+ void close();
+ bool setup(); // use default port, baud (0,9600)
+ bool setup(string portName, int baudrate);
+ bool setup(int deviceNumber, int baudrate);
- int readBytes(unsigned char* buffer, int length);
- int writeBytes(unsigned char* buffer, int length);
- bool writeByte(unsigned char singleByte);
+ int readBytes(unsigned char* buffer, int length);
+ int writeBytes(unsigned char* buffer, int length);
+ bool writeByte(unsigned char singleByte);
int readByte(); // returns -1 on no read or error...
- void flush(bool flushIn = true, bool flushOut = true);
- int available();
+ void flush(bool flushIn = true, bool flushOut = true);
+ int available();
void drain();
protected:
- void buildDeviceList();
+ void buildDeviceList();
- string deviceType;
+ string deviceType;
vector <ofSerialDeviceInfo> devices;
bool bHaveEnumeratedDevices;
- bool bInited;
+ bool bInited;
#ifdef TARGET_WIN32
- char** portNamesShort;//[MAX_SERIAL_PORTS];
- char** portNamesFriendly; ///[MAX_SERIAL_PORTS];
- HANDLE hComm; // the handle to the serial port pc
- int nPorts;
- bool bPortsEnumerated;
- void enumerateWin32Ports();
- COMMTIMEOUTS oldTimeout; // we alter this, so keep a record
+ char** portNamesShort;//[MAX_SERIAL_PORTS];
+ char** portNamesFriendly; ///[MAX_SERIAL_PORTS];
+ HANDLE hComm; // the handle to the serial port pc
+ int nPorts;
+ bool bPortsEnumerated;
+ void enumerateWin32Ports();
+ COMMTIMEOUTS oldTimeout; // we alter this, so keep a record
#else
- int fd; // the handle to the serial port mac
- struct termios oldoptions;
+ int fd; // the handle to the serial port mac
+ struct termios oldoptions;
#endif
};
@@ -149,11 +149,11 @@ class ofSerial
// the name of the com port the device is attached to
// for example, on a mac, it might look like:
//
-// setup("/dev/tty.usbserial-3B1", 9600)
+// setup("/dev/tty.usbserial-3B1", 9600)
//
// and on a pc, it might look like:
//
-// setup("COM4", 9600)
+// setup("COM4", 9600)
//
// if you are using an arduino board, for example,
// you should check what ports you device is on in the
@@ -161,13 +161,13 @@ class ofSerial
// to do:
// ----------------------------
-// a) support blocking / non-blocking
-// b) support numChars available type functions
+// a) support blocking / non-blocking
+// b) support numChars available type functions
// c) can we reduce the number of includes here?
-// useful :
-// http://en.wikibooks.org/wiki/Serial_Programming:Unix/termios
-// http://www.keyspan.com/downloads-files/developer/win/USBSerial/html/DevDocsUSBSerial.html
+// useful :
+// http://en.wikibooks.org/wiki/Serial_Programming:Unix/termios
+// http://www.keyspan.com/downloads-files/developer/win/USBSerial/html/DevDocsUSBSerial.html
// ----------------------------
// (also useful, might be this serial example - worth checking out:
// http://web.mit.edu/kvogt/Public/osrc/src/
@@ -175,4 +175,3 @@ class ofSerial
// and non-blocking instances)
// ----------------------------
-
View
72 open-ephys.jucer
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.2.4"
+<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.2.5"
juceLinkage="amalg_multi" buildVST="1" buildRTAS="0" buildAU="1"
pluginName="Juce Project" pluginDesc="Juce Project" pluginManufacturer="yourcompany"
pluginManufacturerCode="Manu" pluginCode="Plug" pluginChannelConfigs="{1, 1}, {2, 2}"
@@ -11,7 +11,8 @@
companyName="Open Ephys" userNotes="The Open Ephys GUI was designed to provide a fast and flexible interface for acquiring, processing, and visualizing data from extracellular electrodes. See open-ephys.org for more information.">
<EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
- juceFolder="JuceLibraryCode" extraLinkerFlags="" objCExtraSuffix="fea2mT">
+ juceFolder="JuceLibraryCode" extraLinkerFlags="-lzmq" objCExtraSuffix="fea2mT"
+ externalLibraries="">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
osxSDK="default" osxCompatibility="default" osxArchitecture="default"/>
@@ -20,29 +21,33 @@
</CONFIGURATIONS>
</XCODE_MAC>
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="~/SDKs/vstsdk2.4" juceFolder="JuceLibraryCode"
- extraLinkerFlags="-pg -ldl -lXext" extraCompilerFlags="-export-dynamic -g -pg">
+ extraLinkerFlags="-pg -ldl -lXext -lzmq -lprotobuf -lGLU" extraCompilerFlags="-export-dynamic -g -pg -std=c++0x">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
- libraryPath="/usr/X11R6/lib/"/>
+ libraryPath="/usr/X11R6/lib/&#10;/usr/local/include&#10;" headerPath=""/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="open-ephys-release"
libraryPath="/usr/X11R6/lib/"/>
</CONFIGURATIONS>
</LINUX_MAKE>
<VS2012 targetFolder="Builds/VisualStudio2012" libraryType="1" juceFolder="JuceLibraryCode/modules"
- extraDefs="NOMINMAX" externalLibraries="setupapi.lib&#10;opengl32.lib&#10;glu32.lib&#10;">
+ extraDefs="NOMINMAX" externalLibraries="setupapi.lib&#10;opengl32.lib&#10;glu32.lib&#10;libzmq-v110-mt-3_2_2.lib&#10;libprotobuf.lib">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
- isDebug="1" optimisation="3" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Debug\bin"
- headerPath="" libraryPath="" postbuildCommand="copy ..\..\Resources\DLLs\okFrontPanel.dll .\Debug\bin"/>
+ isDebug="1" optimisation="1" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Debug\bin"
+ headerPath="../../Resources/Google Protocols/src" libraryPath="../../Resources/ZeroMQ/lib_x86&#10;../../Resources/Google Protocols/vsprojects/Debug"
+ postbuildCommand="copy ..\..\Resources\DLLs\okFrontPanel.dll .\Debug\bin"/>
<CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
- isDebug="0" optimisation="2" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Release\bin"
- headerPath="" libraryPath="" postbuildCommand="copy ..\..\Resources\DLLs\okFrontPanel.dll .\Release\bin"/>
- <CONFIGURATION name="Debug64" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
- isDebug="1" optimisation="3" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Debug64\bin"
- headerPath="" libraryPath="" postbuildCommand="copy ..\..\Resources\DLLs\Win64\okFrontPanel.dll .\Debug64\bin"/>
- <CONFIGURATION name="Release64" winWarningLevel="4" generateManifest="1" winArchitecture="x64"
- isDebug="0" optimisation="2" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Release64\bin"
- headerPath="" libraryPath="" postbuildCommand="copy ..\..\Resources\DLLs\Win64\okFrontPanel.dll .\Release64\bin"/>
+ isDebug="0" optimisation="3" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Release\bin"
+ headerPath="../../Resources/Google Protocols/src" libraryPath="../../Resources/ZeroMQ/lib_x86&#10;../../Resources/Google Protocols/vsprojects/Release"
+ postbuildCommand="copy ..\..\Resources\DLLs\okFrontPanel.dll .\Release\bin"/>
+ <CONFIGURATION name="Debug64" winWarningLevel="2" generateManifest="1" winArchitecture="x64"
+ isDebug="1" optimisation="1" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Debug64\bin"
+ headerPath="../../Resources/Google Protocols/src" libraryPath="../../Resources/ZeroMQ/lib_x64&#10;../../Resources/Google Protocols/vsprojects/x64/Debug"
+ postbuildCommand="post_build_commands_x64debug.bat"/>
+ <CONFIGURATION name="Release64" winWarningLevel="2" generateManifest="1" winArchitecture="x64"
+ isDebug="0" optimisation="3" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Release64\bin"
+ headerPath="../../Resources/Google Protocols/src" libraryPath="../../Resources/ZeroMQ/lib_x64&#10;../../Resources/Google Protocols/vsprojects/x64/Release"
+ postbuildCommand="post_build_commands_x64release.bat"/>
</CONFIGURATIONS>
</VS2012>
</EXPORTFORMATS>
@@ -224,12 +229,8 @@
file="Source/Audio/AudioComponent.h"/>
</GROUP>
<GROUP id="yQmqZWk" name="Processors">
- <FILE id="QdCHbA" name="SerialInput.cpp" compile="1" resource="0" file="Source/Processors/SerialInput.cpp"/>
- <FILE id="cMRCTu" name="SerialInput.h" compile="0" resource="0" file="Source/Processors/SerialInput.h"/>
- <FILE id="E7s1De" name="LfpTriggeredAverageNode.cpp" compile="1" resource="0"
- file="Source/Processors/LfpTriggeredAverageNode.cpp"/>
- <FILE id="MKL66o" name="LfpTriggeredAverageNode.h" compile="0" resource="0"
- file="Source/Processors/LfpTriggeredAverageNode.h"/>
+ <FILE id="Yj1umv" name="SerialInput.cpp" compile="1" resource="0" file="Source/Processors/SerialInput.cpp"/>
+ <FILE id="TSsuVv" name="SerialInput.h" compile="0" resource="0" file="Source/Processors/SerialInput.h"/>
<FILE id="M6nCIs" name="FileReader.cpp" compile="1" resource="0" file="Source/Processors/FileReader.cpp"/>
<FILE id="VU1bQ0" name="FileReader.h" compile="0" resource="0" file="Source/Processors/FileReader.h"/>
<FILE id="e7QoyI" name="ChannelMappingNode.cpp" compile="1" resource="0"
@@ -296,10 +297,6 @@
<FILE id="DXYynnz" name="Splitter.h" compile="0" resource="0" file="Source/Processors/Utilities/Splitter.h"/>
</GROUP>
<GROUP id="W4eqkOy" name="Visualization">
- <FILE id="zrJGqi" name="LfpTriggeredAverageCanvas.cpp" compile="1"
- resource="0" file="Source/Processors/Visualization/LfpTriggeredAverageCanvas.cpp"/>
- <FILE id="OPRWvZ" name="LfpTriggeredAverageCanvas.h" compile="0" resource="0"
- file="Source/Processors/Visualization/LfpTriggeredAverageCanvas.h"/>
<FILE id="ajAJi" name="SpikeObject.cpp" compile="1" resource="0" file="Source/Processors/Visualization/SpikeObject.cpp"/>
<FILE id="xqF5zL" name="SpikeObject.h" compile="0" resource="0" file="Source/Processors/Visualization/SpikeObject.h"/>
<FILE id="jGEqDp" name="SpikeDisplayCanvas.cpp" compile="1" resource="0"
@@ -313,9 +310,6 @@
file="Source/Processors/Visualization/LfpDisplayCanvas.cpp"/>
<FILE id="18BC8qM" name="LfpDisplayCanvas.h" compile="0" resource="0"
file="Source/Processors/Visualization/LfpDisplayCanvas.h"/>
- <FILE id="AXVHGiz" name="OpenGLCanvas.cpp" compile="1" resource="0"
- file="Source/Processors/Visualization/OpenGLCanvas.cpp"/>
- <FILE id="51k3it9" name="OpenGLCanvas.h" compile="0" resource="0" file="Source/Processors/Visualization/OpenGLCanvas.h"/>
</GROUP>
<FILE id="533rUXO" name="SpikeDetector.cpp" compile="1" resource="0"
file="Source/Processors/SpikeDetector.cpp"/>
@@ -326,18 +320,18 @@
<FILE id="hGnGAjh" name="EventNode.cpp" compile="1" resource="0" file="Source/Processors/EventNode.cpp"/>
<FILE id="dUtRN6" name="EventNode.h" compile="0" resource="0" file="Source/Processors/EventNode.h"/>
<GROUP id="AqvwO6w" name="Editors">
- <FILE id="wPpw1N" name="SerialInputEditor.cpp" compile="1" resource="0"
+ <FILE id="jQo6Ff" name="LfpTriggeredAverageEditor.cpp" compile="1"
+ resource="0" file="Source/Processors/Editors/LfpTriggeredAverageEditor.cpp"/>
+ <FILE id="RaQC38" name="LfpTriggeredAverageEditor.h" compile="0" resource="0"
+ file="Source/Processors/Editors/LfpTriggeredAverageEditor.h"/>
+ <FILE id="D3eN0G" name="SerialInputEditor.cpp" compile="1" resource="0"
file="Source/Processors/Editors/SerialInputEditor.cpp"/>
- <FILE id="UC2F4Z" name="SerialInputEditor.h" compile="0" resource="0"
+ <FILE id="iG39Gh" name="SerialInputEditor.h" compile="0" resource="0"
file="Source/Processors/Editors/SerialInputEditor.h"/>
<FILE id="E2PXvz" name="ElectrodeButtons.cpp" compile="1" resource="0"
file="Source/Processors/Editors/ElectrodeButtons.cpp"/>
<FILE id="yriJOG" name="ElectrodeButtons.h" compile="0" resource="0"
file="Source/Processors/Editors/ElectrodeButtons.h"/>
- <FILE id="wyH6Hs" name="LfpTriggeredAverageEditor.cpp" compile="1"
- resource="0" file="Source/Processors/Editors/LfpTriggeredAverageEditor.cpp"/>
- <FILE id="GE3VJI" name="LfpTriggeredAverageEditor.h" compile="0" resource="0"
- file="Source/Processors/Editors/LfpTriggeredAverageEditor.h"/>
<FILE id="g1ki17" name="ChannelMappingEditor.cpp" compile="1" resource="0"
file="Source/Processors/Editors/ChannelMappingEditor.cpp"/>
<FILE id="KLhI0Q" name="ChannelMappingEditor.h" compile="0" resource="0"
@@ -369,7 +363,7 @@
file="Source/Processors/Editors/ResamplingNodeEditor.cpp"/>
<FILE id="pMjiz6m" name="ResamplingNodeEditor.h" compile="0" resource="0"
file="Source/Processors/Editors/ResamplingNodeEditor.h"/>
- <FILE id="mvixd58" name="FPGAOutputEditor.cpp" compile="1" resource="0"
+ <FILE id="mvixd58" name="FPGAOutputEditor.cpp" compile="1" resource="1"
file="Source/Processors/Editors/FPGAOutputEditor.cpp"/>
<FILE id="phTDDOR" name="FPGAOutputEditor.h" compile="0" resource="0"
file="Source/Processors/Editors/FPGAOutputEditor.h"/>
@@ -495,12 +489,12 @@
file="Source/Processors/ProcessorGraph.h"/>
</GROUP>
<GROUP id="RNGb1yR" name="UI">
- <FILE id="WGP2TN" name="GraphViewer.cpp" compile="1" resource="0" file="Source/UI/GraphViewer.cpp"/>
- <FILE id="t96NjG" name="GraphViewer.h" compile="0" resource="0" file="Source/UI/GraphViewer.h"/>
- <FILE id="eFLOvq" name="CustomArrowButton.cpp" compile="1" resource="0"
+ <FILE id="gXswXJ" name="CustomArrowButton.cpp" compile="1" resource="0"
file="Source/UI/CustomArrowButton.cpp"/>
- <FILE id="WC4eCg" name="CustomArrowButton.h" compile="0" resource="0"
+ <FILE id="ECOEoc" name="CustomArrowButton.h" compile="0" resource="0"
file="Source/UI/CustomArrowButton.h"/>
+ <FILE id="aHMWGl" name="GraphViewer.cpp" compile="1" resource="0" file="Source/UI/GraphViewer.cpp"/>
+ <FILE id="EOJ8RU" name="GraphViewer.h" compile="0" resource="0" file="Source/UI/GraphViewer.h"/>
<FILE id="sWZ22HN" name="EditorViewportButtons.cpp" compile="1" resource="0"
file="Source/UI/EditorViewportButtons.cpp"/>
<FILE id="WwXnCHj" name="EditorViewportButtons.h" compile="0" resource="0"
Please sign in to comment.
Something went wrong with that request. Please try again.