Skip to content

Commit a2082c1

Browse files
jdub233jdub233
authored
Merge pull request #31 from mitmedialab/serialSansLocking
Release 1.2 for museum installation
2 parents a27686f + 1dc5fbf commit a2082c1

40 files changed

+1577
-339
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ bin/emptyExampleDebug.app
99
bin/neoFormDebug.app
1010
bin/libfmod.so
1111
bin/neoFORM*
12+
# hardware specific config files
13+
bin/data/settings.xml
14+
bin/data/layoutSettings.xml

‎bin/data/TRANSFORM_pinsDisabled.xml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<num>0</num>

‎bin/data/inFORM_pinsDisabled.xml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<num>0</num>

‎neoForm.xcodeproj/project.pbxproj

+21-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
0539DA98F69604E28C739CD8 /* DepthDebugApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2E1E998977F62B94824A57 /* DepthDebugApp.cpp */; };
1414
0F8F016776681D468C0D0949 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 34FC4C582EA5ED68F36013CD /* audio.c */; };
1515
10E6F4EE94C43550178020B8 /* messages_mosq.c in Sources */ = {isa = PBXBuildFile; fileRef = A75316ABD0D140AA71445C50 /* messages_mosq.c */; };
16-
1106A5F01B257A9B6D7F6513 /* SinglePinDebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EBB8A7F45CEE5C6E85F5CCA /* SinglePinDebug.cpp */; };
1716
11C82DAF0F346ED7E3D24378 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F11AACC474CFDA164875B201 /* utils.cpp */; };
1817
120B4283A7F029AA7AC5185B /* handle_disconnect.c in Sources */ = {isa = PBXBuildFile; fileRef = B8F39F6EBA0607ECB7D18D89 /* handle_disconnect.c */; };
1918
125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; };
@@ -61,6 +60,9 @@
6160
7BB869C7114A607859B1D47C /* ofxMQTT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8130AFF2F6485D85D2604796 /* ofxMQTT.cpp */; };
6261
7F59AC8CDAF8CF8D30E50E57 /* send_disconnect.c in Sources */ = {isa = PBXBuildFile; fileRef = 25D84EECC76A85F5598FF2B3 /* send_disconnect.c */; };
6362
837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; };
63+
84AD72D32D3EDCB00005F27B /* PinDisabler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84AD72D12D3EDCB00005F27B /* PinDisabler.cpp */; };
64+
84AD72D62D3EDD1A0005F27B /* KinectMaskMaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84AD72D42D3EDD1A0005F27B /* KinectMaskMaker.cpp */; };
65+
84AD72D92D3EDD810005F27B /* PropagationWave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84AD72D72D3EDD810005F27B /* PropagationWave.cpp */; };
6466
852E0891794923EE7583C621 /* ofxInputField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44B351490B620D04E1E7C52D /* ofxInputField.cpp */; };
6567
853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 181D363B6DD54D1FA6309C43 /* ofxColorPicker.cpp */; };
6668
856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; };
@@ -208,7 +210,6 @@
208210
1DEB0E951B50A4AA4A6CFF05 /* warp.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = warp.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/cuda/warp.hpp; sourceTree = SOURCE_ROOT; };
209211
1DFA26F2C6BBD1B8AC24C0B1 /* ofxNetworkUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = ofxNetworkUtils.h; path = ../../../addons/ofxNetwork/src/ofxNetworkUtils.h; sourceTree = SOURCE_ROOT; };
210212
1E95EFD35ED9C5D97F2F015E /* timer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = timer.h; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/flann/timer.h; sourceTree = SOURCE_ROOT; };
211-
1EBB8A7F45CEE5C6E85F5CCA /* SinglePinDebug.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = SinglePinDebug.cpp; path = src/Applications/SinglePinDebug.cpp; sourceTree = SOURCE_ROOT; };
212213
1F8D7DDFE20B60F2A1AB9230 /* all_layers.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = all_layers.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/dnn/all_layers.hpp; sourceTree = SOURCE_ROOT; };
213214
1F9D46D19614774956DFE362 /* seam_finders.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = seam_finders.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/stitching/detail/seam_finders.hpp; sourceTree = SOURCE_ROOT; };
214215
20378FCC3CF23A063A1A6E09 /* type_traits_detail.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = type_traits_detail.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/cuda/detail/type_traits_detail.hpp; sourceTree = SOURCE_ROOT; };
@@ -429,6 +430,12 @@
429430
83C70000C4AE60283CC77EB9 /* freenect_internal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = freenect_internal.h; path = ../../../addons/ofxKinect/libs/libfreenect/src/freenect_internal.h; sourceTree = SOURCE_ROOT; };
430431
848371264443687510D5047E /* cv_cpu_dispatch.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cv_cpu_dispatch.h; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/core/cv_cpu_dispatch.h; sourceTree = SOURCE_ROOT; };
431432
849E0FB3BF7726C6FFE88602 /* matx.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = matx.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/matx.hpp; sourceTree = SOURCE_ROOT; };
433+
84AD72D12D3EDCB00005F27B /* PinDisabler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PinDisabler.cpp; path = Applications/PinDisabler.cpp; sourceTree = "<group>"; };
434+
84AD72D22D3EDCB00005F27B /* PinDisabler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PinDisabler.hpp; path = Applications/PinDisabler.hpp; sourceTree = "<group>"; };
435+
84AD72D42D3EDD1A0005F27B /* KinectMaskMaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KinectMaskMaker.cpp; path = Applications/KinectMaskMaker.cpp; sourceTree = "<group>"; };
436+
84AD72D52D3EDD1A0005F27B /* KinectMaskMaker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = KinectMaskMaker.hpp; path = Applications/KinectMaskMaker.hpp; sourceTree = "<group>"; };
437+
84AD72D72D3EDD810005F27B /* PropagationWave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropagationWave.cpp; path = Applications/PropagationWave.cpp; sourceTree = "<group>"; };
438+
84AD72D82D3EDD810005F27B /* PropagationWave.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PropagationWave.hpp; path = Applications/PropagationWave.hpp; sourceTree = "<group>"; };
432439
84C059AA681D7088B742D8E8 /* cuda.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cuda.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda.hpp; sourceTree = SOURCE_ROOT; };
433440
84DB6A323E1B2EBC068676D0 /* version.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = version.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/dnn/version.hpp; sourceTree = SOURCE_ROOT; };
434441
85EE29124410F522F3338B11 /* mosquitto_internal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = mosquitto_internal.h; path = "../../../addons/ofxMQTT-1.5.0/libs/mosquitto/src/mosquitto_internal.h"; sourceTree = SOURCE_ROOT; };
@@ -466,7 +473,6 @@
466473
910F0AB42DA6B6983B9E4E8F /* opencl_clamdblas.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = opencl_clamdblas.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp; sourceTree = SOURCE_ROOT; };
467474
9118B8059684FBB32471ED87 /* cv_cpu_helper.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cv_cpu_helper.h; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/cv_cpu_helper.h; sourceTree = SOURCE_ROOT; };
468475
914EC672874BEB924175DCC0 /* intrin_sse_em.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = intrin_sse_em.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/hal/intrin_sse_em.hpp; sourceTree = SOURCE_ROOT; };
469-
9173510537C7D6FE1E419118 /* SinglePinDebug.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SinglePinDebug.hpp; path = src/Applications/SinglePinDebug.hpp; sourceTree = SOURCE_ROOT; };
470476
930B84B145D9C48AB8AF391C /* hal.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = hal.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/core/hal/hal.hpp; sourceTree = SOURCE_ROOT; };
471477
9380CCEAA1D07591C5BE12EB /* gmetaarg.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = gmetaarg.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv2/gapi/gmetaarg.hpp; sourceTree = SOURCE_ROOT; };
472478
939C00519D3AFB3F1A1E7985 /* transform.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = transform.hpp; path = ../../../addons/ofxOpenCv/libs/opencv/include/opencv4/opencv2/core/cuda/transform.hpp; sourceTree = SOURCE_ROOT; };
@@ -1713,10 +1719,14 @@
17131719
B951ED6C2CEA703B00C74190 /* EquationMode.cpp */,
17141720
5CA9FA6BC0B5960F86829213 /* KinectHandWavy.hpp */,
17151721
0EE2CDE44D22EEE04A103259 /* KinectHandWavy.cpp */,
1722+
84AD72D42D3EDD1A0005F27B /* KinectMaskMaker.cpp */,
1723+
84AD72D52D3EDD1A0005F27B /* KinectMaskMaker.hpp */,
1724+
84AD72D72D3EDD810005F27B /* PropagationWave.cpp */,
1725+
84AD72D82D3EDD810005F27B /* PropagationWave.hpp */,
17161726
4B810A70678A82CBADCAFF05 /* MqttTransmissionApp.hpp */,
17171727
371A3F038DAEE97357696076 /* MqttTransmissionApp.cpp */,
1718-
9173510537C7D6FE1E419118 /* SinglePinDebug.hpp */,
1719-
1EBB8A7F45CEE5C6E85F5CCA /* SinglePinDebug.cpp */,
1728+
84AD72D22D3EDCB00005F27B /* PinDisabler.hpp */,
1729+
84AD72D12D3EDCB00005F27B /* PinDisabler.cpp */,
17201730
B916F1122D20C87A00BC378D /* Telepresence.hpp */,
17211731
B916F1132D20C87A00BC378D /* Telepresence.cpp */,
17221732
AE527AF4F7B13F64D57C5A79 /* VideoPlayerApp.hpp */,
@@ -2135,6 +2145,7 @@
21352145
994116FAE9B72955C57E4FFB /* KinectDebugApp.hpp */,
21362146
);
21372147
name = DebuggingApps;
2148+
path = ShapeDisplayManagers;
21382149
sourceTree = "<group>";
21392150
};
21402151
BB4B014C10F69532006C3DED /* addons */ = {
@@ -2760,7 +2771,7 @@
27602771
attributes = {
27612772
LastUpgradeCheck = 0600;
27622773
};
2763-
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "neoFORM" */;
2774+
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "neoForm" */;
27642775
compatibilityVersion = "Xcode 3.2";
27652776
developmentRegion = English;
27662777
hasScannedForEncodings = 0;
@@ -2846,7 +2857,6 @@
28462857
78BA2658D3AD37A46853C83F /* KinectHandWavy.cpp in Sources */,
28472858
6E0EB1DDA3A9C297C0955FD6 /* MqttTransmissionApp.cpp in Sources */,
28482859
E2A298BB6EBC92CF0F034069 /* VideoPlayerApp.cpp in Sources */,
2849-
1106A5F01B257A9B6D7F6513 /* SinglePinDebug.cpp in Sources */,
28502860
1BFB57D03D3B7A47D4D50FF1 /* Application.cpp in Sources */,
28512861
4CD97A467E5A05547530160F /* KinectDebugApp.cpp in Sources */,
28522862
C77AA92B55CE88F23EE470A0 /* AxisCheckerApp.cpp in Sources */,
@@ -2855,6 +2865,7 @@
28552865
5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */,
28562866
853E0BA2F448076739446874 /* ofxColorPicker.cpp in Sources */,
28572867
B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */,
2868+
84AD72D92D3EDD810005F27B /* PropagationWave.cpp in Sources */,
28582869
852E0891794923EE7583C621 /* ofxInputField.cpp in Sources */,
28592870
483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */,
28602871
F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */,
@@ -2865,11 +2876,13 @@
28652876
ACE7DC9A3223ED5EE1B80074 /* cameras.c in Sources */,
28662877
F4135EEFC911E9ED211FB6F9 /* core.c in Sources */,
28672878
E55DEEF784A10419E444669E /* flags.c in Sources */,
2879+
84AD72D32D3EDCB00005F27B /* PinDisabler.cpp in Sources */,
28682880
FCC16AB16073FF0581F50ED7 /* loader.c in Sources */,
28692881
D31F5C1B140C59B2AF1533A8 /* registration.c in Sources */,
28702882
49BEEB2DFA5319D55AA6899F /* tilt.c in Sources */,
28712883
255A7B680DC81E543C875794 /* usb_libusb10.c in Sources */,
28722884
7ADB04AF67C568EAFAEBA546 /* ofxKinectExtras.cpp in Sources */,
2885+
84AD72D62D3EDD1A0005F27B /* KinectMaskMaker.cpp in Sources */,
28732886
B951ED6E2CEA703B00C74190 /* EquationMode.cpp in Sources */,
28742887
686B0DF6249B52E1A85B39EC /* ofxKinect.cpp in Sources */,
28752888
69578CC6A029D58E3A0F0D33 /* actions.c in Sources */,
@@ -3761,7 +3774,7 @@
37613774
/* End XCBuildConfiguration section */
37623775

37633776
/* Begin XCConfigurationList section */
3764-
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "neoFORM" */ = {
3777+
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "neoForm" */ = {
37653778
isa = XCConfigurationList;
37663779
buildConfigurations = (
37673780
E4B69B4E0A3A1720003C02F2 /* Debug */,

‎neoForm.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate

57.9 KB
Binary file not shown.

‎neoForm.xcodeproj/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Bucket
3+
uuid = "CA18B0BD-C46C-435F-BB60-7D15A0D00B64"
4+
type = "1"
5+
version = "2.0">
6+
<Breakpoints>
7+
<BreakpointProxy
8+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
9+
<BreakpointContent
10+
uuid = "1FBE6C9D-8D5E-45B1-A6F9-1CEAA8A60B16"
11+
shouldBeEnabled = "No"
12+
ignoreCount = "0"
13+
continueAfterRunningActions = "No"
14+
filePath = "src/ShapeDisplayManagers/SerialShapeIO.cpp"
15+
startingColumnNumber = "9223372036854775807"
16+
endingColumnNumber = "9223372036854775807"
17+
startingLineNumber = "102"
18+
endingLineNumber = "102"
19+
landmarkName = "SerialShapeIO::threadedFunction()"
20+
landmarkType = "7">
21+
</BreakpointContent>
22+
</BreakpointProxy>
23+
<BreakpointProxy
24+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
25+
<BreakpointContent
26+
uuid = "B56ECC7A-626F-4773-BEA8-74785DBEDAB8"
27+
shouldBeEnabled = "No"
28+
ignoreCount = "0"
29+
continueAfterRunningActions = "No"
30+
filePath = "src/ShapeDisplayManagers/SerialShapeIO.cpp"
31+
startingColumnNumber = "9223372036854775807"
32+
endingColumnNumber = "9223372036854775807"
33+
startingLineNumber = "120"
34+
endingLineNumber = "120"
35+
landmarkName = "SerialShapeIO::threadedFunction()"
36+
landmarkType = "7">
37+
</BreakpointContent>
38+
</BreakpointProxy>
39+
<BreakpointProxy
40+
BreakpointExtensionID = "Xcode.Breakpoint.AddressBreakpoint">
41+
<BreakpointContent
42+
uuid = "1A939536-3964-42A3-A64B-1E0DDCFD0030"
43+
shouldBeEnabled = "No"
44+
ignoreCount = "0"
45+
continueAfterRunningActions = "No"
46+
symbolName = "*0x18b3f101c">
47+
<Locations>
48+
</Locations>
49+
</BreakpointContent>
50+
</BreakpointProxy>
51+
</Breakpoints>
52+
</Bucket>

0 commit comments

Comments
 (0)