Skip to content

Commit 71eb110

Browse files
aacuevasaacuevas
committed
Merge remote-tracking branch 'origin/development' into NWB
2 parents 71d995b + b92f02a commit 71eb110

5 files changed

Lines changed: 160 additions & 6 deletions

File tree

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0720"
4-
version = "1.3">
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Script"
13+
scriptText = "#!/bin/bash&#10;cd $PROJECT_DIR/Plugins/Config&#10;if [[ ! -a Env.xcconfig ]]&#10;then&#10;touch Env.xcconfig&#10;fi"
14+
shellToInvoke = "/bin/bash">
15+
<EnvironmentBuildable>
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
19+
BuildableName = "open-ephys.app"
20+
BlueprintName = "open-ephys (App)"
21+
ReferencedContainer = "container:open-ephys.xcodeproj">
22+
</BuildableReference>
23+
</EnvironmentBuildable>
24+
</ActionContent>
25+
</ExecutionAction>
26+
</PreActions>
827
<BuildActionEntries>
928
<BuildActionEntry
1029
buildForTesting = "YES"

‎Builds/MacOSX/Plugins/Config/Plugin.xcconfig‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
1-
#include "Base.xcconfig"
1+
// Defaults for values that might be overridden in Env.xcconfig
2+
JULIA_PATH = /Applications/Julia-0.5.app/Contents/Resources/julia
3+
MAC_PACKAGE_DIR = /opt/local
4+
5+
// Pull in machine-specific settings from git-ignored file, if it exists.
6+
#include "Env.xcconfig"
27

38
CONFIGURATION_BUILD_DIR = $(PROJECT_DIR)/../../build/$(CONFIGURATION)/open-ephys.app/Contents/PlugIns
4-
HEADER_SEARCH_PATHS = ../../../../JuceLibraryCode ../../../../JuceLibraryCode/modules ../../../../Source/Plugins/Headers ../../../../Source/Plugins/CommonLibs $(inherited)
9+
COPY_PHASE_STRIP = NO
10+
DEBUG_INFORMATION_FORMAT = dwarf
11+
ENABLE_STRICT_OBJC_MSGSEND = YES
12+
GCC_C_LANGUAGE_STANDARD = c99
13+
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
14+
GCC_NO_COMMON_BLOCKS = YES
15+
GCC_OPTIMIZATION_LEVEL = 3
16+
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) OEPLUGIN JUCER_XCODE_MAC_F6D2F4CF=1 JUCE_APP_VERSION=0.4.1 JUCE_APP_VERSION_HEX=0x401
17+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
18+
GCC_WARN_64_TO_32_BIT_CONVERSION = NO
19+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
20+
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
21+
GCC_WARN_MISSING_PARENTHESES = YES
22+
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES
23+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES
24+
GCC_WARN_UNDECLARED_SELECTOR = YES
25+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
26+
GCC_WARN_UNUSED_FUNCTION = YES
27+
GCC_WARN_UNUSED_VARIABLE = YES
28+
HEADER_SEARCH_PATHS = ../../../../JuceLibraryCode ../../../../JuceLibraryCode/modules ../../../../Source/Plugins/Headers ../../../../Source/Plugins/CommonLibs $(MAC_PACKAGE_DIR)/include $(inherited)
529
INSTALL_PATH = $(HOME)/Applications/open-ephys.app/Contents/PlugIns
630
WRAPPER_EXTENSION = bundle

