Ignore:
Timestamp:
07/15/13 18:04:05 (9 years ago)
Author:
Jonathon Horsman <jonathon@…>
Branches:
master, RawEEG, Servo, Tab_Interface, pyramid
Children:
9015b1e
Parents:
d6fbdfb
Message:

Initial check in to convert into a 4 tab app with tutorial, flight, advanced and support tabs.
Old controller code remains for now but about to be removed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/orbit.xcodeproj/project.pbxproj

    ra9059a5 rab9d63b  
    2121                28174C7D167F2EAA00104752 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28174C7C167F2EAA00104752 /* ViewController.m */; }; 
    2222                28174C84167F30C400104752 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28174C83167F30C400104752 /* AVFoundation.framework */; }; 
     23                2843FE891790205900C79D56 /* status_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE811790205900C79D56 /* status_1.png */; }; 
     24                2843FE8A1790205900C79D56 /* status_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE821790205900C79D56 /* status_1@2x.png */; }; 
     25                2843FE8B1790205900C79D56 /* status_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE831790205900C79D56 /* status_2.png */; }; 
     26                2843FE8C1790205900C79D56 /* status_2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE841790205900C79D56 /* status_2@2x.png */; }; 
     27                2843FE8D1790205900C79D56 /* status_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE851790205900C79D56 /* status_3.png */; }; 
     28                2843FE8E1790205900C79D56 /* status_3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE861790205900C79D56 /* status_3@2x.png */; }; 
     29                2843FE8F1790205900C79D56 /* status_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE871790205900C79D56 /* status_4.png */; }; 
     30                2843FE901790205900C79D56 /* status_4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2843FE881790205900C79D56 /* status_4@2x.png */; }; 
     31                288B4BC0178EB112007D588D /* status_0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 288B4BBF178EB112007D588D /* status_0@2x.png */; }; 
     32                288B4BC3178ECD0B007D588D /* AdvancedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 288B4BC2178ECD0B007D588D /* AdvancedViewController.m */; }; 
     33                288B4BC6178ED362007D588D /* SupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 288B4BC5178ED362007D588D /* SupportViewController.m */; }; 
     34                288B4BC9178F016F007D588D /* SignalConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 288B4BC8178F016F007D588D /* SignalConverter.m */; }; 
     35                289C7CCF178C36A9005C08EC /* TutorialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289C7CCE178C36A9005C08EC /* TutorialViewController.m */; }; 
     36                289C7D0E178D757F005C08EC /* FlightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289C7D0D178D757F005C08EC /* FlightViewController.m */; }; 
     37                289C7D19178D7A34005C08EC /* status_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 289C7D14178D7A34005C08EC /* status_0.png */; }; 
    2338                28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; }; 
    2439                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; }; 
     
    5065                28174C7C167F2EAA00104752 /* ViewController.m */ = {isa = PBXFileReference; indentWidth = 3; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; tabWidth = 3; }; 
    5166                28174C83167F30C400104752 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 
     67                2843FE811790205900C79D56 /* status_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_1.png; sourceTree = "<group>"; }; 
     68                2843FE821790205900C79D56 /* status_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "status_1@2x.png"; sourceTree = "<group>"; }; 
     69                2843FE831790205900C79D56 /* status_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_2.png; sourceTree = "<group>"; }; 
     70                2843FE841790205900C79D56 /* status_2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "status_2@2x.png"; sourceTree = "<group>"; }; 
     71                2843FE851790205900C79D56 /* status_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_3.png; sourceTree = "<group>"; }; 
     72                2843FE861790205900C79D56 /* status_3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "status_3@2x.png"; sourceTree = "<group>"; }; 
     73                2843FE871790205900C79D56 /* status_4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_4.png; sourceTree = "<group>"; }; 
     74                2843FE881790205900C79D56 /* status_4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "status_4@2x.png"; sourceTree = "<group>"; }; 
     75                288B4BBF178EB112007D588D /* status_0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "status_0@2x.png"; sourceTree = "<group>"; }; 
     76                288B4BC1178ECD0A007D588D /* AdvancedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdvancedViewController.h; path = controllers/AdvancedViewController.h; sourceTree = "<group>"; }; 
     77                288B4BC2178ECD0B007D588D /* AdvancedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdvancedViewController.m; path = controllers/AdvancedViewController.m; sourceTree = "<group>"; }; 
     78                288B4BC4178ED362007D588D /* SupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportViewController.h; path = controllers/SupportViewController.h; sourceTree = "<group>"; }; 
     79                288B4BC5178ED362007D588D /* SupportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportViewController.m; path = controllers/SupportViewController.m; sourceTree = "<group>"; }; 
     80                288B4BC7178F016F007D588D /* SignalConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignalConverter.h; sourceTree = "<group>"; }; 
     81                288B4BC8178F016F007D588D /* SignalConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignalConverter.m; sourceTree = "<group>"; }; 
     82                288B4BCA178F0842007D588D /* SignalConverterDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignalConverterDelegate.h; sourceTree = "<group>"; }; 
     83                289C7CCD178C36A9005C08EC /* TutorialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TutorialViewController.h; path = controllers/TutorialViewController.h; sourceTree = "<group>"; }; 
     84                289C7CCE178C36A9005C08EC /* TutorialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TutorialViewController.m; path = controllers/TutorialViewController.m; sourceTree = "<group>"; }; 
     85                289C7D0C178D757F005C08EC /* FlightViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FlightViewController.h; path = controllers/FlightViewController.h; sourceTree = "<group>"; }; 
     86                289C7D0D178D757F005C08EC /* FlightViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlightViewController.m; path = controllers/FlightViewController.m; sourceTree = "<group>"; }; 
     87                289C7D14178D7A34005C08EC /* status_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_0.png; sourceTree = "<group>"; }; 
    5288                28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; }; 
    5389                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; }; 
     
    169205                        isa = PBXGroup; 
    170206                        children = ( 
     207                                289C7D0F178D7A21005C08EC /* Images */, 
    171208                                52FA364716899C63004C280A /* Default-568h@2x.png */, 
    172209                                52FA364516899B69004C280A /* ic_launcher-114x114.png */, 
     
    211248                                2815BC08167F428B00F7E6DA /* Libraries */, 
    212249                                28174C67167F2EA900104752 /* Supporting Files */, 
     250                                289C7CCD178C36A9005C08EC /* TutorialViewController.h */, 
     251                                289C7CCE178C36A9005C08EC /* TutorialViewController.m */, 
     252                                289C7D0C178D757F005C08EC /* FlightViewController.h */, 
     253                                289C7D0D178D757F005C08EC /* FlightViewController.m */, 
     254                                288B4BC1178ECD0A007D588D /* AdvancedViewController.h */, 
     255                                288B4BC2178ECD0B007D588D /* AdvancedViewController.m */, 
     256                                288B4BC4178ED362007D588D /* SupportViewController.h */, 
     257                                288B4BC5178ED362007D588D /* SupportViewController.m */, 
     258                                288B4BC7178F016F007D588D /* SignalConverter.h */, 
     259                                288B4BC8178F016F007D588D /* SignalConverter.m */, 
     260                                288B4BCA178F0842007D588D /* SignalConverterDelegate.h */, 
    213261                        ); 
    214262                        path = Orbit; 
     
    225273                        ); 
    226274                        name = "Supporting Files"; 
     275                        sourceTree = "<group>"; 
     276                }; 
     277                289C7D0F178D7A21005C08EC /* Images */ = { 
     278                        isa = PBXGroup; 
     279                        children = ( 
     280                                289C7D14178D7A34005C08EC /* status_0.png */, 
     281                                288B4BBF178EB112007D588D /* status_0@2x.png */, 
     282                                2843FE811790205900C79D56 /* status_1.png */, 
     283                                2843FE821790205900C79D56 /* status_1@2x.png */, 
     284                                2843FE831790205900C79D56 /* status_2.png */, 
     285                                2843FE841790205900C79D56 /* status_2@2x.png */, 
     286                                2843FE851790205900C79D56 /* status_3.png */, 
     287                                2843FE861790205900C79D56 /* status_3@2x.png */, 
     288                                2843FE871790205900C79D56 /* status_4.png */, 
     289                                2843FE881790205900C79D56 /* status_4@2x.png */, 
     290                        ); 
     291                        name = Images; 
    227292                        sourceTree = "<group>"; 
    228293                }; 
     
    366431                                52FA364616899B69004C280A /* ic_launcher-114x114.png in Resources */, 
    367432                                52FA364816899C63004C280A /* Default-568h@2x.png in Resources */, 
     433                                289C7D19178D7A34005C08EC /* status_0.png in Resources */, 
     434                                288B4BC0178EB112007D588D /* status_0@2x.png in Resources */, 
     435                                2843FE891790205900C79D56 /* status_1.png in Resources */, 
     436                                2843FE8A1790205900C79D56 /* status_1@2x.png in Resources */, 
     437                                2843FE8B1790205900C79D56 /* status_2.png in Resources */, 
     438                                2843FE8C1790205900C79D56 /* status_2@2x.png in Resources */, 
     439                                2843FE8D1790205900C79D56 /* status_3.png in Resources */, 
     440                                2843FE8E1790205900C79D56 /* status_3@2x.png in Resources */, 
     441                                2843FE8F1790205900C79D56 /* status_4.png in Resources */, 
     442                                2843FE901790205900C79D56 /* status_4@2x.png in Resources */, 
    368443                        ); 
    369444                        runOnlyForDeploymentPostprocessing = 0; 
     
    379454                                28174C71167F2EA900104752 /* AppDelegate.m in Sources */, 
    380455                                28174C7D167F2EAA00104752 /* ViewController.m in Sources */, 
     456                                289C7CCF178C36A9005C08EC /* TutorialViewController.m in Sources */, 
     457                                289C7D0E178D757F005C08EC /* FlightViewController.m in Sources */, 
     458                                288B4BC3178ECD0B007D588D /* AdvancedViewController.m in Sources */, 
     459                                288B4BC6178ED362007D588D /* SupportViewController.m in Sources */, 
     460                                288B4BC9178F016F007D588D /* SignalConverter.m in Sources */, 
    381461                        ); 
    382462                        runOnlyForDeploymentPostprocessing = 0; 
     
    457537                        isa = XCBuildConfiguration; 
    458538                        buildSettings = { 
    459                                 CLANG_ENABLE_OBJC_ARC = NO; 
    460539                                GCC_PRECOMPILE_PREFIX_HEADER = YES; 
    461540                                GCC_PREFIX_HEADER = "Orbit/Orbit-Prefix.pch"; 
     
    478557                        isa = XCBuildConfiguration; 
    479558                        buildSettings = { 
    480                                 CLANG_ENABLE_OBJC_ARC = NO; 
    481559                                GCC_PRECOMPILE_PREFIX_HEADER = YES; 
    482560                                GCC_PREFIX_HEADER = "Orbit/Orbit-Prefix.pch"; 
Note: See TracChangeset for help on using the changeset viewer.