Changeset eac712d in orbit


Ignore:
Timestamp:
12/23/12 19:15:27 (7 years ago)
Author:
Jonathon Horsman <jonathon@…>
Branches:
master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
Children:
2aabdf3
Parents:
c21b58a
Message:

Added instructions

Location:
iOS/Orbit
Files:
1 added
3 edited

Legend:

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

    rb3458d9 reac712d  
    2828                28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; }; 
    2929                28C10EEF16875C9200ECFD59 /* iOS_noflip.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEE16875C9200ECFD59 /* iOS_noflip.wav */; }; 
     30                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; }; 
    3031/* End PBXBuildFile section */ 
    3132 
     
    5859                28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; }; 
    5960                28C10EEE16875C9200ECFD59 /* iOS_noflip.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = iOS_noflip.wav; sourceTree = "<group>"; }; 
     61                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; }; 
    6062/* End PBXFileReference section */ 
    6163 
     
    9294                        isa = PBXGroup; 
    9395                        children = ( 
     96                                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */, 
    9497                                282F2B351681D10200B9A99A /* ic_launcher-114x114.png */, 
    9598                                282F2B321681D0FC00B9A99A /* ic_launcher-57x57.png */, 
     
    212215                                28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */, 
    213216                                28C10EEF16875C9200ECFD59 /* iOS_noflip.wav in Resources */, 
     217                                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */, 
    214218                        ); 
    215219                        runOnlyForDeploymentPostprocessing = 0; 
  • iOS/Orbit/Orbit/ViewController.m

    rb3458d9 reac712d  
    1212#define LOGGING true // set to false to stop each received signal being logged 
    1313 
    14 #define AUDIO_FILE_NAME @"iOS_noflip.wav" //@"throttle_hover_ios.wav" 
     14#define AUDIO_FILE_NAME @"throttle_hover_ios.wav" // @"iOS_noflip.wav" // 
    1515#define POOR_SIGNAL_KEY @"poorSignal" 
    1616#define ATTENTION_KEY @"eSenseAttention" 
     
    142142// Reset the outputs back to zero 
    143143- (void)accessoryDidDisconnect { 
    144     [self logMessage:@"An accessory was disconnected."]; 
     144    [self logMessage:@"Accessory was disconnected."]; 
    145145    [self resetOutputToZero]; 
    146146} 
     
    238238{ 
    239239    demoRunning = NO; 
     240    [self resetOutputToZero]; 
    240241    [demoButton setTitle:@"Demo" forState:UIControlStateNormal]; 
    241242    if (audioPlayer != NULL && [audioPlayer isPlaying]) { 
Note: See TracChangeset for help on using the changeset viewer.