‎Builds/MacOSX/open-ephys.xcodeproj/xcshareddata/xcschemes/open-ephys (App).xcscheme‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0730"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Script"
13+
scriptText = "#!/bin/bash&#10;cd $PROJECT_DIR/Plugins/Config&#10;if [[ ! -a Env.xcconfig ]]&#10;then&#10;touch Env.xcconfig&#10;fi"
14+
shellToInvoke = "/bin/bash">
15+
<EnvironmentBuildable>
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
19+
BuildableName = "open-ephys.app"
20+
BlueprintName = "open-ephys (App)"
21+
ReferencedContainer = "container:open-ephys.xcodeproj">
22+
</BuildableReference>
23+
</EnvironmentBuildable>
24+
</ActionContent>
25+
</ExecutionAction>
26+
</PreActions>
27+
<BuildActionEntries>
28+
<BuildActionEntry
29+
buildForTesting = "YES"
30+
buildForRunning = "YES"
31+
buildForProfiling = "YES"
32+
buildForArchiving = "YES"
33+
buildForAnalyzing = "YES">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
37+
BuildableName = "open-ephys.app"
38+
BlueprintName = "open-ephys (App)"
39+
ReferencedContainer = "container:open-ephys.xcodeproj">
40+
</BuildableReference>
41+
</BuildActionEntry>
42+
</BuildActionEntries>
43+
</BuildAction>
44+
<TestAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
shouldUseLaunchSchemeArgsEnv = "YES">
49+
<Testables>
50+
</Testables>
51+
<MacroExpansion>
52+
<BuildableReference
53+
BuildableIdentifier = "primary"
54+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
55+
BuildableName = "open-ephys.app"
56+
BlueprintName = "open-ephys (App)"
57+
ReferencedContainer = "container:open-ephys.xcodeproj">
58+
</BuildableReference>
59+
</MacroExpansion>
60+
<AdditionalOptions>
61+
</AdditionalOptions>
62+
</TestAction>
63+
<LaunchAction
64+
buildConfiguration = "Debug"
65+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
66+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
67+
launchStyle = "0"
68+
useCustomWorkingDirectory = "NO"
69+
ignoresPersistentStateOnLaunch = "NO"
70+
debugDocumentVersioning = "YES"
71+
debugServiceExtension = "internal"
72+
allowLocationSimulation = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
78+
BuildableName = "open-ephys.app"
79+
BlueprintName = "open-ephys (App)"
80+
ReferencedContainer = "container:open-ephys.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
<AdditionalOptions>
84+
</AdditionalOptions>
85+
</LaunchAction>
86+
<ProfileAction
87+
buildConfiguration = "Release"
88+
shouldUseLaunchSchemeArgsEnv = "YES"
89+
savedToolIdentifier = ""
90+
useCustomWorkingDirectory = "NO"
91+
debugDocumentVersioning = "YES">
92+
<BuildableProductRunnable
93+
runnableDebuggingMode = "0">
94+
<BuildableReference
95+
BuildableIdentifier = "primary"
96+
BlueprintIdentifier = "62F40A2101C1715EE4F8C87B"
97+
BuildableName = "open-ephys.app"
98+
BlueprintName = "open-ephys (App)"
99+
ReferencedContainer = "container:open-ephys.xcodeproj">
100+
</BuildableReference>
101+
</BuildableProductRunnable>
102+
</ProfileAction>
103+
<AnalyzeAction
104+
buildConfiguration = "Debug">
105+
</AnalyzeAction>
106+
<ArchiveAction
107+
buildConfiguration = "Release"
108+
revealArchiveInOrganizer = "YES">
109+
</ArchiveAction>
110+
</Scheme>

‎Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,13 +871,14 @@ void RHD2000Editor::buttonEvent(Button* button)
871871

872872
void RHD2000Editor::channelChanged (int channel, bool /*newState*/)
873873
{
874+
// Audio output is tied to DAC channels 0 and 1
874875
for (int i = 0; i < 2; i++)
875876
{
876877
if (electrodeButtons[i]->getToggleState())
877878
{
878879
electrodeButtons[i]->setChannelNum (channel);
879880
electrodeButtons[i]->repaint();
880-
board->setDACchannel (i, channel);
881+
board->setDACchannel (i, channel - 1); // HW channels are zero-based
881882
}
882883
}
883884
}

‎Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void RHD2000Thread::setDACchannel(int dacOutput, int channel)
216216
{
217217
dacChannels[dacOutput] = channel - channelCount;
218218
dacStream[dacOutput] = i;
219-
break;
219+
break;
220220
}
221221
else
222222
{
@@ -1666,7 +1666,7 @@ bool RHD2000Thread::updateBuffer()
16661666

16671667
}
16681668

1669-
1669+
16701670
if (dacOutputShouldChange)
16711671
{
16721672
std::cout << "DAC" << std::endl;

0 commit comments

Comments
 (0)