Changeset eac712d in orbit for iOS/Orbit

Timestamp:

12/23/12 19:15:27 (8 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:

• HOW_TO_USE.txt (added)
• Orbit.xcodeproj/project.pbxproj (modified) (4 diffs)
• Orbit.xcodeproj/project.xcworkspace/xcuserdata/jonathon.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• Orbit/ViewController.m (modified) (3 diffs)

iOS/Orbit/Orbit.xcodeproj/project.pbxproj

@@ -28 +28 @@
                 28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; };
                 28C10EEF16875C9200ECFD59 /* iOS_noflip.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEE16875C9200ECFD59 /* iOS_noflip.wav */; };
+                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; };
 /* End PBXBuildFile section */
 
@@ -58 +59 @@
                 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; };
                 28C10EEE16875C9200ECFD59 /* iOS_noflip.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = iOS_noflip.wav; sourceTree = "<group>"; };
+                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -92 +94 @@
                         isa = PBXGroup;
                         children = (
+                                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */,
                                 282F2B351681D10200B9A99A /* ic_launcher-114x114.png */,
                                 282F2B321681D0FC00B9A99A /* ic_launcher-57x57.png */,
@@ -212 +215 @@
                                 28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */,
                                 28C10EEF16875C9200ECFD59 /* iOS_noflip.wav in Resources */,
+                                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

iOS/Orbit/Orbit/ViewController.m

@@ -12 +12 @@
 #define LOGGING true // set to false to stop each received signal being logged
 
-#define AUDIO_FILE_NAME @"iOS_noflip.wav" //@"throttle_hover_ios.wav"
+#define AUDIO_FILE_NAME @"throttle_hover_ios.wav" // @"iOS_noflip.wav" //
 #define POOR_SIGNAL_KEY @"poorSignal"
 #define ATTENTION_KEY @"eSenseAttention"
@@ -142 +142 @@
 // Reset the outputs back to zero
 - (void)accessoryDidDisconnect {
-    [self logMessage:@"An accessory was disconnected."];
+    [self logMessage:@"Accessory was disconnected."];
     [self resetOutputToZero];
 }
@@ -238 +238 @@
 {
     demoRunning = NO;
+    [self resetOutputToZero];
     [demoButton setTitle:@"Demo" forState:UIControlStateNormal];
     if (audioPlayer != NULL && [audioPlayer isPlaying]) {