Skip to content

Commit 86c153e

Browse files
committed
Merge branch 'IntanRecController' into development
2 parents 3d3738b + 4340256 commit 86c153e

22 files changed

Lines changed: 10808 additions & 1 deletion

File tree

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,20 @@
333333
ReferencedContainer = "container:Plugins/RhythmNode/RhythmNode.xcodeproj">
334334
</BuildableReference>
335335
</BuildActionEntry>
336+
<BuildActionEntry
337+
buildForTesting = "YES"
338+
buildForRunning = "YES"
339+
buildForProfiling = "YES"
340+
buildForArchiving = "YES"
341+
buildForAnalyzing = "YES">
342+
<BuildableReference
343+
BuildableIdentifier = "primary"
344+
BlueprintIdentifier = "2775FF342043399F0022A8FA"
345+
BuildableName = "IntanRecordingController.bundle"
346+
BlueprintName = "IntanRecordingController"
347+
ReferencedContainer = "container:Plugins/IntanRecordingController/IntanRecordingController.xcodeproj">
348+
</BuildableReference>
349+
</BuildActionEntry>
336350
</BuildActionEntries>
337351
</BuildAction>
338352
<TestAction
Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 48;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
2775FF562043420F0022A8FA /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4320433A5B0022A8FA /* OpenEphysLib.cpp */; };
11+
2775FF572043420F0022A8FA /* RHD2000Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4220433A5B0022A8FA /* RHD2000Editor.cpp */; };
12+
2775FF582043420F0022A8FA /* RHD2000Editor.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4120433A5B0022A8FA /* RHD2000Editor.h */; };
13+
2775FF592043420F0022A8FA /* RHD2000Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4E20433A5C0022A8FA /* RHD2000Thread.cpp */; };
14+
2775FF5A2043420F0022A8FA /* RHD2000Thread.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4420433A5C0022A8FA /* RHD2000Thread.h */; };
15+
2775FF5B2043420F0022A8FA /* rhd2000evalboardusb3.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4620433A5C0022A8FA /* rhd2000evalboardusb3.h */; };
16+
2775FF5C2043420F0022A8FA /* okFrontPanelDLL.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4720433A5C0022A8FA /* okFrontPanelDLL.h */; };
17+
2775FF5D2043420F0022A8FA /* rhd2000datablockusb3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4820433A5C0022A8FA /* rhd2000datablockusb3.cpp */; };
18+
2775FF5E2043420F0022A8FA /* rhd2000datablockusb3.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4920433A5C0022A8FA /* rhd2000datablockusb3.h */; };
19+
2775FF5F2043420F0022A8FA /* rhd2000registersusb3.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4A20433A5C0022A8FA /* rhd2000registersusb3.h */; };
20+
2775FF602043420F0022A8FA /* rhd2000registersusb3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4B20433A5C0022A8FA /* rhd2000registersusb3.cpp */; };
21+
2775FF612043420F0022A8FA /* rhd2000evalboardusb3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4C20433A5C0022A8FA /* rhd2000evalboardusb3.cpp */; };
22+
2775FF622043420F0022A8FA /* USBThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4D20433A5C0022A8FA /* USBThread.cpp */; };
23+
2775FF632043420F0022A8FA /* USBThread.h in Sources */ = {isa = PBXBuildFile; fileRef = 2775FF4F20433A5C0022A8FA /* USBThread.h */; };
24+
2775FF64204342890022A8FA /* libokFrontPanel.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2775FF55204340280022A8FA /* libokFrontPanel.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
25+
2775FF65204342980022A8FA /* libokFrontPanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2775FF55204340280022A8FA /* libokFrontPanel.dylib */; };
26+
/* End PBXBuildFile section */
27+
28+
/* Begin PBXCopyFilesBuildPhase section */
29+
2775FF5020433C1D0022A8FA /* CopyFiles */ = {
30+
isa = PBXCopyFilesBuildPhase;
31+
buildActionMask = 2147483647;
32+
dstPath = "";
33+
dstSubfolderSpec = 10;
34+
files = (
35+
2775FF64204342890022A8FA /* libokFrontPanel.dylib in CopyFiles */,
36+
);
37+
runOnlyForDeploymentPostprocessing = 0;
38+
};
39+
/* End PBXCopyFilesBuildPhase section */
40+
41+
/* Begin PBXFileReference section */
42+
2775FF352043399F0022A8FA /* IntanRecordingController.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IntanRecordingController.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
43+
2775FF382043399F0022A8FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
44+
2775FF3F20433A210022A8FA /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
45+
2775FF4020433A210022A8FA /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
46+
2775FF4120433A5B0022A8FA /* RHD2000Editor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RHD2000Editor.h; path = ../../../../../Source/Plugins/IntanRecordingController/RHD2000Editor.h; sourceTree = "<group>"; };
47+
2775FF4220433A5B0022A8FA /* RHD2000Editor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Editor.cpp; path = ../../../../../Source/Plugins/IntanRecordingController/RHD2000Editor.cpp; sourceTree = "<group>"; };
48+
2775FF4320433A5B0022A8FA /* OpenEphysLib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../Source/Plugins/IntanRecordingController/OpenEphysLib.cpp; sourceTree = "<group>"; };
49+
2775FF4420433A5C0022A8FA /* RHD2000Thread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RHD2000Thread.h; path = ../../../../../Source/Plugins/IntanRecordingController/RHD2000Thread.h; sourceTree = "<group>"; };
50+
2775FF4620433A5C0022A8FA /* rhd2000evalboardusb3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rhd2000evalboardusb3.h; sourceTree = "<group>"; };
51+
2775FF4720433A5C0022A8FA /* okFrontPanelDLL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = okFrontPanelDLL.h; sourceTree = "<group>"; };
52+
2775FF4820433A5C0022A8FA /* rhd2000datablockusb3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = rhd2000datablockusb3.cpp; sourceTree = "<group>"; };
53+
2775FF4920433A5C0022A8FA /* rhd2000datablockusb3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rhd2000datablockusb3.h; sourceTree = "<group>"; };
54+
2775FF4A20433A5C0022A8FA /* rhd2000registersusb3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rhd2000registersusb3.h; sourceTree = "<group>"; };
55+
2775FF4B20433A5C0022A8FA /* rhd2000registersusb3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = rhd2000registersusb3.cpp; sourceTree = "<group>"; };
56+
2775FF4C20433A5C0022A8FA /* rhd2000evalboardusb3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = rhd2000evalboardusb3.cpp; sourceTree = "<group>"; };
57+
2775FF4D20433A5C0022A8FA /* USBThread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = USBThread.cpp; path = ../../../../../Source/Plugins/IntanRecordingController/USBThread.cpp; sourceTree = "<group>"; };
58+
2775FF4E20433A5C0022A8FA /* RHD2000Thread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Thread.cpp; path = ../../../../../Source/Plugins/IntanRecordingController/RHD2000Thread.cpp; sourceTree = "<group>"; };
59+
2775FF4F20433A5C0022A8FA /* USBThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = USBThread.h; path = ../../../../../Source/Plugins/IntanRecordingController/USBThread.h; sourceTree = "<group>"; };
60+
2775FF55204340280022A8FA /* libokFrontPanel.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libokFrontPanel.dylib; path = ../../../../Resources/DLLs/libokFrontPanel.dylib; sourceTree = "<group>"; };
61+
/* End PBXFileReference section */
62+
63+
/* Begin PBXFrameworksBuildPhase section */
64+
2775FF322043399F0022A8FA /* Frameworks */ = {
65+
isa = PBXFrameworksBuildPhase;
66+
buildActionMask = 2147483647;
67+
files = (
68+
2775FF65204342980022A8FA /* libokFrontPanel.dylib in Frameworks */,
69+
);
70+
runOnlyForDeploymentPostprocessing = 0;
71+
};
72+
/* End PBXFrameworksBuildPhase section */
73+
74+
/* Begin PBXGroup section */
75+
2775FF2C2043399F0022A8FA = {
76+
isa = PBXGroup;
77+
children = (
78+
2775FF3E204339FA0022A8FA /* Config */,
79+
2775FF372043399F0022A8FA /* IntanRecordingController */,
80+
2775FF362043399F0022A8FA /* Products */,
81+
2775FF5320433CAA0022A8FA /* Frameworks */,
82+
);
83+
sourceTree = "<group>";
84+
};
85+
2775FF362043399F0022A8FA /* Products */ = {
86+
isa = PBXGroup;
87+
children = (
88+
2775FF352043399F0022A8FA /* IntanRecordingController.bundle */,
89+
);
90+
name = Products;
91+
sourceTree = "<group>";
92+
};
93+
2775FF372043399F0022A8FA /* IntanRecordingController */ = {
94+
isa = PBXGroup;
95+
children = (
96+
2775FF4320433A5B0022A8FA /* OpenEphysLib.cpp */,
97+
2775FF4220433A5B0022A8FA /* RHD2000Editor.cpp */,
98+
2775FF4120433A5B0022A8FA /* RHD2000Editor.h */,
99+
2775FF4E20433A5C0022A8FA /* RHD2000Thread.cpp */,
100+
2775FF4420433A5C0022A8FA /* RHD2000Thread.h */,
101+
2775FF4520433A5C0022A8FA /* rhythm-api */,
102+
2775FF4D20433A5C0022A8FA /* USBThread.cpp */,
103+
2775FF4F20433A5C0022A8FA /* USBThread.h */,
104+
2775FF382043399F0022A8FA /* Info.plist */,
105+
);
106+
path = IntanRecordingController;
107+
sourceTree = "<group>";
108+
};
109+
2775FF3E204339FA0022A8FA /* Config */ = {
110+
isa = PBXGroup;
111+
children = (
112+
2775FF3F20433A210022A8FA /* Plugin_Debug.xcconfig */,
113+
2775FF4020433A210022A8FA /* Plugin_Release.xcconfig */,
114+
);
115+
name = Config;
116+
sourceTree = "<group>";
117+
};
118+
2775FF4520433A5C0022A8FA /* rhythm-api */ = {
119+
isa = PBXGroup;
120+
children = (
121+
2775FF4620433A5C0022A8FA /* rhd2000evalboardusb3.h */,
122+
2775FF4720433A5C0022A8FA /* okFrontPanelDLL.h */,
123+
2775FF4820433A5C0022A8FA /* rhd2000datablockusb3.cpp */,
124+
2775FF4920433A5C0022A8FA /* rhd2000datablockusb3.h */,
125+
2775FF4A20433A5C0022A8FA /* rhd2000registersusb3.h */,
126+
2775FF4B20433A5C0022A8FA /* rhd2000registersusb3.cpp */,
127+
2775FF4C20433A5C0022A8FA /* rhd2000evalboardusb3.cpp */,
128+
);
129+
name = "rhythm-api";
130+
path = "../../../../../Source/Plugins/IntanRecordingController/rhythm-api";
131+
sourceTree = "<group>";
132+
};
133+
2775FF5320433CAA0022A8FA /* Frameworks */ = {
134+
isa = PBXGroup;
135+
children = (
136+
2775FF55204340280022A8FA /* libokFrontPanel.dylib */,
137+
);
138+
name = Frameworks;
139+
sourceTree = "<group>";
140+
};
141+
/* End PBXGroup section */
142+
143+
/* Begin PBXNativeTarget section */
144+
2775FF342043399F0022A8FA /* IntanRecordingController */ = {
145+
isa = PBXNativeTarget;
146+
buildConfigurationList = 2775FF3B2043399F0022A8FA /* Build configuration list for PBXNativeTarget "IntanRecordingController" */;
147+
buildPhases = (
148+
2775FF5020433C1D0022A8FA /* CopyFiles */,
149+
2775FF312043399F0022A8FA /* Sources */,
150+
2775FF322043399F0022A8FA /* Frameworks */,
151+
2775FF332043399F0022A8FA /* Resources */,
152+
);
153+
buildRules = (
154+
);
155+
dependencies = (
156+
);
157+
name = IntanRecordingController;
158+
productName = IntanRecordingController;
159+
productReference = 2775FF352043399F0022A8FA /* IntanRecordingController.bundle */;
160+
productType = "com.apple.product-type.bundle";
161+
};
162+
/* End PBXNativeTarget section */
163+
164+
/* Begin PBXProject section */
165+
2775FF2D2043399F0022A8FA /* Project object */ = {
166+
isa = PBXProject;
167+
attributes = {
168+
LastUpgradeCheck = 0920;
169+
ORGANIZATIONNAME = "Open Ephys";
170+
TargetAttributes = {
171+
2775FF342043399F0022A8FA = {
172+
CreatedOnToolsVersion = 9.2;
173+
};
174+
};
175+
};
176+
buildConfigurationList = 2775FF302043399F0022A8FA /* Build configuration list for PBXProject "IntanRecordingController" */;
177+
compatibilityVersion = "Xcode 8.0";
178+
developmentRegion = en;
179+
hasScannedForEncodings = 0;
180+
knownRegions = (
181+
en,
182+
);
183+
mainGroup = 2775FF2C2043399F0022A8FA;
184+
productRefGroup = 2775FF362043399F0022A8FA /* Products */;
185+
projectDirPath = "";
186+
projectRoot = "";
187+
targets = (
188+
2775FF342043399F0022A8FA /* IntanRecordingController */,
189+
);
190+
};
191+
/* End PBXProject section */
192+
193+
/* Begin PBXResourcesBuildPhase section */
194+
2775FF332043399F0022A8FA /* Resources */ = {
195+
isa = PBXResourcesBuildPhase;
196+
buildActionMask = 2147483647;
197+
files = (
198+
);
199+
runOnlyForDeploymentPostprocessing = 0;
200+
};
201+
/* End PBXResourcesBuildPhase section */
202+
203+
/* Begin PBXSourcesBuildPhase section */
204+
2775FF312043399F0022A8FA /* Sources */ = {
205+
isa = PBXSourcesBuildPhase;
206+
buildActionMask = 2147483647;
207+
files = (
208+
2775FF562043420F0022A8FA /* OpenEphysLib.cpp in Sources */,
209+
2775FF572043420F0022A8FA /* RHD2000Editor.cpp in Sources */,
210+
2775FF582043420F0022A8FA /* RHD2000Editor.h in Sources */,
211+
2775FF592043420F0022A8FA /* RHD2000Thread.cpp in Sources */,
212+
2775FF5A2043420F0022A8FA /* RHD2000Thread.h in Sources */,
213+
2775FF5B2043420F0022A8FA /* rhd2000evalboardusb3.h in Sources */,
214+
2775FF5C2043420F0022A8FA /* okFrontPanelDLL.h in Sources */,
215+
2775FF5D2043420F0022A8FA /* rhd2000datablockusb3.cpp in Sources */,
216+
2775FF5E2043420F0022A8FA /* rhd2000datablockusb3.h in Sources */,
217+
2775FF5F2043420F0022A8FA /* rhd2000registersusb3.h in Sources */,
218+
2775FF602043420F0022A8FA /* rhd2000registersusb3.cpp in Sources */,
219+
2775FF612043420F0022A8FA /* rhd2000evalboardusb3.cpp in Sources */,
220+
2775FF622043420F0022A8FA /* USBThread.cpp in Sources */,
221+
2775FF632043420F0022A8FA /* USBThread.h in Sources */,
222+
);
223+
runOnlyForDeploymentPostprocessing = 0;
224+
};
225+
/* End PBXSourcesBuildPhase section */
226+
227+
/* Begin XCBuildConfiguration section */
228+
2775FF392043399F0022A8FA /* Debug */ = {
229+
isa = XCBuildConfiguration;
230+
baseConfigurationReference = 2775FF3F20433A210022A8FA /* Plugin_Debug.xcconfig */;
231+
buildSettings = {
232+
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks";
233+
};
234+
name = Debug;
235+
};
236+
2775FF3A2043399F0022A8FA /* Release */ = {
237+
isa = XCBuildConfiguration;
238+
baseConfigurationReference = 2775FF4020433A210022A8FA /* Plugin_Release.xcconfig */;
239+
buildSettings = {
240+
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks";
241+
};
242+
name = Release;
243+
};
244+
2775FF3C2043399F0022A8FA /* Debug */ = {
245+
isa = XCBuildConfiguration;
246+
buildSettings = {
247+
INFOPLIST_FILE = IntanRecordingController/Info.plist;
248+
LIBRARY_SEARCH_PATHS = (
249+
"$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks",
250+
"$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks",
251+
);
252+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.IntanRecordingController;
253+
PRODUCT_NAME = "$(TARGET_NAME)";
254+
};
255+
name = Debug;
256+
};
257+
2775FF3D2043399F0022A8FA /* Release */ = {
258+
isa = XCBuildConfiguration;
259+
buildSettings = {
260+
INFOPLIST_FILE = IntanRecordingController/Info.plist;
261+
LIBRARY_SEARCH_PATHS = (
262+
"$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks",
263+
"$(CONFIGURATION_BUILD_DIR)/IntanRecordingController.bundle/Contents/Frameworks",
264+
);
265+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.IntanRecordingController;
266+
PRODUCT_NAME = "$(TARGET_NAME)";
267+
};
268+
name = Release;
269+
};
270+
/* End XCBuildConfiguration section */
271+
272+
/* Begin XCConfigurationList section */
273+
2775FF302043399F0022A8FA /* Build configuration list for PBXProject "IntanRecordingController" */ = {
274+
isa = XCConfigurationList;
275+
buildConfigurations = (
276+
2775FF392043399F0022A8FA /* Debug */,
277+
2775FF3A2043399F0022A8FA /* Release */,
278+
);
279+
defaultConfigurationIsVisible = 0;
280+
defaultConfigurationName = Release;
281+
};
282+
2775FF3B2043399F0022A8FA /* Build configuration list for PBXNativeTarget "IntanRecordingController" */ = {
283+
isa = XCConfigurationList;
284+
buildConfigurations = (
285+
2775FF3C2043399F0022A8FA /* Debug */,
286+
2775FF3D2043399F0022A8FA /* Release */,
287+
);
288+
defaultConfigurationIsVisible = 0;
289+
defaultConfigurationName = Release;
290+
};
291+
/* End XCConfigurationList section */
292+
};
293+
rootObject = 2775FF2D2043399F0022A8FA /* Project object */;
294+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>Copyright © 2018 Open Ephys. All rights reserved.</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

0 commit comments

Comments
 (0)